From 039d5c678760e402ca09905e2b8286b9bfab7e35 Mon Sep 17 00:00:00 2001 From: Bertrand DELION Date: Sat, 18 Apr 2020 09:38:38 +0200 Subject: [PATCH 01/15] Feature/maven dependency plugin analyze only (#53) * :green_heart: Fix maven-dependency-plugin_analyze-only for basic-weather-app * :green_heart: Fix log4j-core Unused message --- pom.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index 8b7073c..252b7ad 100644 --- a/pom.xml +++ b/pom.xml @@ -12,6 +12,7 @@ pom FIFIZ :: Socle Java :: java-parent Pom parent Java de mes projets + https://bdelion.github.io/java-parent/ @@ -457,9 +458,8 @@ true - + true - org.junit.jupiter:junit-jupiter-*:: org.apache.logging.log4j:log4j-core:: true @@ -717,4 +717,4 @@ - + \ No newline at end of file From 7267d5052131b280ed91224a332d3f45e61552dd Mon Sep 17 00:00:00 2001 From: Bertrand DELION Date: Sat, 18 Apr 2020 17:18:16 +0200 Subject: [PATCH 02/15] :heavy_plus_sign: maven-javadoc-plugin :arrow_up: junit 5.6.2 :green_heart: change integration.test.skip to verify.skip :green_heart: plug sources-jard and javadoc-jar with deploy phase --- .github/workflows/maven-java.yml | 2 +- pom.xml | 68 +++++++++++--------------------- 2 files changed, 25 insertions(+), 45 deletions(-) diff --git a/.github/workflows/maven-java.yml b/.github/workflows/maven-java.yml index 07f8a55..9167fad 100644 --- a/.github/workflows/maven-java.yml +++ b/.github/workflows/maven-java.yml @@ -99,7 +99,7 @@ jobs: #TODO - name: Quality Gate [SonarQube] #TODO run: mvn -U '-Dsonar.links.scm=http://gitxxx' '-Dsonar.links.ci=http://jenkinsxxx' org.sonarsource.scanner.maven:sonar-maven-plugin:3.7.0.1746:sonar '-Dsonar.projectKey=[groupId]-[artifactId]' '-Dsonar.branch.name=develop' '-Dsonar.projectName=[artifactId]' '-Dsonar.gitlab.ref_name=b7c32ea3401d64f97eecc4dd46de331b00391cd7' '-Dsonar.gitlab.commit_sha=b7c32ea3401d64f97eecc4dd46de331b00391cd7' '-Dsonar.gitlab.project_id=3555' - name: Publish to GitHub Packages Apache Maven - run: mvn -U -Dmaven.main.skip -Dunit.test.skip -Dintegration.test.skip deploy --file pom.xml --settings .github/workflows/settings.xml + run: mvn -U -Dmaven.main.skip -Dunit.test.skip -Dverify.skip source:jar-no-fork@attach-sources javadoc:jar@attach-javadocs deploy --file pom.xml --settings .github/workflows/settings.xml env: SERVER_USERNAME: $GITHUB_ACTOR SERVER_PASSWORD: ${{ secrets.MVN_PCKGS_REPO_TOKEN}} diff --git a/pom.xml b/pom.xml index 252b7ad..6760b47 100644 --- a/pom.xml +++ b/pom.xml @@ -60,13 +60,13 @@ github GitHub Snapshot bdelion/maven-packages Apache Maven Packages https://maven.pkg.github.com/bdelion/maven-packages - + github GitHub Release bdelion/maven-packages Apache Maven Packages https://maven.pkg.github.com/bdelion/${project.artifactId} - + @@ -114,12 +114,13 @@ 3.2.0 3.2.0 3.2.1 + 3.2.0 3.1.2 3.0.0 4.0.0 - 5.6.1 + 5.6.2 3.0.0-M4 3.0.0-M4 0.8.5 @@ -260,8 +261,8 @@ prepare-agent-integration - - ${integration.test.skip} + + ${verify.skip} ${jacoco.itReportPath} ${jacoco.itReportPath} @@ -277,8 +278,8 @@ report-integration - - ${integration.test.skip} + + ${verify.skip} ${jacoco.itReportPath} @@ -366,8 +367,8 @@ alphabetical ${failsafeArgLine} - - ${integration.test.skip} + + ${verify.skip} **/*IT.* @@ -438,13 +439,26 @@ attach-sources - package jar-no-fork + + + org.apache.maven.plugins + maven-javadoc-plugin + ${maven-javadoc-plugin.version} + + + attach-javadocs + + jar + + + + org.apache.maven.plugins @@ -494,11 +508,6 @@ org.apache.maven.plugins maven-assembly-plugin - - - org.apache.maven.plugins - maven-source-plugin - org.apache.maven.plugins @@ -684,35 +693,6 @@ - - - org.apache.maven.plugins - maven-antrun-plugin - ${maven-antrun-plugin.version} - - - validate - - run - - - - Displaying value of pom.xml element - [distributionManagement.repository.name] ${project.distributionManagement.repository.name} - [distributionManagement.repository.url] ${project.distributionManagement.repository.url} - [maven.main.skip] ${maven.main.skip} - [skipMain] ${skipMain} - [maven.test.skip] ${maven.test.skip} - [unit.test.skip] ${unit.test.skip} - [integration.test.skip] ${unit.test.skip} - [skipTests] ${skipTests} - [skip.unit.tests] ${skip.unit.tests} - [maven-assembly-plugin-skip] ${maven-assembly-plugin-skip} - - - - - From 5fdf29e6eeafae6de69afd26635c4d98035f445c Mon Sep 17 00:00:00 2001 From: Bertrand DELION Date: Sat, 18 Apr 2020 17:30:18 +0200 Subject: [PATCH 03/15] :green_heart: plug sources-jard and javadoc-jar with deploy phase --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 49dd69c..69f7a46 100644 --- a/.travis.yml +++ b/.travis.yml @@ -10,5 +10,5 @@ script: - mvn -U clean compile -Pproject-controls-check --file pom.xml --settings .github/workflows/settings.xml - mvn -U -Dmaven.main.skip test --file pom.xml --settings .github/workflows/settings.xml - mvn -U -Dmaven.main.skip -Dunit.test.skip verify --file pom.xml --settings .github/workflows/settings.xml - - mvn -U -Dmaven.main.skip -Dunit.test.skip -Dintegration.test.skip deploy --file pom.xml --settings .github/workflows/settings.xml + - mvn -U -Dmaven.main.skip -Dunit.test.skip -Dverify.skip source:jar-no-fork@attach-sources javadoc:jar@attach-javadocs deploy --file pom.xml --settings .github/workflows/settings.xml - mvn -U site --file pom.xml --settings .github/workflows/settings.xml \ No newline at end of file From 2a177ee1042c260fb10354098a86bafbb400eb61 Mon Sep 17 00:00:00 2001 From: Bertrand DELION Date: Sat, 18 Apr 2020 18:13:56 +0200 Subject: [PATCH 04/15] :green_heart: make jar and jar-with-dep in CI, not in Maven --- .github/workflows/maven-java.yml | 2 +- .travis.yml | 2 +- pom.xml | 13 ++++++------- 3 files changed, 8 insertions(+), 9 deletions(-) diff --git a/.github/workflows/maven-java.yml b/.github/workflows/maven-java.yml index 9167fad..be0f6a0 100644 --- a/.github/workflows/maven-java.yml +++ b/.github/workflows/maven-java.yml @@ -99,7 +99,7 @@ jobs: #TODO - name: Quality Gate [SonarQube] #TODO run: mvn -U '-Dsonar.links.scm=http://gitxxx' '-Dsonar.links.ci=http://jenkinsxxx' org.sonarsource.scanner.maven:sonar-maven-plugin:3.7.0.1746:sonar '-Dsonar.projectKey=[groupId]-[artifactId]' '-Dsonar.branch.name=develop' '-Dsonar.projectName=[artifactId]' '-Dsonar.gitlab.ref_name=b7c32ea3401d64f97eecc4dd46de331b00391cd7' '-Dsonar.gitlab.commit_sha=b7c32ea3401d64f97eecc4dd46de331b00391cd7' '-Dsonar.gitlab.project_id=3555' - name: Publish to GitHub Packages Apache Maven - run: mvn -U -Dmaven.main.skip -Dunit.test.skip -Dverify.skip source:jar-no-fork@attach-sources javadoc:jar@attach-javadocs deploy --file pom.xml --settings .github/workflows/settings.xml + mvn -U -Dmaven.main.skip -Dunit.test.skip -Dverify.skip jar:jar@default-jar assembly:single@make-assembly source:jar-no-fork@attach-sources javadoc:jar@attach-javadocs deploy --file pom.xml --settings .github/workflows/settings.xml env: SERVER_USERNAME: $GITHUB_ACTOR SERVER_PASSWORD: ${{ secrets.MVN_PCKGS_REPO_TOKEN}} diff --git a/.travis.yml b/.travis.yml index 69f7a46..16ce19c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -10,5 +10,5 @@ script: - mvn -U clean compile -Pproject-controls-check --file pom.xml --settings .github/workflows/settings.xml - mvn -U -Dmaven.main.skip test --file pom.xml --settings .github/workflows/settings.xml - mvn -U -Dmaven.main.skip -Dunit.test.skip verify --file pom.xml --settings .github/workflows/settings.xml - - mvn -U -Dmaven.main.skip -Dunit.test.skip -Dverify.skip source:jar-no-fork@attach-sources javadoc:jar@attach-javadocs deploy --file pom.xml --settings .github/workflows/settings.xml + - mvn -U -Dmaven.main.skip -Dunit.test.skip -Dverify.skip jar:jar@default-jar assembly:single@make-assembly source:jar-no-fork@attach-sources javadoc:jar@attach-javadocs deploy --file pom.xml --settings .github/workflows/settings.xml - mvn -U site --file pom.xml --settings .github/workflows/settings.xml \ No newline at end of file diff --git a/pom.xml b/pom.xml index 6760b47..7251ffb 100644 --- a/pom.xml +++ b/pom.xml @@ -341,6 +341,12 @@ org.apache.maven.plugins maven-jar-plugin ${maven-jar-plugin.version} + + + default-jar + none + + @@ -501,13 +507,6 @@ org.jacoco jacoco-maven-plugin - - - - org.apache.maven.plugins - maven-assembly-plugin - org.apache.maven.plugins From 5e73c3fd2ed48eba09eef9e4f3462c1c5da3e193 Mon Sep 17 00:00:00 2001 From: Bertrand DELION Date: Sat, 18 Apr 2020 18:18:33 +0200 Subject: [PATCH 05/15] :bug: yml syntax in Actions CI --- .github/workflows/maven-java.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/maven-java.yml b/.github/workflows/maven-java.yml index be0f6a0..2867578 100644 --- a/.github/workflows/maven-java.yml +++ b/.github/workflows/maven-java.yml @@ -99,7 +99,7 @@ jobs: #TODO - name: Quality Gate [SonarQube] #TODO run: mvn -U '-Dsonar.links.scm=http://gitxxx' '-Dsonar.links.ci=http://jenkinsxxx' org.sonarsource.scanner.maven:sonar-maven-plugin:3.7.0.1746:sonar '-Dsonar.projectKey=[groupId]-[artifactId]' '-Dsonar.branch.name=develop' '-Dsonar.projectName=[artifactId]' '-Dsonar.gitlab.ref_name=b7c32ea3401d64f97eecc4dd46de331b00391cd7' '-Dsonar.gitlab.commit_sha=b7c32ea3401d64f97eecc4dd46de331b00391cd7' '-Dsonar.gitlab.project_id=3555' - name: Publish to GitHub Packages Apache Maven - mvn -U -Dmaven.main.skip -Dunit.test.skip -Dverify.skip jar:jar@default-jar assembly:single@make-assembly source:jar-no-fork@attach-sources javadoc:jar@attach-javadocs deploy --file pom.xml --settings .github/workflows/settings.xml + run: mvn -U -Dmaven.main.skip -Dunit.test.skip -Dverify.skip jar:jar@default-jar assembly:single@make-assembly source:jar-no-fork@attach-sources javadoc:jar@attach-javadocs deploy --file pom.xml --settings .github/workflows/settings.xml env: SERVER_USERNAME: $GITHUB_ACTOR SERVER_PASSWORD: ${{ secrets.MVN_PCKGS_REPO_TOKEN}} From 89ab668af8350cbbc34dad7310e50fbff06e7025 Mon Sep 17 00:00:00 2001 From: Bertrand DELION Date: Sun, 19 Apr 2020 09:05:26 +0200 Subject: [PATCH 06/15] :chart_with_upwards_trend: Add javadoc in reporting :green_heart: delete mvn version's param not util --- .github/workflows/maven-java.yml | 2 +- pom.xml | 18 ++++++++++++++++++ 2 files changed, 19 insertions(+), 1 deletion(-) diff --git a/.github/workflows/maven-java.yml b/.github/workflows/maven-java.yml index 2867578..a503fc3 100644 --- a/.github/workflows/maven-java.yml +++ b/.github/workflows/maven-java.yml @@ -28,7 +28,7 @@ jobs: with: java-version: 1.8 - name: Maven version - run: mvn -version --file pom.xml --settings .github/workflows/settings.xml + run: mvn -version env: SERVER_USERNAME: $GITHUB_ACTOR SERVER_PASSWORD: ${{ secrets.MVN_PCKGS_REPO_TOKEN}} diff --git a/pom.xml b/pom.xml index 7251ffb..3a07b22 100644 --- a/pom.xml +++ b/pom.xml @@ -133,6 +133,7 @@ true 3.9.0 + 3.0.0 @@ -550,6 +551,11 @@ + + org.apache.maven.plugins + maven-jxr-plugin + ${maven-jxr-plugin.version} + org.jacoco jacoco-maven-plugin @@ -603,6 +609,18 @@ + + org.apache.maven.plugins + maven-javadoc-plugin + ${maven-javadoc-plugin.version} + + + + javadoc-no-fork + + + + From 8e0b6b9ae34e6b324ff37971df2019eee02a0dc3 Mon Sep 17 00:00:00 2001 From: Bertrand DELION Date: Mon, 20 Apr 2020 10:57:23 +0200 Subject: [PATCH 07/15] Generate version with commitId (#54) * :green_heart: Add commitId in version for version SNASPHOT and non POM packaging :art: Replace env variable by outputs step :art: Rework on Maven Project information :art: Add more Context informations * :art: Add .editorconfig and Format files --- .editorconfig | 61 ++ .github/workflows/maven-java.yml | 71 +- .github/workflows/settings.xml | 92 +- .travis.yml | 2 +- CHANGELOG.md | 32 +- README.md | 45 +- pom.xml | 1364 +++++++++++++++--------------- 7 files changed, 869 insertions(+), 798 deletions(-) create mode 100644 .editorconfig diff --git a/.editorconfig b/.editorconfig new file mode 100644 index 0000000..962f3db --- /dev/null +++ b/.editorconfig @@ -0,0 +1,61 @@ +# Version: 1.5.0 (Using https://semver.org/) +# Updated: 2020-03-09 +# See https://github.com/RehanSaeed/EditorConfig/releases for release notes. +# See https://github.com/RehanSaeed/EditorConfig for updates to this file. +# See http://EditorConfig.org for more information about .editorconfig files. + +########################################## +# Common Settings +########################################## + +# This file is the top-most EditorConfig file +root = true + +# All Files +[*] +charset = utf-8 +indent_style = space +indent_size = 4 +end_of_line = lf +insert_final_newline = true +trim_trailing_whitespace = true +max_line_length = 80 + +########################################## +# File Extension Settings +########################################## + +# XML Configuration Files +[*.{xml,config,props,targets,nuspec,resx,ruleset,vsixmanifest,vsct}] +indent_size = 2 + +# JSON Files +[*.{json,json5,webmanifest}] +indent_size = 2 + +# YAML Files +[*.{yml,yaml}] +indent_size = 2 + +# Markdown Files +[*.md] +max_line_length = off +trim_trailing_whitespace = false + +# Web Files +[*.{htm,html,js,jsm,ts,tsx,css,sass,scss,less,svg,vue}] +indent_size = 2 + +# Batch Files +[*.{cmd,bat}] +end_of_line = crlf + +# Bash Files +[*.sh] +end_of_line = lf + +# Java Files +[*.java] +indent_size = 4 +max_line_length = 120 +continuation_indent_size = 8 diff --git a/.github/workflows/maven-java.yml b/.github/workflows/maven-java.yml index a503fc3..1bb8d43 100644 --- a/.github/workflows/maven-java.yml +++ b/.github/workflows/maven-java.yml @@ -18,6 +18,22 @@ jobs: env: JOB_CONTEXT: ${{ toJson(job) }} run: echo "$JOB_CONTEXT" + - name: Dump steps context + env: + STEPS_CONTEXT: ${{ toJson(steps) }} + run: echo "$STEPS_CONTEXT" + - name: Dump runner context + env: + RUNNER_CONTEXT: ${{ toJson(runner) }} + run: echo "$RUNNER_CONTEXT" + - name: Dump strategy context + env: + STRATEGY_CONTEXT: ${{ toJson(strategy) }} + run: echo "$STRATEGY_CONTEXT" + - name: Dump matrix context + env: + MATRIX_CONTEXT: ${{ toJson(matrix) }} + run: echo "$MATRIX_CONTEXT" maven-build-test-package-deploy-site: name: Maven test, package and deploy Java project @@ -34,7 +50,7 @@ jobs: SERVER_PASSWORD: ${{ secrets.MVN_PCKGS_REPO_TOKEN}} - name: Check out from version control uses: actions/checkout@v2 - - name: Cache Maven packages + - name: Cache Maven dependencies uses: actions/cache@v1 env: cache-name: cache-maven-dependencies @@ -45,38 +61,33 @@ jobs: ${{ runner.os }}-m2-${{ env.cache-name }}- ${{ runner.os }}-m2- ${{ runner.os }}- - - name: Get groupId - run: mvn org.apache.maven.plugins:maven-help-plugin:3.1.0:evaluate '-Dexpression=project.groupId' -q -DforceStdout --file pom.xml --settings .github/workflows/settings.xml - env: - SERVER_USERNAME: $GITHUB_ACTOR - SERVER_PASSWORD: ${{ secrets.MVN_PCKGS_REPO_TOKEN}} - - name: Get artifactId - run: mvn org.apache.maven.plugins:maven-help-plugin:3.1.0:evaluate '-Dexpression=project.artifactId' -q -DforceStdout --file pom.xml --settings .github/workflows/settings.xml - env: - SERVER_USERNAME: $GITHUB_ACTOR - SERVER_PASSWORD: ${{ secrets.MVN_PCKGS_REPO_TOKEN}} - - name: Get version - id: build-version-initial - run: mvn org.apache.maven.plugins:maven-help-plugin:3.1.0:evaluate '-Dexpression=project.version' -q -DforceStdout --file pom.xml --settings .github/workflows/settings.xml + - name: Get Maven Project information + id: maven-project-info + run: | + echo "$(mvn help:evaluate -Dexpression=project.groupId -q -DforceStdout --file pom.xml --settings .github/workflows/settings.xml)" + echo "$(mvn help:evaluate -Dexpression=project.artifactId -q -DforceStdout --file pom.xml --settings .github/workflows/settings.xml)" + echo "::set-output name=VERSION::$(mvn help:evaluate -Dexpression=project.version -q -DforceStdout --file pom.xml --settings .github/workflows/settings.xml)" + echo "::set-output name=PACKAGING::$(mvn help:evaluate -Dexpression=project.packaging -q -DforceStdout --file pom.xml --settings .github/workflows/settings.xml)" env: SERVER_USERNAME: $GITHUB_ACTOR SERVER_PASSWORD: ${{ secrets.MVN_PCKGS_REPO_TOKEN}} - #TODEL - name: Get short SHA - #TODEL id: short-sha - #TODEL run: | - #TODEL echo "Version initiale: ${MVN_VERSION}" - #TODEL echo "::set-env name=COMMIT_ID_SHORT::${GITHUB_SHA::8}" - #TODEL - name: Create version number - #TODEL id: create-version-number - #TODEL uses: frabert/replace-string-action@v1.1 - #TODEL with: - #TODEL pattern: "^(.*)-SNAPSHOT$" - #TODEL string: ${{env.MVN_VERSION}} - #TODEL replace-with: "$1-${COMMIT_ID_SHORT}-SNAPSHOT" - #TODEL - name: Set version number - #TODEL run: | - #TODEL echo "New version: ${{ steps.create-version-number.outputs.replaced }}" - #TODEL mvn versions:set -DnewVersion=${{ steps.create-version-number.outputs.replaced }} + - name: Get short SHA + id: short-sha + run: | + echo "Maven Project version: ${{ steps.maven-project-info.outputs.VERSION }}" + echo "::set-output name=COMMIT_ID_SHORT::${GITHUB_SHA::8}" + - name: Create version number + id: create-version-number + uses: frabert/replace-string-action@v1.1 + with: + pattern: "^(.*)-SNAPSHOT$" + string: ${{ steps.maven-project-info.outputs.VERSION }} + replace-with: "$1-${{ steps.short-sha.outputs.COMMIT_ID_SHORT }}-SNAPSHOT" + - name: Set version number + if: endsWith( steps.maven-project-info.outputs.VERSION, '-SNAPSHOT' ) && ( steps.maven-project-info.outputs.PACKAGING != 'pom' ) + run: | + echo "New version: ${{ steps.create-version-number.outputs.replaced }}" + mvn versions:set -DnewVersion=${{ steps.create-version-number.outputs.replaced }} --file pom.xml - name: Build with Maven run: mvn -U clean compile -Pproject-controls-check --file pom.xml --settings .github/workflows/settings.xml env: diff --git a/.github/workflows/settings.xml b/.github/workflows/settings.xml index ae2e253..e1dbe0d 100644 --- a/.github/workflows/settings.xml +++ b/.github/workflows/settings.xml @@ -1,51 +1,51 @@ - - github - + + github + - - - github - - - central - https://repo1.maven.org/maven2 - - true - always - - - true - daily - - - - github - GitHub Release bdelion/maven-packages Apache Maven Packages - https://maven.pkg.github.com/bdelion/maven-packages - - true - always - - - true - daily - - - - - + + + github + + + central + https://repo1.maven.org/maven2 + + true + always + + + true + daily + + + + github + GitHub Release bdelion/maven-packages Apache Maven Packages + https://maven.pkg.github.com/bdelion/maven-packages + + true + always + + + true + daily + + + + + - - - github - ${env.SERVER_USERNAME} - ${env.SERVER_PASSWORD} - - + + + github + ${env.SERVER_USERNAME} + ${env.SERVER_PASSWORD} + + - - - - \ No newline at end of file + + + + diff --git a/.travis.yml b/.travis.yml index 16ce19c..4f9e72c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -11,4 +11,4 @@ script: - mvn -U -Dmaven.main.skip test --file pom.xml --settings .github/workflows/settings.xml - mvn -U -Dmaven.main.skip -Dunit.test.skip verify --file pom.xml --settings .github/workflows/settings.xml - mvn -U -Dmaven.main.skip -Dunit.test.skip -Dverify.skip jar:jar@default-jar assembly:single@make-assembly source:jar-no-fork@attach-sources javadoc:jar@attach-javadocs deploy --file pom.xml --settings .github/workflows/settings.xml - - mvn -U site --file pom.xml --settings .github/workflows/settings.xml \ No newline at end of file + - mvn -U site --file pom.xml --settings .github/workflows/settings.xml diff --git a/CHANGELOG.md b/CHANGELOG.md index 4be6e2a..b72bbe8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,16 +1,16 @@ # Changelog > NOTE : Le format est basé sur [Keep a Changelog], -et ce projet adhère à [Semantic Versioning]. +> et ce projet adhère à [Semantic Versioning]. Tous les changements notables apportés à ce projet seront documentés dans ce fichier. ## [Unreleased] > ## [8.1.0] - 2020-mm-jj -> -> * Intégration plus propre de Jacoco. -> * Intégration plus propre de SonarCloud. +> +> - Intégration plus propre de Jacoco. +> - Intégration plus propre de SonarCloud. ## [8.0.0] - 2020-mm-jj @@ -18,35 +18,35 @@ Download at TODO ### Added -* :pencil: Nouveau README.md. -* :pencil: Mise en place CHANGELOG.md. +- :pencil: Nouveau README.md. +- :pencil: Mise en place CHANGELOG.md. ### Changed -* +\* ### Deprecated -* +\* ### Removed -* +\* ### Fixed -* +\* ### Security -* +\* ### Dependencies -* +\* -[Keep a Changelog]: https://keepachangelog.com/fr/1.0.0/ -[Semantic Versioning]: https://semver.org/lang/fr/ -[Unreleased]: https://github.com/bdelion/java-parent/compare/8.0.0...HEAD +[keep a changelog]: https://keepachangelog.com/fr/1.0.0/ +[semantic versioning]: https://semver.org/lang/fr/ +[unreleased]: https://github.com/bdelion/java-parent/compare/8.0.0...HEAD [8.0.1]: https://github.com/bdelion/java-parent/compare/8.0.1...8.0.0 -[8.0.0]: https://github.com/bdelion/java-parent/releases/tag/8.0.0 \ No newline at end of file +[8.0.0]: https://github.com/bdelion/java-parent/releases/tag/8.0.0 diff --git a/README.md b/README.md index be6ca96..cfde026 100644 --- a/README.md +++ b/README.md @@ -14,8 +14,8 @@ > `java-parent` est un pom qui permet de gérer pour mes dév Java Training : > -> * les versions des dépendances obligatoires. -> * les phases de builds communes. +> - les versions des dépendances obligatoires. +> - les phases de builds communes. ## :house: [Homepage] @@ -33,13 +33,13 @@ Ajouter au `pom.xml` de votre composant : ## :construction_worker: Fabriqué avec -* [Visual Studio Code] - Editeur de code source. +- [Visual Studio Code] - Editeur de code source. ## :busts_in_silhouette: Authors :bust_in_silhouette: **Bertrand DELION** -* Github: [@bdelion] +- Github: [@bdelion] Voir aussi la liste des [contributeurs] ayant participés à ce projet. @@ -60,30 +60,29 @@ Pour les versions disponibles, voir [les tags de ce projet]. ## :link: Liens utiles -* :pencil: Documentation : [Wiki] -* :building_construction: Build : - * [Job Travis CI] - * [Github Actions] -* Repository : [GitHub Package Registry] +- :pencil: Documentation : [Wiki] +- :building_construction: Build : + - [Job Travis CI] + - [Github Actions] +- Repository : [GitHub Package Registry] ## :spider_web: Dependency -* [Dependencies] - Dépendances de ce projet -* [Dependents] - Projets dépendants de celui-ci +- [Dependencies] - Dépendances de ce projet +- [Dependents] - Projets dépendants de celui-ci - -[Make a README]: https://www.makeareadme.com/#template-1 -[Homepage]: https://github.com/bdelion/java-parent/tree/master -[Visual Studio Code]: https://code.visualstudio.com/ +[make a readme]: https://www.makeareadme.com/#template-1 +[homepage]: https://github.com/bdelion/java-parent/tree/master +[visual studio code]: https://code.visualstudio.com/ [@bdelion]: https://github.com/bdelion [contributeurs]: https://github.com/bdelion/java-parent/graphs/contributors -[CHANGELOG]: CHANGELOG.md +[changelog]: CHANGELOG.md [issues]: https://github.com/bdelion/java-parent/issues -[SemVer]: http://semver.org/ +[semver]: http://semver.org/ [les tags de ce projet]: https://github.com/bdelion/java-parent/tags -[Wiki]: https://github.com/bdelion/java-parent/wiki -[Job Travis CI]: https://travis-ci.com/bdelion/java-parent -[Github Actions]: https://github.com/bdelion/java-parent/actions -[GitHub Package Registry]: https://github.com/bdelion/java-parent/packages -[Dependencies]: https://github.com/bdelion/java-parent/network/dependencies -[Dependents]: https://github.com/bdelion/java-parent/network/dependents \ No newline at end of file +[wiki]: https://github.com/bdelion/java-parent/wiki +[job travis ci]: https://travis-ci.com/bdelion/java-parent +[github actions]: https://github.com/bdelion/java-parent/actions +[github package registry]: https://github.com/bdelion/java-parent/packages +[dependencies]: https://github.com/bdelion/java-parent/network/dependencies +[dependents]: https://github.com/bdelion/java-parent/network/dependents diff --git a/pom.xml b/pom.xml index 3a07b22..1c4f0c7 100644 --- a/pom.xml +++ b/pom.xml @@ -1,663 +1,663 @@ - - 4.0.0 + + 4.0.0 - + - - fr.fifiz.socle.java - java-parent - 8.0.0-SNAPSHOT - pom - FIFIZ :: Socle Java :: java-parent - Pom parent Java de mes projets + + fr.fifiz.socle.java + java-parent + 8.0.0-SNAPSHOT + pom + FIFIZ :: Socle Java :: java-parent + Pom parent Java de mes projets - - https://bdelion.github.io/java-parent/ - + + https://bdelion.github.io/java-parent/ + - - FIFIZ Company - https://bdelion.github.io/ - + + FIFIZ Company + https://bdelion.github.io/ + - - - bdelion - Bertrand Delion - bertrand.delion@free.fr - https://github.com/bdelion - FIFIZ Company - https://github.com/bdelion - +1 - - Architect - Developer - - - + + + bdelion + Bertrand Delion + bertrand.delion@free.fr + https://github.com/bdelion + FIFIZ Company + https://github.com/bdelion + +1 + + Architect + Developer + + + - - - - https://github.com/bdelion/java-parent - scm:git:git://github.com/bdelion/java-parent.git - scm:git:git@github.com:bdelion/java-parent.git - HEAD - - - https://github.com/bdelion/java-parent/issues - GitHub Issues - - - GitHub Actions - https://github.com/bdelion/java-parent/actions - + + + + https://github.com/bdelion/java-parent + scm:git:git://github.com/bdelion/java-parent.git + scm:git:git@github.com:bdelion/java-parent.git + HEAD + + + https://github.com/bdelion/java-parent/issues + GitHub Issues + + + GitHub Actions + https://github.com/bdelion/java-parent/actions + - - - github - GitHub Snapshot bdelion/maven-packages Apache Maven Packages - https://maven.pkg.github.com/bdelion/maven-packages - - - - github - GitHub Release bdelion/maven-packages Apache Maven Packages - https://maven.pkg.github.com/bdelion/${project.artifactId} - - - - - - github - GitHub bdelion/maven-packages Apache Maven Packages - https://github.com/bdelion - - true - - - true - - - + + + github + GitHub Snapshot bdelion/maven-packages Apache Maven Packages + https://maven.pkg.github.com/bdelion/maven-packages + + + + github + GitHub Release bdelion/maven-packages Apache Maven Packages + https://maven.pkg.github.com/bdelion/${project.artifactId} + + + + + + github + GitHub bdelion/maven-packages Apache Maven Packages + https://github.com/bdelion + + true + + + true + + + - - - 1.8 - UTF-8 - - 3.6.3 - - - 3.0.0-M3 - 2.7 - - 1.8 - - 3.1.0 - 3.0.0-M1 - 3.0.0-M1 - - 3.1.0 - 3.8.1 - - ${java.version} - ${java.version} - UTF-8 - true - true - false - false - - 3.2.0 - 3.2.0 - 3.2.1 - 3.2.0 - 3.1.2 - 3.0.0 - - 4.0.0 - - 5.6.2 - 3.0.0-M4 - 3.0.0-M4 - 0.8.5 - ${project.build.directory}/coverage-reports/jacoco-ut.exec - ${project.build.directory}/coverage-reports/jacoco-it.exec - + 1.8 + UTF-8 + + 3.6.3 + + + 3.0.0-M3 + 2.7 + + 1.8 + + 3.1.0 + 3.0.0-M1 + 3.0.0-M1 + + 3.1.0 + 3.8.1 + + ${java.version} + ${java.version} + UTF-8 + true + true + false + false + + 3.2.0 + 3.2.0 + 3.2.1 + 3.2.0 + 3.1.2 + 3.0.0 + + 4.0.0 + + 5.6.2 + 3.0.0-M4 + 3.0.0-M4 + 0.8.5 + ${project.build.directory}/coverage-reports/jacoco-ut.exec + ${project.build.directory}/coverage-reports/jacoco-it.exec + - - true - - 3.9.0 - 3.0.0 - + + true + + 3.9.0 + 3.0.0 + - - - - - org.junit.jupiter - junit-jupiter-api - ${junit.version} - test - - - org.junit.jupiter - junit-jupiter-engine - ${junit.version} - test - - - + + + + + org.junit.jupiter + junit-jupiter-api + ${junit.version} + test + + + org.junit.jupiter + junit-jupiter-engine + ${junit.version} + test + + + - - - - - - + + - - pl.project13.maven - git-commit-id-plugin - ${git-commit-id-plugin.version} - - true - - ${maven.main.skip} - full - json - false - false - - git.build.host - git.commit.id.abbrev - - - true - - ${project.build.outputDirectory}/git-properties.json - - - - get-the-git-infos - - revision - - initialize - - - - + ${maven.main.skip} + full + json + false + false + + git.build.host + git.commit.id.abbrev + + + true + + ${project.build.outputDirectory}/git-properties.json + + + + get-the-git-infos + + revision + + initialize + + + + - - org.apache.maven.plugins - maven-resources-plugin - ${maven-resources-plugin.version} - - - - org.apache.maven.plugins - maven-compiler-plugin - ${maven-compiler-plugin.version} - - - - - - - org.jacoco - jacoco-maven-plugin - ${jacoco-maven-plugin.version} - - - - - pre-unit-test - test-compile - - prepare-agent - - - - ${unit.test.skip} - - ${jacoco.utReportPath} - ${jacoco.utReportPath} - - surefireArgLine - - - - - post-unit-test - test - - report - - - - ${unit.test.skip} - - ${jacoco.utReportPath} - - ${project.reporting.outputDirectory}/jacoco-ut - - - - - - pre-integration-test - pre-integration-test - - prepare-agent-integration - - - - ${verify.skip} - - ${jacoco.itReportPath} - ${jacoco.itReportPath} - - failsafeArgLine - - - - - post-integration-test - post-integration-test - - report-integration - - - - ${verify.skip} - - ${jacoco.itReportPath} - - ${project.reporting.outputDirectory}/jacoco-it - - - - merge-unit-and-integration - post-integration-test - - merge - - - - - ${project.build.directory}/coverage-reports/ - - *.exec - - - - ${project.build.directory}/coverage-reports/merged.exec - - - - create-merged-report - post-integration-test - - report-aggregate - - - ${project.build.directory}/coverage-reports/merged.exec - ${project.reporting.outputDirectory}/jacoco-aggregate - - - - - - - - org.apache.maven.plugins - maven-surefire-plugin - ${maven-surefire-plugin.version} - - false - alphabetical - - ${surefireArgLine} - - ${unit.test.skip} - - - **/*IT.* - - - - - - org.apache.maven.plugins - maven-jar-plugin - ${maven-jar-plugin.version} - - - default-jar - none - - - - - - true - true - - - ${project.name} - ${project.version} - ${project.groupId}.${project.artifactId} - ${maven.build.timestamp} - ${git.commit.id.abbrev} - - - - - - - - org.apache.maven.plugins - maven-failsafe-plugin - ${maven-failsafe-plugin.version} - - alphabetical - - ${failsafeArgLine} - - ${verify.skip} - - **/*IT.* - - - - - integration-tests - integration-test - - integration-test - - - - - verify-integration-tests - verify - - verify - - - - - + + org.apache.maven.plugins + maven-compiler-plugin + ${maven-compiler-plugin.version} + + + + + + + org.jacoco + jacoco-maven-plugin + ${jacoco-maven-plugin.version} + + + + + pre-unit-test + test-compile + + prepare-agent + + + + ${unit.test.skip} + + ${jacoco.utReportPath} + ${jacoco.utReportPath} + + surefireArgLine + + + + + post-unit-test + test + + report + + + + ${unit.test.skip} + + ${jacoco.utReportPath} + + ${project.reporting.outputDirectory}/jacoco-ut + + + + + + pre-integration-test + pre-integration-test + + prepare-agent-integration + + + + ${verify.skip} + + ${jacoco.itReportPath} + ${jacoco.itReportPath} + + failsafeArgLine + + + + + post-integration-test + post-integration-test + + report-integration + + + + ${verify.skip} + + ${jacoco.itReportPath} + + ${project.reporting.outputDirectory}/jacoco-it + + + + merge-unit-and-integration + post-integration-test + + merge + + + + + ${project.build.directory}/coverage-reports/ + + *.exec + + + + ${project.build.directory}/coverage-reports/merged.exec + + + + create-merged-report + post-integration-test + + report-aggregate + + + ${project.build.directory}/coverage-reports/merged.exec + ${project.reporting.outputDirectory}/jacoco-aggregate + + + + + + + + org.apache.maven.plugins + maven-surefire-plugin + ${maven-surefire-plugin.version} + + false + alphabetical + + ${surefireArgLine} + + ${unit.test.skip} + + + **/*IT.* + + + + + + org.apache.maven.plugins + maven-jar-plugin + ${maven-jar-plugin.version} + + + default-jar + none + + + + + + true + true + + + ${project.name} + ${project.version} + ${project.groupId}.${project.artifactId} + ${maven.build.timestamp} + ${git.commit.id.abbrev} + + + + + + + + org.apache.maven.plugins + maven-failsafe-plugin + ${maven-failsafe-plugin.version} + + alphabetical + + ${failsafeArgLine} + + ${verify.skip} + + **/*IT.* + + + + + integration-tests + integration-test + + integration-test + + + + + verify-integration-tests + verify + + verify + + + + + - - - org.apache.maven.plugins - maven-assembly-plugin - ${maven-assembly-plugin.version} - - ${maven-assembly-plugin-skip} - - - jar-with-dependencies - - - - - ${main-class} - true - true - - - ${project.name} - ${project.version} - ${project.groupId}.${project.artifactId} - ${maven.build.timestamp} - ${git.commit.id.abbrev} - - - - - - make-assembly - - package - - single - - - - - - - org.apache.maven.plugins - maven-source-plugin - ${maven-source-plugin.version} - - - attach-sources - - jar-no-fork - - - - - - - org.apache.maven.plugins - maven-javadoc-plugin - ${maven-javadoc-plugin.version} - - - attach-javadocs - - jar - - - - - - - org.apache.maven.plugins - maven-dependency-plugin - ${maven-dependency-plugin.version} - - - analyze - - analyze-only - - - true - true - - org.apache.logging.log4j:log4j-core:: - - true - - - - - - + + + org.apache.maven.plugins + maven-assembly-plugin + ${maven-assembly-plugin.version} + + ${maven-assembly-plugin-skip} + + + jar-with-dependencies + + + + + ${main-class} + true + true + + + ${project.name} + ${project.version} + ${project.groupId}.${project.artifactId} + ${maven.build.timestamp} + ${git.commit.id.abbrev} + + + + + + make-assembly + + package + + single + + + + + + + org.apache.maven.plugins + maven-source-plugin + ${maven-source-plugin.version} + + + attach-sources + + jar-no-fork + + + + + + + org.apache.maven.plugins + maven-javadoc-plugin + ${maven-javadoc-plugin.version} + + + attach-javadocs + + jar + + + + + + + org.apache.maven.plugins + maven-dependency-plugin + ${maven-dependency-plugin.version} + + + analyze + + analyze-only + + + true + true + + org.apache.logging.log4j:log4j-core:: + + true + + + + + + - - - - org.apache.maven.plugins - maven-clean-plugin - ${maven-clean-plugin.version} - - - - pl.project13.maven - git-commit-id-plugin - - - - org.jacoco - jacoco-maven-plugin - - - - org.apache.maven.plugins - maven-failsafe-plugin - - - - org.apache.maven.plugins - maven-dependency-plugin - - - - org.apache.maven.plugins - maven-install-plugin - ${maven-install-plugin.version} - - - - org.apache.maven.plugins - maven-deploy-plugin - ${maven-deploy-plugin.version} - - - - org.apache.maven.plugins - maven-site-plugin - ${maven-site-plugin.version} - - - fr - - - - - org.apache.maven.plugins - maven-project-info-reports-plugin - ${maven-project-info-reports-plugin} - - - + + + + org.apache.maven.plugins + maven-clean-plugin + ${maven-clean-plugin.version} + + + + pl.project13.maven + git-commit-id-plugin + + + + org.jacoco + jacoco-maven-plugin + + + + org.apache.maven.plugins + maven-failsafe-plugin + + + + org.apache.maven.plugins + maven-dependency-plugin + + + + org.apache.maven.plugins + maven-install-plugin + ${maven-install-plugin.version} + + + + org.apache.maven.plugins + maven-deploy-plugin + ${maven-deploy-plugin.version} + + + + org.apache.maven.plugins + maven-site-plugin + ${maven-site-plugin.version} + + + fr + + + + + org.apache.maven.plugins + maven-project-info-reports-plugin + ${maven-project-info-reports-plugin} + + + - - - - org.apache.maven.plugins - maven-jxr-plugin - ${maven-jxr-plugin.version} - - - org.jacoco - jacoco-maven-plugin - ${jacoco-maven-plugin.version} - - - jacoco-report - - report - - - ${project.build.directory}/coverage-reports/jacoco-ut.exec - - - - jacoco-report-integration - - report-integration - - - ${project.build.directory}/coverage-reports/jacoco-it.exec - - - - jacoco-report-aggregate - - report-aggregate - - - ${project.build.directory}/coverage-reports/merged.exec - - - - - - org.apache.maven.plugins - maven-surefire-report-plugin - ${maven-surefire-plugin.version} - - - unit-tests - - report-only - - - - integration-tests - - failsafe-report-only - - - - - - org.apache.maven.plugins - maven-javadoc-plugin - ${maven-javadoc-plugin.version} - - - - javadoc-no-fork - - - - - - + + + + org.apache.maven.plugins + maven-jxr-plugin + ${maven-jxr-plugin.version} + + + org.jacoco + jacoco-maven-plugin + ${jacoco-maven-plugin.version} + + + jacoco-report + + report + + + ${project.build.directory}/coverage-reports/jacoco-ut.exec + + + + jacoco-report-integration + + report-integration + + + ${project.build.directory}/coverage-reports/jacoco-it.exec + + + + jacoco-report-aggregate + + report-aggregate + + + ${project.build.directory}/coverage-reports/merged.exec + + + + + + org.apache.maven.plugins + maven-surefire-report-plugin + ${maven-surefire-plugin.version} + + + unit-tests + + report-only + + + + integration-tests + + failsafe-report-only + + + + + + org.apache.maven.plugins + maven-javadoc-plugin + ${maven-javadoc-plugin.version} + + + + javadoc-no-fork + + + + + + - - - project-controls-check - - - - - org.apache.maven.plugins - maven-enforcer-plugin - ${maven-enforcer-plugin.version} - - - enforce-rules-controls - - enforce - - - - - ${maven.version} - - - ${java.version} - - - Définissez plugin.version ! - - - enforces that the project doesn't have duplicate declared dependencies. - - - true - - A banned dependency or plugin was found! - - - - No Snapshots Allowed in releases! - true - - - - - + + - - - ${maven.main.skip} - - - - enforce-display-info - validate - - display-info - - - - - - - org.codehaus.mojo - versions-maven-plugin - ${versions-maven-plugin.version} - - - validate - - display-plugin-updates - display-dependency-updates - display-property-updates - - - - - - - - - \ No newline at end of file + + + ${maven.main.skip} + + + + enforce-display-info + validate + + display-info + + + + + + + org.codehaus.mojo + versions-maven-plugin + ${versions-maven-plugin.version} + + + validate + + display-plugin-updates + display-dependency-updates + display-property-updates + + + + + + + + + From 5175ef08f8125a0018d2265e273d90e5c2e98efb Mon Sep 17 00:00:00 2001 From: Bertrand DELION Date: Tue, 21 Apr 2020 11:10:32 +0200 Subject: [PATCH 08/15] :heavy_plus_sign: maven-changelog-plugin for reporting (#55) Part of #35 --- .gitignore | 355 +---------------------------------------------------- pom.xml | 6 + 2 files changed, 9 insertions(+), 352 deletions(-) diff --git a/.gitignore b/.gitignore index 9cf7322..6601acd 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,5 @@ - -# Created by https://www.gitignore.io/api/git,java,maven,eclipse,intellij,intellij+all,visualstudio,visualstudiocode -# Edit at https://www.gitignore.io/?templates=git,java,maven,eclipse,intellij,intellij+all,visualstudio,visualstudiocode +# Created by https://www.gitignore.io/api/git,java,maven,eclipse,intellij,intellij+all,visualstudiocode +# Edit at https://www.gitignore.io/?templates=git,java,maven,eclipse,intellij,intellij+all,visualstudiocode ### Eclipse ### .metadata @@ -281,352 +280,4 @@ buildNumber.properties # Ignore all local history of files .history -### VisualStudio ### -## Ignore Visual Studio temporary files, build results, and -## files generated by popular Visual Studio add-ons. -## -## Get latest from https://github.com/github/gitignore/blob/master/VisualStudio.gitignore - -# User-specific files -*.rsuser -*.suo -*.user -*.userosscache -*.sln.docstates - -# User-specific files (MonoDevelop/Xamarin Studio) -*.userprefs - -# Mono auto generated files -mono_crash.* - -# Build results -[Dd]ebug/ -[Dd]ebugPublic/ -[Rr]elease/ -[Rr]eleases/ -x64/ -x86/ -[Aa][Rr][Mm]/ -[Aa][Rr][Mm]64/ -bld/ -[Bb]in/ -[Oo]bj/ -[Ll]og/ - -# Visual Studio 2015/2017 cache/options directory -.vs/ -# Uncomment if you have tasks that create the project's static files in wwwroot -#wwwroot/ - -# Visual Studio 2017 auto generated files -Generated\ Files/ - -# MSTest test Results -[Tt]est[Rr]esult*/ -[Bb]uild[Ll]og.* - -# NUnit -*.VisualState.xml -TestResult.xml -nunit-*.xml - -# Build Results of an ATL Project -[Dd]ebugPS/ -[Rr]eleasePS/ -dlldata.c - -# Benchmark Results -BenchmarkDotNet.Artifacts/ - -# .NET Core -project.lock.json -project.fragment.lock.json -artifacts/ - -# StyleCop -StyleCopReport.xml - -# Files built by Visual Studio -*_i.c -*_p.c -*_h.h -*.ilk -*.obj -*.iobj -*.pch -*.pdb -*.ipdb -*.pgc -*.pgd -*.rsp -*.sbr -*.tlb -*.tli -*.tlh -*.tmp_proj -*_wpftmp.csproj -*.vspscc -*.vssscc -.builds -*.pidb -*.svclog -*.scc - -# Chutzpah Test files -_Chutzpah* - -# Visual C++ cache files -ipch/ -*.aps -*.ncb -*.opendb -*.opensdf -*.sdf -*.cachefile -*.VC.db -*.VC.VC.opendb - -# Visual Studio profiler -*.psess -*.vsp -*.vspx -*.sap - -# Visual Studio Trace Files -*.e2e - -# TFS 2012 Local Workspace -$tf/ - -# Guidance Automation Toolkit -*.gpState - -# ReSharper is a .NET coding add-in -_ReSharper*/ -*.[Rr]e[Ss]harper -*.DotSettings.user - -# JustCode is a .NET coding add-in -.JustCode - -# TeamCity is a build add-in -_TeamCity* - -# DotCover is a Code Coverage Tool -*.dotCover - -# AxoCover is a Code Coverage Tool -.axoCover/* -!.axoCover/settings.json - -# Visual Studio code coverage results -*.coverage -*.coveragexml - -# NCrunch -_NCrunch_* -.*crunch*.local.xml -nCrunchTemp_* - -# MightyMoose -*.mm.* -AutoTest.Net/ - -# Web workbench (sass) -.sass-cache/ - -# Installshield output folder -[Ee]xpress/ - -# DocProject is a documentation generator add-in -DocProject/buildhelp/ -DocProject/Help/*.HxT -DocProject/Help/*.HxC -DocProject/Help/*.hhc -DocProject/Help/*.hhk -DocProject/Help/*.hhp -DocProject/Help/Html2 -DocProject/Help/html - -# Click-Once directory -publish/ - -# Publish Web Output -*.[Pp]ublish.xml -*.azurePubxml -# Note: Comment the next line if you want to checkin your web deploy settings, -# but database connection strings (with potential passwords) will be unencrypted -*.pubxml -*.publishproj - -# Microsoft Azure Web App publish settings. Comment the next line if you want to -# checkin your Azure Web App publish settings, but sensitive information contained -# in these scripts will be unencrypted -PublishScripts/ - -# NuGet Packages -*.nupkg -# NuGet Symbol Packages -*.snupkg -# The packages folder can be ignored because of Package Restore -**/[Pp]ackages/* -# except build/, which is used as an MSBuild target. -!**/[Pp]ackages/build/ -# Uncomment if necessary however generally it will be regenerated when needed -#!**/[Pp]ackages/repositories.config -# NuGet v3's project.json files produces more ignorable files -*.nuget.props -*.nuget.targets - -# Microsoft Azure Build Output -csx/ -*.build.csdef - -# Microsoft Azure Emulator -ecf/ -rcf/ - -# Windows Store app package directories and files -AppPackages/ -BundleArtifacts/ -Package.StoreAssociation.xml -_pkginfo.txt -*.appx -*.appxbundle -*.appxupload - -# Visual Studio cache files -# files ending in .cache can be ignored -*.[Cc]ache -# but keep track of directories ending in .cache -!?*.[Cc]ache/ - -# Others -ClientBin/ -~$* -*~ -*.dbmdl -*.dbproj.schemaview -*.jfm -*.pfx -*.publishsettings -orleans.codegen.cs - -# Including strong name files can present a security risk -# (https://github.com/github/gitignore/pull/2483#issue-259490424) -#*.snk - -# Since there are multiple workflows, uncomment next line to ignore bower_components -# (https://github.com/github/gitignore/pull/1529#issuecomment-104372622) -#bower_components/ - -# RIA/Silverlight projects -Generated_Code/ - -# Backup & report files from converting an old project file -# to a newer Visual Studio version. Backup files are not needed, -# because we have git ;-) -_UpgradeReport_Files/ -Backup*/ -UpgradeLog*.XML -UpgradeLog*.htm -ServiceFabricBackup/ -*.rptproj.bak - -# SQL Server files -*.mdf -*.ldf -*.ndf - -# Business Intelligence projects -*.rdl.data -*.bim.layout -*.bim_*.settings -*.rptproj.rsuser -*- [Bb]ackup.rdl -*- [Bb]ackup ([0-9]).rdl -*- [Bb]ackup ([0-9][0-9]).rdl - -# Microsoft Fakes -FakesAssemblies/ - -# GhostDoc plugin setting file -*.GhostDoc.xml - -# Node.js Tools for Visual Studio -.ntvs_analysis.dat -node_modules/ - -# Visual Studio 6 build log -*.plg - -# Visual Studio 6 workspace options file -*.opt - -# Visual Studio 6 auto-generated workspace file (contains which files were open etc.) -*.vbw - -# Visual Studio LightSwitch build output -**/*.HTMLClient/GeneratedArtifacts -**/*.DesktopClient/GeneratedArtifacts -**/*.DesktopClient/ModelManifest.xml -**/*.Server/GeneratedArtifacts -**/*.Server/ModelManifest.xml -_Pvt_Extensions - -# Paket dependency manager -.paket/paket.exe -paket-files/ - -# FAKE - F# Make -.fake/ - -# CodeRush personal settings -.cr/personal - -# Python Tools for Visual Studio (PTVS) -__pycache__/ -*.pyc - -# Cake - Uncomment if you are using it -# tools/** -# !tools/packages.config - -# Tabs Studio -*.tss - -# Telerik's JustMock configuration file -*.jmconfig - -# BizTalk build output -*.btp.cs -*.btm.cs -*.odx.cs -*.xsd.cs - -# OpenCover UI analysis results -OpenCover/ - -# Azure Stream Analytics local run output -ASALocalRun/ - -# MSBuild Binary and Structured Log -*.binlog - -# NVidia Nsight GPU debugger configuration file -*.nvuser - -# MFractors (Xamarin productivity tool) working folder -.mfractor/ - -# Local History for Visual Studio -.localhistory/ - -# BeatPulse healthcheck temp database -healthchecksdb - -# Backup folder for Package Reference Convert tool in Visual Studio 2017 -MigrationBackup/ - -# End of https://www.gitignore.io/api/git,java,maven,eclipse,intellij,intellij+all,visualstudio,visualstudiocode +# End of https://www.gitignore.io/api/git,java,maven,eclipse,intellij,intellij+all,visualstudiocode diff --git a/pom.xml b/pom.xml index 1c4f0c7..18adaf9 100644 --- a/pom.xml +++ b/pom.xml @@ -134,6 +134,7 @@ 3.9.0 3.0.0 + 2.3 @@ -621,6 +622,11 @@ + + org.apache.maven.plugins + maven-changelog-plugin + ${maven-changelog-plugin.version} + From e8d5e09e24e7ee35ca062a5d782e0f447b54287f Mon Sep 17 00:00:00 2001 From: Bertrand DELION Date: Wed, 22 Apr 2020 10:06:06 +0200 Subject: [PATCH 09/15] Feature/issue 56 (#57) * :green_heart: Specific workflow for feature and bugfix in GitHub Actions Part of #56 * :bug: Revert error delete compile * :green_heart: Specific workflow for feature and bugfix in Travis CI Part of #56 * :bug: Foget compile in Travis CI * :bug: Print Maven Project info in Travis * :bug: Add mvn in command line * :green_heart: Travis process time optimization --- .github/workflows/maven-java-feature.yml | 69 ++++++++++++++++++++++++ .github/workflows/maven-java.yml | 6 ++- .travis.yml | 34 +++++++++--- 3 files changed, 102 insertions(+), 7 deletions(-) create mode 100644 .github/workflows/maven-java-feature.yml diff --git a/.github/workflows/maven-java-feature.yml b/.github/workflows/maven-java-feature.yml new file mode 100644 index 0000000..223048e --- /dev/null +++ b/.github/workflows/maven-java-feature.yml @@ -0,0 +1,69 @@ +name: Maven CI for Java for Feature/Bugfix Branch + +on: + push: + branches-ignore: + - 'develop' + - 'release/*' + - 'master' + - 'hotfix/*' + - 'support/*' + +jobs: + maven-build-test-verify: + name: Maven test, package and deploy Java project + runs-on: ubuntu-latest + steps: + - name: Set up JDK 1.8 + uses: actions/setup-java@v1 + with: + java-version: 1.8 + - name: Maven version + run: mvn -version + env: + SERVER_USERNAME: $GITHUB_ACTOR + SERVER_PASSWORD: ${{ secrets.MVN_PCKGS_REPO_TOKEN}} + - name: Check out from version control + uses: actions/checkout@v2 + - name: Cache Maven dependencies + uses: actions/cache@v1 + env: + cache-name: cache-maven-dependencies + with: + path: ~/.m2/repository + key: ${{ runner.os }}-m2-${{ env.cache-name }}-${{ hashFiles('**/pom.xml') }} + restore-keys: | + ${{ runner.os }}-m2-${{ env.cache-name }}- + ${{ runner.os }}-m2- + ${{ runner.os }}- + - name: Get Maven Project information + id: maven-project-info + run: | + echo "$(mvn help:evaluate -Dexpression=project.groupId -q -DforceStdout --file pom.xml --settings .github/workflows/settings.xml)" + echo "$(mvn help:evaluate -Dexpression=project.artifactId -q -DforceStdout --file pom.xml --settings .github/workflows/settings.xml)" + echo "$(mvn help:evaluate -Dexpression=project.version -q -DforceStdout --file pom.xml --settings .github/workflows/settings.xml)" + echo "$(mvn help:evaluate -Dexpression=project.packaging -q -DforceStdout --file pom.xml --settings .github/workflows/settings.xml)" + env: + SERVER_USERNAME: $GITHUB_ACTOR + SERVER_PASSWORD: ${{ secrets.MVN_PCKGS_REPO_TOKEN}} + - name: Build with Maven + run: mvn -U clean compile -Pproject-controls-check --file pom.xml --settings .github/workflows/settings.xml + env: + SERVER_USERNAME: $GITHUB_ACTOR + SERVER_PASSWORD: ${{ secrets.MVN_PCKGS_REPO_TOKEN}} + - name: Unit Test with Maven + run: mvn -U -Dmaven.main.skip test --file pom.xml --settings .github/workflows/settings.xml + env: + SERVER_USERNAME: $GITHUB_ACTOR + SERVER_PASSWORD: ${{ secrets.MVN_PCKGS_REPO_TOKEN}} + - name: Verify with Maven + run: mvn -U -Dmaven.main.skip -Dunit.test.skip verify --file pom.xml --settings .github/workflows/settings.xml + env: + SERVER_USERNAME: $GITHUB_ACTOR + SERVER_PASSWORD: ${{ secrets.MVN_PCKGS_REPO_TOKEN}} + #TODO - name: Set Leak Period [SonarQube] + #TODO run: checkout du parent commun + #TODO run: mvn -U clean verify '-Dmaven.test.failure.ignore=true' + #TODO run: mvn -U '-Dsonar.links.scm=http://gitxxx' '-Dsonar.links.ci=http://jenkinsxxx' org.sonarsource.scanner.maven:sonar-maven-plugin:3.7.0.1746:sonar '-Dsonar.projectKey=[groupId]-[artifactId]' '-Dsonar.branch.name=develop' '-Dsonar.projectName=[artifactId]r' '-Dsonar.buildbreaker.skip=true' '-Dsonar.projectVersion=#d0b75832' + #TODO - name: Quality Gate [SonarQube] + #TODO run: mvn -U '-Dsonar.links.scm=http://gitxxx' '-Dsonar.links.ci=http://jenkinsxxx' org.sonarsource.scanner.maven:sonar-maven-plugin:3.7.0.1746:sonar '-Dsonar.projectKey=[groupId]-[artifactId]' '-Dsonar.branch.name=develop' '-Dsonar.projectName=[artifactId]' '-Dsonar.gitlab.ref_name=b7c32ea3401d64f97eecc4dd46de331b00391cd7' '-Dsonar.gitlab.commit_sha=b7c32ea3401d64f97eecc4dd46de331b00391cd7' '-Dsonar.gitlab.project_id=3555' diff --git a/.github/workflows/maven-java.yml b/.github/workflows/maven-java.yml index 1bb8d43..f1e48f6 100644 --- a/.github/workflows/maven-java.yml +++ b/.github/workflows/maven-java.yml @@ -1,6 +1,10 @@ name: Maven CI for Java -on: [push] +on: + push: + branches-ignore: + - 'feature/*' + - 'bugfix/*' jobs: gihub-context-get-info: diff --git a/.travis.yml b/.travis.yml index 4f9e72c..5021884 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,9 +6,31 @@ cache: - $HOME/.m2 install: true -script: - - mvn -U clean compile -Pproject-controls-check --file pom.xml --settings .github/workflows/settings.xml - - mvn -U -Dmaven.main.skip test --file pom.xml --settings .github/workflows/settings.xml - - mvn -U -Dmaven.main.skip -Dunit.test.skip verify --file pom.xml --settings .github/workflows/settings.xml - - mvn -U -Dmaven.main.skip -Dunit.test.skip -Dverify.skip jar:jar@default-jar assembly:single@make-assembly source:jar-no-fork@attach-sources javadoc:jar@attach-javadocs deploy --file pom.xml --settings .github/workflows/settings.xml - - mvn -U site --file pom.xml --settings .github/workflows/settings.xml +jobs: + include: + - stage: Get Maven Project information + script: + - echo $(mvn help:evaluate -Dexpression=project.groupId -q -DforceStdout --file pom.xml --settings .github/workflows/settings.xml) + - echo $(mvn help:evaluate -Dexpression=project.artifactId -q -DforceStdout --file pom.xml --settings .github/workflows/settings.xml) + - echo $(mvn help:evaluate -Dexpression=project.version -q -DforceStdout --file pom.xml --settings .github/workflows/settings.xml) + - echo $(mvn help:evaluate -Dexpression=project.packaging -q -DforceStdout --file pom.xml --settings .github/workflows/settings.xml) + + - stage: Build, Test and Verify with Maven + script: + - mvn -U clean compile -Pproject-controls-check --file pom.xml --settings .github/workflows/settings.xml + - mvn -U -Dmaven.main.skip test --file pom.xml --settings .github/workflows/settings.xml + - mvn -U -Dmaven.main.skip -Dunit.test.skip verify --file pom.xml --settings .github/workflows/settings.xml + + - stage: Publish to GitHub Packages Apache Maven + script: + - mvn -U -Dmaven.main.skip -Dunit.test.skip -Dverify.skip jar:jar@default-jar assembly:single@make-assembly source:jar-no-fork@attach-sources javadoc:jar@attach-javadocs deploy --file pom.xml --settings .github/workflows/settings.xml + + - stage: Site with Maven + script: + - mvn -U site --file pom.xml --settings .github/workflows/settings.xml + +stages: + - name: Publish to GitHub Packages Apache Maven + if: type = push AND branch =~ /^((develop|master)|((release|hotfix|support)\/(0|[1-9]\d*)\.(0|[1-9]\d*)\.(0|[1-9]\d*)(?:-((?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*)(?:\.(?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*))*))?(?:\+([0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?))$/ + - name: Site with Maven + if: type = push AND branch =~ /^((develop|master)|((release|hotfix|support)\/(0|[1-9]\d*)\.(0|[1-9]\d*)\.(0|[1-9]\d*)(?:-((?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*)(?:\.(?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*))*))?(?:\+([0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?))$/ From a8b5272303fb6767b04734d2e6123d1e96484b12 Mon Sep 17 00:00:00 2001 From: Bertrand DELION Date: Wed, 22 Apr 2020 13:07:12 +0200 Subject: [PATCH 10/15] Bugfix/issue 58 to develop ! (#60) * :green_heart: Travis order stages" Part of #58 * :bug: Travis could not parse yaml file * :green_heart: Travis reorganize jobs, stages & scripts * :bug: Travis could not parse yaml file * :bug: Travis could not parse yaml file * :green_heart: Skip install and organize file --- .travis.yml | 33 +++++++++++++++++---------------- 1 file changed, 17 insertions(+), 16 deletions(-) diff --git a/.travis.yml b/.travis.yml index 5021884..0c1e754 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,16 +4,25 @@ jdk: cache: directories: - $HOME/.m2 -install: true +install: skip + +stages: + - name: Get Maven Project information + - name: Build, Test and Verify with Maven + - name: Deploy and make Site + if: type = push AND branch =~ /^((develop|master)|((release|hotfix|support)\/(0|[1-9]\d*)\.(0|[1-9]\d*)\.(0|[1-9]\d*)(?:-((?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*)(?:\.(?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*))*))?(?:\+([0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?))$/ jobs: include: - stage: Get Maven Project information - script: - - echo $(mvn help:evaluate -Dexpression=project.groupId -q -DforceStdout --file pom.xml --settings .github/workflows/settings.xml) - - echo $(mvn help:evaluate -Dexpression=project.artifactId -q -DforceStdout --file pom.xml --settings .github/workflows/settings.xml) - - echo $(mvn help:evaluate -Dexpression=project.version -q -DforceStdout --file pom.xml --settings .github/workflows/settings.xml) - - echo $(mvn help:evaluate -Dexpression=project.packaging -q -DforceStdout --file pom.xml --settings .github/workflows/settings.xml) + name: Get groupId + script: echo $(mvn help:evaluate -Dexpression=project.groupId -q -DforceStdout --file pom.xml --settings .github/workflows/settings.xml) + - script: echo $(mvn help:evaluate -Dexpression=project.artifactId -q -DforceStdout --file pom.xml --settings .github/workflows/settings.xml) + name: Get artifactId + - script: echo $(mvn help:evaluate -Dexpression=project.version -q -DforceStdout --file pom.xml --settings .github/workflows/settings.xml) + name: Get version + - script: echo $(mvn help:evaluate -Dexpression=project.packaging -q -DforceStdout --file pom.xml --settings .github/workflows/settings.xml) + name: Get packaging - stage: Build, Test and Verify with Maven script: @@ -21,16 +30,8 @@ jobs: - mvn -U -Dmaven.main.skip test --file pom.xml --settings .github/workflows/settings.xml - mvn -U -Dmaven.main.skip -Dunit.test.skip verify --file pom.xml --settings .github/workflows/settings.xml - - stage: Publish to GitHub Packages Apache Maven + - stage: Deploy and make Site + name: Publish to GitHub Packages Apache Maven script: - mvn -U -Dmaven.main.skip -Dunit.test.skip -Dverify.skip jar:jar@default-jar assembly:single@make-assembly source:jar-no-fork@attach-sources javadoc:jar@attach-javadocs deploy --file pom.xml --settings .github/workflows/settings.xml - - - stage: Site with Maven - script: - mvn -U site --file pom.xml --settings .github/workflows/settings.xml - -stages: - - name: Publish to GitHub Packages Apache Maven - if: type = push AND branch =~ /^((develop|master)|((release|hotfix|support)\/(0|[1-9]\d*)\.(0|[1-9]\d*)\.(0|[1-9]\d*)(?:-((?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*)(?:\.(?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*))*))?(?:\+([0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?))$/ - - name: Site with Maven - if: type = push AND branch =~ /^((develop|master)|((release|hotfix|support)\/(0|[1-9]\d*)\.(0|[1-9]\d*)\.(0|[1-9]\d*)(?:-((?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*)(?:\.(?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*))*))?(?:\+([0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?))$/ From 3d3b3982755524c677d1a8a87da40d2a1f9af59f Mon Sep 17 00:00:00 2001 From: Bertrand DELION Date: Sat, 25 Apr 2020 09:54:04 +0200 Subject: [PATCH 11/15] :green_heart: Add SonarQube analysis (#63) * :green_heart: Add SonarQube analysis in GitHub Actions Part of #25 * :green_heart: Add SonarQube analysis in Travis CI Part of #25 * :pencil: Add SonarCloud Quality Gate badge * :pencil: Bad param branch in SonarCloud badge * :pencil: Fix param branch in SonarCloud badge * :rotating_light: Remove editorconfig-maven-plugin * :wrench: Add pom properties for Sonar * :green_heart: GH Actions delete Extract branch name * :loud_sound: log sonar.host.url in GitHub Actions * :green_heart: Set tags on Sonar project in GitHub Actions * :bug: Step outputs not interpreted in curl POST SonarCloud * :bug: Bad copy past for SONAR_PROJECT_KEY * :bug: Forgetting $ before SONAR_PROJECT_KEY variable * :bug: curl -u option pb * :sparkles: Finalize POST SonarCloud tags * :bug: sonar.jacoco.reportPaths is deprecated switch to sonar.coverage.jacoco.xmlReportPaths * :art: Badges in README --- .github/workflows/maven-java-feature.yml | 14 +++++++++++-- .github/workflows/maven-java.yml | 14 +++++++++++-- .github/workflows/settings.xml | 4 +++- .travis.yml | 1 + README.md | 2 +- pom.xml | 26 +++++++++++++++++++----- 6 files changed, 50 insertions(+), 11 deletions(-) diff --git a/.github/workflows/maven-java-feature.yml b/.github/workflows/maven-java-feature.yml index 223048e..cd975f5 100644 --- a/.github/workflows/maven-java-feature.yml +++ b/.github/workflows/maven-java-feature.yml @@ -43,6 +43,8 @@ jobs: echo "$(mvn help:evaluate -Dexpression=project.artifactId -q -DforceStdout --file pom.xml --settings .github/workflows/settings.xml)" echo "$(mvn help:evaluate -Dexpression=project.version -q -DforceStdout --file pom.xml --settings .github/workflows/settings.xml)" echo "$(mvn help:evaluate -Dexpression=project.packaging -q -DforceStdout --file pom.xml --settings .github/workflows/settings.xml)" + echo "::set-output name=SONAR_HOST_URL::$(mvn help:evaluate -Dexpression=sonar.host.url -q -DforceStdout --file pom.xml --settings .github/workflows/settings.xml)" + echo "::set-output name=SONAR_PROJECT_KEY::$(mvn help:evaluate -Dexpression=sonar.projectKey -q -DforceStdout --file pom.xml --settings .github/workflows/settings.xml)" env: SERVER_USERNAME: $GITHUB_ACTOR SERVER_PASSWORD: ${{ secrets.MVN_PCKGS_REPO_TOKEN}} @@ -61,9 +63,17 @@ jobs: env: SERVER_USERNAME: $GITHUB_ACTOR SERVER_PASSWORD: ${{ secrets.MVN_PCKGS_REPO_TOKEN}} - #TODO - name: Set Leak Period [SonarQube] + #TODO - name: Set Leak Period [SonarCloud.io] #TODO run: checkout du parent commun #TODO run: mvn -U clean verify '-Dmaven.test.failure.ignore=true' #TODO run: mvn -U '-Dsonar.links.scm=http://gitxxx' '-Dsonar.links.ci=http://jenkinsxxx' org.sonarsource.scanner.maven:sonar-maven-plugin:3.7.0.1746:sonar '-Dsonar.projectKey=[groupId]-[artifactId]' '-Dsonar.branch.name=develop' '-Dsonar.projectName=[artifactId]r' '-Dsonar.buildbreaker.skip=true' '-Dsonar.projectVersion=#d0b75832' - #TODO - name: Quality Gate [SonarQube] + - name: Quality Gate [SonarCloud.io] #TODO run: mvn -U '-Dsonar.links.scm=http://gitxxx' '-Dsonar.links.ci=http://jenkinsxxx' org.sonarsource.scanner.maven:sonar-maven-plugin:3.7.0.1746:sonar '-Dsonar.projectKey=[groupId]-[artifactId]' '-Dsonar.branch.name=develop' '-Dsonar.projectName=[artifactId]' '-Dsonar.gitlab.ref_name=b7c32ea3401d64f97eecc4dd46de331b00391cd7' '-Dsonar.gitlab.commit_sha=b7c32ea3401d64f97eecc4dd46de331b00391cd7' '-Dsonar.gitlab.project_id=3555' + run: mvn -U -Dsonar.branch.name=${GITHUB_REF#refs/heads/} -Dsonar.gitlab.commit_sha=${GITHUB_SHA} sonar:sonar --file pom.xml --settings .github/workflows/settings.xml + env: + SERVER_USERNAME: $GITHUB_ACTOR + SERVER_PASSWORD: ${{ secrets.MVN_PCKGS_REPO_TOKEN}} + SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }} + - name: Add tags [SonarCloud.io] + run: | + curl -u "${{ secrets.SONAR_TOKEN }}" -X POST "${{ steps.maven-project-info.outputs.SONAR_HOST_URL }}/api/project_tags/set?project=${{ steps.maven-project-info.outputs.SONAR_PROJECT_KEY }}&tags=socle,java" diff --git a/.github/workflows/maven-java.yml b/.github/workflows/maven-java.yml index f1e48f6..a6d72ed 100644 --- a/.github/workflows/maven-java.yml +++ b/.github/workflows/maven-java.yml @@ -72,6 +72,8 @@ jobs: echo "$(mvn help:evaluate -Dexpression=project.artifactId -q -DforceStdout --file pom.xml --settings .github/workflows/settings.xml)" echo "::set-output name=VERSION::$(mvn help:evaluate -Dexpression=project.version -q -DforceStdout --file pom.xml --settings .github/workflows/settings.xml)" echo "::set-output name=PACKAGING::$(mvn help:evaluate -Dexpression=project.packaging -q -DforceStdout --file pom.xml --settings .github/workflows/settings.xml)" + echo "::set-output name=SONAR_HOST_URL::$(mvn help:evaluate -Dexpression=sonar.host.url -q -DforceStdout --file pom.xml --settings .github/workflows/settings.xml)" + echo "::set-output name=SONAR_PROJECT_KEY::$(mvn help:evaluate -Dexpression=sonar.projectKey -q -DforceStdout --file pom.xml --settings .github/workflows/settings.xml)" env: SERVER_USERNAME: $GITHUB_ACTOR SERVER_PASSWORD: ${{ secrets.MVN_PCKGS_REPO_TOKEN}} @@ -107,12 +109,20 @@ jobs: env: SERVER_USERNAME: $GITHUB_ACTOR SERVER_PASSWORD: ${{ secrets.MVN_PCKGS_REPO_TOKEN}} - #TODO - name: Set Leak Period [SonarQube] + #TODO - name: Set Leak Period [SonarCloud.io] #TODO run: checkout du parent commun #TODO run: mvn -U clean verify '-Dmaven.test.failure.ignore=true' #TODO run: mvn -U '-Dsonar.links.scm=http://gitxxx' '-Dsonar.links.ci=http://jenkinsxxx' org.sonarsource.scanner.maven:sonar-maven-plugin:3.7.0.1746:sonar '-Dsonar.projectKey=[groupId]-[artifactId]' '-Dsonar.branch.name=develop' '-Dsonar.projectName=[artifactId]r' '-Dsonar.buildbreaker.skip=true' '-Dsonar.projectVersion=#d0b75832' - #TODO - name: Quality Gate [SonarQube] + - name: Quality Gate [SonarCloud.io] #TODO run: mvn -U '-Dsonar.links.scm=http://gitxxx' '-Dsonar.links.ci=http://jenkinsxxx' org.sonarsource.scanner.maven:sonar-maven-plugin:3.7.0.1746:sonar '-Dsonar.projectKey=[groupId]-[artifactId]' '-Dsonar.branch.name=develop' '-Dsonar.projectName=[artifactId]' '-Dsonar.gitlab.ref_name=b7c32ea3401d64f97eecc4dd46de331b00391cd7' '-Dsonar.gitlab.commit_sha=b7c32ea3401d64f97eecc4dd46de331b00391cd7' '-Dsonar.gitlab.project_id=3555' + run: mvn -U -Dsonar.branch.name=${GITHUB_REF#refs/heads/} -Dsonar.gitlab.commit_sha=${GITHUB_SHA} sonar:sonar --file pom.xml --settings .github/workflows/settings.xml + env: + SERVER_USERNAME: $GITHUB_ACTOR + SERVER_PASSWORD: ${{ secrets.MVN_PCKGS_REPO_TOKEN}} + SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }} + - name: Add tags [SonarCloud.io] + run: | + curl -u "${{ secrets.SONAR_TOKEN }}" -X POST "${{ steps.maven-project-info.outputs.SONAR_HOST_URL }}/api/project_tags/set?project=${{ steps.maven-project-info.outputs.SONAR_PROJECT_KEY }}&tags=socle,java" - name: Publish to GitHub Packages Apache Maven run: mvn -U -Dmaven.main.skip -Dunit.test.skip -Dverify.skip jar:jar@default-jar assembly:single@make-assembly source:jar-no-fork@attach-sources javadoc:jar@attach-javadocs deploy --file pom.xml --settings .github/workflows/settings.xml env: diff --git a/.github/workflows/settings.xml b/.github/workflows/settings.xml index e1dbe0d..273b971 100644 --- a/.github/workflows/settings.xml +++ b/.github/workflows/settings.xml @@ -45,7 +45,9 @@ - + + org.sonarsource.scanner.maven + diff --git a/.travis.yml b/.travis.yml index 0c1e754..4497448 100644 --- a/.travis.yml +++ b/.travis.yml @@ -29,6 +29,7 @@ jobs: - mvn -U clean compile -Pproject-controls-check --file pom.xml --settings .github/workflows/settings.xml - mvn -U -Dmaven.main.skip test --file pom.xml --settings .github/workflows/settings.xml - mvn -U -Dmaven.main.skip -Dunit.test.skip verify --file pom.xml --settings .github/workflows/settings.xml + - mvn -U -Dsonar.branch.name=${GITHUB_REF#refs/heads/} -Dsonar.gitlab.commit_sha=${GITHUB_SHA} sonar:sonar --file pom.xml --settings .github/workflows/settings.xml - stage: Deploy and make Site name: Publish to GitHub Packages Apache Maven diff --git a/README.md b/README.md index cfde026..179df41 100644 --- a/README.md +++ b/README.md @@ -6,7 +6,7 @@ ![Maven CI for Java](https://github.com/bdelion/java-parent/workflows/Maven%20CI%20for%20Java/badge.svg?branch=develop) [![Travis CI Build Status](https://travis-ci.com/bdelion/java-parent.svg?branch=develop)](https://travis-ci.com/bdelion/java-parent) -[![Known Vulnerabilities](https://snyk.io/test/github/bdelion/java-parent/badge.svg?targetFile=pom.xml)](https://snyk.io/test/github/bdelion/java-parent?targetFile=pom.xml) +[![Quality Gate Status](https://sonarcloud.io/api/project_badges/measure?branch=develop&project=fr.fifiz.socle.java%3Ajava-parent&metric=alert_status)](https://sonarcloud.io/dashboard?id=fr.fifiz.socle.java%3Ajava-parent&branch=develop) [![Known Vulnerabilities](https://snyk.io/test/github/bdelion/java-parent/badge.svg?targetFile=pom.xml)](https://snyk.io/test/github/bdelion/java-parent?targetFile=pom.xml)

Sourcerer gitMemory diff --git a/pom.xml b/pom.xml index 18adaf9..1029532 100644 --- a/pom.xml +++ b/pom.xml @@ -108,8 +108,8 @@ UTF-8 true true - false - false + true + true 3.2.0 3.2.0 @@ -122,19 +122,28 @@ 5.6.2 3.0.0-M4 + ${project.build.directory}/surefire-reports 3.0.0-M4 0.8.5 ${project.build.directory}/coverage-reports/jacoco-ut.exec ${project.build.directory}/coverage-reports/jacoco-it.exec - true 3.9.0 3.0.0 2.3 + + 3.7.0.1746 + https://sonarcloud.io + bdelion-github + ${project.groupId}:${project.artifactId} + ${project.name} + ${project.version} + ${project.build.sourceEncoding} + + ${surefire.reportsDirectory} + ${project.reporting.outputDirectory}/jacoco-it/jacoco.xml,${project.reporting.outputDirectory}/jacoco-ut/jacoco.xml,${project.reporting.outputDirectory}/jacoco-aggregate/jacoco.xml @@ -326,6 +335,7 @@ maven-surefire-plugin ${maven-surefire-plugin.version} + ${surefire.reportsDirectory} false alphabetical @@ -547,6 +557,12 @@ maven-project-info-reports-plugin ${maven-project-info-reports-plugin} + + + org.sonarsource.scanner.maven + sonar-maven-plugin + ${sonar-maven-plugin.version} + From 36642c69b887dff22aacaa515135e5274b079efe Mon Sep 17 00:00:00 2001 From: Bertrand DELION Date: Sun, 26 Apr 2020 10:55:28 +0200 Subject: [PATCH 12/15] Deploy release candidate on release and hotfix branches (#68) * :green_heart: Fix version -rc.buildNumber for branches release/* and hotfix/* Part of #67 * :bug: Get project version and packaging on all branches * :construction: Comment set mvn version --- .github/workflows/maven-java-feature.yml | 40 ++++++++++++++++-- .github/workflows/maven-java.yml | 26 ++++++++++-- .../5e21d90ee4d781fd01ff4ddd73870267.0 | 38 +++++++++++++++++ .../5e21d90ee4d781fd01ff4ddd73870267.1 | Bin 0 -> 12315 bytes .okhttpcache/journal | 10 +++++ 5 files changed, 107 insertions(+), 7 deletions(-) create mode 100644 .okhttpcache/5e21d90ee4d781fd01ff4ddd73870267.0 create mode 100644 .okhttpcache/5e21d90ee4d781fd01ff4ddd73870267.1 create mode 100644 .okhttpcache/journal diff --git a/.github/workflows/maven-java-feature.yml b/.github/workflows/maven-java-feature.yml index cd975f5..22c2e2f 100644 --- a/.github/workflows/maven-java-feature.yml +++ b/.github/workflows/maven-java-feature.yml @@ -41,13 +41,47 @@ jobs: run: | echo "$(mvn help:evaluate -Dexpression=project.groupId -q -DforceStdout --file pom.xml --settings .github/workflows/settings.xml)" echo "$(mvn help:evaluate -Dexpression=project.artifactId -q -DforceStdout --file pom.xml --settings .github/workflows/settings.xml)" - echo "$(mvn help:evaluate -Dexpression=project.version -q -DforceStdout --file pom.xml --settings .github/workflows/settings.xml)" - echo "$(mvn help:evaluate -Dexpression=project.packaging -q -DforceStdout --file pom.xml --settings .github/workflows/settings.xml)" + echo "::set-output name=VERSION::$(mvn help:evaluate -Dexpression=project.version -q -DforceStdout --file pom.xml --settings .github/workflows/settings.xml)" + echo "::set-output name=PACKAGING::$(mvn help:evaluate -Dexpression=project.packaging -q -DforceStdout --file pom.xml --settings .github/workflows/settings.xml)" echo "::set-output name=SONAR_HOST_URL::$(mvn help:evaluate -Dexpression=sonar.host.url -q -DforceStdout --file pom.xml --settings .github/workflows/settings.xml)" echo "::set-output name=SONAR_PROJECT_KEY::$(mvn help:evaluate -Dexpression=sonar.projectKey -q -DforceStdout --file pom.xml --settings .github/workflows/settings.xml)" env: SERVER_USERNAME: $GITHUB_ACTOR SERVER_PASSWORD: ${{ secrets.MVN_PCKGS_REPO_TOKEN}} + - name: Get Branche name + id: get-branche-name + run: | + echo "::set-output name=BRANCHE_NAME::${GITHUB_REF#refs/heads/}" + - name: Set Release Candidate Mode (branche == (release/*|hotfix/*)) + id: set-release-candidate-mode + if: startsWith( steps.get-branche-name.outputs.BRANCHE_NAME, 'release/' ) || ( startsWith( steps.get-branche-name.outputs.BRANCHE_NAME, 'hotfix/' ) ) + run: | + echo "::set-output name=CREATE_RC::true" + - name: Get short SHA + id: short-sha + run: | + echo "Maven Project version: ${{ steps.maven-project-info.outputs.VERSION }}" + echo "::set-output name=COMMIT_ID_SHORT::${GITHUB_SHA::8}" + - name: Create version number SNAPSHOT + id: create-version-snapshot + if: ( steps.set-release-candidate-mode.outputs.CREATE_RC != 'true' ) + uses: frabert/replace-string-action@v1.1 + with: + pattern: "^(.*)-SNAPSHOT$" + string: ${{ steps.maven-project-info.outputs.VERSION }} + replace-with: "$1-${{ steps.short-sha.outputs.COMMIT_ID_SHORT }}-SNAPSHOT" + - name: Create version number RELEASE CANDIDATE + id: create-version-rc + if: ( steps.set-release-candidate-mode.outputs.CREATE_RC == 'true' ) + uses: frabert/replace-string-action@v1.1 + with: + pattern: "^(.*)-SNAPSHOT$" + string: ${{ steps.maven-project-info.outputs.VERSION }} + replace-with: "$1-rc.${GITHUB_RUN_NUMBER}" + - name: Set version number + if: endsWith( steps.maven-project-info.outputs.VERSION, '-SNAPSHOT' ) && ( steps.maven-project-info.outputs.PACKAGING != 'pom' ) + run: | + echo "New version: ${{ steps.create-version-number.outputs.replaced }}" - name: Build with Maven run: mvn -U clean compile -Pproject-controls-check --file pom.xml --settings .github/workflows/settings.xml env: @@ -69,7 +103,7 @@ jobs: #TODO run: mvn -U '-Dsonar.links.scm=http://gitxxx' '-Dsonar.links.ci=http://jenkinsxxx' org.sonarsource.scanner.maven:sonar-maven-plugin:3.7.0.1746:sonar '-Dsonar.projectKey=[groupId]-[artifactId]' '-Dsonar.branch.name=develop' '-Dsonar.projectName=[artifactId]r' '-Dsonar.buildbreaker.skip=true' '-Dsonar.projectVersion=#d0b75832' - name: Quality Gate [SonarCloud.io] #TODO run: mvn -U '-Dsonar.links.scm=http://gitxxx' '-Dsonar.links.ci=http://jenkinsxxx' org.sonarsource.scanner.maven:sonar-maven-plugin:3.7.0.1746:sonar '-Dsonar.projectKey=[groupId]-[artifactId]' '-Dsonar.branch.name=develop' '-Dsonar.projectName=[artifactId]' '-Dsonar.gitlab.ref_name=b7c32ea3401d64f97eecc4dd46de331b00391cd7' '-Dsonar.gitlab.commit_sha=b7c32ea3401d64f97eecc4dd46de331b00391cd7' '-Dsonar.gitlab.project_id=3555' - run: mvn -U -Dsonar.branch.name=${GITHUB_REF#refs/heads/} -Dsonar.gitlab.commit_sha=${GITHUB_SHA} sonar:sonar --file pom.xml --settings .github/workflows/settings.xml + run: mvn -U -Dsonar.branch.name=steps.get-branche-name.outputs.BRANCHE_NAME -Dsonar.gitlab.commit_sha=${GITHUB_SHA} sonar:sonar --file pom.xml --settings .github/workflows/settings.xml env: SERVER_USERNAME: $GITHUB_ACTOR SERVER_PASSWORD: ${{ secrets.MVN_PCKGS_REPO_TOKEN}} diff --git a/.github/workflows/maven-java.yml b/.github/workflows/maven-java.yml index a6d72ed..d46a386 100644 --- a/.github/workflows/maven-java.yml +++ b/.github/workflows/maven-java.yml @@ -77,23 +77,41 @@ jobs: env: SERVER_USERNAME: $GITHUB_ACTOR SERVER_PASSWORD: ${{ secrets.MVN_PCKGS_REPO_TOKEN}} + - name: Get Branche name + id: get-branche-name + run: | + echo "::set-output name=BRANCHE_NAME::${GITHUB_REF#refs/heads/}" + - name: Set Release Candidate Mode (branche == (release/*|hotfix/*)) + id: set-release-candidate-mode + if: startsWith( steps.get-branche-name.outputs.BRANCHE_NAME, 'release/' ) || ( startsWith( steps.get-branche-name.outputs.BRANCHE_NAME, 'hotfix/' ) ) + run: | + echo "::set-output name=CREATE_RC::true" - name: Get short SHA id: short-sha run: | echo "Maven Project version: ${{ steps.maven-project-info.outputs.VERSION }}" echo "::set-output name=COMMIT_ID_SHORT::${GITHUB_SHA::8}" - - name: Create version number - id: create-version-number + - name: Create version number SNAPSHOT + id: create-version-snapshot + if: ( steps.set-release-candidate-mode.outputs.CREATE_RC != 'true' ) uses: frabert/replace-string-action@v1.1 with: pattern: "^(.*)-SNAPSHOT$" string: ${{ steps.maven-project-info.outputs.VERSION }} replace-with: "$1-${{ steps.short-sha.outputs.COMMIT_ID_SHORT }}-SNAPSHOT" + - name: Create version number RELEASE CANDIDATE + id: create-version-rc + if: ( steps.set-release-candidate-mode.outputs.CREATE_RC == 'true' ) + uses: frabert/replace-string-action@v1.1 + with: + pattern: "^(.*)-SNAPSHOT$" + string: ${{ steps.maven-project-info.outputs.VERSION }} + replace-with: "$1-rc.${GITHUB_RUN_NUMBER}" - name: Set version number if: endsWith( steps.maven-project-info.outputs.VERSION, '-SNAPSHOT' ) && ( steps.maven-project-info.outputs.PACKAGING != 'pom' ) run: | echo "New version: ${{ steps.create-version-number.outputs.replaced }}" - mvn versions:set -DnewVersion=${{ steps.create-version-number.outputs.replaced }} --file pom.xml +#TODO mvn versions:set -DnewVersion=${{ steps.create-version-number.outputs.replaced }} --file pom.xml - name: Build with Maven run: mvn -U clean compile -Pproject-controls-check --file pom.xml --settings .github/workflows/settings.xml env: @@ -115,7 +133,7 @@ jobs: #TODO run: mvn -U '-Dsonar.links.scm=http://gitxxx' '-Dsonar.links.ci=http://jenkinsxxx' org.sonarsource.scanner.maven:sonar-maven-plugin:3.7.0.1746:sonar '-Dsonar.projectKey=[groupId]-[artifactId]' '-Dsonar.branch.name=develop' '-Dsonar.projectName=[artifactId]r' '-Dsonar.buildbreaker.skip=true' '-Dsonar.projectVersion=#d0b75832' - name: Quality Gate [SonarCloud.io] #TODO run: mvn -U '-Dsonar.links.scm=http://gitxxx' '-Dsonar.links.ci=http://jenkinsxxx' org.sonarsource.scanner.maven:sonar-maven-plugin:3.7.0.1746:sonar '-Dsonar.projectKey=[groupId]-[artifactId]' '-Dsonar.branch.name=develop' '-Dsonar.projectName=[artifactId]' '-Dsonar.gitlab.ref_name=b7c32ea3401d64f97eecc4dd46de331b00391cd7' '-Dsonar.gitlab.commit_sha=b7c32ea3401d64f97eecc4dd46de331b00391cd7' '-Dsonar.gitlab.project_id=3555' - run: mvn -U -Dsonar.branch.name=${GITHUB_REF#refs/heads/} -Dsonar.gitlab.commit_sha=${GITHUB_SHA} sonar:sonar --file pom.xml --settings .github/workflows/settings.xml + run: mvn -U -Dsonar.branch.name=steps.get-branche-name.outputs.BRANCHE_NAME -Dsonar.gitlab.commit_sha=${GITHUB_SHA} sonar:sonar --file pom.xml --settings .github/workflows/settings.xml env: SERVER_USERNAME: $GITHUB_ACTOR SERVER_PASSWORD: ${{ secrets.MVN_PCKGS_REPO_TOKEN}} diff --git a/.okhttpcache/5e21d90ee4d781fd01ff4ddd73870267.0 b/.okhttpcache/5e21d90ee4d781fd01ff4ddd73870267.0 new file mode 100644 index 0000000..f73f628 --- /dev/null +++ b/.okhttpcache/5e21d90ee4d781fd01ff4ddd73870267.0 @@ -0,0 +1,38 @@ +https://api.github.com/repos/bdelion/java-parent/issues?state=all&per_page=100&page=1 +GET +1 +Accept-Encoding: gzip +HTTP/1.1 200 OK +25 +Accept-Ranges: bytes +Transfer-Encoding: chunked +date: Tue, 21 Apr 2020 08:51:27 GMT +content-type: application/json; charset=utf-8 +server: GitHub.com +status: 200 OK +cache-control: public, max-age=60, s-maxage=60 +vary: Accept, Accept-Encoding, Accept, X-Requested-With +etag: W/"90dabb9ff71b58e6325ae82db14d54dc" +x-github-media-type: github.v3; format=json +access-control-expose-headers: ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type, Deprecation, Sunset +access-control-allow-origin: * +strict-transport-security: max-age=31536000; includeSubdomains; preload +x-frame-options: deny +x-content-type-options: nosniff +x-xss-protection: 1; mode=block +referrer-policy: origin-when-cross-origin, strict-origin-when-cross-origin +content-security-policy: default-src 'none' +content-encoding: gzip +X-Ratelimit-Limit: 60 +X-Ratelimit-Remaining: 58 +X-Ratelimit-Reset: 1587462426 +X-GitHub-Request-Id: E4CF:BFE1:8D47640:A636E38:5E9EB40E +OkHttp-Sent-Millis: 1587459085355 +OkHttp-Received-Millis: 1587459086351 + +TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256 +2 +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 +0 +TLSv1.2 diff --git a/.okhttpcache/5e21d90ee4d781fd01ff4ddd73870267.1 b/.okhttpcache/5e21d90ee4d781fd01ff4ddd73870267.1 new file mode 100644 index 0000000000000000000000000000000000000000..78b506b3404bca1a622eb36d7a65cfaf5a165a81 GIT binary patch literal 12315 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 Date: Sun, 26 Apr 2020 11:00:28 +0200 Subject: [PATCH 13/15] :arrow_up: prepare for next development iteration 8.1.0 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 1029532..6f1b343 100644 --- a/pom.xml +++ b/pom.xml @@ -8,7 +8,7 @@ fr.fifiz.socle.java java-parent - 8.0.0-SNAPSHOT + 8.1.0-SNAPSHOT pom FIFIZ :: Socle Java :: java-parent Pom parent Java de mes projets From 85568fba9025a932d8a48deaa26c4fc99ed27215 Mon Sep 17 00:00:00 2001 From: Bertrand DELION Date: Sun, 30 Jan 2022 16:18:41 +0100 Subject: [PATCH 14/15] :arrow_up: sonar-maven-plugin (#76) --- CHANGELOG.md | 5 +++-- README.md | 2 +- pom.xml | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index b72bbe8..9b1921f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,8 +9,9 @@ Tous les changements notables apportés à ce projet seront documentés dans ce > ## [8.1.0] - 2020-mm-jj > -> - Intégration plus propre de Jacoco. -> - Intégration plus propre de SonarCloud. +> - Intégration plus propre de Jacoco. +> - Intégration plus propre de SonarCloud. +> - Montée de version `sonar-maven-plugin` ## [8.0.0] - 2020-mm-jj diff --git a/README.md b/README.md index 179df41..0b472c9 100644 --- a/README.md +++ b/README.md @@ -27,7 +27,7 @@ Ajouter au `pom.xml` de votre composant : fr.fifiz.socle.java java-parent - 8.0.0-SNAPSHOT + 8.1.0-SNAPSHOT ``` diff --git a/pom.xml b/pom.xml index 6f1b343..5500a7c 100644 --- a/pom.xml +++ b/pom.xml @@ -134,7 +134,7 @@ 3.0.0 2.3 - 3.7.0.1746 + 3.9.1.2184 https://sonarcloud.io bdelion-github ${project.groupId}:${project.artifactId} From efef40d4a1b5f49945c7be02cb38c4f95aee4e7f Mon Sep 17 00:00:00 2001 From: Bertrand DELION Date: Sun, 30 Jan 2022 18:58:53 +0100 Subject: [PATCH 15/15] :arrow_up: Java 11 and Maven plugins (#77) GitHub Actions : specify Java distribution TravisCI : specify Java distribution and version --- .github/workflows/maven-java-feature.yml | 9 ++++-- .github/workflows/maven-java.yml | 9 ++++-- .travis.yml | 2 +- CHANGELOG.md | 5 +-- pom.xml | 39 +++++++++++++----------- 5 files changed, 37 insertions(+), 27 deletions(-) diff --git a/.github/workflows/maven-java-feature.yml b/.github/workflows/maven-java-feature.yml index 22c2e2f..d253e02 100644 --- a/.github/workflows/maven-java-feature.yml +++ b/.github/workflows/maven-java-feature.yml @@ -14,10 +14,13 @@ jobs: name: Maven test, package and deploy Java project runs-on: ubuntu-latest steps: - - name: Set up JDK 1.8 - uses: actions/setup-java@v1 + - uses: actions/checkout@v2 + - name: Set up JDK 11 + uses: actions/setup-java@v2 with: - java-version: 1.8 + distribution: 'adopt' + java-version: '11' + cache: 'maven' - name: Maven version run: mvn -version env: diff --git a/.github/workflows/maven-java.yml b/.github/workflows/maven-java.yml index d46a386..f32923b 100644 --- a/.github/workflows/maven-java.yml +++ b/.github/workflows/maven-java.yml @@ -43,10 +43,13 @@ jobs: name: Maven test, package and deploy Java project runs-on: ubuntu-latest steps: - - name: Set up JDK 1.8 - uses: actions/setup-java@v1 + - uses: actions/checkout@v2 + - name: Set up JDK 11 + uses: actions/setup-java@v2 with: - java-version: 1.8 + distribution: 'adopt' + java-version: '11' + cache: 'maven' - name: Maven version run: mvn -version env: diff --git a/.travis.yml b/.travis.yml index 4497448..089940e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,6 +1,6 @@ language: java jdk: - - openjdk8 + - openjdk11 cache: directories: - $HOME/.m2 diff --git a/CHANGELOG.md b/CHANGELOG.md index 9b1921f..043faa7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,7 +8,7 @@ Tous les changements notables apportés à ce projet seront documentés dans ce ## [Unreleased] > ## [8.1.0] - 2020-mm-jj -> +> - Montée de version vers Java 11 > - Intégration plus propre de Jacoco. > - Intégration plus propre de SonarCloud. > - Montée de version `sonar-maven-plugin` @@ -48,6 +48,7 @@ Download at TODO [keep a changelog]: https://keepachangelog.com/fr/1.0.0/ [semantic versioning]: https://semver.org/lang/fr/ -[unreleased]: https://github.com/bdelion/java-parent/compare/8.0.0...HEAD +[unreleased]: https://github.com/bdelion/java-parent/compare/8.1.0...HEAD +[8.1.0]: https://github.com/bdelion/java-parent/compare/8.1.0...8.0.1 [8.0.1]: https://github.com/bdelion/java-parent/compare/8.0.1...8.0.0 [8.0.0]: https://github.com/bdelion/java-parent/releases/tag/8.0.0 diff --git a/pom.xml b/pom.xml index 5500a7c..d412236 100644 --- a/pom.xml +++ b/pom.xml @@ -85,23 +85,23 @@ - 1.8 + 11 UTF-8 3.6.3 - 3.0.0-M3 - 2.7 + 3.0.0 + 2.9.0 1.8 3.1.0 3.0.0-M1 - 3.0.0-M1 + 3.0.0-M2 - 3.1.0 - 3.8.1 + 3.2.0 + 3.9.0 ${java.version} ${java.version} @@ -111,27 +111,27 @@ true true - 3.2.0 - 3.2.0 + 3.2.2 + 3.3.0 3.2.1 - 3.2.0 - 3.1.2 - 3.0.0 + 3.3.1 + 3.2.0 + 3.1.2 - 4.0.0 + 4.9.10 - 5.6.2 - 3.0.0-M4 + 5.8.2 + 3.0.0-M5 ${project.build.directory}/surefire-reports - 3.0.0-M4 - 0.8.5 + 3.0.0-M5 + 0.8.7 ${project.build.directory}/coverage-reports/jacoco-ut.exec ${project.build.directory}/coverage-reports/jacoco-it.exec true - 3.9.0 - 3.0.0 + 3.10.0 + 3.1.1 2.3 3.9.1.2184 @@ -219,6 +219,9 @@ org.apache.maven.plugins maven-compiler-plugin ${maven-compiler-plugin.version} + + 11 +