Jhc upgrade

.github/project.yml

@@ -1,4 +1,4 @@
 name: Quarkus Logging JSON
 release:
-  current-version: 1.1.1
-  next-version: 1.1.2-SNAPSHOT
+  current-version: 3.1.0
+  next-version: 3.1.1-SNAPSHOT

.github/workflows/build.yml

@@ -3,7 +3,7 @@ name: Build
 on:
   push:
     branches:
-      - "master"
+      - "main"
     paths-ignore:
       - '.gitignore'
       - 'CODEOWNERS'
@@ -13,7 +13,6 @@ on:
       - '*.txt'
       - '.all-contributorsrc'
   pull_request:
-    types: [opened, synchronize, reopened]
     paths-ignore:
       - '.gitignore'
       - 'CODEOWNERS'
@@ -23,44 +22,38 @@ on:
       - '*.txt'
       - '.all-contributorsrc'
 
-jobs:
-  build:
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
 
-    runs-on: ubuntu-latest
+defaults:
+  run:
+    shell: bash
 
+jobs:
+  build:
+    name: Build on ${{ matrix.os }}
+    strategy:
+      fail-fast: false
+      matrix:
+#        os: [windows-latest, macos-latest, ubuntu-latest]
+        os: [ubuntu-latest]
+    runs-on: ${{ matrix.os }}
     steps:
-    - uses: actions/checkout@v2
-      with:
-        fetch-depth: 0  # Shallow clones should be disabled for a better relevancy of analysis
-
-    - name: Set up JDK 11
-      uses: actions/setup-java@v1
-      with:
-        java-version: 11
-
-#    - name: Cache SonarCloud packages
-#      uses: actions/cache@v1
-#      with:
-#        path: ~/.sonar/cache
-#        key: ${{ runner.os }}-sonar
-#        restore-keys: ${{ runner.os }}-sonar
-
-    - name: Get Date
-      id: get-date
-      run: |
-        echo "::set-output name=date::$(/bin/date -u "+%Y-%m")"
-      shell: bash
-    - name: Cache Maven Repository
-      id: cache-maven
-      uses: actions/cache@v2
-      with:
-        path: ~/.m2/repository
-        # refresh cache every month to avoid unlimited growth
-        key: maven-repo-${{ runner.os }}-${{ steps.get-date.outputs.date }}
-
-    - name: Build and analyze
-#      env:
-#        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}  # Needed to get PR information, if any
-#        SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
-
-      run: mvn -B -Pnative impsort:check formatter:validate verify # org.sonarsource.scanner.maven:sonar-maven-plugin:sonar
+      - name: Prepare git
+        run: git config --global core.autocrlf false
+        if: startsWith(matrix.os, 'windows')
+
+      - uses: actions/checkout@v4
+      - name: Set up JDK 17
+        uses: actions/setup-java@v4
+        with:
+          distribution: temurin
+          java-version: 17
+          cache: 'maven'
+
+      - name: Build with Maven
+        run: mvn -B clean install -Dno-format
+
+      - name: Build with Maven (Native)
+        run: mvn -B install -Dnative -Dquarkus.native.container-build -Dnative.surefire.skip

.github/workflows/pre-release.yml

@@ -5,6 +5,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

.github/workflows/quarkus-snapshot.yaml

@@ -1,49 +1,60 @@
 name: "Quarkus ecosystem CI"
 on:
+  workflow_dispatch:
   watch:
     types: [started]
 
-# For this CI to work, ECOSYSTEM_CI_TOKEN needs to contain a GitHub with rights to close the Quarkus issue that the user/bot has opened,
- # while 'ECOSYSTEM_CI_REPO_PATH' needs to be set to the corresponding path in the 'quarkusio/quarkus-ecosystem-ci' repository
+  # For this CI to work, ECOSYSTEM_CI_TOKEN needs to contain a GitHub with rights to close the Quarkus issue that the user/bot has opened,
+  # while 'ECOSYSTEM_CI_REPO_PATH' needs to be set to the corresponding path in the 'quarkusio/quarkus-ecosystem-ci' repository
 
 env:
   ECOSYSTEM_CI_REPO: quarkusio/quarkus-ecosystem-ci
   ECOSYSTEM_CI_REPO_FILE: context.yaml
-  JAVA_VERSION: 11
+  JAVA_VERSION: 17
 
   #########################
   # Repo specific setting #
   #########################
 
-  ECOSYSTEM_CI_REPO_PATH: quarkus-logging-json
+  ECOSYSTEM_CI_REPO_PATH: quarkiverse-logging-json
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
+defaults:
+  run:
+    shell: bash
 
 jobs:
   build:
     name: "Build against latest Quarkus snapshot"
     runs-on: ubuntu-latest
-    if: github.actor == 'quarkusbot' || github.actor == 'quarkiversebot'
+    # Allow <ADMIN> to manually launch the ecosystem CI in addition to the bots
+    if: github.actor == 'quarkusbot' || github.actor == 'quarkiversebot' || github.actor == '<ADMIN>'
 
     steps:
       - name: Install yq
-        run: sudo add-apt-repository ppa:rmescandon/yq && sudo apt update && sudo apt install yq -y
+        uses: dcarbone/install[email protected]
 
       - name: Set up Java
-        uses: actions/setup-java@v1
+        uses: actions/setup-java@v3
         with:
+          distribution: temurin
           java-version: ${{ env.JAVA_VERSION }}
 
       - name: Checkout repo
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
         with:
           path: current-repo
 
       - name: Checkout Ecosystem
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
         with:
           repository: ${{ env.ECOSYSTEM_CI_REPO }}
           path: ecosystem-ci
 
       - name: Setup and Run Tests
         run: ./ecosystem-ci/setup-and-test
         env:
-          ECOSYSTEM_CI_TOKEN: ${{ secrets.ECOSYSTEM_CI_TOKEN }}
+          ECOSYSTEM_CI_TOKEN: ${{ secrets.ECOSYSTEM_CI_TOKEN }}

.github/workflows/release.yml

@@ -6,63 +6,65 @@ 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
     name: release
     if: ${{github.event.pull_request.merged == true}}
 
     steps:
-      - uses: radcortez/project-metadata-action@master
+      - uses: radcortez/project-metadata-action@main
         name: Retrieve project metadata
         id: metadata
         with:
           github-token: ${{secrets.GITHUB_TOKEN}}
           metadata-file-path: '.github/project.yml'
 
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
 
-      - 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 }}
-
-      - uses: actions/[email protected]
+      - name: Set up JDK 11
+        uses: actions/setup-java@v4
         with:
+          distribution: temurin
           java-version: 11
-
-      - name: Cache local Maven repository
-        uses: actions/cache@v2
-        with:
-          path: ~/.m2/repository
-          key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
-          restore-keys: |
-            ${{ runner.os }}-maven-
+          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 "[email protected]"
           git config --local user.name "GitHub Action"
 
-      - name: Maven release ${{steps.metadata.outputs.current-version}}
+      - name: Update latest release version in docs
         run: |
-          gpg --quiet --batch --yes --decrypt --passphrase="${{secrets.GPG_PASSPHRASE}}" --output maven-settings.xml .github/release/maven-settings.xml.gpg
-          git checkout -b release
-          mvn -B release:prepare -Prelease -DreleaseVersion=${{steps.metadata.outputs.current-version}} -DdevelopmentVersion=${{steps.metadata.outputs.next-version}} -s maven-settings.xml
-          git checkout ${{github.base_ref}}
-          git rebase release
-          mvn -B release:perform -Darguments=-DperformRelease -Prelease -s maven-settings.xml
+          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 the latest release version ${{steps.metadata.outputs.current-version}} in documentation"
+          fi
 
-      - name: Push changes to ${{github.base_ref}}
-        uses: ad-m/[email protected]
-        with:
-          github_token: ${{ secrets.GITHUB_TOKEN }}
-          branch: ${{github.base_ref}}
+      - 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: Push tags
-        uses: ad-m/[email protected]
-        with:
-          github_token: ${{ secrets.GITHUB_TOKEN }}
-          tags: true
+      - name: Push changes to ${{github.base_ref}} branch
+        run: |
+          git push
+          git push origin ${{steps.metadata.outputs.current-version}}

.gitignore

@@ -3,6 +3,7 @@
 
 # Log file
 *.log
+quarkus.log.*
 
 # BlueJ files
 *.ctxt

README.md

@@ -6,15 +6,21 @@
 # Quarkus Logging Json
 Quarkus logging extension outputting the logging in json.
 
+## Version to use
+| Quarkus Version | Use version |
+|-------|-------|
+| 3.x.x | 3.x.x |
+| 2.x.x | 1.x.x, 2.x.x |
+
 # Configuration
-The extension is enabled by default, when added to the project.
-Can be disabled using configuration: `quarkus.log.console.json=false`
+The extension is enabled by default for console, when added to the project.
+Console logging can be disabled using configuration: `quarkus.log.json.console.enable=false`
 
 To see additional configuration options take a look at [Config](https://quarkiverse.github.io/quarkiverse-docs/quarkus-logging-json/dev/index.html)
 
 ## Elastic Common Scheme
 ```properties
-quarkus.log.console.json.log-format=ecs
+quarkus.log.json.log-format=ecs
 ```
 
 ## Google Cloud Platform Scheme
@@ -26,10 +32,10 @@ quarkus.log.console.json.log-format=gcp
 # Add additional fields to all log messages
 If you want to add a static field to all the log message, that is possible using the configuration.
 ```properties
-quarkus.log.console.json.additional-field.serviceName.value=service-a
+quarkus.log.json.additional-field.serviceName.value=service-a
 # type is by default STRING - Other is INT, LONG, FLOAT, DOUBLE 
-quarkus.log.console.json.additional-field.buildNumber.type=INT
-quarkus.log.console.json.additional-field.buildNumber.value=42
+quarkus.log.json.additional-field.buildNumber.type=INT
+quarkus.log.json.additional-field.buildNumber.value=42
 ```
 
 # Structured argument
@@ -46,7 +52,7 @@ If you want to add your own custom way to handle the LogRecords.
 You can create your own implementations of `io.quarkiverse.loggingjson.JsonProvider`, and provide it using CDI.
 Example implementation:
 ```java
-import javax.inject.Singleton;
+import jakarta.inject.Singleton;
 import java.io.IOException;
 
 import io.quarkiverse.loggingjson.JsonProvider;

deployment/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <groupId>io.quarkiverse.loggingjson.jhc</groupId>
         <artifactId>quarkus-logging-json-parent</artifactId>
-        <version>1.1.2-0-SNAPSHOT</version>
+        <version>3.1.0</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -18,18 +18,12 @@
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-jackson-deployment</artifactId>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-jsonb-deployment</artifactId>
-            <scope>compile</scope>
+            <artifactId>quarkus-arc-deployment</artifactId>
         </dependency>
         <dependency>
             <groupId>io.quarkiverse.loggingjson.jhc</groupId>
             <artifactId>quarkus-logging-json</artifactId>
-            <version>1.1.2-0-SNAPSHOT</version>
+            <version>3.1.0</version>
         </dependency>
         <!-- test dependencies -->
         <dependency>
@@ -42,6 +36,17 @@
             <artifactId>quarkus-junit5-internal</artifactId>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-jackson</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-jsonb</artifactId>
+            <scope>test</scope>
+        </dependency>
+
     </dependencies>
 
     <build>