- Observe-commits - mailman.cloud.codelutin.com

[Git][ultreia.io/ird-observe][develop] 2 commits: improve release scripts
by Tony CHEMIT 08 Mar '17

08 Mar '17

Tony CHEMIT pushed to branch develop at ultreia.io / ird-observe Commits: 27a26a87 by Tony CHEMIT at 2017-03-08T18:16:32+01:00 improve release scripts - - - - - d09ccb1e by Tony CHEMIT at 2017-03-08T18:23:16+01:00 prepare release 6.0-RC-1 + fix release - - - - - 26 changed files: - application-swing-configuration/pom.xml - application-swing-decoration/pom.xml - application-swing-validation/pom.xml - application-swing-validators/pom.xml - application-swing/pom.xml - application-web-configuration/pom.xml - application-web/pom.xml - bin/stage_create.sh - common/pom.xml - observe/pom.xml - persistence/pom.xml - pom.xml - services-binder/pom.xml - services-configuration-rest/pom.xml - services-configuration-topia/pom.xml - services-configuration/pom.xml - services-rest/pom.xml - services-runner/pom.xml - services-topia/pom.xml - services-validation/pom.xml - services-validators/pom.xml - services/pom.xml - test/pom.xml - toolbox-maven-plugin/pom.xml - topia-extension/pom.xml - topia-templates-extension/pom.xml Changes: ===================================== application-swing-configuration/pom.xml ===================================== --- a/application-swing-configuration/pom.xml +++ b/application-swing-configuration/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>3.0-RC-2-SNAPSHOT</version> + <version>6.0-RC-1-SNAPSHOT</version> </parent> <artifactId>application-swing-configuration</artifactId> ===================================== application-swing-decoration/pom.xml ===================================== --- a/application-swing-decoration/pom.xml +++ b/application-swing-decoration/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>3.0-RC-2-SNAPSHOT</version> + <version>6.0-RC-1-SNAPSHOT</version> </parent> <artifactId>application-swing-decoration</artifactId> ===================================== application-swing-validation/pom.xml ===================================== --- a/application-swing-validation/pom.xml +++ b/application-swing-validation/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>3.0-RC-2-SNAPSHOT</version> + <version>6.0-RC-1-SNAPSHOT</version> </parent> <artifactId>application-swing-validation</artifactId> ===================================== application-swing-validators/pom.xml ===================================== --- a/application-swing-validators/pom.xml +++ b/application-swing-validators/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>3.0-RC-2-SNAPSHOT</version> + <version>6.0-RC-1-SNAPSHOT</version> </parent> <artifactId>application-swing-validators</artifactId> ===================================== application-swing/pom.xml ===================================== --- a/application-swing/pom.xml +++ b/application-swing/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>3.0-RC-2-SNAPSHOT</version> + <version>6.0-RC-1-SNAPSHOT</version> </parent> <artifactId>application-swing</artifactId> ===================================== application-web-configuration/pom.xml ===================================== --- a/application-web-configuration/pom.xml +++ b/application-web-configuration/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>3.0-RC-2-SNAPSHOT</version> + <version>6.0-RC-1-SNAPSHOT</version> </parent> <artifactId>application-web-configuration</artifactId> @@ -179,36 +179,4 @@ </build> - <profiles> - <profile> - <id>deploy-demo</id> - <properties> - <classifier>${project.version}</classifier> - </properties> - <build> - <defaultGoal>verify</defaultGoal> - <plugins> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>wagon-maven-plugin</artifactId> - <executions> - <execution> - <id>deploy-demo</id> - <phase>verify</phase> - <goals> - <goal>upload-single</goal> - </goals> - <configuration> - <serverId>doc.ultreia.io</serverId> - <url>scpexe://ultreia.io/var/lib/tomcat8/webapps</url> - <fromFile>${project.build.directory}/${project.build.finalName}.war</fromFile> - <toFile>observe-${classifier}.war</toFile> - </configuration> - </execution> - </executions> - </plugin> - </plugins> - </build> - </profile> - </profiles> </project> ===================================== application-web/pom.xml ===================================== --- a/application-web/pom.xml +++ b/application-web/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>3.0-RC-2-SNAPSHOT</version> + <version>6.0-RC-1-SNAPSHOT</version> </parent> <artifactId>application-web</artifactId> @@ -39,18 +39,8 @@ <properties> <applicationName>observeweb</applicationName> - <i18n.bundleOutputName>${applicationName}-i18n</i18n.bundleOutputName> -  - <deployFiles>${project.build.directory}/${project.build.finalName}.war</deployFiles> - -  - <redmine.releaseFiles>${project.build.directory}/${project.build.finalName}.war</redmine.releaseFiles> - -  - <maven.deploy.skip>false</maven.deploy.skip> - </properties> <dependencies> @@ -296,5 +286,37 @@ </build> + <profiles> + <profile> + <id>deploy-demo</id> + <properties> + <classifier>${project.version}</classifier> + </properties> + <build> + <defaultGoal>verify</defaultGoal> + <plugins> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>wagon-maven-plugin</artifactId> + <executions> + <execution> + <id>deploy-demo</id> + <phase>verify</phase> + <goals> + <goal>upload-single</goal> + </goals> + <configuration> + <serverId>doc.ultreia.io</serverId> + <url>scpexe://ultreia.io/var/lib/tomcat8/webapps</url> + <fromFile>${project.build.directory}/${project.build.finalName}.war</fromFile> + <toFile>observe-${classifier}.war</toFile> + </configuration> + </execution> + </executions> + </plugin> + </plugins> + </build> + </profile> + </profiles> </project> ===================================== bin/stage_create.sh ===================================== --- a/bin/stage_create.sh +++ b/bin/stage_create.sh @@ -29,10 +29,10 @@ if [ ! "$?" == "0" ]; then exit 1 fi echo "Get staging id..." -STAGE_ID=$(mvn nexus-staging:rc-list | grep ${STAGE} | cut -d' ' -f2) +STAGE_ID=$(mvn nexus-staging:rc-list -N | grep ${STAGE} | cut -d' ' -f2) echo "Closing stage: $STAGE_ID ($LOG_DIR/release-close.log)" -mvn nexus-staging:close -DstagingRepositoryId=${STAGE_ID} --log-file ${LOG_DIR}/release-close.log +mvn nexus-staging:close -N -DstagingRepositoryId=${STAGE_ID} --log-file ${LOG_DIR}/release-close.log if [ ! "$?" == "0" ]; then echo "Error" exit 1 ===================================== common/pom.xml ===================================== --- a/common/pom.xml +++ b/common/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>3.0-RC-2-SNAPSHOT</version> + <version>6.0-RC-1-SNAPSHOT</version> </parent> <artifactId>common</artifactId> ===================================== observe/pom.xml ===================================== --- a/observe/pom.xml +++ b/observe/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>3.0-RC-2-SNAPSHOT</version> + <version>6.0-RC-1-SNAPSHOT</version> </parent> <artifactId>observe</artifactId> ===================================== persistence/pom.xml ===================================== --- a/persistence/pom.xml +++ b/persistence/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>3.0-RC-2-SNAPSHOT</version> + <version>6.0-RC-1-SNAPSHOT</version> </parent> <artifactId>persistence</artifactId> ===================================== pom.xml ===================================== --- a/pom.xml +++ b/pom.xml @@ -31,7 +31,7 @@ <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>3.0-RC-2-SNAPSHOT</version> + <version>6.0-RC-1-SNAPSHOT</version> <packaging>pom</packaging> <name>ObServe</name> @@ -216,6 +216,9 @@  <observe.model.version>6.0</observe.model.version> +  + <maven.deploy.skip>true</maven.deploy.skip> + </properties> <dependencyManagement> @@ -1007,7 +1010,7 @@ <fileset dir="doc/modelisation"> <include name="**/*.pdf" /> </fileset> - <fileset dir="entities/src/main/xmi"> + <fileset dir="persistence/src/main/xmi"> <include name="**/*.zargo" /> </fileset> </copy> ===================================== services-binder/pom.xml ===================================== --- a/services-binder/pom.xml +++ b/services-binder/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>3.0-RC-2-SNAPSHOT</version> + <version>6.0-RC-1-SNAPSHOT</version> </parent> <artifactId>services-binder</artifactId> ===================================== services-configuration-rest/pom.xml ===================================== --- a/services-configuration-rest/pom.xml +++ b/services-configuration-rest/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>3.0-RC-2-SNAPSHOT</version> + <version>6.0-RC-1-SNAPSHOT</version> </parent> <artifactId>services-configuration-rest</artifactId> ===================================== services-configuration-topia/pom.xml ===================================== --- a/services-configuration-topia/pom.xml +++ b/services-configuration-topia/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>3.0-RC-2-SNAPSHOT</version> + <version>6.0-RC-1-SNAPSHOT</version> </parent> <artifactId>services-configuration-topia</artifactId> ===================================== services-configuration/pom.xml ===================================== --- a/services-configuration/pom.xml +++ b/services-configuration/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>3.0-RC-2-SNAPSHOT</version> + <version>6.0-RC-1-SNAPSHOT</version> </parent> <artifactId>services-configuration</artifactId> ===================================== services-rest/pom.xml ===================================== --- a/services-rest/pom.xml +++ b/services-rest/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>3.0-RC-2-SNAPSHOT</version> + <version>6.0-RC-1-SNAPSHOT</version> </parent> <artifactId>services-rest</artifactId> ===================================== services-runner/pom.xml ===================================== --- a/services-runner/pom.xml +++ b/services-runner/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>3.0-RC-2-SNAPSHOT</version> + <version>6.0-RC-1-SNAPSHOT</version> </parent> <artifactId>services-runner</artifactId> ===================================== services-topia/pom.xml ===================================== --- a/services-topia/pom.xml +++ b/services-topia/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>3.0-RC-2-SNAPSHOT</version> + <version>6.0-RC-1-SNAPSHOT</version> </parent> <artifactId>services-topia</artifactId> ===================================== services-validation/pom.xml ===================================== --- a/services-validation/pom.xml +++ b/services-validation/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>3.0-RC-2-SNAPSHOT</version> + <version>6.0-RC-1-SNAPSHOT</version> </parent> <artifactId>services-validation</artifactId> ===================================== services-validators/pom.xml ===================================== --- a/services-validators/pom.xml +++ b/services-validators/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>3.0-RC-2-SNAPSHOT</version> + <version>6.0-RC-1-SNAPSHOT</version> </parent> <artifactId>services-validators</artifactId> ===================================== services/pom.xml ===================================== --- a/services/pom.xml +++ b/services/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>3.0-RC-2-SNAPSHOT</version> + <version>6.0-RC-1-SNAPSHOT</version> </parent> <artifactId>services</artifactId> ===================================== test/pom.xml ===================================== --- a/test/pom.xml +++ b/test/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>3.0-RC-2-SNAPSHOT</version> + <version>6.0-RC-1-SNAPSHOT</version> </parent> <artifactId>test</artifactId> ===================================== toolbox-maven-plugin/pom.xml ===================================== --- a/toolbox-maven-plugin/pom.xml +++ b/toolbox-maven-plugin/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>3.0-RC-2-SNAPSHOT</version> + <version>6.0-RC-1-SNAPSHOT</version> </parent> <artifactId>toolbox-maven-plugin</artifactId> ===================================== topia-extension/pom.xml ===================================== --- a/topia-extension/pom.xml +++ b/topia-extension/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>3.0-RC-2-SNAPSHOT</version> + <version>6.0-RC-1-SNAPSHOT</version> </parent> <artifactId>topia-extension</artifactId> ===================================== topia-templates-extension/pom.xml ===================================== --- a/topia-templates-extension/pom.xml +++ b/topia-templates-extension/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>3.0-RC-2-SNAPSHOT</version> + <version>6.0-RC-1-SNAPSHOT</version> </parent> <artifactId>topia-templates-extension</artifactId> View it on GitLab: https://gitlab.com/ultreia.io/ird-observe/compare/c98241e089a688c0886b4e1bf…

1 0

[Git][ultreia.io/ird-observe] Deleted tag ird-observe-3.0-RC-1
by Tony CHEMIT 08 Mar '17

08 Mar '17

Tony CHEMIT deleted tag ird-observe-3.0-RC-1 at ultreia.io / ird-observe

1 0

[Git][ultreia.io/ird-observe] Pushed new tag observe-6.0-RC-1
by Tony CHEMIT 08 Mar '17

08 Mar '17

Tony CHEMIT pushed new tag observe-6.0-RC-1 at ultreia.io / ird-observe

1 0

[Git][ultreia.io/ird-observe] Pushed new tag observe-6.0-RC-2
by Tony CHEMIT 08 Mar '17

08 Mar '17

Tony CHEMIT pushed new tag observe-6.0-RC-2 at ultreia.io / ird-observe

1 0

[Git][ultreia.io/ird-observe] Deleted branch release/3.0-RC-1
by Tony CHEMIT 08 Mar '17

08 Mar '17

Tony CHEMIT deleted branch release/3.0-RC-1 at ultreia.io / ird-observe

1 0

[Git][ultreia.io/ird-observe] Pushed new tag observe-6.0-RC-3
by Tony CHEMIT 08 Mar '17

08 Mar '17

Tony CHEMIT pushed new tag observe-6.0-RC-3 at ultreia.io / ird-observe

1 0

[Git][ultreia.io/ird-observe][release/3.0-RC-1] 2 commits: [jgitflow-maven-plugin]updating poms for branch'release/3.0-RC-1' with non-snapshot versions
by Tony CHEMIT 08 Mar '17

08 Mar '17

Tony CHEMIT pushed to branch release/3.0-RC-1 at ultreia.io / ird-observe Commits: 187db334 by Tony CHEMIT at 2017-03-08T18:01:38+01:00 [jgitflow-maven-plugin]updating poms for branch'release/3.0-RC-1' with non-snapshot versions - - - - - 059ff71f by Tony CHEMIT at 2017-03-08T18:09:10+01:00 improve release script - - - - - 26 changed files: - application-swing-configuration/pom.xml - application-swing-decoration/pom.xml - application-swing-validation/pom.xml - application-swing-validators/pom.xml - application-swing/pom.xml - application-web-configuration/pom.xml - application-web/pom.xml - bin/stage_create.sh - common/pom.xml - observe/pom.xml - persistence/pom.xml - pom.xml - services-binder/pom.xml - services-configuration-rest/pom.xml - services-configuration-topia/pom.xml - services-configuration/pom.xml - services-rest/pom.xml - services-runner/pom.xml - services-topia/pom.xml - services-validation/pom.xml - services-validators/pom.xml - services/pom.xml - test/pom.xml - toolbox-maven-plugin/pom.xml - topia-extension/pom.xml - topia-templates-extension/pom.xml Changes: ===================================== application-swing-configuration/pom.xml ===================================== --- a/application-swing-configuration/pom.xml +++ b/application-swing-configuration/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>3.0-RC-1-SNAPSHOT</version> + <version>3.0-RC-1</version> </parent> <artifactId>application-swing-configuration</artifactId> ===================================== application-swing-decoration/pom.xml ===================================== --- a/application-swing-decoration/pom.xml +++ b/application-swing-decoration/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>3.0-RC-1-SNAPSHOT</version> + <version>3.0-RC-1</version> </parent> <artifactId>application-swing-decoration</artifactId> ===================================== application-swing-validation/pom.xml ===================================== --- a/application-swing-validation/pom.xml +++ b/application-swing-validation/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>3.0-RC-1-SNAPSHOT</version> + <version>3.0-RC-1</version> </parent> <artifactId>application-swing-validation</artifactId> ===================================== application-swing-validators/pom.xml ===================================== --- a/application-swing-validators/pom.xml +++ b/application-swing-validators/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>3.0-RC-1-SNAPSHOT</version> + <version>3.0-RC-1</version> </parent> <artifactId>application-swing-validators</artifactId> ===================================== application-swing/pom.xml ===================================== --- a/application-swing/pom.xml +++ b/application-swing/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>3.0-RC-1-SNAPSHOT</version> + <version>3.0-RC-1</version> </parent> <artifactId>application-swing</artifactId> ===================================== application-web-configuration/pom.xml ===================================== --- a/application-web-configuration/pom.xml +++ b/application-web-configuration/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>3.0-RC-1-SNAPSHOT</version> + <version>3.0-RC-1</version> </parent> <artifactId>application-web-configuration</artifactId> ===================================== application-web/pom.xml ===================================== --- a/application-web/pom.xml +++ b/application-web/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>3.0-RC-1-SNAPSHOT</version> + <version>3.0-RC-1</version> </parent> <artifactId>application-web</artifactId> ===================================== bin/stage_create.sh ===================================== --- a/bin/stage_create.sh +++ b/bin/stage_create.sh @@ -18,23 +18,39 @@ git checkout -B ${DEVELOP} echo "Start release: $VERSION ($LOG_DIR/release-start.log)" mvn jgitflow:release-start -B -Prelease-profile --log-file ${LOG_DIR}/release-start.log - +if [ ! "$?" == "0" ]; then + echo "Error" + exit 1 +fi echo "Finish release: $VERSION ($LOG_DIR/release-finish.log)" mvn jgitflow:release-finish -Prelease-profile --log-file ${LOG_DIR}/release-finish.log - +if [ ! "$?" == "0" ]; then + echo "Error" + exit 1 +fi echo "Get staging id..." STAGE_ID=$(mvn nexus-staging:rc-list | grep ${STAGE} | cut -d' ' -f2) echo "Closing stage: $STAGE_ID ($LOG_DIR/release-close.log)" mvn nexus-staging:close -DstagingRepositoryId=${STAGE_ID} --log-file ${LOG_DIR}/release-close.log - +if [ ! "$?" == "0" ]; then + echo "Error" + exit 1 +fi git checkout ${MASTER} echo "Generate site: ($LOG_DIR/release-site.log)" mvn verify site-deploy -DskipTests -DperformRelease --log-file ${LOG_DIR}/release-site.log - +if [ ! "$?" == "0" ]; then + echo "Error" + exit 1 +fi echo "Deploy demo: ($LOG_DIR/release-demo.log)" mvn install -am -pl application-web -DskipTests -DperformRelease -Pdeploy-demo --log-file ${LOG_DIR}/release-demo.log +if [ ! "$?" == "0" ]; then + echo "Error" + exit 1 +fi git stash git checkout ${DEVELOP} \ No newline at end of file ===================================== common/pom.xml ===================================== --- a/common/pom.xml +++ b/common/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>3.0-RC-1-SNAPSHOT</version> + <version>3.0-RC-1</version> </parent> <artifactId>common</artifactId> ===================================== observe/pom.xml ===================================== --- a/observe/pom.xml +++ b/observe/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>3.0-RC-1-SNAPSHOT</version> + <version>3.0-RC-1</version> </parent> <artifactId>observe</artifactId> ===================================== persistence/pom.xml ===================================== --- a/persistence/pom.xml +++ b/persistence/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>3.0-RC-1-SNAPSHOT</version> + <version>3.0-RC-1</version> </parent> <artifactId>persistence</artifactId> ===================================== pom.xml ===================================== --- a/pom.xml +++ b/pom.xml @@ -31,7 +31,7 @@ <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>3.0-RC-1-SNAPSHOT</version> + <version>3.0-RC-1</version> <packaging>pom</packaging> <name>ObServe</name> ===================================== services-binder/pom.xml ===================================== --- a/services-binder/pom.xml +++ b/services-binder/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>3.0-RC-1-SNAPSHOT</version> + <version>3.0-RC-1</version> </parent> <artifactId>services-binder</artifactId> ===================================== services-configuration-rest/pom.xml ===================================== --- a/services-configuration-rest/pom.xml +++ b/services-configuration-rest/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>3.0-RC-1-SNAPSHOT</version> + <version>3.0-RC-1</version> </parent> <artifactId>services-configuration-rest</artifactId> ===================================== services-configuration-topia/pom.xml ===================================== --- a/services-configuration-topia/pom.xml +++ b/services-configuration-topia/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>3.0-RC-1-SNAPSHOT</version> + <version>3.0-RC-1</version> </parent> <artifactId>services-configuration-topia</artifactId> ===================================== services-configuration/pom.xml ===================================== --- a/services-configuration/pom.xml +++ b/services-configuration/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>3.0-RC-1-SNAPSHOT</version> + <version>3.0-RC-1</version> </parent> <artifactId>services-configuration</artifactId> ===================================== services-rest/pom.xml ===================================== --- a/services-rest/pom.xml +++ b/services-rest/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>3.0-RC-1-SNAPSHOT</version> + <version>3.0-RC-1</version> </parent> <artifactId>services-rest</artifactId> ===================================== services-runner/pom.xml ===================================== --- a/services-runner/pom.xml +++ b/services-runner/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>3.0-RC-1-SNAPSHOT</version> + <version>3.0-RC-1</version> </parent> <artifactId>services-runner</artifactId> ===================================== services-topia/pom.xml ===================================== --- a/services-topia/pom.xml +++ b/services-topia/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>3.0-RC-1-SNAPSHOT</version> + <version>3.0-RC-1</version> </parent> <artifactId>services-topia</artifactId> ===================================== services-validation/pom.xml ===================================== --- a/services-validation/pom.xml +++ b/services-validation/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>3.0-RC-1-SNAPSHOT</version> + <version>3.0-RC-1</version> </parent> <artifactId>services-validation</artifactId> ===================================== services-validators/pom.xml ===================================== --- a/services-validators/pom.xml +++ b/services-validators/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>3.0-RC-1-SNAPSHOT</version> + <version>3.0-RC-1</version> </parent> <artifactId>services-validators</artifactId> ===================================== services/pom.xml ===================================== --- a/services/pom.xml +++ b/services/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>3.0-RC-1-SNAPSHOT</version> + <version>3.0-RC-1</version> </parent> <artifactId>services</artifactId> ===================================== test/pom.xml ===================================== --- a/test/pom.xml +++ b/test/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>3.0-RC-1-SNAPSHOT</version> + <version>3.0-RC-1</version> </parent> <artifactId>test</artifactId> ===================================== toolbox-maven-plugin/pom.xml ===================================== --- a/toolbox-maven-plugin/pom.xml +++ b/toolbox-maven-plugin/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>3.0-RC-1-SNAPSHOT</version> + <version>3.0-RC-1</version> </parent> <artifactId>toolbox-maven-plugin</artifactId> ===================================== topia-extension/pom.xml ===================================== --- a/topia-extension/pom.xml +++ b/topia-extension/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>3.0-RC-1-SNAPSHOT</version> + <version>3.0-RC-1</version> </parent> <artifactId>topia-extension</artifactId> ===================================== topia-templates-extension/pom.xml ===================================== --- a/topia-templates-extension/pom.xml +++ b/topia-templates-extension/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>3.0-RC-1-SNAPSHOT</version> + <version>3.0-RC-1</version> </parent> <artifactId>topia-templates-extension</artifactId> View it on GitLab: https://gitlab.com/ultreia.io/ird-observe/compare/598082e53a9977e16cfb0dab9…

1 0

[Git][ultreia.io/ird-observe] Pushed new tag ird-observe-3.0-RC-1
by Tony CHEMIT 08 Mar '17

08 Mar '17

Tony CHEMIT pushed new tag ird-observe-3.0-RC-1 at ultreia.io / ird-observe

1 0

[Git][ultreia.io/ird-observe][master] 38 commits: [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts
by Tony CHEMIT 08 Mar '17

08 Mar '17

Tony CHEMIT pushed to branch master at ultreia.io / ird-observe Commits: 3c84b795 by Maven Release at 2017-01-01T19:20:39+01:00 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts - - - - - 28e1bfb3 by Maven Release at 2017-01-01T19:20:40+01:00 [jgitflow-maven-plugin]merging 'master' into 'develop' - - - - - f38f98c1 by Maven Release at 2017-01-01T19:20:41+01:00 [jgitflow-maven-plugin]Updating develop poms back to pre merge state - - - - - 2012cc8f by Tony CHEMIT at 2017-01-04T12:04:07+01:00 La connexion serveur HTTPS ne fonctionne pas (Fixes #8914) - - - - - cc1674d7 by Tony CHEMIT at 2017-01-06T14:02:16+01:00 Ajout d'une information visuelle sur les écrans de gestion avancée du référentiel et des données (Fixes #8920) - - - - - 1e10c046 by Tony CHEMIT at 2017-01-06T14:02:34+01:00 revue des raccourcis claviers pour le lancement des opérations - - - - - 62c1f68e by Tony CHEMIT at 2017-01-06T15:32:55+01:00 fix method for admin actions - - - - - 3136d5d7 by Tony CHEMIT at 2017-01-06T15:35:19+01:00 ajout doc windows - - - - - e2d45556 by Tony CHEMIT at 2017-01-06T15:44:03+01:00 remove gitlab ci - - - - - e9f885a4 by Tony CHEMIT at 2017-01-10T09:07:19+01:00 La boîte Informations sur la source n'affiche plus l'URL de la base (Fixes #8933) - - - - - 2574d559 by Tony CHEMIT at 2017-01-10T10:06:43+01:00 La suppression d'un équipement dans le référentiel ne fonctionne pas (Fixes #8937) - - - - - 541900b9 by Tony CHEMIT at 2017-01-10T10:42:21+01:00 Lors de la suppression d'un programme, l'UI propose des programmes qui ne sont pas du type de la marée (Fixes #8935) - - - - - 1869d037 by Tony CHEMIT at 2017-01-10T11:26:00+01:00 Fix bad topia generation (Fixes #8934) - - - - - 52570ec0 by Tony CHEMIT at 2017-01-18T15:36:14+01:00 Petites mises au point sur le widget positions(fixes #8964) - - - - - 28561c46 by Tony CHEMIT at 2017-01-18T20:12:28+01:00 fix doc - - - - - 0f58afb1 by Tony CHEMIT at 2017-01-18T20:15:13+01:00 Le serveur ouvre une quantité astronomique de connexions (Fixes #8969) - - - - - 17384ba3 by Tony CHEMIT at 2017-01-18T20:18:53+01:00 le calendrier reste en anglais (fixes #8952) - - - - - 8663e1ac by Tony CHEMIT at 2017-01-18T20:22:12+01:00 Templates de traduction mis à jour (fixes #8967) - - - - - 3feb95ee by Tony CHEMIT at 2017-01-19T20:02:44+01:00 Ajout d'un mojo pour merger les trads (TODO a déplacer dans le projet i18n) - - - - - 81bb131e by Tony CHEMIT at 2017-01-19T20:12:55+01:00 Les corrections orthographiques (fixes #8975) - - - - - c4ab5c10 by Tony CHEMIT at 2017-01-30T18:13:29+01:00 Configuration pour générer le site dans une branche pages - - - - - 4f937a41 by Tony CHEMIT at 2017-01-30T18:13:40+01:00 Add missing license header - - - - - 0cd5a2e7 by Tony CHEMIT at 2017-01-30T21:17:44+01:00 add ci - - - - - df615478 by Tony CHEMIT at 2017-03-08T14:38:45+01:00 update project to fit to new gitlab instance - - - - - 4a553819 by Tony CHEMIT at 2017-03-08T14:41:25+01:00 add release module - - - - - c35accbd by Tony CHEMIT at 2017-03-08T14:58:31+01:00 add changelog - - - - - 096a5b7d by Tony CHEMIT at 2017-03-08T14:59:57+01:00 update license header - - - - - 626cb230 by Tony CHEMIT at 2017-03-08T15:06:20+01:00 upgrade site - - - - - 896bfa5f by Tony CHEMIT at 2017-03-08T15:06:34+01:00 add gitlab issue templates - - - - - 2086d578 by Tony CHEMIT at 2017-03-08T17:06:14+01:00 Report from version 5.x (See #742) - - - - - 877354fc by Tony CHEMIT at 2017-03-08T17:07:55+01:00 report builds from 5.x - - - - - 9d64efaa by Tony CHEMIT at 2017-03-08T17:54:00+01:00 update changelog for version 5.3.2 - - - - - f4a25c6a by Tony CHEMIT at 2017-03-08T17:57:03+01:00 update readme - - - - - c3db5b6d by Tony CHEMIT at 2017-03-08T17:59:24+01:00 add release scripts - - - - - 598082e5 by Tony CHEMIT at 2017-03-08T18:00:42+01:00 prepare release 6.0-RC-1 - - - - - 187db334 by Tony CHEMIT at 2017-03-08T18:01:38+01:00 [jgitflow-maven-plugin]updating poms for branch'release/3.0-RC-1' with non-snapshot versions - - - - - 059ff71f by Tony CHEMIT at 2017-03-08T18:09:10+01:00 improve release script - - - - - 2ac0abaf by Tony CHEMIT at 2017-03-08T18:09:45+01:00 [jgitflow-maven-plugin]merging 'release/3.0-RC-1' into 'master' - - - - - 30 changed files: - .gitlab-ci.yml - + .gitlab/issue_templates/Bug-6.md - + .gitlab/issue_templates/Bug.md - + .gitlab/issue_templates/Feature-6.md - + .gitlab/issue_templates/Feature-IRD.md - + .gitlab/issue_templates/Feature.md - + CHANGELOG.md - README.md - application-swing-configuration/pom.xml - application-swing-configuration/src/main/config/ObserveSwingApplication.ini - application-swing-configuration/src/main/java/fr/ird/observe/application/swing/configuration/ObserveSwingApplicationConfig.java - application-swing-configuration/src/main/java/fr/ird/observe/application/swing/configuration/constants/CreationMode.java - application-swing-configuration/src/main/java/fr/ird/observe/application/swing/configuration/constants/DbMode.java - application-swing-configuration/src/main/resources/i18n/application-swing-configuration_en_GB.properties - application-swing-configuration/src/main/resources/i18n/application-swing-configuration_es_ES.properties - application-swing-configuration/src/main/resources/i18n/application-swing-configuration_fr_FR.properties - application-swing-configuration/src/main/resources/log4j.properties - application-swing-configuration/src/main/resources/observe-log4j.properties - application-swing-configuration/src/main/resources/validators.xml - application-swing-decoration/pom.xml - application-swing-decoration/src/main/java/fr/ird/observe/application/swing/decoration/DecoratorService.java - application-swing-decoration/src/main/java/fr/ird/observe/application/swing/decoration/ObserveI18nDecoratorHelper.java - application-swing-decoration/src/main/java/fr/ird/observe/application/swing/decoration/decorators/DataReferenceDecorator.java - application-swing-decoration/src/main/java/fr/ird/observe/application/swing/decoration/decorators/LengthLengthParameterDecorator.java - application-swing-decoration/src/main/java/fr/ird/observe/application/swing/decoration/decorators/LengthWeightParameterDecorator.java - application-swing-decoration/src/main/java/fr/ird/observe/application/swing/decoration/decorators/NonTargetCatchDecorator.java - application-swing-decoration/src/main/java/fr/ird/observe/application/swing/decoration/decorators/NonTargetLengthDecorator.java - application-swing-decoration/src/main/java/fr/ird/observe/application/swing/decoration/decorators/ObjectObservedSpeciesDecorator.java - application-swing-decoration/src/main/java/fr/ird/observe/application/swing/decoration/decorators/ObserveDecorator.java - application-swing-decoration/src/main/java/fr/ird/observe/application/swing/decoration/decorators/ReferentialReferenceDecorator.java The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreia.io/ird-observe/compare/54a7f32605b02a713edfa1a59…

1 0

[Git][ultreia.io/ird-observe][develop] 6 commits: [jgitflow-maven-plugin]updating poms for branch'release/3.0-RC-1' with non-snapshot versions
by Tony CHEMIT 08 Mar '17

08 Mar '17

Tony CHEMIT pushed to branch develop at ultreia.io / ird-observe Commits: 187db334 by Tony CHEMIT at 2017-03-08T18:01:38+01:00 [jgitflow-maven-plugin]updating poms for branch'release/3.0-RC-1' with non-snapshot versions - - - - - 059ff71f by Tony CHEMIT at 2017-03-08T18:09:10+01:00 improve release script - - - - - 2ac0abaf by Tony CHEMIT at 2017-03-08T18:09:45+01:00 [jgitflow-maven-plugin]merging 'release/3.0-RC-1' into 'master' - - - - - 09ecd5dd by Tony CHEMIT at 2017-03-08T18:09:49+01:00 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts - - - - - 290ef09a by Tony CHEMIT at 2017-03-08T18:09:50+01:00 [jgitflow-maven-plugin]merging 'master' into 'develop' - - - - - c98241e0 by Tony CHEMIT at 2017-03-08T18:09:51+01:00 [jgitflow-maven-plugin]Updating develop poms back to pre merge state - - - - - 1 changed file: - bin/stage_create.sh Changes: ===================================== bin/stage_create.sh ===================================== --- a/bin/stage_create.sh +++ b/bin/stage_create.sh @@ -18,23 +18,39 @@ git checkout -B ${DEVELOP} echo "Start release: $VERSION ($LOG_DIR/release-start.log)" mvn jgitflow:release-start -B -Prelease-profile --log-file ${LOG_DIR}/release-start.log - +if [ ! "$?" == "0" ]; then + echo "Error" + exit 1 +fi echo "Finish release: $VERSION ($LOG_DIR/release-finish.log)" mvn jgitflow:release-finish -Prelease-profile --log-file ${LOG_DIR}/release-finish.log - +if [ ! "$?" == "0" ]; then + echo "Error" + exit 1 +fi echo "Get staging id..." STAGE_ID=$(mvn nexus-staging:rc-list | grep ${STAGE} | cut -d' ' -f2) echo "Closing stage: $STAGE_ID ($LOG_DIR/release-close.log)" mvn nexus-staging:close -DstagingRepositoryId=${STAGE_ID} --log-file ${LOG_DIR}/release-close.log - +if [ ! "$?" == "0" ]; then + echo "Error" + exit 1 +fi git checkout ${MASTER} echo "Generate site: ($LOG_DIR/release-site.log)" mvn verify site-deploy -DskipTests -DperformRelease --log-file ${LOG_DIR}/release-site.log - +if [ ! "$?" == "0" ]; then + echo "Error" + exit 1 +fi echo "Deploy demo: ($LOG_DIR/release-demo.log)" mvn install -am -pl application-web -DskipTests -DperformRelease -Pdeploy-demo --log-file ${LOG_DIR}/release-demo.log +if [ ! "$?" == "0" ]; then + echo "Error" + exit 1 +fi git stash git checkout ${DEVELOP} \ No newline at end of file View it on GitLab: https://gitlab.com/ultreia.io/ird-observe/compare/4443e6d5c2a78831cdf5ee836…

1 0