diff --git a/.github/workflows/cd-config.yml b/.github/workflows/cd-config.yml index fe140a446c9..c7b163921b3 100644 --- a/.github/workflows/cd-config.yml +++ b/.github/workflows/cd-config.yml @@ -3,11 +3,9 @@ name: Solid Java Client CD on: push: branches: - - main + - 1.2 tags: - - inrupt-client-[0-9]+.[0-9]+.[0-9]+ - - inrupt-client-[0-9]+.[0-9]+.[0-9]+.Alpha[0-9]+ - - inrupt-client-[0-9]+.[0-9]+.[0-9]+.Beta[0-9]+ + - inrupt-client-1.2.[0-9]+ jobs: deployment: @@ -27,15 +25,15 @@ jobs: envName: "Development" steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v6 - name: Set up JDK 17 - uses: actions/setup-java@v4 + uses: actions/setup-java@v5 with: distribution: 'temurin' java-version: 17 cache: 'maven' - server-id: 'ossrh' + server-id: 'central' server-username: MAVEN_REPO_USERNAME server-password: MAVEN_REPO_TOKEN gpg-private-key: ${{ secrets.GPG_SIGNING_KEY }} @@ -54,7 +52,7 @@ jobs: - name: Sonar Analysis if: ${{ github.actor != 'dependabot[bot]' }} - run: mvn sonar:sonar -Dsonar.login=${{ secrets.SONARQUBE_TOKEN }} + run: mvn sonar:sonar -Dsonar.token=${{ secrets.SONARQUBE_TOKEN }} site: name: Publish version-specific site @@ -64,10 +62,10 @@ jobs: name: "Documentation" steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v6 - name: Set up JDK 17 - uses: actions/setup-java@v4 + uses: actions/setup-java@v5 with: distribution: 'temurin' java-version: 17 diff --git a/.github/workflows/ci-config.yml b/.github/workflows/ci-config.yml index 5c55300a57b..764a22250b4 100644 --- a/.github/workflows/ci-config.yml +++ b/.github/workflows/ci-config.yml @@ -14,10 +14,10 @@ jobs: fail-fast: false steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v6 - name: Set up JDK ${{ matrix.java }} - uses: actions/setup-java@v4 + uses: actions/setup-java@v5 with: distribution: 'temurin' java-version: ${{ matrix.java }} @@ -63,10 +63,10 @@ jobs: java: [ 17 ] steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v6 - name: Set up JDK ${{ matrix.java }} - uses: actions/setup-java@v4 + uses: actions/setup-java@v5 with: distribution: 'temurin' java-version: ${{ matrix.java }} @@ -84,10 +84,10 @@ jobs: java: [ 17 ] steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v6 - name: Set up JDK ${{ matrix.java }} - uses: actions/setup-java@v4 + uses: actions/setup-java@v5 with: distribution: 'temurin' java-version: ${{ matrix.java }} @@ -104,10 +104,10 @@ jobs: java: [ 17 ] steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v6 - name: Set up JDK ${{ matrix.java }} - uses: actions/setup-java@v4 + uses: actions/setup-java@v5 with: distribution: 'temurin' java-version: ${{ matrix.java }} @@ -118,7 +118,7 @@ jobs: run: echo "CACHE_NAME=$(date '+%y.%j')" >> $GITHUB_ENV - name: Restore NVD data cache - uses: actions/cache@v4 + uses: actions/cache@v5 with: key: nvd-data-${{ env.CACHE_NAME }} restore-keys: nvd-data- @@ -133,10 +133,10 @@ jobs: if: ${{ github.actor != 'dependabot[bot]' }} steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v6 - name: Set up JDK 17 - uses: actions/setup-java@v4 + uses: actions/setup-java@v5 with: distribution: 'temurin' java-version: 17 @@ -146,5 +146,5 @@ jobs: run: mvn -B -ntp install -Pci - name: Sonar Analysis - run: mvn sonar:sonar -Dsonar.login=${{ secrets.SONARQUBE_TOKEN }} + run: mvn sonar:sonar -Dsonar.token=${{ secrets.SONARQUBE_TOKEN }} diff --git a/.github/workflows/nvd-cache.yml b/.github/workflows/nvd-cache.yml index 664481f32bb..d6af467b6e7 100644 --- a/.github/workflows/nvd-cache.yml +++ b/.github/workflows/nvd-cache.yml @@ -13,14 +13,14 @@ jobs: steps: - name: Checkout OVP repository - uses: actions/checkout@v4 + uses: actions/checkout@v6 with: repository: jeremylong/Open-Vulnerability-Project path: ovp ref: v6.1.2 - name: Set up JDK 17 - uses: actions/setup-java@v4 + uses: actions/setup-java@v5 with: distribution: 'temurin' java-version: 17 @@ -30,7 +30,7 @@ jobs: working-directory: ./ovp run: ./gradlew build -x test - - uses: actions/checkout@v4 + - uses: actions/checkout@v6 with: path: data @@ -48,7 +48,7 @@ jobs: NVD_API_KEY: ${{ secrets.NVD_API_KEY }} - name: Cache NVD data - uses: actions/cache@v4 + uses: actions/cache@v5 with: key: nvd-data-${{ env.CACHE_NAME }} path: ./data/cache diff --git a/.github/workflows/site-ci-config.yml b/.github/workflows/site-ci-config.yml index ba7e9ff08a3..a94e7dba13e 100644 --- a/.github/workflows/site-ci-config.yml +++ b/.github/workflows/site-ci-config.yml @@ -15,10 +15,10 @@ jobs: java: [ 11 ] steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v6 - name: Set up JDK ${{ matrix.java }} - uses: actions/setup-java@v4 + uses: actions/setup-java@v5 with: distribution: 'temurin' java-version: ${{ matrix.java }} diff --git a/access-grant/pom.xml b/access-grant/pom.xml index 76910cd80f8..346c72d7919 100644 --- a/access-grant/pom.xml +++ b/access-grant/pom.xml @@ -4,7 +4,7 @@ com.inrupt.client inrupt-client - 1.2.0-SNAPSHOT + 1.2.1-SNAPSHOT inrupt-client-accessgrant diff --git a/api/pom.xml b/api/pom.xml index 0371802bbd5..e4c1d22de0b 100644 --- a/api/pom.xml +++ b/api/pom.xml @@ -4,7 +4,7 @@ com.inrupt.client inrupt-client - 1.2.0-SNAPSHOT + 1.2.1-SNAPSHOT inrupt-client-api diff --git a/archetypes/java/pom.xml b/archetypes/java/pom.xml index 04d967987fc..0c2fccf428c 100644 --- a/archetypes/java/pom.xml +++ b/archetypes/java/pom.xml @@ -3,7 +3,7 @@ com.inrupt.client inrupt-client-archetype-parent - 1.2.0-SNAPSHOT + 1.2.1-SNAPSHOT inrupt-client-archetype-java diff --git a/archetypes/java/src/main/resources/archetype-resources/pom.xml b/archetypes/java/src/main/resources/archetype-resources/pom.xml index 1fc855f02c6..0ec6a9f84ed 100644 --- a/archetypes/java/src/main/resources/archetype-resources/pom.xml +++ b/archetypes/java/src/main/resources/archetype-resources/pom.xml @@ -131,7 +131,7 @@ org.apache.maven.plugins maven-compiler-plugin - ${maven-compiler-plugin} + 3.13.0 org.apache.maven.plugins diff --git a/archetypes/java/src/test/resources/projects/test/archetype.properties b/archetypes/java/src/test/resources/projects/test/archetype.properties index 301339fbc3e..844c3eb9d9c 100644 --- a/archetypes/java/src/test/resources/projects/test/archetype.properties +++ b/archetypes/java/src/test/resources/projects/test/archetype.properties @@ -9,7 +9,6 @@ junit-version=${junit.version} maven-antrun-plugin=${antrun.plugin.version} maven-assembly-plugin=${assembly.plugin.version} maven-clean-plugin=${clean.plugin.version} -maven-compiler-plugin=${compiler.plugin.version} maven-dependency-plugin=${dependency.plugin.version} maven-install-plugin=${install.plugin.version} maven-jar-plugin=${jar.plugin.version} diff --git a/archetypes/pom.xml b/archetypes/pom.xml index 1af37f66aaf..80f5a18104c 100644 --- a/archetypes/pom.xml +++ b/archetypes/pom.xml @@ -4,7 +4,7 @@ com.inrupt.client inrupt-client - 1.2.0-SNAPSHOT + 1.2.1-SNAPSHOT inrupt-client-archetype-parent @@ -17,4 +17,16 @@ java + + + + + org.owasp + dependency-check-maven + + true + + + + diff --git a/bom/pom.xml b/bom/pom.xml index 0ea8bff48fa..6ddb7044400 100644 --- a/bom/pom.xml +++ b/bom/pom.xml @@ -5,7 +5,7 @@ com.inrupt.client inrupt-client - 1.2.0-SNAPSHOT + 1.2.1-SNAPSHOT .. diff --git a/build-tools/owasp/suppressions.xml b/build-tools/owasp/suppressions.xml index f0177dcfe40..cb1e22fa847 100644 --- a/build-tools/owasp/suppressions.xml +++ b/build-tools/owasp/suppressions.xml @@ -8,13 +8,42 @@ ^pkg:maven/com\.inrupt\.client/inrupt\-client\-openid@.*$ cpe:/a:openid:openid + + + ^pkg:maven/org\.roaringbitmap/RoaringBitmap@.*$ + cpe:/a:bitmap_project:bitmap + + + + ^pkg:maven/(com\.inrupt\.client/inrupt\-client\-jsonb|com\.github\.jsonld\-java/jsonld\-java|net\.javacrumbs\.json\-unit/json\-unit\-core)@.*$ + CVE-2023-5072 + + + + ^pkg:maven/(com\.inrupt\.client/inrupt\-client\-jsonb|com\.github\.jsonld\-java/jsonld\-java|net\.javacrumbs\.json\-unit/json\-unit\-core)@.*$ + CVE-2022-45688 + - + - ^pkg:javascript/DOMPurify@.*$ - CVE-2024-45801 + ^pkg:maven/org\.apache\.jena/jena-.*@.*$ + CVE-2025-49656 + + + ^pkg:maven/org\.apache\.jena/jena-.*@.*$ + CVE-2025-50151 + + diff --git a/caffeine/pom.xml b/caffeine/pom.xml index ca1e146bbdd..4fb44b8b119 100644 --- a/caffeine/pom.xml +++ b/caffeine/pom.xml @@ -4,7 +4,7 @@ com.inrupt.client inrupt-client - 1.2.0-SNAPSHOT + 1.2.1-SNAPSHOT inrupt-client-caffeine diff --git a/core/pom.xml b/core/pom.xml index 3beac12833d..12eb472004f 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -4,7 +4,7 @@ com.inrupt.client inrupt-client - 1.2.0-SNAPSHOT + 1.2.1-SNAPSHOT inrupt-client-core diff --git a/examples/cli/pom.xml b/examples/cli/pom.xml index 321d5ac8002..bf3ec9072dd 100644 --- a/examples/cli/pom.xml +++ b/examples/cli/pom.xml @@ -5,11 +5,11 @@ com.inrupt.client inrupt-client-examples-parent - 1.2.0-SNAPSHOT + 1.2.1-SNAPSHOT inrupt-client-examples-cli - 1.2.0-SNAPSHOT + 1.2.1-SNAPSHOT Inrupt Java Client Libraries - CLI Example Sample CLI application. @@ -18,7 +18,7 @@ 17 - 3.14.4 + 3.30.3 diff --git a/examples/pom.xml b/examples/pom.xml index bcb805f35c6..7954883a541 100644 --- a/examples/pom.xml +++ b/examples/pom.xml @@ -4,7 +4,7 @@ com.inrupt.client inrupt-client - 1.2.0-SNAPSHOT + 1.2.1-SNAPSHOT inrupt-client-examples-parent diff --git a/examples/spring-web/pom.xml b/examples/spring-web/pom.xml index 979dccbb0d3..31536b93325 100644 --- a/examples/spring-web/pom.xml +++ b/examples/spring-web/pom.xml @@ -5,11 +5,11 @@ com.inrupt.client inrupt-client-examples-parent - 1.2.0-SNAPSHOT + 1.2.1-SNAPSHOT inrupt-client-examples-spring-web - 1.2.0-SNAPSHOT + 1.2.1-SNAPSHOT Inrupt Java Client Libraries - SpringBoot WebApp Example Sample SpringBoot Web Application. @@ -17,7 +17,7 @@ 17 - 3.3.4 + 3.5.7 @@ -61,7 +61,7 @@ com.nimbusds nimbus-jose-jwt - 9.41.1 + 10.8 diff --git a/examples/springboot/pom.xml b/examples/springboot/pom.xml index 881ca5bce2b..c9ec533c652 100644 --- a/examples/springboot/pom.xml +++ b/examples/springboot/pom.xml @@ -5,11 +5,11 @@ com.inrupt.client inrupt-client-examples-parent - 1.2.0-SNAPSHOT + 1.2.1-SNAPSHOT inrupt-client-examples-springboot - 1.2.0-SNAPSHOT + 1.2.1-SNAPSHOT Inrupt Java Client Libraries - Spring Boot Example Sample Spring Boot application. @@ -17,7 +17,7 @@ 17 - 3.3.4 + 3.5.7 @@ -112,7 +112,7 @@ com.nimbusds nimbus-jose-jwt - 9.41.1 + 10.8 diff --git a/examples/webapp/pom.xml b/examples/webapp/pom.xml index 9124d0d2a11..0b920a25ad4 100644 --- a/examples/webapp/pom.xml +++ b/examples/webapp/pom.xml @@ -5,11 +5,11 @@ com.inrupt.client inrupt-client-examples-parent - 1.2.0-SNAPSHOT + 1.2.1-SNAPSHOT inrupt-client-examples-webapp - 1.2.0-SNAPSHOT + 1.2.1-SNAPSHOT Inrupt Java Client Libraries - Quarkus Example Sample web application. @@ -18,7 +18,7 @@ 17 - 3.14.4 + 3.30.3 diff --git a/gradle/pom.xml b/gradle/pom.xml index 1322724eb06..276947b0166 100644 --- a/gradle/pom.xml +++ b/gradle/pom.xml @@ -4,7 +4,7 @@ com.inrupt.client inrupt-client - 1.2.0-SNAPSHOT + 1.2.1-SNAPSHOT inrupt-client-gradle diff --git a/gradle/settings.gradle b/gradle/settings.gradle index 702f724fd13..978c2c8a9c3 100644 --- a/gradle/settings.gradle +++ b/gradle/settings.gradle @@ -7,7 +7,7 @@ pluginManagement { } plugins { - id "com.gradle.enterprise" version "3.18.1" + id "com.gradle.enterprise" version "3.19.2" } dependencyResolutionManagement { diff --git a/guava/pom.xml b/guava/pom.xml index 2c59229b9a2..d4b642947ce 100644 --- a/guava/pom.xml +++ b/guava/pom.xml @@ -4,7 +4,7 @@ com.inrupt.client inrupt-client - 1.2.0-SNAPSHOT + 1.2.1-SNAPSHOT inrupt-client-guava diff --git a/httpclient/pom.xml b/httpclient/pom.xml index 437efe25f66..d5e7d330d73 100644 --- a/httpclient/pom.xml +++ b/httpclient/pom.xml @@ -4,7 +4,7 @@ com.inrupt.client inrupt-client - 1.2.0-SNAPSHOT + 1.2.1-SNAPSHOT inrupt-client-httpclient diff --git a/integration/base/pom.xml b/integration/base/pom.xml index c9b2802ef8b..3dc1c009178 100644 --- a/integration/base/pom.xml +++ b/integration/base/pom.xml @@ -4,7 +4,7 @@ com.inrupt.client inrupt-client-integration-tests - 1.2.0-SNAPSHOT + 1.2.1-SNAPSHOT inrupt-client-integration-base-tests Inrupt Java Client Libraries - Integration Base Tests @@ -14,9 +14,20 @@ 2.1.1 - 3.9.1 + + + + com.fasterxml.jackson + jackson-bom + ${jackson.version} + pom + import + + + + com.inrupt.client @@ -76,7 +87,6 @@ com.fasterxml.jackson.core jackson-annotations - ${jackson.version} io.smallrye.config @@ -108,10 +118,15 @@ org.wiremock - wiremock + wiremock-standalone ${wiremock.version} provided + + org.hamcrest + hamcrest + ${hamcrest.version} + diff --git a/integration/openid/pom.xml b/integration/openid/pom.xml index cde1d6d1cb1..0d79187e368 100644 --- a/integration/openid/pom.xml +++ b/integration/openid/pom.xml @@ -4,7 +4,7 @@ com.inrupt.client inrupt-client-integration-tests - 1.2.0-SNAPSHOT + 1.2.1-SNAPSHOT inrupt-client-integration-openid-tests diff --git a/integration/pom.xml b/integration/pom.xml index 58ce773687b..5afadee17f0 100644 --- a/integration/pom.xml +++ b/integration/pom.xml @@ -4,7 +4,7 @@ com.inrupt.client inrupt-client - 1.2.0-SNAPSHOT + 1.2.1-SNAPSHOT inrupt-client-integration-tests diff --git a/integration/uma/pom.xml b/integration/uma/pom.xml index 168d2a96d84..da38a03c4ee 100644 --- a/integration/uma/pom.xml +++ b/integration/uma/pom.xml @@ -4,7 +4,7 @@ com.inrupt.client inrupt-client-integration-tests - 1.2.0-SNAPSHOT + 1.2.1-SNAPSHOT inrupt-client-integration-uma-tests diff --git a/jackson/pom.xml b/jackson/pom.xml index 155cdccd65a..594af9b7e1c 100644 --- a/jackson/pom.xml +++ b/jackson/pom.xml @@ -4,7 +4,7 @@ com.inrupt.client inrupt-client - 1.2.0-SNAPSHOT + 1.2.1-SNAPSHOT inrupt-client-jackson diff --git a/jena/pom.xml b/jena/pom.xml index b935b572e98..cf7543a3c23 100644 --- a/jena/pom.xml +++ b/jena/pom.xml @@ -4,7 +4,7 @@ com.inrupt.client inrupt-client - 1.2.0-SNAPSHOT + 1.2.1-SNAPSHOT inrupt-client-jena diff --git a/jsonb/pom.xml b/jsonb/pom.xml index 14fc7e3303d..85a46c55b25 100644 --- a/jsonb/pom.xml +++ b/jsonb/pom.xml @@ -4,7 +4,7 @@ com.inrupt.client inrupt-client - 1.2.0-SNAPSHOT + 1.2.1-SNAPSHOT inrupt-client-jsonb diff --git a/okhttp/pom.xml b/okhttp/pom.xml index 9d1d90ea809..4e30fb3b833 100644 --- a/okhttp/pom.xml +++ b/okhttp/pom.xml @@ -4,7 +4,7 @@ com.inrupt.client inrupt-client - 1.2.0-SNAPSHOT + 1.2.1-SNAPSHOT inrupt-client-okhttp @@ -25,7 +25,7 @@ com.squareup.okhttp3 - okhttp + okhttp-jvm ${okhttp.version} @@ -39,7 +39,7 @@ com.squareup.okio okio - 3.9.1 + 3.16.4 diff --git a/openid/pom.xml b/openid/pom.xml index 0440b487f6f..f73f586bc44 100644 --- a/openid/pom.xml +++ b/openid/pom.xml @@ -4,7 +4,7 @@ com.inrupt.client inrupt-client - 1.2.0-SNAPSHOT + 1.2.1-SNAPSHOT inrupt-client-openid diff --git a/parser/pom.xml b/parser/pom.xml index 0dc234e3fb3..cf94d8985c7 100644 --- a/parser/pom.xml +++ b/parser/pom.xml @@ -4,7 +4,7 @@ com.inrupt.client inrupt-client - 1.2.0-SNAPSHOT + 1.2.1-SNAPSHOT inrupt-client-parser diff --git a/performance/base/pom.xml b/performance/base/pom.xml index ad0866ee25a..9fd28fef4ab 100644 --- a/performance/base/pom.xml +++ b/performance/base/pom.xml @@ -4,7 +4,7 @@ com.inrupt.client inrupt-client-performance-tests - 1.2.0-SNAPSHOT + 1.2.1-SNAPSHOT inrupt-client-performance-base-tests Inrupt Java Client Libraries - Performance Base Tests @@ -14,9 +14,20 @@ 2.1.1 - 3.9.1 + + + + com.fasterxml.jackson + jackson-bom + ${jackson.version} + pom + import + + + + com.inrupt.client @@ -76,7 +87,6 @@ com.fasterxml.jackson.core jackson-annotations - ${jackson.version} io.smallrye.config @@ -108,7 +118,7 @@ org.wiremock - wiremock + wiremock-standalone ${wiremock.version} provided diff --git a/performance/pom.xml b/performance/pom.xml index 2114a70cff9..54df5336827 100644 --- a/performance/pom.xml +++ b/performance/pom.xml @@ -4,7 +4,7 @@ com.inrupt.client inrupt-client - 1.2.0-SNAPSHOT + 1.2.1-SNAPSHOT inrupt-client-performance-tests diff --git a/performance/uma/pom.xml b/performance/uma/pom.xml index 55971a8afa2..6b9d68879fa 100644 --- a/performance/uma/pom.xml +++ b/performance/uma/pom.xml @@ -4,7 +4,7 @@ com.inrupt.client inrupt-client-performance-tests - 1.2.0-SNAPSHOT + 1.2.1-SNAPSHOT inrupt-client-performance-uma-tests diff --git a/pom.xml b/pom.xml index a18a7297a5d..457e60bafb5 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ com.inrupt.client inrupt-client - 1.2.0-SNAPSHOT + 1.2.1-SNAPSHOT Inrupt Java Client Libraries https://docs.inrupt.com/developer-tools/java/client-libraries/ @@ -20,75 +20,77 @@ 4.13.2 - 3.1.8 - 1.17.1 - 1.9.0 - 2.17.0 + 3.2.3 + 1.20.0 + 1.11.0 + 2.21.0 0.5.0 - 33.3.0-jre - 2.17.2 + 33.4.8-jre + 2.21.0 2.1.3 4.10.0 0.9.6 3.0.1 - 4.12.0 - 3.14.4 - 2.0.16 + 5.3.2 + 3.30.3 + 2.0.17 5.8.14 0.6.0 1.1.1 - 3.1.0 - 3.2.1 - 3.7.1 - 3.5.0 - 3.4.0 - 3.13.0 - 3.8.0 - 3.1.3 - 3.5.0 - 3.4.1 - 3.1.3 - 3.2.6 - 0.8.12 - 3.4.2 - 3.10.0 - 4.5 - 1.7.0 - 10.0.4 - 3.7.0 - 3.25.0 - 3.20.0 - 3.1.1 - 3.3.1 - 4.0.0.4121 - 3.3.1 - 3.5.0 + 3.2.0 + 3.4.1 + 3.8.0 + 3.6.0 + 3.5.0 + 3.15.0 + 3.10.0 + 3.1.4 + 3.6.2 + 3.6.2 + 3.1.4 + 3.2.8 + 0.8.14 + 3.5.0 + 3.12.0 + 5.0.0 + 12.2.0 + 3.9.0 + 3.28.0 + 3.21.0 + 3.3.1 + 3.4.0 + 5.5.0.6356 + 0.10.0 + 3.4.0 + 3.5.4 - 10.18.1 + 10.26.1 - 4.2.2 - 3.16.2 + 4.3.0 + 3.19.4 2.0.1 - 5.11.0 - 4.6.0 - 3.9.1 + 5.14.1 + 4.6.2 + 3.14.1 3.0.4 - 3.9.1 + 3.13.2 + 3.0 true true - + ${maven.multiModuleProjectDirectory}/reports/target/site/jacoco-merged/jacoco.xml - https://sonarqube.dev.inrupt.com + https://sonarcloud.io + inrupt solid-client-java ${project.artifactId} @@ -108,7 +110,6 @@ okhttp openid parser - quarkus rdf4j rdf-legacy solid @@ -120,21 +121,10 @@ spring integration performance - reports archetypes - - Snapshot Repository - ossrh - https://s01.oss.sonatype.org/content/repositories/snapshots - - - Staging Repository - ossrh - https://s01.oss.sonatype.org/service/local/staging/deploy/maven2 - ${project.artifactId} ${project.baseUri} @@ -152,13 +142,19 @@ org.apache.commons commons-compress - 1.27.1 + 1.28.0 org.xmlunit xmlunit-core - 2.10.0 + 2.11.0 + + + + com.google.protobuf + protobuf-java + 3.25.8 @@ -289,7 +285,7 @@ org.codehaus.mojo extra-enforcer-rules - 1.8.0 + 1.11.0 @@ -499,15 +495,9 @@ ${sonar.plugin.version} - org.sonatype.plugins - nexus-staging-maven-plugin - ${nexus.plugin.version} - true - - ossrh - https://s01.oss.sonatype.org/ - true - + org.sonatype.central + central-publishing-maven-plugin + ${sonatype.plugin.version} org.antlr @@ -651,6 +641,15 @@ ${nvd.api.datafeed} + + org.sonatype.central + central-publishing-maven-plugin + true + + central + true + + @@ -770,6 +769,25 @@ + + java-17 + + [17,) + + + quarkus + reports + + + + java-11 + + 11 + + + 3.10.2 + + publish @@ -864,7 +882,7 @@ scm:git:https://github.com/inrupt/solid-client-java.git scm:git:git@github.com:inrupt/solid-client-java.git https://github.com/inrupt/solid-client-java - HEAD + inrupt-client-1.2.0 diff --git a/quarkus/pom.xml b/quarkus/pom.xml index 1633800c74d..35bb5665e5c 100644 --- a/quarkus/pom.xml +++ b/quarkus/pom.xml @@ -4,7 +4,7 @@ com.inrupt.client inrupt-client - 1.2.0-SNAPSHOT + 1.2.1-SNAPSHOT inrupt-client-quarkus diff --git a/quarkus/src/test/java/com/inrupt/client/quarkus/SessionUtilsTest.java b/quarkus/src/test/java/com/inrupt/client/quarkus/SessionUtilsTest.java index f8d8c2e22e5..253155aa1a6 100644 --- a/quarkus/src/test/java/com/inrupt/client/quarkus/SessionUtilsTest.java +++ b/quarkus/src/test/java/com/inrupt/client/quarkus/SessionUtilsTest.java @@ -36,6 +36,7 @@ import java.net.URI; import java.time.Instant; import java.util.Optional; +import java.util.Set; import org.eclipse.microprofile.jwt.JsonWebToken; import org.jose4j.jwk.PublicJsonWebKey; @@ -81,7 +82,7 @@ static JsonWebToken generateIdToken(final String sub, final String issuer, final .newPublicJwk(ResourceUtils.readResource("testKey.json")); final var authContext = new JWTAuthContextInfo(jwk.getPublicKey(), issuer); - authContext.setSignatureAlgorithm(SignatureAlgorithm.ES256); + authContext.setSignatureAlgorithm(Set.of(SignatureAlgorithm.ES256)); final var parser = new DefaultJWTParser(authContext); final var token = Jwt.claims() diff --git a/rdf-legacy/pom.xml b/rdf-legacy/pom.xml index 0bd84f3350d..88c89bfbcc5 100644 --- a/rdf-legacy/pom.xml +++ b/rdf-legacy/pom.xml @@ -4,7 +4,7 @@ com.inrupt.client inrupt-client - 1.2.0-SNAPSHOT + 1.2.1-SNAPSHOT inrupt-client-rdf-legacy @@ -17,7 +17,7 @@ 8 - 1.12.0 + 1.15.0 3.7.7 @@ -47,6 +47,12 @@ pom import + + + commons-io + commons-io + ${commons.io.version} + diff --git a/rdf4j/pom.xml b/rdf4j/pom.xml index dbbd4b13a27..6408e0b9172 100644 --- a/rdf4j/pom.xml +++ b/rdf4j/pom.xml @@ -4,7 +4,7 @@ com.inrupt.client inrupt-client - 1.2.0-SNAPSHOT + 1.2.1-SNAPSHOT inrupt-client-rdf4j @@ -15,7 +15,7 @@ 8 - 5.0.2 + 5.2.2 @@ -43,6 +43,12 @@ pom import + + + commons-io + commons-io + ${commons.io.version} + diff --git a/reports/pom.xml b/reports/pom.xml index ab0e53cbd1d..a3df5eb9e6a 100644 --- a/reports/pom.xml +++ b/reports/pom.xml @@ -4,7 +4,7 @@ com.inrupt.client inrupt-client - 1.2.0-SNAPSHOT + 1.2.1-SNAPSHOT inrupt-client-report diff --git a/runtime/pom.xml b/runtime/pom.xml index 68be3e37349..6952eab0f93 100644 --- a/runtime/pom.xml +++ b/runtime/pom.xml @@ -5,7 +5,7 @@ com.inrupt.client inrupt-client - 1.2.0-SNAPSHOT + 1.2.1-SNAPSHOT .. diff --git a/solid/pom.xml b/solid/pom.xml index 1d8dbabcae1..a7bec68fc42 100644 --- a/solid/pom.xml +++ b/solid/pom.xml @@ -4,7 +4,7 @@ com.inrupt.client inrupt-client - 1.2.0-SNAPSHOT + 1.2.1-SNAPSHOT inrupt-client-solid diff --git a/spring/pom.xml b/spring/pom.xml index 5ba87d579b0..6f8b937b711 100644 --- a/spring/pom.xml +++ b/spring/pom.xml @@ -4,7 +4,7 @@ com.inrupt.client inrupt-client - 1.2.0-SNAPSHOT + 1.2.1-SNAPSHOT inrupt-client-spring @@ -95,7 +95,7 @@ org.springframework spring-web - 6.1.13 + 7.0.1 provided @@ -107,7 +107,7 @@ [17,) - 6.3.3 + 7.0.3 diff --git a/test/pom.xml b/test/pom.xml index 4a0072a6a81..b81ea8d23a8 100644 --- a/test/pom.xml +++ b/test/pom.xml @@ -4,7 +4,7 @@ com.inrupt.client inrupt-client - 1.2.0-SNAPSHOT + 1.2.1-SNAPSHOT inrupt-client-test @@ -39,7 +39,7 @@ org.wiremock - wiremock + wiremock-standalone ${wiremock.version} provided diff --git a/uma/pom.xml b/uma/pom.xml index f532ef2955d..d7d05c04fed 100644 --- a/uma/pom.xml +++ b/uma/pom.xml @@ -4,7 +4,7 @@ com.inrupt.client inrupt-client - 1.2.0-SNAPSHOT + 1.2.1-SNAPSHOT inrupt-client-uma diff --git a/vocabulary/pom.xml b/vocabulary/pom.xml index 2c4c6e9d57d..cb9f87aef13 100644 --- a/vocabulary/pom.xml +++ b/vocabulary/pom.xml @@ -4,7 +4,7 @@ com.inrupt.client inrupt-client - 1.2.0-SNAPSHOT + 1.2.1-SNAPSHOT inrupt-client-vocabulary diff --git a/webid/pom.xml b/webid/pom.xml index 3dae094ab29..42df26e9a43 100644 --- a/webid/pom.xml +++ b/webid/pom.xml @@ -4,7 +4,7 @@ com.inrupt.client inrupt-client - 1.2.0-SNAPSHOT + 1.2.1-SNAPSHOT inrupt-client-webid