Update SmallRye Parent to 46

smallrye · Oct 16, 2024 · ad95f04 · ad95f04
1 parent 44476c2
commit ad95f04
Show file tree

Hide file tree

Showing 11 changed files with 56 additions and 109 deletions.
diff --git a/.github/release/maven-settings.xml.gpg b/.github/release/maven-settings.xml.gpg
diff --git a/.github/release/smallrye-sign.asc.gpg b/.github/release/smallrye-sign.asc.gpg
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -23,17 +23,20 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        java: [8, 11, 17]
+        java: [11, 17, 21]
     name: build with jdk ${{matrix.java}}
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
         name: checkout
 
-      - uses: actions/setup-java@v1
+      - uses: actions/setup-java@v4
         name: set up jdk ${{matrix.java}}
         with:
+          distribution: 'temurin'
           java-version: ${{matrix.java}}
+          cache: 'maven'
+          cache-dependency-path: '**/pom.xml'
 
       - name: build with maven
         run: mvn -B formatter:validate verify --file pom.xml
@@ -42,17 +45,20 @@ jobs:
     runs-on: windows-latest
     strategy:
       matrix:
-        java: [8, 11, 17]
+        java: [11, 17, 21]
     name: build with jdk ${{matrix.java}} windows
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
         name: checkout
 
-      - uses: actions/setup-java@v1
+      - uses: actions/setup-java@v4
         name: set up jdk ${{matrix.java}}
         with:
+          distribution: 'temurin'
           java-version: ${{matrix.java}}
+          cache: 'maven'
+          cache-dependency-path: '**/pom.xml'
 
       - name: build with maven
         run: mvn -B formatter:validate verify --file pom.xml
@@ -64,15 +70,24 @@ jobs:
     name: quality
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
         with:
           fetch-depth: 0
-      - uses: actions/setup-java@v1
+
+      - 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
-        env:
-          GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}
-          SONAR_TOKEN: ${{secrets.SONAR_TOKEN}}
-        run: mvn -B verify --file pom.xml -Pcoverage javadoc:javadoc sonar:sonar -Dsonar.projectKey=smallrye_smallrye-converters -Dsonar.login=$SONAR_TOKEN
+        run: mvn sonar:sonar -Psonar -Dsonar.token=${{secrets.SONAR_TOKEN}}
diff --git a/.github/workflows/pre-release.yml b/.github/workflows/pre-release.yml
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
diff --git a/README.adoc b/README.adoc
@@ -1,8 +1,8 @@
-:ci: https://github.com/smallrye/smallrye-config/actions?query=workflow%3A%22SmallRye+Build%22
-:sonar: https://sonarcloud.io/dashboard?id=smallrye_smallrye-converters
+:ci: https://github.com/smallrye/smallrye-converters/actions/workflows/build.yml
+:sonar: https://sonarcloud.io/dashboard?id=io.smallrye%3Asmallrye-converters
 
-image:https://github.com/smallrye/smallrye-converters/workflows/SmallRye%20Build/badge.svg?branch=main[link={ci}]
-image:https://sonarcloud.io/api/project_badges/measure?project=smallrye_smallrye-converters&metric=alert_status["Quality Gate Status", link={sonar}]
+image:https://github.com/smallrye/smallrye-converters/actions/workflows/build.yml/badge.svg?branch=main[link={ci}]
+image:https://sonarcloud.io/api/project_badges/measure?project=io.smallrye%3Asmallrye-converters&metric=alert_status["Quality Gate Status", link={sonar}]
 image:https://img.shields.io/github/license/smallrye/smallrye-converters.svg["License", link="http://www.apache.org/licenses/LICENSE-2.0"]
 image:https://img.shields.io/maven-central/v/io.smallrye.converters/smallrye-converters?color=green[]
 

diff --git a/api/pom.xml b/api/pom.xml
@@ -38,12 +38,6 @@
       <groupId>org.jboss.logging</groupId>
       <artifactId>jboss-logging</artifactId>
     </dependency>
-
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <scope>test</scope>
-    </dependency>
   </dependencies>
 
   <build>

diff --git a/implementation/pom.xml b/implementation/pom.xml
@@ -61,9 +61,6 @@
         <configuration>
           <redirectTestOutputToFile>true</redirectTestOutputToFile>
           <enableAssertions>true</enableAssertions>
-          <argLine>-Xmx512m</argLine>
-          <forkMode>once</forkMode>
-          <trimStackTrace>false</trimStackTrace>
         </configuration>
       </plugin>
     </plugins>

diff --git a/implementation/src/main/java/io/smallrye/converters/SmallRyeConvertersBuilder.java b/implementation/src/main/java/io/smallrye/converters/SmallRyeConvertersBuilder.java
@@ -4,7 +4,7 @@
 import java.util.HashMap;
 import java.util.Map;
 
-import javax.annotation.Priority;
+import jakarta.annotation.Priority;
 
 import io.smallrye.converters.api.Converter;
 

diff --git a/implementation/src/test/java/io/smallrye/converters/SmallRyeConvertersBuilderTest.java b/implementation/src/test/java/io/smallrye/converters/SmallRyeConvertersBuilderTest.java
@@ -3,7 +3,7 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
 
-import javax.annotation.Priority;
+import jakarta.annotation.Priority;
 
 import org.junit.jupiter.api.Test;
 

diff --git a/pom.xml b/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>io.smallrye</groupId>
     <artifactId>smallrye-parent</artifactId>
-    <version>35</version>
+    <version>46</version>
   </parent>
 
   <groupId>io.smallrye.converters</groupId>
@@ -34,9 +34,7 @@
   <url>http://smallrye.io</url>
 
   <properties>
-    <version.eclipse.microprofile.config>2.0</version.eclipse.microprofile.config>
-
-    <sonar.projectName>SmallRye Converters</sonar.projectName>
+    <version.smallrye.testing>2.3.1</version.smallrye.testing>
   </properties>
 
   <licenses>
@@ -65,6 +63,15 @@
 
   <dependencyManagement>
     <dependencies>
+      <!-- Test Dependencies -->
+      <dependency>
+        <groupId>io.smallrye.testing</groupId>
+        <artifactId>smallrye-testing-bom</artifactId>
+        <version>${version.smallrye.testing}</version>
+        <scope>import</scope>
+        <type>pom</type>
+      </dependency>
+
       <!-- Dependencies provided by the project -->
       <dependency>
         <groupId>io.smallrye.converters</groupId>
@@ -114,5 +121,17 @@
         <module>coverage</module>
       </modules>
     </profile>
+    <profile>
+      <id>sonar</id>
+      <properties>
+        <sonar.projectName>SmallRye Converters</sonar.projectName>
+        <sonar.projectKey>io.smallrye:smallrye-converters</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>