Tony CHEMIT pushed to branch master at ultreiaio / ird-t3 Commits: f9304adc by 166231 at 2017-04-10T14:24:20+00:00 [jgitflow-maven-plugin]updating poms for 2.1-SNAPSHOT development - - - - - 237c8952 by 166231 at 2017-04-10T14:31:00+00:00 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts - - - - - 40800720 by 166231 at 2017-04-10T14:31:00+00:00 [jgitflow-maven-plugin]merging 'master' into 'develop' - - - - - fbd0168a by 166231 at 2017-04-10T14:31:01+00:00 [jgitflow-maven-plugin]Updating develop poms back to pre merge state - - - - - 8eefa637 by Tony CHEMIT at 2017-04-10T19:48:32+02:00 improve docs - - - - - 83dce961 by Tony CHEMIT at 2017-04-10T19:51:21+02:00 fix release - - - - - c1a5219e by Tony CHEMIT at 2017-04-10T19:52:15+02:00 back to 2.0-SNAPSHOT - - - - - 601f4ee5 by Tony CHEMIT at 2017-04-10T19:53:03+02:00 up builds - - - - - e0ca34a8 by 166231 at 2017-04-10T18:04:58+00:00 [jgitflow-maven-plugin]updating poms for branch'release/2.0' with non-snapshot versions - - - - - 13ec19d0 by 166231 at 2017-04-10T18:13:37+00:00 [jgitflow-maven-plugin]merging 'release/2.0' into 'master' - - - - - 4 changed files: - .gitlab-ci.yml - CONTRIBUTING.md - README.md - pom.xml Changes: ===================================== .gitlab-ci.yml ===================================== --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -84,11 +84,23 @@ stage: <<: *test_manual <<: *before_script_clone script: - - wget -O - https://gitlab.com/ultreiaio/pom/raw/master/bin/close-milestone.sh | bash - - wget -O - https://gitlab.com/ultreiaio/pom/raw/master/bin/create-stage.sh | bash - - wget -O - https://gitlab.com/ultreiaio/pom/raw/master/bin/close-stage.sh | sed 's/$1/$STAGE/' | bash - - wget -O - https://gitlab.com/ultreiaio/pom/raw/master/bin/update-staging-changelog.sh | sed 's/$1/$STAGE/' | bash - - wget -O - https://gitlab.com/ultreiaio/pom/raw/master/bin/create-milestone.sh | bash + - wget -q -O - https://gitlab.com/ultreiaio/pom/raw/master/bin/close-milestone.sh | bash + - wget -q -O - https://gitlab.com/ultreiaio/pom/raw/master/bin/create-stage.sh | bash + - wget -q -O - https://gitlab.com/ultreiaio/pom/raw/master/bin/close-stage.sh | sed 's/$1/$STAGE/' | bash + - wget -q -O - https://gitlab.com/ultreiaio/pom/raw/master/bin/update-staging-changelog.sh | sed 's/$1/$STAGE/' | bash + - wget -q -O - https://gitlab.com/ultreiaio/pom/raw/master/bin/create-milestone.sh | bash + +release: + <<: *env_staging + <<: *test_manual + <<: *before_script_clone + script: + - wget -q -O - https://gitlab.com/ultreiaio/pom/raw/master/bin/close-milestone.sh | bash + - wget -q -O - https://gitlab.com/ultreiaio/pom/raw/master/bin/create-stage.sh | bash + - wget -q -O - https://gitlab.com/ultreiaio/pom/raw/master/bin/close-stage.sh | sed 's/$1/$STAGE/' | bash + - wget -q -O - https://gitlab.com/ultreiaio/pom/raw/master/bin/release-stage.sh | sed 's/$1/$STAGE/' | bash + - wget -q -O - https://gitlab.com/ultreiaio/pom/raw/master/bin/update-changelog.sh | sed 's/$1/$STAGE/' | bash + - wget -q -O - https://gitlab.com/ultreiaio/pom/raw/master/bin/create-milestone.sh | bash latest-site: <<: *env_test @@ -143,13 +155,13 @@ release: <<: *staging when: manual script: - - wget -O - https://gitlab.com/ultreiaio/pom/raw/master/bin/release-stage.sh | sed 's/$1/$STAGE/' | bash + - wget -q -O - https://gitlab.com/ultreiaio/pom/raw/master/bin/release-stage.sh | sed 's/$1/$STAGE/' | bash drop: <<: *staging when: manual script: - - wget -O - https://gitlab.com/ultreiaio/pom/raw/master/bin/drop-stage.sh | sed 's/$1/$STAGE/' | bash + - wget -q &-O - https://gitlab.com/ultreiaio/pom/raw/master/bin/drop-stage.sh | sed 's/$1/$STAGE/' | bash production: stage: Production ===================================== CONTRIBUTING.md ===================================== --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -3,7 +3,7 @@ ``` wget -q -O - https://gitlab.com/ultreiaio/pom/raw/master/bin/close-milestone.sh | bash wget -q -O - https://gitlab.com/ultreiaio/pom/raw/master/bin/create-stage.sh | bash -wget -q -O - https://gitlab.com/ultreiaio/pom/raw/master/bin/close-and-release-stage.sh | sed 's/$1/frirdobserve/' | bash +wget -q -O - https://gitlab.com/ultreiaio/pom/raw/master/bin/close-and-release-stage.sh | sed 's/$1/frirdt3/' | bash wget -q -O - https://gitlab.com/ultreiaio/pom/raw/master/bin/update-changelog.sh | bash wget -q -O - https://gitlab.com/ultreiaio/pom/raw/master/bin/create-milestone.sh | bash ``` @@ -15,15 +15,15 @@ Create stage ``` wget -q -O - https://gitlab.com/ultreiaio/pom/raw/master/bin/close-milestone.sh | bash wget -q -O - https://gitlab.com/ultreiaio/pom/raw/master/bin/create-stage.sh | bash -wget -q -O - https://gitlab.com/ultreiaio/pom/raw/master/bin/close-stage.sh | sed 's/$1/frirdobserve/' | bash -wget -q -O - https://gitlab.com/ultreiaio/pom/raw/master/bin/update-staging-changelog.sh | sed 's/$1/frirdobserve/' | bash +wget -q -O - https://gitlab.com/ultreiaio/pom/raw/master/bin/close-stage.sh | sed 's/$1/frirdt3/' | bash +wget -q -O - https://gitlab.com/ultreiaio/pom/raw/master/bin/update-staging-changelog.sh | sed 's/$1/frirdt3/' | bash wget -q -O - https://gitlab.com/ultreiaio/pom/raw/master/bin/create-milestone.sh | bash ``` And to release stage ``` -wget -q -O - https://gitlab.com/ultreiaio/pom/raw/master/bin/release-stage.sh | sed 's/$1/frirdobserve/' | bash +wget -q -O - https://gitlab.com/ultreiaio/pom/raw/master/bin/release-stage.sh | sed 's/$1/frirdt3/' | bash ``` # Generate site ===================================== README.md ===================================== --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # T3 -[](https://search.maven.org/#search%7Cga%7C1%7Cg%3A%22fr.ird.t3%22%20AND%20a%3A%t3%22) +[](https://search.maven.org/#search%7Cga%7C1%7Cg%3A%22fr.ird.t3%22%20AND%20a%3A%22t3%22)  [](http://www.gnu.org/licenses/agpl-3.0.txt) @@ -11,3 +11,8 @@ * [Mailing-list (Devel)](http://list.forge.codelutin.com/cgi-bin/mailman/listinfo/t3-devel) * [Mailing-list (Commits)](http://list.forge.codelutin.com/cgi-bin/mailman/listinfo/t3-commits) * [Contact](mailto:dev@tchemit.fr) + +# Demo + +* [Demo (latest)](https://demo.ultreia.io/t3-latest) +* [Demo (2.0)](https://demo.ultreia.io/t3-2.0) ===================================== pom.xml ===================================== --- a/pom.xml +++ b/pom.xml @@ -143,6 +143,9 @@ <log4jVersion>1.2.17</log4jVersion> + <!-- deploy nothing --> + <maven.deploy.skip>true</maven.deploy.skip> + </properties> <dependencyManagement> View it on GitLab: https://gitlab.com/ultreiaio/ird-t3/compare/e1595aabab91807d9c19082ef48a4604...