Skip to content

Commit 9636afd

Browse files
committed
Update SmallRye Parent to 46
1 parent 44476c2 commit 9636afd

File tree

11 files changed

+54
-107
lines changed

11 files changed

+54
-107
lines changed
-316 Bytes
Binary file not shown.
-6.34 KB
Binary file not shown.

.github/workflows/build.yml

Lines changed: 27 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -23,17 +23,20 @@ jobs:
2323
runs-on: ubuntu-latest
2424
strategy:
2525
matrix:
26-
java: [8, 11, 17]
26+
java: [11, 17, 21]
2727
name: build with jdk ${{matrix.java}}
2828

2929
steps:
30-
- uses: actions/checkout@v2
30+
- uses: actions/checkout@v4
3131
name: checkout
3232

33-
- uses: actions/setup-java@v1
33+
- uses: actions/setup-java@v4
3434
name: set up jdk ${{matrix.java}}
3535
with:
36+
distribution: 'temurin'
3637
java-version: ${{matrix.java}}
38+
cache: 'maven'
39+
cache-dependency-path: '**/pom.xml'
3740

3841
- name: build with maven
3942
run: mvn -B formatter:validate verify --file pom.xml
@@ -42,17 +45,20 @@ jobs:
4245
runs-on: windows-latest
4346
strategy:
4447
matrix:
45-
java: [8, 11, 17]
48+
java: [11, 17, 21]
4649
name: build with jdk ${{matrix.java}} windows
4750

4851
steps:
49-
- uses: actions/checkout@v2
52+
- uses: actions/checkout@v4
5053
name: checkout
5154

52-
- uses: actions/setup-java@v1
55+
- uses: actions/setup-java@v4
5356
name: set up jdk ${{matrix.java}}
5457
with:
58+
distribution: 'temurin'
5559
java-version: ${{matrix.java}}
60+
cache: 'maven'
61+
cache-dependency-path: '**/pom.xml'
5662

5763
- name: build with maven
5864
run: mvn -B formatter:validate verify --file pom.xml
@@ -64,15 +70,24 @@ jobs:
6470
name: quality
6571

6672
steps:
67-
- uses: actions/checkout@v2
73+
- uses: actions/checkout@v4
6874
with:
6975
fetch-depth: 0
70-
- uses: actions/setup-java@v1
76+
77+
- uses: actions/setup-java@v4
7178
with:
79+
distribution: 'temurin'
7280
java-version: 11
81+
cache: 'maven'
82+
cache-dependency-path: '**/pom.xml'
83+
84+
- name: build with docs and coverage
85+
run: mvn verify -Pcoverage javadoc:javadoc
86+
87+
- uses: actions/setup-java@v4
88+
with:
89+
distribution: 'temurin'
90+
java-version: 17
7391

7492
- name: sonar
75-
env:
76-
GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}
77-
SONAR_TOKEN: ${{secrets.SONAR_TOKEN}}
78-
run: mvn -B verify --file pom.xml -Pcoverage javadoc:javadoc sonar:sonar -Dsonar.projectKey=smallrye_smallrye-converters -Dsonar.login=$SONAR_TOKEN
93+
run: mvn sonar:sonar -Psonar -Dsonar.token=${{secrets.SONAR_TOKEN}}

.github/workflows/pre-release.yml

Lines changed: 0 additions & 25 deletions
This file was deleted.

.github/workflows/release.yml

Lines changed: 0 additions & 53 deletions
This file was deleted.

README.adoc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
:ci: https://github.com/smallrye/smallrye-config/actions?query=workflow%3A%22SmallRye+Build%22
2-
:sonar: https://sonarcloud.io/dashboard?id=smallrye_smallrye-converters
2+
:sonar: https://sonarcloud.io/dashboard?id=io.smallrye%3Asmallrye-converters
33

44
image:https://github.com/smallrye/smallrye-converters/workflows/SmallRye%20Build/badge.svg?branch=main[link={ci}]
5-
image:https://sonarcloud.io/api/project_badges/measure?project=smallrye_smallrye-converters&metric=alert_status["Quality Gate Status", link={sonar}]
5+
image:https://sonarcloud.io/api/project_badges/measure?project=io.smallrye%3Asmallrye-converters&metric=alert_status["Quality Gate Status", link={sonar}]
66
image:https://img.shields.io/github/license/smallrye/smallrye-converters.svg["License", link="http://www.apache.org/licenses/LICENSE-2.0"]
77
image:https://img.shields.io/maven-central/v/io.smallrye.converters/smallrye-converters?color=green[]
88

api/pom.xml

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -38,12 +38,6 @@
3838
<groupId>org.jboss.logging</groupId>
3939
<artifactId>jboss-logging</artifactId>
4040
</dependency>
41-
42-
<dependency>
43-
<groupId>junit</groupId>
44-
<artifactId>junit</artifactId>
45-
<scope>test</scope>
46-
</dependency>
4741
</dependencies>
4842

4943
<build>

implementation/pom.xml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -61,9 +61,6 @@
6161
<configuration>
6262
<redirectTestOutputToFile>true</redirectTestOutputToFile>
6363
<enableAssertions>true</enableAssertions>
64-
<argLine>-Xmx512m</argLine>
65-
<forkMode>once</forkMode>
66-
<trimStackTrace>false</trimStackTrace>
6764
</configuration>
6865
</plugin>
6966
</plugins>

implementation/src/main/java/io/smallrye/converters/SmallRyeConvertersBuilder.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
import java.util.HashMap;
55
import java.util.Map;
66

7-
import javax.annotation.Priority;
7+
import jakarta.annotation.Priority;
88

99
import io.smallrye.converters.api.Converter;
1010

implementation/src/test/java/io/smallrye/converters/SmallRyeConvertersBuilderTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
import static org.junit.jupiter.api.Assertions.assertEquals;
44
import static org.junit.jupiter.api.Assertions.assertNotNull;
55

6-
import javax.annotation.Priority;
6+
import jakarta.annotation.Priority;
77

88
import org.junit.jupiter.api.Test;
99

0 commit comments

Comments
 (0)