Merge branch 'main' into dependabot/maven/quarkus.version-3.7.1

.github/workflows/build.yml

@@ -37,11 +37,11 @@ jobs:
  if: startsWith(matrix.os, 'windows')
 
  - uses: actions/checkout@v3
- - name: Set up JDK 11
+ - name: Set up JDK 17
  uses: actions/setup-java@v3
  with:
  distribution: temurin
- java-version: 11
+ java-version: 17
  cache: 'maven'
 
  - name: Build with Maven

.github/workflows/release.yml

@@ -6,6 +6,14 @@ on:
  paths:
  - '.github/project.yml'
 
+concurrency:
+ group: ${{ github.workflow }}-${{ github.ref }}
+ cancel-in-progress: true
+
+defaults:
+ run:
+ shell: bash
+
 jobs:
  release:
  runs-on: ubuntu-latest
@@ -20,67 +28,42 @@ jobs:
  github-token: ${{secrets.GITHUB_TOKEN}}
  metadata-file-path: '.github/project.yml'
 
- - uses: actions/checkout@v3
-
- - name: Import GPG key
- id: import_gpg
- uses: crazy-max/ghaction-import-gpg@v3
- with:
- gpg-private-key: ${{ secrets.GPG_PRIVATE_KEY }}
- passphrase: ${{ secrets.GPG_PASSPHRASE }}
-
- - name: Set up JDK 11
- uses: actions/setup-java@v3
+ - uses: actions/checkout@v4
+ - name: Set up JDK 17
+ uses: actions/setup-java@v4
  with:
  distribution: temurin
- java-version: 11
+ java-version: 17
  cache: 'maven'
  server-id: ossrh
  server-username: MAVEN_USERNAME
  server-password: MAVEN_PASSWORD
+ gpg-private-key: ${{ secrets.GPG_PRIVATE_KEY }}
+ gpg-passphrase: MAVEN_GPG_PASSPHRASE
 
  - name: Configure Git author
  run: |
  git config --local user.email "action@github.com"
  git config --local user.name "GitHub Action"
 
- - name: Maven release ${{steps.metadata.outputs.current-version}}
+ - name: Update latest release version in docs
  run: |
- git checkout -b release
- mvn -B release:prepare -Prelease -DpreparationGoals="clean install" -DreleaseVersion=${{steps.metadata.outputs.current-version}} -DdevelopmentVersion=${{steps.metadata.outputs.next-version}}
+ mvn -B -ntp -pl docs -am generate-resources -Denforcer.skip -Dformatter.skip -Dimpsort.skip
  if ! git diff --quiet docs/modules/ROOT/pages/includes/attributes.adoc; then
  git add docs/modules/ROOT/pages/includes/attributes.adoc
- git commit -m "Update stable version for documentation"
+ git commit -m "Update the latest release version ${{steps.metadata.outputs.current-version}} in documentation"
  fi
- git checkout ${{github.base_ref}}
- git rebase release
+
+ - name: Maven release ${{steps.metadata.outputs.current-version}}
+ run: |
+ mvn -B release:prepare -Prelease -DreleaseVersion=${{steps.metadata.outputs.current-version}} -DdevelopmentVersion=${{steps.metadata.outputs.next-version}}
  mvn -B release:perform -Darguments=-DperformRelease -DperformRelease -Prelease
  env:
  MAVEN_USERNAME: ${{ secrets.OSSRH_USERNAME }}
  MAVEN_PASSWORD: ${{ secrets.OSSRH_TOKEN }}
+ MAVEN_GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }}
 
- - name: Adjust tag for documentation changes
+ - name: Push changes to ${{github.base_ref}} branch
  run: |
- git checkout ${{steps.metadata.outputs.current-version}}
- mvn -B clean install -DskipTests -DskipITs
- if ! git diff --quiet docs/modules/ROOT/pages/includes/attributes.adoc; then
- git add docs/modules/ROOT/pages/includes/attributes.adoc
- git commit -m "Update stable version for documentation"
- # Move the tag after inclusion of documentation adjustments
- git tag -f ${{steps.metadata.outputs.current-version}}
- fi
- # Go back to base branch
- git checkout ${{github.base_ref}}
-
- - name: Push changes to ${{github.base_ref}}
- uses: ad-m/github-push-action@v0.6.0
- with:
- github_token: ${{ secrets.GITHUB_TOKEN }}
- branch: ${{github.base_ref}}
-
- - name: Push tags
- uses: ad-m/github-push-action@v0.6.0
- with:
- github_token: ${{ secrets.GITHUB_TOKEN }}
- tags: true
- branch: ${{github.base_ref}}
+ git push
+ git push origin ${{steps.metadata.outputs.current-version}}

pom.xml

@@ -4,7 +4,7 @@
  <parent>
  <groupId>io.quarkiverse</groupId>
  <artifactId>quarkiverse-parent</artifactId>
- <version>15</version>
+ <version>16</version>
  </parent>
  <groupId>io.quarkiverse.asyncapi</groupId>
  <artifactId>quarkus-asyncapi-root</artifactId>
@@ -33,9 +33,9 @@
  <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
  <quarkus.version>3.7.1</quarkus.version>
  <version.org.assertj>3.25.1</version.org.assertj>
- <version.org.slf4j>2.0.11</version.org.slf4j>
+ <version.org.slf4j>2.0.12</version.org.slf4j>
  <version.asyncapi.core>1.0.0-EAP-2</version.asyncapi.core>
- <version.org.mockito>5.8.0</version.org.mockito>
+ <version.org.mockito>5.10.0</version.org.mockito>
  <version.org.projectlombok>1.18.30</version.org.projectlombok>
  </properties>
  <dependencyManagement>