diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index d6773dd..73c7433 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,33 @@ 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: + needs: neo4jv4 + runs-on: ubuntu-latest + 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: clean-tag + 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 c82e6cf..eed0eaa 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 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 ec68f03..09e5eb4 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 + + + ${classifier.name} + + + + @@ -146,6 +162,7 @@ 4.7.2 + neo4jv4 @@ -155,6 +172,7 @@ 4.13.1 + neo4jv5