From b75c299c31b3eccd2218fbf209fe7ee025b3bb9c Mon Sep 17 00:00:00 2001
From: Roberto Cortez <radcortez@yahoo.com>
Date: Wed, 16 Oct 2024 16:22:47 +0100
Subject: [PATCH] Update CI Build

---
 .github/workflows/build.yml | 48 +++++++++++++++++++++---
 README.adoc                 |  4 +-
 pom.xml                     | 74 +++++++++++++++----------------------
 3 files changed, 73 insertions(+), 53 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 4c27696b..4b4ad1ec 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -34,13 +34,49 @@ jobs:
     steps:
       - uses: actions/checkout@v4
         name: checkout
+
       - uses: actions/setup-java@v4
         name: set up jdk ${{matrix.java.version}}
         with:
-          distribution: temurin
-          java-version: ${{matrix.java.version}}
-          cache: maven
-      - name: validate format
-        run: mvn -f pom.xml -B ${{matrix.java.opts}} formatter:validate
+          distribution: 'temurin'
+          java-version: ${{matrix.java}}
+          cache: 'maven'
+          cache-dependency-path: '**/pom.xml'
+
       - name: build with maven
-        run: mvn -f pom.xml -B verify ${{matrix.java.opts}}
+        run: mvn -B formatter:validate verify ${{matrix.java.opts}} --file pom.xml
+
+      - uses: actions/upload-artifact@v4
+        name: tck-report
+        with:
+          name: tck-report-java-${{matrix.java}}
+          path: testsuite/tck/target/surefire-reports
+
+  quality:
+    needs: [build]
+    if: github.event_name == 'push' && github.repository_owner == 'smallrye'
+    runs-on: ubuntu-latest
+    name: quality
+
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+
+      - uses: actions/setup-java@v4
+        with:
+          distribution: 'temurin'
+          java-version: 11
+          cache: 'maven'
+          cache-dependency-path: '**/pom.xml'
+
+      - name: build with docs and coverage
+        run: mvn verify -Pcoverage javadoc:javadoc
+
+      - uses: actions/setup-java@v4
+        with:
+          distribution: 'temurin'
+          java-version: 17
+
+      - name: sonar
+        run: mvn sonar:sonar -Psonar -Dsonar.token=${{secrets.SONAR_TOKEN}}
diff --git a/README.adoc b/README.adoc
index 74d773eb..5f301500 100644
--- a/README.adoc
+++ b/README.adoc
@@ -1,9 +1,9 @@
 :microprofile-context: https://github.com/eclipse/microprofile-context-propagation/
 :ci: https://github.com/smallrye/smallrye-context-propagation/actions?query=workflow%3A%22SmallRye+Build%22
-:sonar: https://sonarcloud.io/dashboard?id=smallrye_smallrye-context-propagation
+:sonar: https://sonarcloud.io/dashboard?id=io.smallrye%3Asmallrye-context-propagation
 
 image:https://github.com/smallrye/smallrye-context-propagation/workflows/SmallRye%20Build/badge.svg?branch=main[link={ci}]
-image:https://sonarcloud.io/api/project_badges/measure?project=smallrye_smallrye-context-propagation&metric=alert_status["Quality Gate Status", link={sonar}]
+image:https://sonarcloud.io/api/project_badges/measure?project=io.smallrye%3Asmallrye-context-propagation&metric=alert_status["Quality Gate Status", link={sonar}]
 image:https://img.shields.io/github/license/smallrye/smallrye-context-propagation.svg["License", link="http://www.apache.org/licenses/LICENSE-2.0"]
 image:https://img.shields.io/maven-central/v/io.smallrye/smallrye-context-propagation?color=green[]
 
diff --git a/pom.xml b/pom.xml
index 594149b9..597e8985 100644
--- a/pom.xml
+++ b/pom.xml
@@ -2,11 +2,11 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 
-	<parent>
-            <groupId>io.smallrye</groupId>
-            <artifactId>smallrye-parent</artifactId>
-            <version>45</version>
-        </parent>
+    <parent>
+        <groupId>io.smallrye</groupId>
+        <artifactId>smallrye-parent</artifactId>
+        <version>45</version>
+    </parent>
 
 	<artifactId>smallrye-context-propagation-parent</artifactId>
 	<version>2.1.3-SNAPSHOT</version>
@@ -37,25 +37,23 @@
 	</scm>
 
 	<properties>
-            <sonar.coverage.jacoco.xmlReportPaths>target/site/jacoco/jacoco.xml</sonar.coverage.jacoco.xmlReportPaths>
+        <version.microprofile.context-propagation>1.3</version.microprofile.context-propagation>
+        <version.microprofile.config>3.0.2</version.microprofile.config>
 
-            <version.microprofile.context-propagation>1.3</version.microprofile.context-propagation>
-            <version.microprofile.config>3.0.2</version.microprofile.config>
+        <version.weld-api>5.0.SP3</version.weld-api>
+        <version.jboss.threads>3.5.0.Final</version.jboss.threads>
+        <version.jta>2.0.1</version.jta>
+        <version.narayana>6.0.1.Final</version.narayana>
+        <version.rxjava2>2.2.21</version.rxjava2>
+        <version.rxjava1>1.3.8</version.rxjava1>
 
-            <version.weld-api>5.0.SP3</version.weld-api>
-            <version.jboss.threads>3.5.0.Final</version.jboss.threads>
-            <version.jta>2.0.1</version.jta>
-            <version.narayana>6.0.1.Final</version.narayana>
-            <version.rxjava2>2.2.21</version.rxjava2>
-            <version.rxjava1>1.3.8</version.rxjava1>
-
-            <maven.javadoc.failOnWarnings>false</maven.javadoc.failOnWarnings>
+        <maven.javadoc.failOnWarnings>false</maven.javadoc.failOnWarnings>
     </properties>
 
-	  <developers>
+    <developers>
         <developer>
-          <name>Stéphane Épardaud</name>
-          <email>stef@epardaud.fr</email>
+            <name>Stéphane Épardaud</name>
+            <email>stef@epardaud.fr</email>
         </developer>
         <developer>
             <name>Matěj Novotný</name>
@@ -176,31 +174,6 @@
                 <release>11</release>
             </configuration>
         </plugin>
-        <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-release-plugin</artifactId>
-            <version>${version.release.plugin}</version>
-            <configuration>
-                <autoVersionSubmodules>true</autoVersionSubmodules>
-                <tagNameFormat>@{project.version}</tagNameFormat>
-                <preparationGoals>verify</preparationGoals>
-                <pushChanges>false</pushChanges>
-                <localCheckout>true</localCheckout>
-                <remoteTagging>false</remoteTagging>
-                <arguments>-DskipTests ${release.arguments}</arguments>
-            </configuration>
-        </plugin>
-        <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-gpg-plugin</artifactId>
-            <version>${version.gpg.plugin}</version>
-            <configuration>
-                <gpgArguments>
-                    <arg>--pinentry-mode</arg>
-                    <arg>loopback</arg>
-                </gpgArguments>
-            </configuration>
-        </plugin>
     </plugins>
   </build>
 
@@ -230,6 +203,17 @@
                 </plugins>
             </build>
         </profile>
-
+        <profile>
+            <id>sonar</id>
+            <properties>
+                <sonar.projectName>SmallRye Context Propagation</sonar.projectName>
+                <sonar.projectKey>io.smallrye:smallrye-context-propagation</sonar.projectKey>
+                <sonar.moduleKey>${project.artifactId}</sonar.moduleKey>
+                <!--suppress UnresolvedMavenProperty -->
+                <sonar.coverage.jacoco.xmlReportPaths>
+                    ${maven.multiModuleProjectDirectory}/coverage/target/site/jacoco-aggregate/jacoco.xml
+                </sonar.coverage.jacoco.xmlReportPaths>
+            </properties>
+        </profile>
     </profiles>
 </project>