diff --git a/.github/release/maven-settings.xml.gpg b/.github/release/maven-settings.xml.gpg deleted file mode 100644 index d259876..0000000 Binary files a/.github/release/maven-settings.xml.gpg and /dev/null differ diff --git a/.github/release/smallrye-sign.asc.gpg b/.github/release/smallrye-sign.asc.gpg deleted file mode 100644 index ffd7b0f..0000000 Binary files a/.github/release/smallrye-sign.asc.gpg and /dev/null differ diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 6e7f7d1..e912f63 100644 --- 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 deleted file mode 100644 index bbcfff1..0000000 --- a/.github/workflows/pre-release.yml +++ /dev/null @@ -1,25 +0,0 @@ -name: SmallRye Pre Release - -on: - pull_request: - paths: - - '.github/project.yml' - -jobs: - release: - runs-on: ubuntu-latest - name: pre release - - steps: - - 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: radcortez/milestone-review-action@main - name: milestone review - with: - github-token: ${{secrets.GITHUB_TOKEN}} - milestone-title: ${{steps.metadata.outputs.current-version}} diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml deleted file mode 100644 index 4337eb7..0000000 --- a/.github/workflows/release.yml +++ /dev/null @@ -1,53 +0,0 @@ -name: SmallRye Release - -on: - pull_request: - types: [closed] - paths: - - '.github/project.yml' - -jobs: - release: - runs-on: ubuntu-latest - name: release - if: ${{github.event.pull_request.merged == true}} - env: - GITHUB_TOKEN: ${{secrets.RELEASE_TOKEN}} - - steps: - - 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 - with: - token: ${{secrets.RELEASE_TOKEN}} - - - uses: actions/setup-java@v1 - with: - java-version: 8 - - - name: maven release ${{steps.metadata.outputs.current-version}} - run: | - java -version - gpg --quiet --batch --yes --decrypt --passphrase="${{secrets.SECRET_PASSPHRASE}}" --output smallrye-sign.asc .github/release/smallrye-sign.asc.gpg - gpg --quiet --batch --yes --decrypt --passphrase="${{secrets.SECRET_PASSPHRASE}}" --output maven-settings.xml .github/release/maven-settings.xml.gpg - gpg --fast-import --no-tty --batch --yes smallrye-sign.asc - git config --global user.name "SmallRye CI" - git config --global user.email "smallrye@googlegroups.com" - git checkout -b release - mvn -B release:prepare -Prelease,coverage -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 -Prelease -s maven-settings.xml - git push - git push --tags - - - uses: radcortez/milestone-release-action@main - name: milestone release - with: - github-token: ${{secrets.GITHUB_TOKEN}} - milestone-title: ${{steps.metadata.outputs.current-version}} diff --git a/README.adoc b/README.adoc index 37fda87..236668e 100644 --- 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 index 6fe35a9..3da91a0 100644 --- a/api/pom.xml +++ b/api/pom.xml @@ -38,12 +38,6 @@ org.jboss.logging jboss-logging - - - junit - junit - test - diff --git a/implementation/pom.xml b/implementation/pom.xml index cc2c65a..d8da857 100644 --- a/implementation/pom.xml +++ b/implementation/pom.xml @@ -61,9 +61,6 @@ true true - -Xmx512m - once - false diff --git a/implementation/src/main/java/io/smallrye/converters/SmallRyeConvertersBuilder.java b/implementation/src/main/java/io/smallrye/converters/SmallRyeConvertersBuilder.java index c43a6ed..d9171ed 100644 --- 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 index 2c69c8b..55d4fcc 100644 --- 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 index 7c20cb7..8727d26 100644 --- a/pom.xml +++ b/pom.xml @@ -22,7 +22,7 @@ io.smallrye smallrye-parent - 35 + 46 io.smallrye.converters @@ -34,9 +34,7 @@ http://smallrye.io - 2.0 - - SmallRye Converters + 2.3.1 @@ -65,6 +63,15 @@ + + + io.smallrye.testing + smallrye-testing-bom + ${version.smallrye.testing} + import + pom + + io.smallrye.converters @@ -114,5 +121,17 @@ coverage + + sonar + + SmallRye Converters + io.smallrye:smallrye-converters + ${project.artifactId} + + + ${maven.multiModuleProjectDirectory}/coverage/target/site/jacoco-aggregate/jacoco.xml + + +