From 176e2ce69b04c27df1f8302a149acdddbde897fb Mon Sep 17 00:00:00 2001 From: Stephan Pirnbaum Date: Fri, 13 Sep 2024 18:14:29 +0000 Subject: [PATCH 1/9] #11 add classifier to build --- README.adoc | 6 ++++-- pom.xml | 16 ++++++++++++++++ 2 files changed, 20 insertions(+), 2 deletions(-) diff --git a/README.adoc b/README.adoc index c82e6cf..e2f7edb 100644 --- a/README.adoc +++ b/README.adoc @@ -26,14 +26,16 @@ jqassistant: plugins: - group-id: org.jqassistant.plugin <1> artifact-id: jqassistant-c4-plugin + classifier: <2> version: ${jqassistant.c4-plugin.version} scan: include: files: - - ${project.basedir}/documentation/c4 <2> + - ${project.basedir}/documentation/c4 <3> ---- <1> Dependency to the C4 plugin -<2> Location of the `.puml`-files +<2> The classifier, use antlr4.7.2 for builds with JDK11/Neo4j 4 and antlr4.13.1 for builds with JDK17/Neo4j v5 +<3> Location of the `.puml`-files == Mapping between C4 and jQAssistant diff --git a/pom.xml b/pom.xml index ec68f03..bf3cbd5 100644 --- a/pom.xml +++ b/pom.xml @@ -135,6 +135,22 @@ + + org.apache.maven.plugins + maven-jar-plugin + 3.3.0 + + + antlr${antlr4.version} + + jar + + + antlr${antlr4.version} + + + + From 37747d4a61ed301d537fcf9a4536f152defa6fae Mon Sep 17 00:00:00 2001 From: Stephan Pirnbaum Date: Mon, 16 Sep 2024 11:32:11 +0000 Subject: [PATCH 2/9] #11 update github action and classifier name --- .github/workflows/release.yml | 27 +++++++++++++++++++++------ README.adoc | 2 +- pom.xml | 4 +++- 3 files changed, 25 insertions(+), 8 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index d6773dd..b7b06a3 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -4,11 +4,6 @@ name: Release on: workflow_dispatch: inputs: - java_version: - description: Java version to use - type: string - required: false - default: 17 releaseVersion: description: "Default version to use when preparing a release." required: true @@ -24,9 +19,29 @@ on: type: boolean jobs: - build: + neo4jv4: uses: jqassistant-tooling/jqassistant-github-actions/.github/workflows/release.yml@main with: + java_version: 11 + releaseVersion: ${{ github.event.inputs.releaseVersion }} + developmentVersion: ${{ github.event.inputs.developmentVersion }} + dryRun: ${{ github.event.inputs.dryRun }} + secrets: + ossrh_username: ${{ secrets.OSSRH_USERNAME }} + ossrh_password: ${{ secrets.OSSRH_PASSWORD }} + ossrh_signing_key: ${{ secrets.OSSRH_SIGNING_KEY }} + ossrh_signing_password: ${{ secrets.OSSRH_SIGNING_PASSWORD }} + sonar_token: ${{ secrets.SONAR_TOKEN }} + clean-tag: + uses: ClementTsang/delete-tag-and-release@v0.3.1 + with: + tag_name: ${{ github.event.inputs.releaseVersion }} + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + neo4jv5: + uses: jqassistant-tooling/jqassistant-github-actions/.github/workflows/release.yml@main + with: + java_version: 17 releaseVersion: ${{ github.event.inputs.releaseVersion }} developmentVersion: ${{ github.event.inputs.developmentVersion }} dryRun: ${{ github.event.inputs.dryRun }} diff --git a/README.adoc b/README.adoc index e2f7edb..eed0eaa 100644 --- a/README.adoc +++ b/README.adoc @@ -34,7 +34,7 @@ jqassistant: - ${project.basedir}/documentation/c4 <3> ---- <1> Dependency to the C4 plugin -<2> The classifier, use antlr4.7.2 for builds with JDK11/Neo4j 4 and antlr4.13.1 for builds with JDK17/Neo4j v5 +<2> The classifier, use neo4jv4 for builds with JDK11/Neo4j 4 and neo4jv5 for builds with JDK17/Neo4j v5 <3> Location of the `.puml`-files == Mapping between C4 and jQAssistant diff --git a/pom.xml b/pom.xml index bf3cbd5..09e5eb4 100644 --- a/pom.xml +++ b/pom.xml @@ -146,7 +146,7 @@ jar - antlr${antlr4.version} + ${classifier.name} @@ -162,6 +162,7 @@ 4.7.2 + neo4jv4 @@ -171,6 +172,7 @@ 4.13.1 + neo4jv5 From 8d43465b394477e5e5ce0cc87bc91b09baf526d1 Mon Sep 17 00:00:00 2001 From: Stephan Pirnbaum Date: Mon, 16 Sep 2024 11:40:25 +0000 Subject: [PATCH 3/9] #11 update workflow --- .github/workflows/release.yml | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index b7b06a3..84988a4 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -33,12 +33,15 @@ jobs: ossrh_signing_password: ${{ secrets.OSSRH_SIGNING_PASSWORD }} sonar_token: ${{ secrets.SONAR_TOKEN }} clean-tag: - uses: ClementTsang/delete-tag-and-release@v0.3.1 - with: - tag_name: ${{ github.event.inputs.releaseVersion }} - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + needs: neo4jv4 + steps: + - uses: ClementTsang/delete-tag-and-release@v0.3.1 + with: + tag_name: ${{ github.event.inputs.releaseVersion }} + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} neo4jv5: + needs: cleant-tag uses: jqassistant-tooling/jqassistant-github-actions/.github/workflows/release.yml@main with: java_version: 17 From 6ed5dffa7bcabb335a2bfe4f55c031dcdcf52077 Mon Sep 17 00:00:00 2001 From: Stephan Pirnbaum Date: Mon, 16 Sep 2024 11:48:31 +0000 Subject: [PATCH 4/9] #11 update workflow --- .github/workflows/release.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 84988a4..816adda 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -34,6 +34,7 @@ jobs: sonar_token: ${{ secrets.SONAR_TOKEN }} clean-tag: needs: neo4jv4 + runs-on: ubuntu-latest steps: - uses: ClementTsang/delete-tag-and-release@v0.3.1 with: From 8612ac7994ddb42ac6fdad36f04ce738e9266f74 Mon Sep 17 00:00:00 2001 From: Stephan Pirnbaum Date: Mon, 16 Sep 2024 11:49:55 +0000 Subject: [PATCH 5/9] #11 fix typo --- .github/workflows/release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 816adda..73c7433 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -42,7 +42,7 @@ jobs: env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} neo4jv5: - needs: cleant-tag + needs: clean-tag uses: jqassistant-tooling/jqassistant-github-actions/.github/workflows/release.yml@main with: java_version: 17 From 951e9d668376f50f91721257502bc2fee592ec0d Mon Sep 17 00:00:00 2001 From: GitHub Actions Date: Mon, 16 Sep 2024 11:55:23 +0000 Subject: [PATCH 6/9] [maven-release-plugin] prepare release 2.2.0-M1 --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 09e5eb4..e079fd3 100644 --- a/pom.xml +++ b/pom.xml @@ -9,7 +9,7 @@ jqassistant-c4-plugin - 2.2.0-SNAPSHOT + 2.2.0-M1 http://jqassistant.org/ @@ -34,7 +34,7 @@ scm:git:https://github.com/jqassistant-plugin/jqassistant-c4-plugin.git https://github.com/jqassistant-plugin/jqassistant-c4-plugin - HEAD + 2.2.0-M1 From 23a7c09e9e02b3d7f7983acfd5850f42c150fd1f Mon Sep 17 00:00:00 2001 From: GitHub Actions Date: Mon, 16 Sep 2024 11:55:24 +0000 Subject: [PATCH 7/9] [maven-release-plugin] prepare for next development iteration --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index e079fd3..09e5eb4 100644 --- a/pom.xml +++ b/pom.xml @@ -9,7 +9,7 @@ jqassistant-c4-plugin - 2.2.0-M1 + 2.2.0-SNAPSHOT http://jqassistant.org/ @@ -34,7 +34,7 @@ scm:git:https://github.com/jqassistant-plugin/jqassistant-c4-plugin.git https://github.com/jqassistant-plugin/jqassistant-c4-plugin - 2.2.0-M1 + HEAD From 8e904b97c66cbcc15235a9521c38e03454ba8bb7 Mon Sep 17 00:00:00 2001 From: GitHub Actions Date: Mon, 16 Sep 2024 12:02:44 +0000 Subject: [PATCH 8/9] [maven-release-plugin] prepare release 2.2.0-M1 --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 09e5eb4..e079fd3 100644 --- a/pom.xml +++ b/pom.xml @@ -9,7 +9,7 @@ jqassistant-c4-plugin - 2.2.0-SNAPSHOT + 2.2.0-M1 http://jqassistant.org/ @@ -34,7 +34,7 @@ scm:git:https://github.com/jqassistant-plugin/jqassistant-c4-plugin.git https://github.com/jqassistant-plugin/jqassistant-c4-plugin - HEAD + 2.2.0-M1 From 3982a2648fe5b66db75d94bfc3b1653b000a3b8d Mon Sep 17 00:00:00 2001 From: GitHub Actions Date: Mon, 16 Sep 2024 12:02:45 +0000 Subject: [PATCH 9/9] [maven-release-plugin] prepare for next development iteration --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index e079fd3..09e5eb4 100644 --- a/pom.xml +++ b/pom.xml @@ -9,7 +9,7 @@ jqassistant-c4-plugin - 2.2.0-M1 + 2.2.0-SNAPSHOT http://jqassistant.org/ @@ -34,7 +34,7 @@ scm:git:https://github.com/jqassistant-plugin/jqassistant-c4-plugin.git https://github.com/jqassistant-plugin/jqassistant-c4-plugin - 2.2.0-M1 + HEAD