Tony CHEMIT pushed to branch develop at ultreiaio / ird-t3 Commits: 6a5ab77f by Tony CHEMIT at 2018-03-02T14:27:19Z fix release extra model for release - - - - - d1ff484a by Tony CHEMIT at 2018-03-02T14:27:19Z fix stage build - - - - - a533b2b3 by Tony CHEMIT at 2018-03-02T14:27:49Z fix release extra module (for the last time) - - - - - 4 changed files: - .gitlab-ci.yml - pom.xml - t3-installer/pom.xml - t3/pom.xml Changes: ===================================== .gitlab-ci.yml ===================================== --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -56,7 +56,7 @@ image: registry.gitlab.com/${CI_PROJECT_NAMESPACE}/${CI_PROJECT_NAME}/docker:lat - if [ -n "${MAKE_STAGE}" ]; then ultreiaio-milestone-close; fi - if [ -n "${MAKE_STAGE}" ]; then ultreiaio-release-start; fi - if [ -n "${MAKE_STAGE}" ]; then ultreiaio-release-finish; fi - - if [ -n "${MAKE_STAGE}" ]; then ultreiaio-stage-drop; fi + - if [ -n "${MAKE_STAGE}" ]; then ultreiaio-stage-close; fi - if [ -n "${MAKE_STAGE}" ]; then ultreiaio-changelog-update-staging; fi - if [ -n "${MAKE_STAGE}" ]; then ultreiaio-milestone-create; fi ===================================== pom.xml ===================================== --- a/pom.xml +++ b/pom.xml @@ -230,6 +230,45 @@ </configuration> </plugin> + <plugin> + <groupId>io.ultreia.java4all.jgitflow</groupId> + <artifactId>jgitflow-maven-plugin</artifactId> + <version>${plugin.version.jgitflow}</version> + <configuration> + <flowInitContext> + <versionTagPrefix>v</versionTagPrefix> + <masterBranchName>${jgitflow.masterBranchName}</masterBranchName> + <developBranchName>${jgitflow.developBranchName}</developBranchName> + </flowInitContext> + <scmCommentPrefix>[jgitflow-maven-plugin]</scmCommentPrefix> + <scmCommentSuffix>[skip ci]</scmCommentSuffix> + <autoVersionSubmodules>true</autoVersionSubmodules> + <addScmCommentSuffixOnMerge>false</addScmCommentSuffixOnMerge> + + </configuration> + <executions> + <execution> + <id>default-release-start</id> + <goals> + <goal>release-start</goal> + </goals> + <configuration> + <pushReleases>true</pushReleases> + <enableSshAgent>true</enableSshAgent> + </configuration> + </execution> + <execution> + <goals> + <goal>release-finish</goal> + </goals> + <configuration> + <pushReleases>true</pushReleases> + <enableSshAgent>true</enableSshAgent> + </configuration> + </execution> + </executions> + </plugin> + </plugins> </pluginManagement> <plugins> @@ -276,7 +315,7 @@ <profiles> <profile> - <id>release-modules-profile</id> + <id>release-profile</id> <activation> <property> <name>performRelease</name> ===================================== t3-installer/pom.xml ===================================== --- a/t3-installer/pom.xml +++ b/t3-installer/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.t3</groupId> <artifactId>ird-t3</artifactId> - <version>2.2-SNAPSHOT</version> + <version>2.3-SNAPSHOT</version> </parent> <artifactId>t3-installer</artifactId> ===================================== t3/pom.xml ===================================== --- a/t3/pom.xml +++ b/t3/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.t3</groupId> <artifactId>ird-t3</artifactId> - <version>2.2-SNAPSHOT</version> + <version>2.3-SNAPSHOT</version> </parent> <artifactId>t3</artifactId> View it on GitLab: https://gitlab.com/ultreiaio/ird-t3/compare/88660ade0008e472e0a439b2b75830b8... --- View it on GitLab: https://gitlab.com/ultreiaio/ird-t3/compare/88660ade0008e472e0a439b2b75830b8... You're receiving this email because of your account on gitlab.com.