branch develop updated (15bf8ac -> 71b7d44)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository pom. See http://git.nuiton.org/pom.git from 15bf8ac Update animal-sniffer-maven-plugin to 1.15 (Fixes #3899) new e942707 Suppression du check de la proriété siteDeployClassifier (elle est injectée par helper-maven-plugin:compute-distribution-site-url) new 536ede8 Upgrade to m-site-p 3.5 (and jrst 2.2-SNAPSHOT) + can't use anylonger variables to defined urls in site descriptors (See #3886) new 5961309 Fixes #3886 Merge branch 'feature/3886' into develop new 71b7d44 Improve documentation The 4 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit 71b7d44039dcdea74127a0cef5a4677f66ca02ef Author: Tony CHEMIT <chemit@codelutin.com> Date: Sun Feb 28 16:33:37 2016 +0100 Improve documentation commit 5961309c74a6d2854a9d6dc4dc5923ee384d87f6 Merge: e942707 536ede8 Author: Tony CHEMIT <chemit@codelutin.com> Date: Sun Feb 28 14:48:59 2016 +0100 Fixes #3886 Merge branch 'feature/3886' into develop commit 536ede8626a80633810d2d106f6811a254330cda Author: Tony CHEMIT <chemit@codelutin.com> Date: Sun Feb 28 08:15:46 2016 +0100 Upgrade to m-site-p 3.5 (and jrst 2.2-SNAPSHOT) + can't use anylonger variables to defined urls in site descriptors (See #3886) commit e942707b52c8837c6ea6c218b85edcc1bbcffbf0 Author: Tony CHEMIT <chemit@codelutin.com> Date: Sun Feb 28 14:11:11 2016 +0100 Suppression du check de la proriété siteDeployClassifier (elle est injectée par helper-maven-plugin:compute-distribution-site-url) Summary of changes: README.md | 142 ++++++++++++++++++++++++++++++++++++++----------- chorempom/README.md | 56 ++----------------- codelutinpom/README.md | 53 +----------------- nuitonpom/README.md | 56 ++----------------- pom.xml | 28 +--------- src/site/site.xml | 14 ++--- 6 files changed, 128 insertions(+), 221 deletions(-) -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository pom. See http://git.nuiton.org/pom.git commit e942707b52c8837c6ea6c218b85edcc1bbcffbf0 Author: Tony CHEMIT <chemit@codelutin.com> Date: Sun Feb 28 14:11:11 2016 +0100 Suppression du check de la proriété siteDeployClassifier (elle est injectée par helper-maven-plugin:compute-distribution-site-url) --- pom.xml | 21 --------------------- 1 file changed, 21 deletions(-) diff --git a/pom.xml b/pom.xml index 6f01c50..b75a0f5 100644 --- a/pom.xml +++ b/pom.xml @@ -860,27 +860,6 @@ </execution> <execution> - <id>enforce-site-deploy-classifier</id> - <goals> - <goal>enforce</goal> - </goals> - <phase>pre-site</phase> - <configuration> - <rules> - <requireProperty> - <property>siteDeployClassifier</property> - <message>"siteDeployClassifier property must be specified."</message> - <regex>.+$</regex> - <regexMessage>"siteDeployClassifier property can not be empty."</regexMessage> - </requireProperty> - </rules> - <ignoreCache>true</ignoreCache> - <failFast>true</failFast> - <fail>true</fail> - </configuration> - </execution> - - <execution> <id>enforce-platform</id> <goals> <goal>enforce</goal> -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository pom. See http://git.nuiton.org/pom.git commit 536ede8626a80633810d2d106f6811a254330cda Author: Tony CHEMIT <chemit@codelutin.com> Date: Sun Feb 28 08:15:46 2016 +0100 Upgrade to m-site-p 3.5 (and jrst 2.2-SNAPSHOT) + can't use anylonger variables to defined urls in site descriptors (See #3886) --- pom.xml | 7 ++----- src/site/site.xml | 14 +++++++------- 2 files changed, 9 insertions(+), 12 deletions(-) diff --git a/pom.xml b/pom.xml index b75a0f5..c100762 100644 --- a/pom.xml +++ b/pom.xml @@ -234,7 +234,7 @@ <!-- our plugins --> <helperPluginVersion>2.3.1</helperPluginVersion> <jredminePluginVersion>1.9</jredminePluginVersion> - <jrstPluginVersion>2.1</jrstPluginVersion> + <jrstPluginVersion>2.2-SNAPSHOT</jrstPluginVersion> <!-- apache maven plugins version --> <antRunPluginVersion>1.8</antRunPluginVersion> @@ -257,7 +257,7 @@ <releasePluginVersion>2.5.3</releasePluginVersion> <remoteResourcesPluginVersion>1.5</remoteResourcesPluginVersion> <resourcesPluginVersion>2.7</resourcesPluginVersion> - <sitePluginVersion>3.4</sitePluginVersion> + <sitePluginVersion>3.5</sitePluginVersion> <sourcePluginVersion>3.0.0</sourcePluginVersion> <surefirePluginVersion>2.19.1</surefirePluginVersion> <warPluginVersion>2.6</warPluginVersion> @@ -342,9 +342,6 @@ <!-- fluido skin version --> <fluidoSkinVersion>1.5</fluidoSkinVersion> - <!-- where to get common site resources --> - <siteCommonResourcesUrl>http://common.nuiton.org/dev</siteCommonResourcesUrl> - <!-- to generate sitemap --> <generateSitemap>true</generateSitemap> diff --git a/src/site/site.xml b/src/site/site.xml index e7ad5a4..d630162 100644 --- a/src/site/site.xml +++ b/src/site/site.xml @@ -22,9 +22,9 @@ --> -<project name="${project.name}" xmlns="http://maven.apache.org/DECORATION/1.4.0" +<project name="${project.name}" xmlns="http://maven.apache.org/DECORATION/1.7.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/DECORATION/1.4.0 http://maven.apache.org/xsd/decoration-1.4.0.xsd"> + xsi:schemaLocation="http://maven.apache.org/DECORATION/1.7.0 http://maven.apache.org/xsd/decoration-1.7.0.xsd"> <skin> <groupId>org.apache.maven.skins</groupId> @@ -51,17 +51,17 @@ <poweredBy> - <logo href="http://maven.apache.org" name="Maven" img="${siteCommonResourcesUrl}/images/logos/maven-feather.png"/> + <logo href="http://maven.apache.org" name="Maven" img="http://common.nuiton.org/dev/images/logos/maven-feather.png"/> </poweredBy> <body> <head> - <script type="text/javascript" src="${siteCommonResourcesUrl}/js/pom-site.js"> - - </script> - <link rel="stylesheet" type="text/css" href="${siteCommonResourcesUrl}/css/mavenpom-site.css"/> + <![CDATA[ + <script type="text/javascript" src="http://common.nuiton.org/dev/js/pom-site.js"></script> + <link rel="stylesheet" type="text/css" href="http://common.nuiton.org/dev/css/mavenpom-site.css"/> + ]]> </head> </body> -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository pom. See http://git.nuiton.org/pom.git commit 5961309c74a6d2854a9d6dc4dc5923ee384d87f6 Merge: e942707 536ede8 Author: Tony CHEMIT <chemit@codelutin.com> Date: Sun Feb 28 14:48:59 2016 +0100 Fixes #3886 Merge branch 'feature/3886' into develop pom.xml | 7 ++----- src/site/site.xml | 14 +++++++------- 2 files changed, 9 insertions(+), 12 deletions(-) -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository pom. See http://git.nuiton.org/pom.git commit 71b7d44039dcdea74127a0cef5a4677f66ca02ef Author: Tony CHEMIT <chemit@codelutin.com> Date: Sun Feb 28 16:33:37 2016 +0100 Improve documentation --- README.md | 142 ++++++++++++++++++++++++++++++++++++++----------- chorempom/README.md | 56 ++----------------- codelutinpom/README.md | 53 +----------------- nuitonpom/README.md | 56 ++----------------- 4 files changed, 119 insertions(+), 188 deletions(-) diff --git a/README.md b/README.md index 84e23c2..c8e7135 100644 --- a/README.md +++ b/README.md @@ -1,43 +1,123 @@ -Abstract --------- +#Abstract -This is the shared pom ancestor of all maven projects hosted on our forge -(nuiton.org, chorem.org, codelutin.com) using only *Git*; don't use it if you -still using *SVN*. +##Requirements -This one should not be used directly on any of the forge projects. Use -instead the dedicated pom of the forge (see nuitonpom, chorempom or -codelutinpom). +* Use on a redmine platform with *JRedmine* plugin +* Use *git* +* Use *gitflow* +* (optional) Host scm on *gitlab* -Build ------ +##What can I do for you, sir? -Since version 1.9, this is a regular project, no need to add any longer the -*-Dinternal* parameter, it will be added for you. +* infrastructure configuration (redmine, ci, git) +* maven plugins versions +* release configuration +* some usefull configuration in profiles -Release -------- +##No I don't do this! -This project does not support any site generation to make easier the other -project configurations. +* dependancies version +* scm configuration (?) +* site deployment at release release +* svn -To release this project all must be done by hand. +#Use pom -mvn jgitflow:release-start -mvn jgitflow:release-finish +##Which pom to use? -This will (only): +* For a project hosted on *nuiton.org*, use *org.nuiton:nuitonpom* +* For a project hosted on *chorem.org*, use *org.nuiton:chorempom* +* For a project hosted on *codelutin.com*, use *org.nuiton:codelutinpom* -o deploy artifacts on maven central repository -o publish attachments in forge.nuiton.org -o close version on forge.nuiton.org -o publish a news on forge.nuiton.org -o send a email to the commits list if the project -o create the git merge to master -o create the git release tag +##Mandatory configuration -Documentation -------------- +* Mandatory property **projectId** project's redmine id +* Mandatory property **ciViewId** project's ci view id -Note that the pom project does not have any maven site. -Documentation can be found here: https://forge.nuiton.org/projects/pom/wiki \ No newline at end of file +##To deploy artifacts on *Nexus* + Add in maven pom: + +``<maven.deploy.skip>false</maven.deploy.skip>`` + +##To build javadoc + Add in maven pom: + +``<maven.javadoc.skip>true</maven.javadoc.skip>`` + +##To build sources + Add in maven pom: + +``<source.skip>true</source.skip>`` + +###Note + +For projects using *nuitonpom*, **javadoc** and **sources** are included at release time, and **all modules are deployed** to *Nexus*. + +#Do a release + +###Initialize release + +``mvn jgitflow:release-start`` + +###Check before release + +``mvn clean verify -DperformRelease`` + +###Optional commit any changes on the release branch (license headers, third parties files, ...) + +``git commit -am"Fix release ..."`` + +###Launch release + +``mvn jgitflow:release-finish `` + +###What is done? + +* deploy artifacts on nexus repository +* publish attachments in redmine +* close version on redmine +* publish a news on redmine +* send a email to the commits list +* create the git merge to master +* create the git release tag + +###What is not done? + +* generate the maven site +* deploy the maven site + +#Deploy a maven site + +##Using ci + The project should declare two ci jobs: + + * *technical-site* to build and deploy maven site from *master* branch + * *technical-site-snapshot* to build and deploy maven site from *develop* branch + +##Using Maven + + Go where you need to be on git, and launch + +``mvn clean verify site-deploy -DperformRelease`` + +### Where is deployed the site ? + + If the project is in *Snapshot* version, the maven site is deployed to *develop* version, otherwise it is deployed to the project version. + +###Example + + * [ci job jaxx-technical-site] (https://ci.nuiton.org/jaxx-technical-site) → [maven site] (http://jaxx.nuiton.org/v/latest) + * [ci job jaxx-technical-site-snapshot] (https://ci.nuiton.org/jaxx-technical-site-snapshot) → [maven site] (http://jaxx.nuiton.org/v/develop) + +#Howto write a site + +[See] (https://forge.nuiton.org/projects/pom/wiki/Comment_%C3%A9crire_un_site) + +**TODO Migrate this documentation here** + + +#FAQ + +[See] (https://forge.nuiton.org/projects/pom/wiki/FAQ) + +**TODO Migrate this documentation here** diff --git a/chorempom/README.md b/chorempom/README.md index 74ca85e..1c3e6e2 100644 --- a/chorempom/README.md +++ b/chorempom/README.md @@ -1,55 +1,5 @@ -Abstract --------- +#Abstract -The ancestor pom for all maven projects hosted on https://forge.chorem.org +The ancestor pom for all maven projects hosted on [Redmine **chorem.org**] ( https://forge.chorem.org ). -Release -------- - -To perform a release of a project using this pom: - -# check release start, create release branch -mvn jgitflow:release-start - -# launch a build to check everything is ok before doing real release -mvn clean verify -DperformRelease - -# check if there is some modifications to commit on the release branch -git status - -# do commit if necessary -git commit -am"Fix release ..." - -# perform the release -mvn jgitflow:release-finish - -This will: - -o deploy artifacts on maven central repository -o publish attachments in forge.chorem.org -o close version on forge.chorem.org -o publish a news on forge.chorem.org -o send a email to the commits list if the project -o create the git merge to master -o create the git release tag - -This will not: - -o generate the maven site -o deploy the maven site - -Deploy release site -------------------- - -The site is now deployed by a Jenkins job named *projectId-doc* at each commit on master, so nothing for you to do here. - -Just make sure that the job exists. - -Deploy snapshot site --------------------- - -git checkout develop -mvn clean verify site-deploy -DperformRelease -Psnapshot-site - -o build maven site -o deploy it to https://projectId.chorem.org/v/develop +See [Pom main documentation] ( https://gitlab.nuiton.org/nuiton/pom ). diff --git a/codelutinpom/README.md b/codelutinpom/README.md index 3be3ce0..32e8df9 100644 --- a/codelutinpom/README.md +++ b/codelutinpom/README.md @@ -1,55 +1,6 @@ Abstract -------- -The ancestor pom for all maven projects hosted on https://forge.codelutin.com +The ancestor pom for all maven projects hosted on [Redmine **codelutin.com**] ( https://forge.codelutin.com ). -Release -------- - -To perform a release of a project using this pom: - -# check release start, create release branch -mvn jgitflow:release-start - -# launch a build to check everything is ok before doing real release -mvn clean verify -DperformRelease - -# check if there is some modifications to commit on the release branch -git status - -# do commit if necessary -git commit -am"Fix release ..." - -# perform the release -mvn jgitflow:release-finish - -This will: - -o deploy artifacts on maven central repository -o publish attachments in forge.codelutin.com -o close version on forge.codelutin.com -o publish a news on forge.codelutin.com -o send a email to the commits list if the project -o create the git merge to master -o create the git release tag - -This will not: - -o generate the maven site -o deploy the maven site - -Deploy release site -------------------- - -The site is now deployed by a Jenkins job named *projectId-doc* at each commit on master, so nothing for you to do here. - -Just make sure that the job exists. - -Deploy snapshot site --------------------- - -git checkout develop -mvn clean verify site-deploy -DperformRelease -Psnapshot-site - -o build maven site -o deploy it to https://projectId.codelutin.com/v/develop +See [Pom main documentation] ( https://gitlab.nuiton.org/nuiton/pom ). diff --git a/nuitonpom/README.md b/nuitonpom/README.md index bdfe497..827e46c 100644 --- a/nuitonpom/README.md +++ b/nuitonpom/README.md @@ -1,55 +1,5 @@ -Abstract --------- +#Abstract -The ancestor pom for all maven projects hosted on https://forge.nuiton.org +The ancestor pom for all maven projects hosted on [Redmine **nuiton.org**] ( https://forge.nuiton.org ). -Release -------- - -To perform a release of a project using this pom: - -# check release start, create release branch -mvn jgitflow:release-start - -# launch a build to check everything is ok before doing real release -mvn clean verify -DperformRelease - -# check if there is some modifications to commit on the release branch -git status - -# do commit if necessary -git commit -am"Fix release ..." - -# perform the release -mvn jgitflow:release-finish - -This will: - -o deploy artifacts on maven central repository -o publish attachments in forge.nuiton.org -o close version on forge.nuiton.org -o publish a news on forge.nuiton.org -o send a email to the commits list if the project -o create the git merge to master -o create the git release tag - -This will not: - -o generate the maven site -o deploy the maven site - -Deploy release site -------------------- - -The site is now deployed by a Jenkins job named *projectId-doc* at each commit on master, so nothing for you to do here. - -Just make sure that the job exists. - -Deploy snapshot site --------------------- - -git checkout develop -mvn clean verify site-deploy -DperformRelease -Psnapshot-site - -o build maven site -o deploy it to https://projectId.nuiton.org/v/develop +See [Pom main documentation] ( https://gitlab.nuiton.org/nuiton/pom ). -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.
participants (1)
-
nuiton.org scm