diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 51ef5bded7a..ab64af7b8f4 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -35,11 +35,6 @@ updates: allow: - dependency-name: "org.springframework.security:spring-*" - - package-ecosystem: "gradle" - directory: "/gradle/" - schedule: - interval: "weekly" - - package-ecosystem: "github-actions" directory: "/" schedule: diff --git a/.github/workflows/cd-config.yml b/.github/workflows/cd-config.yml index fe140a446c9..eabb6e387e8 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.3 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.3.[0-9]+ jobs: deployment: @@ -27,15 +25,15 @@ jobs: envName: "Development" steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v7 - name: Set up JDK 17 - uses: actions/setup-java@v4 + uses: actions/setup-java@v5.6.0 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@v7 - name: Set up JDK 17 - uses: actions/setup-java@v4 + uses: actions/setup-java@v5.6.0 with: distribution: 'temurin' java-version: 17 diff --git a/.github/workflows/ci-config.yml b/.github/workflows/ci-config.yml index 5c55300a57b..d0d0ae87305 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@v7 - name: Set up JDK ${{ matrix.java }} - uses: actions/setup-java@v4 + uses: actions/setup-java@v5.6.0 with: distribution: 'temurin' java-version: ${{ matrix.java }} @@ -63,10 +63,10 @@ jobs: java: [ 17 ] steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v7 - name: Set up JDK ${{ matrix.java }} - uses: actions/setup-java@v4 + uses: actions/setup-java@v5.6.0 with: distribution: 'temurin' java-version: ${{ matrix.java }} @@ -84,10 +84,10 @@ jobs: java: [ 17 ] steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v7 - name: Set up JDK ${{ matrix.java }} - uses: actions/setup-java@v4 + uses: actions/setup-java@v5.6.0 with: distribution: 'temurin' java-version: ${{ matrix.java }} @@ -96,47 +96,16 @@ jobs: - name: Build the code with Maven run: mvn -B -ntp verify -Pwebsite javadoc:javadoc - dependencies: - name: Dependency Check - runs-on: ubuntu-latest - strategy: - matrix: - java: [ 17 ] - - steps: - - uses: actions/checkout@v4 - - - name: Set up JDK ${{ matrix.java }} - uses: actions/setup-java@v4 - with: - distribution: 'temurin' - java-version: ${{ matrix.java }} - cache: 'maven' - - - name: Generate Cache Name - shell: bash - run: echo "CACHE_NAME=$(date '+%y.%j')" >> $GITHUB_ENV - - - name: Restore NVD data cache - uses: actions/cache@v4 - with: - key: nvd-data-${{ env.CACHE_NAME }} - restore-keys: nvd-data- - path: ./data/cache - - - name: Verify dependencies - run: mvn -B -ntp verify -Pdependencies -Dnvd.api.datafeed="file:${GITHUB_WORKSPACE}/data/cache/nvdcve-{0}.json.gz" - sonar: name: Sonar Scan runs-on: ubuntu-latest if: ${{ github.actor != 'dependabot[bot]' }} steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v7 - name: Set up JDK 17 - uses: actions/setup-java@v4 + uses: actions/setup-java@v5.6.0 with: distribution: 'temurin' java-version: 17 @@ -146,5 +115,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 deleted file mode 100644 index db2a98594a1..00000000000 --- a/.github/workflows/nvd-cache.yml +++ /dev/null @@ -1,55 +0,0 @@ -name: NVD Data Workflow Schedule - -on: - schedule: - - cron: '0 5 * * 1,2,3,4,5' - workflow_dispatch: { } - -jobs: - build: - name: Build and collect data - runs-on: ubuntu-latest - if: ${{ github.actor != 'dependabot[bot]' }} - - steps: - - name: Checkout OVP repository - uses: actions/checkout@v4 - with: - repository: jeremylong/Open-Vulnerability-Project - path: ovp - ref: v7.0.2 - - - name: Set up JDK 17 - uses: actions/setup-java@v4 - with: - distribution: 'temurin' - java-version: 17 - cache: 'gradle' - - - name: Build the OVP code with Gradle - working-directory: ./ovp - run: ./gradlew build -x test - - - uses: actions/checkout@v4 - with: - path: data - - - name: Generate Cache Name - shell: bash - run: echo "CACHE_NAME=$(date '+%y.%j')" >> $GITHUB_ENV - - - name: Rename artifact - run: find ./ovp/vulnz/build/libs -type f -regex './ovp/vulnz/build/libs/vulnz-[0-9].[0-9].[0-9].jar' -exec mv {} ./data/vulnz.jar ';' - - - name: Generate data - working-directory: ./data - run: ./vulnz.jar cve --cache --directory ./cache --delay=10000 --maxRetry=20 - env: - NVD_API_KEY: ${{ secrets.NVD_API_KEY }} - JAVA_OPTS: "-Xmx4g" - - - name: Cache NVD data - uses: actions/cache@v4 - 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..a649e773c69 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@v7 - name: Set up JDK ${{ matrix.java }} - uses: actions/setup-java@v4 + uses: actions/setup-java@v5.6.0 with: distribution: 'temurin' java-version: ${{ matrix.java }} diff --git a/.mvn/wrapper/maven-wrapper.properties b/.mvn/wrapper/maven-wrapper.properties index 6d3a56651da..216df058979 100644 --- a/.mvn/wrapper/maven-wrapper.properties +++ b/.mvn/wrapper/maven-wrapper.properties @@ -1,18 +1,3 @@ -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, -# software distributed under the License is distributed on an -# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the License for the -# specific language governing permissions and limitations -# under the License. -distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.3/apache-maven-3.9.3-bin.zip -wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.2.0/maven-wrapper-3.2.0.jar +wrapperVersion=3.3.4 +distributionType=only-script +distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.16/apache-maven-3.9.16-bin.zip diff --git a/access-grant/pom.xml b/access-grant/pom.xml index a3d27fb7e09..cb74ae8c84b 100644 --- a/access-grant/pom.xml +++ b/access-grant/pom.xml @@ -4,7 +4,7 @@ com.inrupt.client inrupt-client - 1.3.0-SNAPSHOT + 1.3.2-SNAPSHOT inrupt-client-accessgrant diff --git a/access-grant/src/main/java/com/inrupt/client/accessgrant/AccessGrantClient.java b/access-grant/src/main/java/com/inrupt/client/accessgrant/AccessGrantClient.java index bc144db2a65..75293228141 100644 --- a/access-grant/src/main/java/com/inrupt/client/accessgrant/AccessGrantClient.java +++ b/access-grant/src/main/java/com/inrupt/client/accessgrant/AccessGrantClient.java @@ -94,7 +94,7 @@ public class AccessGrantClient { private static final String CONTEXT = "@context"; private static final String VC_CONTEXT_URI = "https://www.w3.org/2018/credentials/v1"; - private static final String INRUPT_CONTEXT_URI = "https://schema.inrupt.com/credentials/v1.jsonld"; + private static final String INRUPT_CONTEXT_URI = "https://schema.inrupt.com/credentials/v2.jsonld"; private static final String VERIFIABLE_CREDENTIAL = "verifiableCredential"; private static final String SOLID_VC_NAMESPACE = "http://www.w3.org/ns/solid/vc#"; private static final String SOLID_VC_QN = "vc:"; diff --git a/access-grant/src/test/resources/access_denial2.json b/access-grant/src/test/resources/access_denial2.json index 6aa36ce336a..98b09d190c2 100644 --- a/access-grant/src/test/resources/access_denial2.json +++ b/access-grant/src/test/resources/access_denial2.json @@ -6,7 +6,7 @@ "https://www.w3.org/2018/credentials/v1", "https://w3id.org/security/suites/ed25519-2020/v1", "https://w3id.org/vc-revocation-list-2020/v1", - "https://schema.inrupt.com/credentials/v1.jsonld"], + "https://schema.inrupt.com/credentials/v2.jsonld"], "id":"https://accessgrant.test/credential/39a4fdd4-44b0-48a5-a9b5-7a9b648e9a67", "type":["VerifiableCredential","vc:SolidAccessDenial"], "issuer":"https://accessgrant.test", diff --git a/access-grant/src/test/resources/access_grant1.json b/access-grant/src/test/resources/access_grant1.json index ea139b6cb44..d86fc898702 100644 --- a/access-grant/src/test/resources/access_grant1.json +++ b/access-grant/src/test/resources/access_grant1.json @@ -6,7 +6,7 @@ "https://www.w3.org/2018/credentials/v1", "https://w3id.org/security/suites/ed25519-2020/v1", "https://w3id.org/vc-revocation-list-2020/v1", - "https://schema.inrupt.com/credentials/v1.jsonld"], + "https://schema.inrupt.com/credentials/v2.jsonld"], "id":"https://accessgrant.example/credential/5c6060ad-2f16-4bc1-b022-dffb46bff626", "type":["VerifiableCredential","SolidAccessGrant"], "issuer":"https://accessgrant.example", diff --git a/access-grant/src/test/resources/access_grant2.json b/access-grant/src/test/resources/access_grant2.json index 54e94002ea0..e14402fb3c0 100644 --- a/access-grant/src/test/resources/access_grant2.json +++ b/access-grant/src/test/resources/access_grant2.json @@ -6,7 +6,7 @@ "https://www.w3.org/2018/credentials/v1", "https://w3id.org/security/suites/ed25519-2020/v1", "https://w3id.org/vc-revocation-list-2020/v1", - "https://schema.inrupt.com/credentials/v1.jsonld"], + "https://schema.inrupt.com/credentials/v2.jsonld"], "id":"https://accessgrant.example/credential/5c6060ad-2f16-4bc1-b022-dffb46bff626", "type":["VerifiableCredential","SolidAccessGrant"], "issuer":"https://accessgrant.example", diff --git a/access-grant/src/test/resources/access_grant3.json b/access-grant/src/test/resources/access_grant3.json index 0f631cf5462..37916227d66 100644 --- a/access-grant/src/test/resources/access_grant3.json +++ b/access-grant/src/test/resources/access_grant3.json @@ -6,7 +6,7 @@ "https://www.w3.org/2018/credentials/v1", "https://w3id.org/security/suites/ed25519-2020/v1", "https://w3id.org/vc-revocation-list-2020/v1", - "https://schema.inrupt.com/credentials/v1.jsonld"], + "https://schema.inrupt.com/credentials/v2.jsonld"], "id":"https://accessgrant.example/credential/5c6060ad-2f16-4bc1-b022-dffb46bff626", "type":["VerifiableCredential","SolidAccessGrant"], "issuer":"https://accessgrant.example", diff --git a/access-grant/src/test/resources/access_request1.json b/access-grant/src/test/resources/access_request1.json index 4404331f2b6..c8e88e6af8f 100644 --- a/access-grant/src/test/resources/access_request1.json +++ b/access-grant/src/test/resources/access_request1.json @@ -6,7 +6,7 @@ "https://www.w3.org/2018/credentials/v1", "https://w3id.org/security/suites/ed25519-2020/v1", "https://w3id.org/vc-revocation-list-2020/v1", - "https://schema.inrupt.com/credentials/v1.jsonld"], + "https://schema.inrupt.com/credentials/v2.jsonld"], "id":"https://accessgrant.test/credential/d604c858-209a-4bb6-a7f8-2f52c9617cab", "type":["VerifiableCredential","SolidAccessRequest"], "issuer":"https://accessgrant.test", diff --git a/access-grant/src/test/resources/access_request2.json b/access-grant/src/test/resources/access_request2.json index 7d6965e554e..3d3fa726f58 100644 --- a/access-grant/src/test/resources/access_request2.json +++ b/access-grant/src/test/resources/access_request2.json @@ -6,7 +6,7 @@ "https://www.w3.org/2018/credentials/v1", "https://w3id.org/security/suites/ed25519-2020/v1", "https://w3id.org/vc-revocation-list-2020/v1", - "https://schema.inrupt.com/credentials/v1.jsonld"], + "https://schema.inrupt.com/credentials/v2.jsonld"], "id":"https://accessgrant.test/credential/d604c858-209a-4bb6-a7f8-2f52c9617cab", "type":["VerifiableCredential","SolidAccessRequest"], "issuer":"https://accessgrant.test", diff --git a/access-grant/src/test/resources/access_request3.json b/access-grant/src/test/resources/access_request3.json index aa0754cc4ec..bfb0327a73c 100644 --- a/access-grant/src/test/resources/access_request3.json +++ b/access-grant/src/test/resources/access_request3.json @@ -6,7 +6,7 @@ "https://www.w3.org/2018/credentials/v1", "https://w3id.org/security/suites/ed25519-2020/v1", "https://w3id.org/vc-revocation-list-2020/v1", - "https://schema.inrupt.com/credentials/v1.jsonld"], + "https://schema.inrupt.com/credentials/v2.jsonld"], "id":"https://accessgrant.test/credential/d604c858-209a-4bb6-a7f8-2f52c9617cab", "type":["VerifiableCredential","vc:SolidAccessRequest"], "issuer":"https://accessgrant.test", diff --git a/access-grant/src/test/resources/alternative-vc-configuration.json b/access-grant/src/test/resources/alternative-vc-configuration.json index 853bb0c116c..d85c7bc64ec 100644 --- a/access-grant/src/test/resources/alternative-vc-configuration.json +++ b/access-grant/src/test/resources/alternative-vc-configuration.json @@ -1,7 +1,7 @@ { "@context": [ "https://www.w3.org/2018/credentials/v1", - "https://schema.inrupt.com/credentials/v1.jsonld" + "https://schema.inrupt.com/credentials/v2.jsonld" ], "issuerService": "{{baseUrl}}/issue", "statusService": "{{baseUrl}}/status", diff --git a/access-grant/src/test/resources/invalid_access_grant1.json b/access-grant/src/test/resources/invalid_access_grant1.json index c8790df7a8f..3cb9860a588 100644 --- a/access-grant/src/test/resources/invalid_access_grant1.json +++ b/access-grant/src/test/resources/invalid_access_grant1.json @@ -3,7 +3,7 @@ "https://www.w3.org/2018/credentials/v1", "https://w3id.org/security/suites/ed25519-2020/v1", "https://w3id.org/vc-revocation-list-2020/v1", - "https://schema.inrupt.com/credentials/v1.jsonld"], + "https://schema.inrupt.com/credentials/v2.jsonld"], "id":"https://accessgrant.example/credential/5c6060ad-2f16-4bc1-b022-dffb46bff626", "type":["VerifiableCredential","SolidAccessGrant"], "issuer":"https://accessgrant.example", diff --git a/access-grant/src/test/resources/invalid_access_grant10.json b/access-grant/src/test/resources/invalid_access_grant10.json index 2f03aa955e7..165e78e6446 100644 --- a/access-grant/src/test/resources/invalid_access_grant10.json +++ b/access-grant/src/test/resources/invalid_access_grant10.json @@ -6,7 +6,7 @@ "https://www.w3.org/2018/credentials/v1", "https://w3id.org/security/suites/ed25519-2020/v1", "https://w3id.org/vc-revocation-list-2020/v1", - "https://schema.inrupt.com/credentials/v1.jsonld"], + "https://schema.inrupt.com/credentials/v2.jsonld"], "id":"https://accessgrant.example/credential/5c6060ad-2f16-4bc1-b022-dffb46bff626", "type":{"name":"VerifiableCredential"}, "issuer":"https://accessgrant.example", diff --git a/access-grant/src/test/resources/invalid_access_grant11.json b/access-grant/src/test/resources/invalid_access_grant11.json index d5091964e67..cafd2b79742 100644 --- a/access-grant/src/test/resources/invalid_access_grant11.json +++ b/access-grant/src/test/resources/invalid_access_grant11.json @@ -6,7 +6,7 @@ "https://www.w3.org/2018/credentials/v1", "https://w3id.org/security/suites/ed25519-2020/v1", "https://w3id.org/vc-revocation-list-2020/v1", - "https://schema.inrupt.com/credentials/v1.jsonld"], + "https://schema.inrupt.com/credentials/v2.jsonld"], "id":"https://accessgrant.example/credential/5c6060ad-2f16-4bc1-b022-dffb46bff626", "type":["VerifiableCredential","SolidAccessGrant"], "issuer":"https://accessgrant.example", diff --git a/access-grant/src/test/resources/invalid_access_grant12.json b/access-grant/src/test/resources/invalid_access_grant12.json index 9b1a0345615..e78f9df6d69 100644 --- a/access-grant/src/test/resources/invalid_access_grant12.json +++ b/access-grant/src/test/resources/invalid_access_grant12.json @@ -6,7 +6,7 @@ "https://www.w3.org/2018/credentials/v1", "https://w3id.org/security/suites/ed25519-2020/v1", "https://w3id.org/vc-revocation-list-2020/v1", - "https://schema.inrupt.com/credentials/v1.jsonld"], + "https://schema.inrupt.com/credentials/v2.jsonld"], "id":"https://accessgrant.example/credential/5c6060ad-2f16-4bc1-b022-dffb46bff626", "type":["VerifiableCredential","SolidAccessGrant"], "issuer":"https://accessgrant.example", diff --git a/access-grant/src/test/resources/invalid_access_grant13.json b/access-grant/src/test/resources/invalid_access_grant13.json index 40369fb7f0a..2a46842c535 100644 --- a/access-grant/src/test/resources/invalid_access_grant13.json +++ b/access-grant/src/test/resources/invalid_access_grant13.json @@ -6,7 +6,7 @@ "https://www.w3.org/2018/credentials/v1", "https://w3id.org/security/suites/ed25519-2020/v1", "https://w3id.org/vc-revocation-list-2020/v1", - "https://schema.inrupt.com/credentials/v1.jsonld"], + "https://schema.inrupt.com/credentials/v2.jsonld"], "id":"https://accessgrant.example/credential/5c6060ad-2f16-4bc1-b022-dffb46bff626", "type":["VerifiableCredential","SolidAccessGrant"], "issuer":"https://accessgrant.example", diff --git a/access-grant/src/test/resources/invalid_access_grant14.json b/access-grant/src/test/resources/invalid_access_grant14.json index 757e5ac5b5b..ae16571564c 100644 --- a/access-grant/src/test/resources/invalid_access_grant14.json +++ b/access-grant/src/test/resources/invalid_access_grant14.json @@ -6,7 +6,7 @@ "https://www.w3.org/2018/credentials/v1", "https://w3id.org/security/suites/ed25519-2020/v1", "https://w3id.org/vc-revocation-list-2020/v1", - "https://schema.inrupt.com/credentials/v1.jsonld"], + "https://schema.inrupt.com/credentials/v2.jsonld"], "id":"https://accessgrant.example/credential/5c6060ad-2f16-4bc1-b022-dffb46bff626", "type":["VerifiableCredential","SolidAccessGrant"], "issuer":"https://accessgrant.example", diff --git a/access-grant/src/test/resources/invalid_access_grant2.json b/access-grant/src/test/resources/invalid_access_grant2.json index ec15077da3c..9ddd7bc79e0 100644 --- a/access-grant/src/test/resources/invalid_access_grant2.json +++ b/access-grant/src/test/resources/invalid_access_grant2.json @@ -6,7 +6,7 @@ "https://www.w3.org/2018/credentials/v1", "https://w3id.org/security/suites/ed25519-2020/v1", "https://w3id.org/vc-revocation-list-2020/v1", - "https://schema.inrupt.com/credentials/v1.jsonld"], + "https://schema.inrupt.com/credentials/v2.jsonld"], "id":"https://accessgrant.example/credential/5c6060ad-2f16-4bc1-b022-dffb46bff626", "type":["VerifiableCredential","SolidAccessGrant"], "expirationDate":"2022-08-27T12:00:00Z", diff --git a/access-grant/src/test/resources/invalid_access_grant3.json b/access-grant/src/test/resources/invalid_access_grant3.json index a8afbecab26..e836c5f7d67 100644 --- a/access-grant/src/test/resources/invalid_access_grant3.json +++ b/access-grant/src/test/resources/invalid_access_grant3.json @@ -6,7 +6,7 @@ "https://www.w3.org/2018/credentials/v1", "https://w3id.org/security/suites/ed25519-2020/v1", "https://w3id.org/vc-revocation-list-2020/v1", - "https://schema.inrupt.com/credentials/v1.jsonld"], + "https://schema.inrupt.com/credentials/v2.jsonld"], "id":"https://accessgrant.example/credential/5c6060ad-2f16-4bc1-b022-dffb46bff626", "type":["VerifiableCredential","http://www.w3.org/ns/solid/vc#SolidAccessGrant"], "issuer":"https://accessgrant.example", diff --git a/access-grant/src/test/resources/invalid_access_grant4.json b/access-grant/src/test/resources/invalid_access_grant4.json index bea31029ea9..7e89638cb86 100644 --- a/access-grant/src/test/resources/invalid_access_grant4.json +++ b/access-grant/src/test/resources/invalid_access_grant4.json @@ -5,7 +5,7 @@ "https://www.w3.org/2018/credentials/v1", "https://w3id.org/security/suites/ed25519-2020/v1", "https://w3id.org/vc-revocation-list-2020/v1", - "https://schema.inrupt.com/credentials/v1.jsonld"], + "https://schema.inrupt.com/credentials/v2.jsonld"], "id":"https://accessgrant.example/credential/5c6060ad-2f16-4bc1-b022-dffb46bff626", "type":["VerifiableCredential","SolidAccessGrant"], "issuer":"https://accessgrant.example", diff --git a/access-grant/src/test/resources/invalid_access_grant5.json b/access-grant/src/test/resources/invalid_access_grant5.json index cd7a3ce27d0..9e403c85e6f 100644 --- a/access-grant/src/test/resources/invalid_access_grant5.json +++ b/access-grant/src/test/resources/invalid_access_grant5.json @@ -11,7 +11,7 @@ "https://www.w3.org/2018/credentials/v1", "https://w3id.org/security/suites/ed25519-2020/v1", "https://w3id.org/vc-revocation-list-2020/v1", - "https://schema.inrupt.com/credentials/v1.jsonld"], + "https://schema.inrupt.com/credentials/v2.jsonld"], "id":"https://accessgrant.example/credential/5c6060ad-2f16-4bc1-b022-dffb46bff626", "type":["VerifiableCredential"], "issuer":"https://accessgrant.example", diff --git a/access-grant/src/test/resources/invalid_access_grant6.json b/access-grant/src/test/resources/invalid_access_grant6.json index 299ad3562b5..754fca9da29 100644 --- a/access-grant/src/test/resources/invalid_access_grant6.json +++ b/access-grant/src/test/resources/invalid_access_grant6.json @@ -6,7 +6,7 @@ "https://www.w3.org/2018/credentials/v1", "https://w3id.org/security/suites/ed25519-2020/v1", "https://w3id.org/vc-revocation-list-2020/v1", - "https://schema.inrupt.com/credentials/v1.jsonld"], + "https://schema.inrupt.com/credentials/v2.jsonld"], "type":["VerifiableCredential","SolidAccessGrant"], "issuer":"https://accessgrant.example", "expirationDate":"2022-08-27T12:00:00Z", diff --git a/access-grant/src/test/resources/invalid_access_grant7.json b/access-grant/src/test/resources/invalid_access_grant7.json index de18e3720a8..cdde4ceadc2 100644 --- a/access-grant/src/test/resources/invalid_access_grant7.json +++ b/access-grant/src/test/resources/invalid_access_grant7.json @@ -6,7 +6,7 @@ "https://www.w3.org/2018/credentials/v1", "https://w3id.org/security/suites/ed25519-2020/v1", "https://w3id.org/vc-revocation-list-2020/v1", - "https://schema.inrupt.com/credentials/v1.jsonld"], + "https://schema.inrupt.com/credentials/v2.jsonld"], "id":"https://accessgrant.example/credential/5c6060ad-2f16-4bc1-b022-dffb46bff626", "type":["VerifiableCredential","SolidAccessGrant"], "issuer":"https://accessgrant.example", diff --git a/access-grant/src/test/resources/invalid_access_grant8.json b/access-grant/src/test/resources/invalid_access_grant8.json index 1ff52f25a2b..b5479ffc5c1 100644 --- a/access-grant/src/test/resources/invalid_access_grant8.json +++ b/access-grant/src/test/resources/invalid_access_grant8.json @@ -6,7 +6,7 @@ "https://www.w3.org/2018/credentials/v1", "https://w3id.org/security/suites/ed25519-2020/v1", "https://w3id.org/vc-revocation-list-2020/v1", - "https://schema.inrupt.com/credentials/v1.jsonld"], + "https://schema.inrupt.com/credentials/v2.jsonld"], "id":"https://accessgrant.example/credential/5c6060ad-2f16-4bc1-b022-dffb46bff626", "type":["VerifiableCredential","SolidAccessGrant"], "issuer":"https://accessgrant.example", diff --git a/access-grant/src/test/resources/invalid_access_grant9.json b/access-grant/src/test/resources/invalid_access_grant9.json index 5202eafbe17..ffacc6d49d3 100644 --- a/access-grant/src/test/resources/invalid_access_grant9.json +++ b/access-grant/src/test/resources/invalid_access_grant9.json @@ -6,7 +6,7 @@ "https://www.w3.org/2018/credentials/v1", "https://w3id.org/security/suites/ed25519-2020/v1", "https://w3id.org/vc-revocation-list-2020/v1", - "https://schema.inrupt.com/credentials/v1.jsonld"], + "https://schema.inrupt.com/credentials/v2.jsonld"], "id":"https://accessgrant.example/credential/5c6060ad-2f16-4bc1-b022-dffb46bff626", "type":[{ "name": "VerifiableCredential"},["SolidAccessGrant"]], "issuer":"https://accessgrant.example", diff --git a/access-grant/src/test/resources/invalid_access_request1.json b/access-grant/src/test/resources/invalid_access_request1.json index 1e1b5280ea6..62435682d18 100644 --- a/access-grant/src/test/resources/invalid_access_request1.json +++ b/access-grant/src/test/resources/invalid_access_request1.json @@ -3,7 +3,7 @@ "https://www.w3.org/2018/credentials/v1", "https://w3id.org/security/suites/ed25519-2020/v1", "https://w3id.org/vc-revocation-list-2020/v1", - "https://schema.inrupt.com/credentials/v1.jsonld"], + "https://schema.inrupt.com/credentials/v2.jsonld"], "id":"{{baseUrl}}/access-request-5", "type":["VerifiableCredential","SolidAccessRequest"], "issuer":"{{baseUrl}}", diff --git a/access-grant/src/test/resources/invalid_access_request2.json b/access-grant/src/test/resources/invalid_access_request2.json index 6f9b9ffb0d4..07f7bbc355a 100644 --- a/access-grant/src/test/resources/invalid_access_request2.json +++ b/access-grant/src/test/resources/invalid_access_request2.json @@ -6,7 +6,7 @@ "https://www.w3.org/2018/credentials/v1", "https://w3id.org/security/suites/ed25519-2020/v1", "https://w3id.org/vc-revocation-list-2020/v1", - "https://schema.inrupt.com/credentials/v1.jsonld"], + "https://schema.inrupt.com/credentials/v2.jsonld"], "id":"https://accessgrant.test/credential/d604c858-209a-4bb6-a7f8-2f52c9617cab", "type":["VerifiableCredential","SolidAccessRequest"], "expirationDate":"2022-08-27T12:00:00Z", diff --git a/access-grant/src/test/resources/invalid_access_request3.json b/access-grant/src/test/resources/invalid_access_request3.json index 2fc78b7391f..985feb823f4 100644 --- a/access-grant/src/test/resources/invalid_access_request3.json +++ b/access-grant/src/test/resources/invalid_access_request3.json @@ -6,7 +6,7 @@ "https://www.w3.org/2018/credentials/v1", "https://w3id.org/security/suites/ed25519-2020/v1", "https://w3id.org/vc-revocation-list-2020/v1", - "https://schema.inrupt.com/credentials/v1.jsonld"], + "https://schema.inrupt.com/credentials/v2.jsonld"], "id":"https://accessgrant.test/credential/d604c858-209a-4bb6-a7f8-2f52c9617cab", "type":["VerifiableCredential","SolidAccessRequest"], "issuer":"https://accessgrant.test", diff --git a/access-grant/src/test/resources/invalid_access_request4.json b/access-grant/src/test/resources/invalid_access_request4.json index fe68834ad3d..c72ce489151 100644 --- a/access-grant/src/test/resources/invalid_access_request4.json +++ b/access-grant/src/test/resources/invalid_access_request4.json @@ -5,7 +5,7 @@ "https://www.w3.org/2018/credentials/v1", "https://w3id.org/security/suites/ed25519-2020/v1", "https://w3id.org/vc-revocation-list-2020/v1", - "https://schema.inrupt.com/credentials/v1.jsonld"], + "https://schema.inrupt.com/credentials/v2.jsonld"], "id":"https://accessgrant.test/credential/d604c858-209a-4bb6-a7f8-2f52c9617cab", "type":["VerifiableCredential","SolidAccessRequest"], "issuer":"https://accessgrant.test", diff --git a/access-grant/src/test/resources/invalid_access_request5.json b/access-grant/src/test/resources/invalid_access_request5.json index 9dfa22c57b6..2bfda144801 100644 --- a/access-grant/src/test/resources/invalid_access_request5.json +++ b/access-grant/src/test/resources/invalid_access_request5.json @@ -6,7 +6,7 @@ "https://www.w3.org/2018/credentials/v1", "https://w3id.org/security/suites/ed25519-2020/v1", "https://w3id.org/vc-revocation-list-2020/v1", - "https://schema.inrupt.com/credentials/v1.jsonld"], + "https://schema.inrupt.com/credentials/v2.jsonld"], "type":["VerifiableCredential","SolidAccessRequest"], "issuer":"https://accessgrant.test", "expirationDate":"2022-08-27T12:00:00Z", diff --git a/access-grant/src/test/resources/invalid_access_request6.json b/access-grant/src/test/resources/invalid_access_request6.json index f45e5ef2fc8..598ee846ff8 100644 --- a/access-grant/src/test/resources/invalid_access_request6.json +++ b/access-grant/src/test/resources/invalid_access_request6.json @@ -6,7 +6,7 @@ "https://www.w3.org/2018/credentials/v1", "https://w3id.org/security/suites/ed25519-2020/v1", "https://w3id.org/vc-revocation-list-2020/v1", - "https://schema.inrupt.com/credentials/v1.jsonld"], + "https://schema.inrupt.com/credentials/v2.jsonld"], "id":"https://accessgrant.test/credential/d604c858-209a-4bb6-a7f8-2f52c9617cab", "type":["VerifiableCredential","SolidAccessRequest"], "issuer":"https://accessgrant.test", diff --git a/access-grant/src/test/resources/invalid_access_request7.json b/access-grant/src/test/resources/invalid_access_request7.json index c40d927f700..b786d830f9c 100644 --- a/access-grant/src/test/resources/invalid_access_request7.json +++ b/access-grant/src/test/resources/invalid_access_request7.json @@ -6,7 +6,7 @@ "https://www.w3.org/2018/credentials/v1", "https://w3id.org/security/suites/ed25519-2020/v1", "https://w3id.org/vc-revocation-list-2020/v1", - "https://schema.inrupt.com/credentials/v1.jsonld"], + "https://schema.inrupt.com/credentials/v2.jsonld"], "id":"https://accessgrant.test/credential/d604c858-209a-4bb6-a7f8-2f52c9617cab", "type":["VerifiableCredential","SolidAccessRequest"], "issuer":"https://accessgrant.test", diff --git a/access-grant/src/test/resources/query_denial_response.json b/access-grant/src/test/resources/query_denial_response.json index 1d7e6d1628f..7342a623aa5 100644 --- a/access-grant/src/test/resources/query_denial_response.json +++ b/access-grant/src/test/resources/query_denial_response.json @@ -5,7 +5,7 @@ "https://www.w3.org/2018/credentials/v1", "https://w3id.org/security/suites/ed25519-2020/v1", "https://w3id.org/vc-revocation-list-2020/v1", - "https://schema.inrupt.com/credentials/v1.jsonld"], + "https://schema.inrupt.com/credentials/v2.jsonld"], "id":"https://accessgrant.test/credential/fc2dbcd9-81d4-4fa4-8fd4-239e16dd83ab", "type":["VerifiableCredential","SolidAccessDenial"], "issuer":"https://accessgrant.test", diff --git a/access-grant/src/test/resources/query_request_page_response.json b/access-grant/src/test/resources/query_request_page_response.json index 10124221004..0002b473362 100644 --- a/access-grant/src/test/resources/query_request_page_response.json +++ b/access-grant/src/test/resources/query_request_page_response.json @@ -5,7 +5,7 @@ "https://www.w3.org/2018/credentials/v1", "https://w3id.org/security/suites/ed25519-2020/v1", "https://w3id.org/vc-revocation-list-2020/v1", - "https://schema.inrupt.com/credentials/v1.jsonld"], + "https://schema.inrupt.com/credentials/v2.jsonld"], "id":"https://accessgrant.test/credential/d604c858-209a-4bb6-a7f8-2f52c9617cab", "type":["VerifiableCredential","SolidAccessRequest"], "issuer":"https://accessgrant.test", @@ -36,7 +36,7 @@ "https://www.w3.org/2018/credentials/v1", "https://w3id.org/security/suites/ed25519-2020/v1", "https://w3id.org/vc-revocation-list-2020/v1", - "https://schema.inrupt.com/credentials/v1.jsonld"], + "https://schema.inrupt.com/credentials/v2.jsonld"], "id":"https://accessgrant.test/credential/52049498-fc2e-45be-be79-703a39086574", "type":["VerifiableCredential","SolidAccessRequest"], "issuer":"https://accessgrant.test", @@ -67,7 +67,7 @@ "https://www.w3.org/2018/credentials/v1", "https://w3id.org/security/suites/ed25519-2020/v1", "https://w3id.org/vc-revocation-list-2020/v1", - "https://schema.inrupt.com/credentials/v1.jsonld"], + "https://schema.inrupt.com/credentials/v2.jsonld"], "id":"https://accessgrant.test/credential/a0a73677-d139-48e4-8e62-0ae63925bd2b", "type":["VerifiableCredential","SolidAccessRequest"], "issuer":"https://accessgrant.test", @@ -98,7 +98,7 @@ "https://www.w3.org/2018/credentials/v1", "https://w3id.org/security/suites/ed25519-2020/v1", "https://w3id.org/vc-revocation-list-2020/v1", - "https://schema.inrupt.com/credentials/v1.jsonld"], + "https://schema.inrupt.com/credentials/v2.jsonld"], "id":"https://accessgrant.test/credential/3869d6d9-3b3e-4c77-b842-6c938367e3b5", "type":["VerifiableCredential","SolidAccessRequest"], "issuer":"https://accessgrant.test", @@ -129,7 +129,7 @@ "https://www.w3.org/2018/credentials/v1", "https://w3id.org/security/suites/ed25519-2020/v1", "https://w3id.org/vc-revocation-list-2020/v1", - "https://schema.inrupt.com/credentials/v1.jsonld"], + "https://schema.inrupt.com/credentials/v2.jsonld"], "id":"https://accessgrant.test/credential/3f61667a-4569-43f3-854e-1832f898049e", "type":["VerifiableCredential","SolidAccessRequest"], "issuer":"https://accessgrant.test", diff --git a/access-grant/src/test/resources/query_request_response.json b/access-grant/src/test/resources/query_request_response.json index 686f90cba98..6c9de6378fc 100644 --- a/access-grant/src/test/resources/query_request_response.json +++ b/access-grant/src/test/resources/query_request_response.json @@ -5,7 +5,7 @@ "https://www.w3.org/2018/credentials/v1", "https://w3id.org/security/suites/ed25519-2020/v1", "https://w3id.org/vc-revocation-list-2020/v1", - "https://schema.inrupt.com/credentials/v1.jsonld"], + "https://schema.inrupt.com/credentials/v2.jsonld"], "id":"https://accessgrant.test/credential/d604c858-209a-4bb6-a7f8-2f52c9617cab", "type":["VerifiableCredential","SolidAccessRequest"], "issuer":"https://accessgrant.test", diff --git a/access-grant/src/test/resources/query_response1.json b/access-grant/src/test/resources/query_response1.json index 7084c8d181a..888c1778cd5 100644 --- a/access-grant/src/test/resources/query_response1.json +++ b/access-grant/src/test/resources/query_response1.json @@ -4,7 +4,7 @@ "https://www.w3.org/2018/credentials/v1", "https://w3id.org/security/suites/ed25519-2020/v1", "https://w3id.org/vc-revocation-list-2020/v1", - "https://schema.inrupt.com/credentials/v1.jsonld"], + "https://schema.inrupt.com/credentials/v2.jsonld"], "id":"{{baseUrl}}/access-grant-1", "type":["VerifiableCredential","SolidAccessGrant"], "issuer":"{{baseUrl}}", @@ -34,7 +34,7 @@ "https://www.w3.org/2018/credentials/v1", "https://w3id.org/security/suites/ed25519-2020/v1", "https://w3id.org/vc-revocation-list-2020/v1", - "https://schema.inrupt.com/credentials/v1.jsonld"], + "https://schema.inrupt.com/credentials/v2.jsonld"], "id":"{{baseUrl}}/access-grant-2", "type":["VerifiableCredential","SolidAccessGrant"], "issuer":"{{baseUrl}}", @@ -64,7 +64,7 @@ "https://www.w3.org/2018/credentials/v1", "https://w3id.org/security/suites/ed25519-2020/v1", "https://w3id.org/vc-revocation-list-2020/v1", - "https://schema.inrupt.com/credentials/v1.jsonld"], + "https://schema.inrupt.com/credentials/v2.jsonld"], "id":"{{baseUrl}}/access-grant-3", "type":["VerifiableCredential","SolidAccessGrant"], "issuer":"{{baseUrl}}", @@ -94,7 +94,7 @@ "https://www.w3.org/2018/credentials/v1", "https://w3id.org/security/suites/ed25519-2020/v1", "https://w3id.org/vc-revocation-list-2020/v1", - "https://schema.inrupt.com/credentials/v1.jsonld"], + "https://schema.inrupt.com/credentials/v2.jsonld"], "id":"{{baseUrl}}/access-grant-4", "type":["VerifiableCredential","SolidAccessGrant"], "issuer":"{{baseUrl}}", diff --git a/access-grant/src/test/resources/query_response3.json b/access-grant/src/test/resources/query_response3.json index 34246a49ad6..9ba49579a3d 100644 --- a/access-grant/src/test/resources/query_response3.json +++ b/access-grant/src/test/resources/query_response3.json @@ -4,7 +4,7 @@ "https://www.w3.org/2018/credentials/v1", "https://w3id.org/security/suites/ed25519-2020/v1", "https://w3id.org/vc-revocation-list-2020/v1", - "https://schema.inrupt.com/credentials/v1.jsonld"], + "https://schema.inrupt.com/credentials/v2.jsonld"], "id":"{{baseUrl}}/access-request-3", "type":["VerifiableCredential","SolidAccessRequest"], "issuer":"{{baseUrl}}", diff --git a/access-grant/src/test/resources/query_response4.json b/access-grant/src/test/resources/query_response4.json index 08a12d9a990..d31fc69ca96 100644 --- a/access-grant/src/test/resources/query_response4.json +++ b/access-grant/src/test/resources/query_response4.json @@ -4,7 +4,7 @@ "https://www.w3.org/2018/credentials/v1", "https://w3id.org/security/suites/ed25519-2020/v1", "https://w3id.org/vc-revocation-list-2020/v1", - "https://schema.inrupt.com/credentials/v1.jsonld"], + "https://schema.inrupt.com/credentials/v2.jsonld"], "id":"{{baseUrl}}/access-grant-1", "type":["VerifiableCredential","SolidAccessGrant"], "issuer":"{{baseUrl}}", diff --git a/access-grant/src/test/resources/query_response5.json b/access-grant/src/test/resources/query_response5.json index f463e4d914c..8f7a7074fd8 100644 --- a/access-grant/src/test/resources/query_response5.json +++ b/access-grant/src/test/resources/query_response5.json @@ -4,7 +4,7 @@ "https://www.w3.org/2018/credentials/v1", "https://w3id.org/security/suites/ed25519-2020/v1", "https://w3id.org/vc-revocation-list-2020/v1", - "https://schema.inrupt.com/credentials/v1.jsonld"], + "https://schema.inrupt.com/credentials/v2.jsonld"], "id":"{{baseUrl}}/access-request-3", "type":["VerifiableCredential","SolidAccessRequest"], "issuer":"{{baseUrl}}", diff --git a/access-grant/src/test/resources/query_response6.json b/access-grant/src/test/resources/query_response6.json index 9da48023a15..33a45b35e4e 100644 --- a/access-grant/src/test/resources/query_response6.json +++ b/access-grant/src/test/resources/query_response6.json @@ -4,7 +4,7 @@ "https://www.w3.org/2018/credentials/v1", "https://w3id.org/security/suites/ed25519-2020/v1", "https://w3id.org/vc-revocation-list-2020/v1", - "https://schema.inrupt.com/credentials/v1.jsonld"], + "https://schema.inrupt.com/credentials/v2.jsonld"], "id":"{{baseUrl}}/access-grant-1", "type":["VerifiableCredential","SolidAccessDenial"], "issuer":"{{baseUrl}}", diff --git a/access-grant/src/test/resources/query_response7.json b/access-grant/src/test/resources/query_response7.json index 399c94bc5fb..46870caffa7 100644 --- a/access-grant/src/test/resources/query_response7.json +++ b/access-grant/src/test/resources/query_response7.json @@ -4,7 +4,7 @@ "https://www.w3.org/2018/credentials/v1", "https://w3id.org/security/suites/ed25519-2020/v1", "https://w3id.org/vc-revocation-list-2020/v1", - "https://schema.inrupt.com/credentials/v1.jsonld"], + "https://schema.inrupt.com/credentials/v2.jsonld"], "id":"{{baseUrl}}/access-grant-1", "type":["VerifiableCredential","SolidAccessGrant"], "issuer":"{{baseUrl}}", diff --git a/access-grant/src/test/resources/vc-1.json b/access-grant/src/test/resources/vc-1.json index 11f15b6fe89..b1d1a8e6d24 100644 --- a/access-grant/src/test/resources/vc-1.json +++ b/access-grant/src/test/resources/vc-1.json @@ -3,7 +3,7 @@ "https://www.w3.org/2018/credentials/v1", "https://w3id.org/security/suites/ed25519-2020/v1", "https://w3id.org/vc-revocation-list-2020/v1", - "https://schema.inrupt.com/credentials/v1.jsonld"], + "https://schema.inrupt.com/credentials/v2.jsonld"], "id":"{{baseUrl}}/access-grant-1", "type":["VerifiableCredential","SolidAccessGrant"], "issuer":"{{baseUrl}}", diff --git a/access-grant/src/test/resources/vc-2.json b/access-grant/src/test/resources/vc-2.json index 23726166877..891942c8df8 100644 --- a/access-grant/src/test/resources/vc-2.json +++ b/access-grant/src/test/resources/vc-2.json @@ -3,7 +3,7 @@ "https://www.w3.org/2018/credentials/v1", "https://w3id.org/security/suites/ed25519-2020/v1", "https://w3id.org/vc-revocation-list-2020/v1", - "https://schema.inrupt.com/credentials/v1.jsonld"], + "https://schema.inrupt.com/credentials/v2.jsonld"], "id":"{{baseUrl}}/access-grant-2", "type":["VerifiableCredential","http://www.w3.org/ns/solid/vc#SolidAccessGrant"], "issuer":"{{baseUrl}}", diff --git a/access-grant/src/test/resources/vc-4.json b/access-grant/src/test/resources/vc-4.json index d5c39ea9d0e..dbb008e45fb 100644 --- a/access-grant/src/test/resources/vc-4.json +++ b/access-grant/src/test/resources/vc-4.json @@ -3,7 +3,7 @@ "https://www.w3.org/2018/credentials/v1", "https://w3id.org/security/suites/ed25519-2020/v1", "https://w3id.org/vc-revocation-list-2020/v1", - "https://schema.inrupt.com/credentials/v1.jsonld"], + "https://schema.inrupt.com/credentials/v2.jsonld"], "id":"{{baseUrl}}/access-grant-4", "type":["VerifiableCredential","SolidAccessGrant"], "issuer":"{{baseUrl}}", diff --git a/access-grant/src/test/resources/vc-5.json b/access-grant/src/test/resources/vc-5.json index 1e1b5280ea6..62435682d18 100644 --- a/access-grant/src/test/resources/vc-5.json +++ b/access-grant/src/test/resources/vc-5.json @@ -3,7 +3,7 @@ "https://www.w3.org/2018/credentials/v1", "https://w3id.org/security/suites/ed25519-2020/v1", "https://w3id.org/vc-revocation-list-2020/v1", - "https://schema.inrupt.com/credentials/v1.jsonld"], + "https://schema.inrupt.com/credentials/v2.jsonld"], "id":"{{baseUrl}}/access-request-5", "type":["VerifiableCredential","SolidAccessRequest"], "issuer":"{{baseUrl}}", diff --git a/access-grant/src/test/resources/vc-6.json b/access-grant/src/test/resources/vc-6.json index 3b8feec55a9..9dc606e584b 100644 --- a/access-grant/src/test/resources/vc-6.json +++ b/access-grant/src/test/resources/vc-6.json @@ -3,7 +3,7 @@ "https://www.w3.org/2018/credentials/v1", "https://w3id.org/security/suites/ed25519-2020/v1", "https://w3id.org/vc-revocation-list-2020/v1", - "https://schema.inrupt.com/credentials/v1.jsonld"], + "https://schema.inrupt.com/credentials/v2.jsonld"], "id":"{{baseUrl}}/access-grant-6", "type":["VerifiableCredential","http://www.w3.org/ns/solid/vc#SolidAccessGrant"], "issuer":"{{baseUrl}}", diff --git a/access-grant/src/test/resources/vc-7.json b/access-grant/src/test/resources/vc-7.json index a133679b55d..eb5917e1ec5 100644 --- a/access-grant/src/test/resources/vc-7.json +++ b/access-grant/src/test/resources/vc-7.json @@ -3,7 +3,7 @@ "https://www.w3.org/2018/credentials/v1", "https://w3id.org/security/suites/ed25519-2020/v1", "https://w3id.org/vc-revocation-list-2020/v1", - "https://schema.inrupt.com/credentials/v1.jsonld"], + "https://schema.inrupt.com/credentials/v2.jsonld"], "id":"{{baseUrl}}/access-denial-1", "type":["VerifiableCredential","SolidAccessDenial"], "issuer":"{{baseUrl}}", diff --git a/access-grant/src/test/resources/vc-8.json b/access-grant/src/test/resources/vc-8.json index 6691894239a..1ee3a613de0 100644 --- a/access-grant/src/test/resources/vc-8.json +++ b/access-grant/src/test/resources/vc-8.json @@ -3,7 +3,7 @@ "https://www.w3.org/2018/credentials/v1", "https://w3id.org/security/suites/ed25519-2020/v1", "https://w3id.org/vc-revocation-list-2020/v1", - "https://schema.inrupt.com/credentials/v1.jsonld"], + "https://schema.inrupt.com/credentials/v2.jsonld"], "id":"{{baseUrl}}/access-request-5", "type":["VerifiableCredential","SolidAccessRequest"], "issuer":"{{baseUrl}}", diff --git a/access-grant/src/test/resources/vc-configuration.json b/access-grant/src/test/resources/vc-configuration.json index 047e9646085..3f2e98b3f5a 100644 --- a/access-grant/src/test/resources/vc-configuration.json +++ b/access-grant/src/test/resources/vc-configuration.json @@ -1,7 +1,7 @@ { "@context": [ "https://www.w3.org/2018/credentials/v1", - "https://schema.inrupt.com/credentials/v1.jsonld" + "https://schema.inrupt.com/credentials/v2.jsonld" ], "derivationService": "{{baseUrl}}/derive", "issuerService": "{{baseUrl}}/issue", diff --git a/api/pom.xml b/api/pom.xml index 780f3d32292..9fed8f121ed 100644 --- a/api/pom.xml +++ b/api/pom.xml @@ -4,7 +4,7 @@ com.inrupt.client inrupt-client - 1.3.0-SNAPSHOT + 1.3.2-SNAPSHOT inrupt-client-api diff --git a/archetypes/java/pom.xml b/archetypes/java/pom.xml index 7fe08a29de9..d678bcdb809 100644 --- a/archetypes/java/pom.xml +++ b/archetypes/java/pom.xml @@ -3,7 +3,7 @@ com.inrupt.client inrupt-client-archetype-parent - 1.3.0-SNAPSHOT + 1.3.2-SNAPSHOT inrupt-client-archetype-java diff --git a/archetypes/pom.xml b/archetypes/pom.xml index 5f4ee039ee4..2232d65ed06 100644 --- a/archetypes/pom.xml +++ b/archetypes/pom.xml @@ -4,7 +4,7 @@ com.inrupt.client inrupt-client - 1.3.0-SNAPSHOT + 1.3.2-SNAPSHOT inrupt-client-archetype-parent @@ -17,16 +17,4 @@ java - - - - - org.owasp - dependency-check-maven - - true - - - - diff --git a/bom/pom.xml b/bom/pom.xml index b1ddab1462f..3e61488d83e 100644 --- a/bom/pom.xml +++ b/bom/pom.xml @@ -5,7 +5,7 @@ com.inrupt.client inrupt-client - 1.3.0-SNAPSHOT + 1.3.2-SNAPSHOT .. diff --git a/build-tools/owasp/suppressions.xml b/build-tools/owasp/suppressions.xml deleted file mode 100644 index 4330c57685d..00000000000 --- a/build-tools/owasp/suppressions.xml +++ /dev/null @@ -1,35 +0,0 @@ - - - - - - ^pkg:maven/com\.inrupt\.client/inrupt\-client\-openid@.*$ - cpe:/a:openid:openid - - - - - - ^pkg:javascript/DOMPurify@.*$ - CVE-2024-45801 - CVE-2024-47875 - - - - ^pkg:maven/org\.eclipse\.jetty/jetty-server@.*$ - CVE-2024-8184 - - - - ^pkg:maven/org\.springframework\..*@.*$ - CVE-2024-38828 - - diff --git a/caffeine/pom.xml b/caffeine/pom.xml index 0448d78dd93..9d14a2627c6 100644 --- a/caffeine/pom.xml +++ b/caffeine/pom.xml @@ -4,7 +4,7 @@ com.inrupt.client inrupt-client - 1.3.0-SNAPSHOT + 1.3.2-SNAPSHOT inrupt-client-caffeine diff --git a/core/pom.xml b/core/pom.xml index ce77f22e961..fe20fb805cb 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -4,7 +4,7 @@ com.inrupt.client inrupt-client - 1.3.0-SNAPSHOT + 1.3.2-SNAPSHOT inrupt-client-core diff --git a/examples/cli/pom.xml b/examples/cli/pom.xml index 7c4a24bca12..74d0712fd4a 100644 --- a/examples/cli/pom.xml +++ b/examples/cli/pom.xml @@ -5,11 +5,11 @@ com.inrupt.client inrupt-client-examples-parent - 1.3.0-SNAPSHOT + 1.3.2-SNAPSHOT inrupt-client-examples-cli - 1.3.0-SNAPSHOT + 1.3.2-SNAPSHOT Inrupt Java Client Libraries - CLI Example Sample CLI application. @@ -18,7 +18,7 @@ 17 - 3.17.3 + 3.38.1 diff --git a/examples/pom.xml b/examples/pom.xml index b947656130f..a709e3b16d7 100644 --- a/examples/pom.xml +++ b/examples/pom.xml @@ -4,7 +4,7 @@ com.inrupt.client inrupt-client - 1.3.0-SNAPSHOT + 1.3.2-SNAPSHOT inrupt-client-examples-parent @@ -16,14 +16,6 @@ - - org.owasp - dependency-check-maven - ${owasp.plugin.version} - - true - - org.apache.maven.plugins maven-deploy-plugin diff --git a/examples/spring-web/pom.xml b/examples/spring-web/pom.xml index 7b874f11468..244aa27a627 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.3.0-SNAPSHOT + 1.3.2-SNAPSHOT inrupt-client-examples-spring-web - 1.3.0-SNAPSHOT + 1.3.2-SNAPSHOT Inrupt Java Client Libraries - SpringBoot WebApp Example Sample SpringBoot Web Application. @@ -17,7 +17,7 @@ 17 - 3.4.0 + 4.1.0 @@ -61,7 +61,7 @@ com.nimbusds nimbus-jose-jwt - 9.47 + 10.9.1 @@ -70,6 +70,16 @@ spring-boot-starter-test test + + org.springframework.boot + spring-boot-restclient + test + + + org.springframework.boot + spring-boot-resttestclient + test + org.springframework.security spring-security-test diff --git a/examples/spring-web/src/test/java/com/inrupt/client/examples/spring/web/WebApplicationTests.java b/examples/spring-web/src/test/java/com/inrupt/client/examples/spring/web/WebApplicationTests.java index 5122e166ddd..9ef19b1f93a 100644 --- a/examples/spring-web/src/test/java/com/inrupt/client/examples/spring/web/WebApplicationTests.java +++ b/examples/spring-web/src/test/java/com/inrupt/client/examples/spring/web/WebApplicationTests.java @@ -41,8 +41,9 @@ import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.resttestclient.TestRestTemplate; +import org.springframework.boot.resttestclient.autoconfigure.AutoConfigureTestRestTemplate; import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.boot.test.web.client.TestRestTemplate; import org.springframework.security.core.authority.AuthorityUtils; import org.springframework.security.oauth2.core.oidc.OidcIdToken; import org.springframework.security.oauth2.core.oidc.user.DefaultOidcUser; @@ -50,6 +51,7 @@ @SpringBootTest( webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT, classes = WebApplication.class) +@AutoConfigureTestRestTemplate class WebApplicationTests { static final MockWebServer mockServer = new MockWebServer(); diff --git a/examples/springboot/pom.xml b/examples/springboot/pom.xml index 44f0c70fbce..149e0812d21 100644 --- a/examples/springboot/pom.xml +++ b/examples/springboot/pom.xml @@ -5,11 +5,11 @@ com.inrupt.client inrupt-client-examples-parent - 1.3.0-SNAPSHOT + 1.3.2-SNAPSHOT inrupt-client-examples-springboot - 1.3.0-SNAPSHOT + 1.3.2-SNAPSHOT Inrupt Java Client Libraries - Spring Boot Example Sample Spring Boot application. @@ -17,7 +17,7 @@ 17 - 3.4.0 + 4.1.0 @@ -112,7 +112,7 @@ com.nimbusds nimbus-jose-jwt - 9.47 + 10.9.1 diff --git a/examples/webapp/pom.xml b/examples/webapp/pom.xml index 0217e20fe48..ef98f36be9f 100644 --- a/examples/webapp/pom.xml +++ b/examples/webapp/pom.xml @@ -5,11 +5,11 @@ com.inrupt.client inrupt-client-examples-parent - 1.3.0-SNAPSHOT + 1.3.2-SNAPSHOT inrupt-client-examples-webapp - 1.3.0-SNAPSHOT + 1.3.2-SNAPSHOT Inrupt Java Client Libraries - Quarkus Example Sample web application. @@ -18,7 +18,7 @@ 17 - 3.17.3 + 3.38.1 diff --git a/gradle/.gitignore b/gradle/.gitignore deleted file mode 100644 index 7f6823bcc0f..00000000000 --- a/gradle/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -.gradle -build/ diff --git a/gradle/build.gradle b/gradle/build.gradle deleted file mode 100644 index 9900fd60df6..00000000000 --- a/gradle/build.gradle +++ /dev/null @@ -1 +0,0 @@ -apply plugin: 'java-library' diff --git a/gradle/gradle.properties b/gradle/gradle.properties deleted file mode 100644 index 82841c381f6..00000000000 --- a/gradle/gradle.properties +++ /dev/null @@ -1,10 +0,0 @@ -org.gradle.jvmargs=-Xmx2048m -Dfile.encoding=UTF-8 -kotlin.code.style=official -# AndroidX package structure to make it clearer which packages are bundled with the -# Android operating system, and which are packaged with your app's APK -# https://developer.android.com/topic/libraries/support-library/androidx-rn -android.useAndroidX=true -# Enables namespacing of each library's R class so that its R class includes only the -# resources declared in the library itself and none from the library's dependencies, -# thereby reducing the size of the R class for that library -android.nonTransitiveRClass=true diff --git a/gradle/gradle/wrapper/gradle-wrapper.jar b/gradle/gradle/wrapper/gradle-wrapper.jar deleted file mode 100644 index e708b1c023e..00000000000 Binary files a/gradle/gradle/wrapper/gradle-wrapper.jar and /dev/null differ diff --git a/gradle/gradle/wrapper/gradle-wrapper.properties b/gradle/gradle/wrapper/gradle-wrapper.properties deleted file mode 100644 index ceee333a02f..00000000000 --- a/gradle/gradle/wrapper/gradle-wrapper.properties +++ /dev/null @@ -1,6 +0,0 @@ -#Mon Feb 13 10:50:37 CST 2023 -distributionBase=GRADLE_USER_HOME -distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip -distributionPath=wrapper/dists -zipStorePath=wrapper/dists -zipStoreBase=GRADLE_USER_HOME diff --git a/gradle/gradlew b/gradle/gradlew deleted file mode 100755 index 4f906e0c811..00000000000 --- a/gradle/gradlew +++ /dev/null @@ -1,185 +0,0 @@ -#!/usr/bin/env sh - -# -# Copyright 2015 the original author or authors. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# https://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# - -############################################################################## -## -## Gradle start up script for UN*X -## -############################################################################## - -# Attempt to set APP_HOME -# Resolve links: $0 may be a link -PRG="$0" -# Need this for relative symlinks. -while [ -h "$PRG" ] ; do - ls=`ls -ld "$PRG"` - link=`expr "$ls" : '.*-> \(.*\)$'` - if expr "$link" : '/.*' > /dev/null; then - PRG="$link" - else - PRG=`dirname "$PRG"`"/$link" - fi -done -SAVED="`pwd`" -cd "`dirname \"$PRG\"`/" >/dev/null -APP_HOME="`pwd -P`" -cd "$SAVED" >/dev/null - -APP_NAME="Gradle" -APP_BASE_NAME=`basename "$0"` - -# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' - -# Use the maximum available, or set MAX_FD != -1 to use that value. -MAX_FD="maximum" - -warn () { - echo "$*" -} - -die () { - echo - echo "$*" - echo - exit 1 -} - -# OS specific support (must be 'true' or 'false'). -cygwin=false -msys=false -darwin=false -nonstop=false -case "`uname`" in - CYGWIN* ) - cygwin=true - ;; - Darwin* ) - darwin=true - ;; - MINGW* ) - msys=true - ;; - NONSTOP* ) - nonstop=true - ;; -esac - -CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar - - -# Determine the Java command to use to start the JVM. -if [ -n "$JAVA_HOME" ] ; then - if [ -x "$JAVA_HOME/jre/sh/java" ] ; then - # IBM's JDK on AIX uses strange locations for the executables - JAVACMD="$JAVA_HOME/jre/sh/java" - else - JAVACMD="$JAVA_HOME/bin/java" - fi - if [ ! -x "$JAVACMD" ] ; then - die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME - -Please set the JAVA_HOME variable in your environment to match the -location of your Java installation." - fi -else - JAVACMD="java" - which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. - -Please set the JAVA_HOME variable in your environment to match the -location of your Java installation." -fi - -# Increase the maximum file descriptors if we can. -if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then - MAX_FD_LIMIT=`ulimit -H -n` - if [ $? -eq 0 ] ; then - if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then - MAX_FD="$MAX_FD_LIMIT" - fi - ulimit -n $MAX_FD - if [ $? -ne 0 ] ; then - warn "Could not set maximum file descriptor limit: $MAX_FD" - fi - else - warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" - fi -fi - -# For Darwin, add options to specify how the application appears in the dock -if $darwin; then - GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" -fi - -# For Cygwin or MSYS, switch paths to Windows format before running java -if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then - APP_HOME=`cygpath --path --mixed "$APP_HOME"` - CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` - - JAVACMD=`cygpath --unix "$JAVACMD"` - - # We build the pattern for arguments to be converted via cygpath - ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` - SEP="" - for dir in $ROOTDIRSRAW ; do - ROOTDIRS="$ROOTDIRS$SEP$dir" - SEP="|" - done - OURCYGPATTERN="(^($ROOTDIRS))" - # Add a user-defined pattern to the cygpath arguments - if [ "$GRADLE_CYGPATTERN" != "" ] ; then - OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" - fi - # Now convert the arguments - kludge to limit ourselves to /bin/sh - i=0 - for arg in "$@" ; do - CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` - CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option - - if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition - eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` - else - eval `echo args$i`="\"$arg\"" - fi - i=`expr $i + 1` - done - case $i in - 0) set -- ;; - 1) set -- "$args0" ;; - 2) set -- "$args0" "$args1" ;; - 3) set -- "$args0" "$args1" "$args2" ;; - 4) set -- "$args0" "$args1" "$args2" "$args3" ;; - 5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; - 6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; - 7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; - 8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; - 9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; - esac -fi - -# Escape application args -save () { - for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done - echo " " -} -APP_ARGS=`save "$@"` - -# Collect all arguments for the java command, following the shell quoting and substitution rules -eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS" - -exec "$JAVACMD" "$@" diff --git a/gradle/gradlew.bat b/gradle/gradlew.bat deleted file mode 100644 index ac1b06f9382..00000000000 --- a/gradle/gradlew.bat +++ /dev/null @@ -1,89 +0,0 @@ -@rem -@rem Copyright 2015 the original author or authors. -@rem -@rem Licensed under the Apache License, Version 2.0 (the "License"); -@rem you may not use this file except in compliance with the License. -@rem You may obtain a copy of the License at -@rem -@rem https://www.apache.org/licenses/LICENSE-2.0 -@rem -@rem Unless required by applicable law or agreed to in writing, software -@rem distributed under the License is distributed on an "AS IS" BASIS, -@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -@rem See the License for the specific language governing permissions and -@rem limitations under the License. -@rem - -@if "%DEBUG%" == "" @echo off -@rem ########################################################################## -@rem -@rem Gradle startup script for Windows -@rem -@rem ########################################################################## - -@rem Set local scope for the variables with windows NT shell -if "%OS%"=="Windows_NT" setlocal - -set DIRNAME=%~dp0 -if "%DIRNAME%" == "" set DIRNAME=. -set APP_BASE_NAME=%~n0 -set APP_HOME=%DIRNAME% - -@rem Resolve any "." and ".." in APP_HOME to make it shorter. -for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi - -@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" - -@rem Find java.exe -if defined JAVA_HOME goto findJavaFromJavaHome - -set JAVA_EXE=java.exe -%JAVA_EXE% -version >NUL 2>&1 -if "%ERRORLEVEL%" == "0" goto execute - -echo. -echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. - -goto fail - -:findJavaFromJavaHome -set JAVA_HOME=%JAVA_HOME:"=% -set JAVA_EXE=%JAVA_HOME%/bin/java.exe - -if exist "%JAVA_EXE%" goto execute - -echo. -echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. - -goto fail - -:execute -@rem Setup the command line - -set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar - - -@rem Execute Gradle -"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* - -:end -@rem End local scope for the variables with windows NT shell -if "%ERRORLEVEL%"=="0" goto mainEnd - -:fail -rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of -rem the _cmd.exe /c_ return code! -if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 -exit /b 1 - -:mainEnd -if "%OS%"=="Windows_NT" endlocal - -:omega diff --git a/gradle/pom.xml b/gradle/pom.xml deleted file mode 100644 index f4a79a03eb1..00000000000 --- a/gradle/pom.xml +++ /dev/null @@ -1,100 +0,0 @@ - - - 4.0.0 - - com.inrupt.client - inrupt-client - 1.3.0-SNAPSHOT - - - inrupt-client-gradle - Inrupt Java Client Libraries - Gradle Examples - - Gradle-based code to work with the Inrupt Java Client Libraries. - - pom - - - ./gradlew - build - false - - - - - windows - - - windows - - - - gradlew.bat - - - - maven.test.skip - - - maven.test.skip - true - - - - assemble - - - - skipTests - - - skipTests - true - - - - assemble - - - - - - - - org.apache.maven.plugins - maven-deploy-plugin - - true - - - - org.codehaus.mojo - exec-maven-plugin - ${exec.plugin.version} - - - gradle - prepare-package - - ${gradle.executable} - - clean - ${gradle.task} - -Dmaven.repo.local=${settings.localRepository} - --no-daemon - - - ${env.MAVEN_OPTS} - - ${skip.gradle.build} - - - exec - - - - - - - - diff --git a/gradle/settings.gradle b/gradle/settings.gradle deleted file mode 100644 index 77cff90fbcb..00000000000 --- a/gradle/settings.gradle +++ /dev/null @@ -1,22 +0,0 @@ -pluginManagement { - repositories { - google() - mavenCentral() - gradlePluginPortal() - } -} - -plugins { - id "com.gradle.enterprise" version "3.18.2" -} - -dependencyResolutionManagement { - repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS) - repositories { - google() - mavenCentral() - mavenLocal() - } -} - -rootProject.name = "inrupt-gradle-app" diff --git a/guava/pom.xml b/guava/pom.xml index 1b7a23e8dc7..a11cc9f99ae 100644 --- a/guava/pom.xml +++ b/guava/pom.xml @@ -4,7 +4,7 @@ com.inrupt.client inrupt-client - 1.3.0-SNAPSHOT + 1.3.2-SNAPSHOT inrupt-client-guava diff --git a/httpclient/pom.xml b/httpclient/pom.xml index 80738ff0164..60035af3688 100644 --- a/httpclient/pom.xml +++ b/httpclient/pom.xml @@ -4,7 +4,7 @@ com.inrupt.client inrupt-client - 1.3.0-SNAPSHOT + 1.3.2-SNAPSHOT inrupt-client-httpclient diff --git a/integration/base/pom.xml b/integration/base/pom.xml index c242572f869..b30a37080cf 100644 --- a/integration/base/pom.xml +++ b/integration/base/pom.xml @@ -4,7 +4,7 @@ com.inrupt.client inrupt-client-integration-tests - 1.3.0-SNAPSHOT + 1.3.2-SNAPSHOT inrupt-client-integration-base-tests Inrupt Java Client Libraries - Integration Base Tests @@ -14,9 +14,20 @@ 2.1.1 - 3.10.2 + + + + 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 diff --git a/integration/openid/pom.xml b/integration/openid/pom.xml index 3f2fbcc78e5..dcfab86d50d 100644 --- a/integration/openid/pom.xml +++ b/integration/openid/pom.xml @@ -4,7 +4,7 @@ com.inrupt.client inrupt-client-integration-tests - 1.3.0-SNAPSHOT + 1.3.2-SNAPSHOT inrupt-client-integration-openid-tests diff --git a/integration/pom.xml b/integration/pom.xml index 40f3229d021..2701d8bf6d3 100644 --- a/integration/pom.xml +++ b/integration/pom.xml @@ -4,7 +4,7 @@ com.inrupt.client inrupt-client - 1.3.0-SNAPSHOT + 1.3.2-SNAPSHOT inrupt-client-integration-tests diff --git a/integration/uma/pom.xml b/integration/uma/pom.xml index fad8d7f9e71..fd3c58867d7 100644 --- a/integration/uma/pom.xml +++ b/integration/uma/pom.xml @@ -4,7 +4,7 @@ com.inrupt.client inrupt-client-integration-tests - 1.3.0-SNAPSHOT + 1.3.2-SNAPSHOT inrupt-client-integration-uma-tests diff --git a/jackson/pom.xml b/jackson/pom.xml index 9e163d96b60..2690ac56fad 100644 --- a/jackson/pom.xml +++ b/jackson/pom.xml @@ -4,7 +4,7 @@ com.inrupt.client inrupt-client - 1.3.0-SNAPSHOT + 1.3.2-SNAPSHOT inrupt-client-jackson diff --git a/jena/pom.xml b/jena/pom.xml index a0735a57d4a..932f0f6f2c0 100644 --- a/jena/pom.xml +++ b/jena/pom.xml @@ -4,7 +4,7 @@ com.inrupt.client inrupt-client - 1.3.0-SNAPSHOT + 1.3.2-SNAPSHOT inrupt-client-jena diff --git a/jsonb/pom.xml b/jsonb/pom.xml index f1c6e658e75..155f2aaa249 100644 --- a/jsonb/pom.xml +++ b/jsonb/pom.xml @@ -4,7 +4,7 @@ com.inrupt.client inrupt-client - 1.3.0-SNAPSHOT + 1.3.2-SNAPSHOT inrupt-client-jsonb diff --git a/mvnw b/mvnw index 8d937f4c14f..bd8896bf221 100755 --- a/mvnw +++ b/mvnw @@ -19,290 +19,277 @@ # ---------------------------------------------------------------------------- # ---------------------------------------------------------------------------- -# Apache Maven Wrapper startup batch script, version 3.2.0 -# -# Required ENV vars: -# ------------------ -# JAVA_HOME - location of a JDK home dir +# Apache Maven Wrapper startup batch script, version 3.3.4 # # Optional ENV vars # ----------------- -# MAVEN_OPTS - parameters passed to the Java VM when running Maven -# e.g. to debug Maven itself, use -# set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000 -# MAVEN_SKIP_RC - flag to disable loading of mavenrc files +# JAVA_HOME - location of a JDK home dir, required when download maven via java source +# MVNW_REPOURL - repo url base for downloading maven distribution +# MVNW_USERNAME/MVNW_PASSWORD - user and password for downloading maven +# MVNW_VERBOSE - true: enable verbose log; debug: trace the mvnw script; others: silence the output # ---------------------------------------------------------------------------- -if [ -z "$MAVEN_SKIP_RC" ] ; then - - if [ -f /usr/local/etc/mavenrc ] ; then - . /usr/local/etc/mavenrc - fi - - if [ -f /etc/mavenrc ] ; then - . /etc/mavenrc - fi - - if [ -f "$HOME/.mavenrc" ] ; then - . "$HOME/.mavenrc" - fi +set -euf +[ "${MVNW_VERBOSE-}" != debug ] || set -x -fi - -# OS specific support. $var _must_ be set to either true or false. -cygwin=false; -darwin=false; -mingw=false +# OS specific support. +native_path() { printf %s\\n "$1"; } case "$(uname)" in - CYGWIN*) cygwin=true ;; - MINGW*) mingw=true;; - Darwin*) darwin=true - # Use /usr/libexec/java_home if available, otherwise fall back to /Library/Java/Home - # See https://developer.apple.com/library/mac/qa/qa1170/_index.html - if [ -z "$JAVA_HOME" ]; then - if [ -x "/usr/libexec/java_home" ]; then - JAVA_HOME="$(/usr/libexec/java_home)"; export JAVA_HOME - else - JAVA_HOME="/Library/Java/Home"; export JAVA_HOME - fi - fi - ;; +CYGWIN* | MINGW*) + [ -z "${JAVA_HOME-}" ] || JAVA_HOME="$(cygpath --unix "$JAVA_HOME")" + native_path() { cygpath --path --windows "$1"; } + ;; esac -if [ -z "$JAVA_HOME" ] ; then - if [ -r /etc/gentoo-release ] ; then - JAVA_HOME=$(java-config --jre-home) - fi -fi - -# For Cygwin, ensure paths are in UNIX format before anything is touched -if $cygwin ; then - [ -n "$JAVA_HOME" ] && - JAVA_HOME=$(cygpath --unix "$JAVA_HOME") - [ -n "$CLASSPATH" ] && - CLASSPATH=$(cygpath --path --unix "$CLASSPATH") -fi - -# For Mingw, ensure paths are in UNIX format before anything is touched -if $mingw ; then - [ -n "$JAVA_HOME" ] && [ -d "$JAVA_HOME" ] && - JAVA_HOME="$(cd "$JAVA_HOME" || (echo "cannot cd into $JAVA_HOME."; exit 1); pwd)" -fi - -if [ -z "$JAVA_HOME" ]; then - javaExecutable="$(which javac)" - if [ -n "$javaExecutable" ] && ! [ "$(expr "\"$javaExecutable\"" : '\([^ ]*\)')" = "no" ]; then - # readlink(1) is not available as standard on Solaris 10. - readLink=$(which readlink) - if [ ! "$(expr "$readLink" : '\([^ ]*\)')" = "no" ]; then - if $darwin ; then - javaHome="$(dirname "\"$javaExecutable\"")" - javaExecutable="$(cd "\"$javaHome\"" && pwd -P)/javac" - else - javaExecutable="$(readlink -f "\"$javaExecutable\"")" - fi - javaHome="$(dirname "\"$javaExecutable\"")" - javaHome=$(expr "$javaHome" : '\(.*\)/bin') - JAVA_HOME="$javaHome" - export JAVA_HOME - fi - fi -fi - -if [ -z "$JAVACMD" ] ; then - if [ -n "$JAVA_HOME" ] ; then - if [ -x "$JAVA_HOME/jre/sh/java" ] ; then +# set JAVACMD and JAVACCMD +set_java_home() { + # For Cygwin and MinGW, ensure paths are in Unix format before anything is touched + if [ -n "${JAVA_HOME-}" ]; then + if [ -x "$JAVA_HOME/jre/sh/java" ]; then # IBM's JDK on AIX uses strange locations for the executables JAVACMD="$JAVA_HOME/jre/sh/java" + JAVACCMD="$JAVA_HOME/jre/sh/javac" else JAVACMD="$JAVA_HOME/bin/java" + JAVACCMD="$JAVA_HOME/bin/javac" + + if [ ! -x "$JAVACMD" ] || [ ! -x "$JAVACCMD" ]; then + echo "The JAVA_HOME environment variable is not defined correctly, so mvnw cannot run." >&2 + echo "JAVA_HOME is set to \"$JAVA_HOME\", but \"\$JAVA_HOME/bin/java\" or \"\$JAVA_HOME/bin/javac\" does not exist." >&2 + return 1 + fi fi else - JAVACMD="$(\unset -f command 2>/dev/null; \command -v java)" - fi -fi + JAVACMD="$( + 'set' +e + 'unset' -f command 2>/dev/null + 'command' -v java + )" || : + JAVACCMD="$( + 'set' +e + 'unset' -f command 2>/dev/null + 'command' -v javac + )" || : -if [ ! -x "$JAVACMD" ] ; then - echo "Error: JAVA_HOME is not defined correctly." >&2 - echo " We cannot execute $JAVACMD" >&2 - exit 1 -fi - -if [ -z "$JAVA_HOME" ] ; then - echo "Warning: JAVA_HOME environment variable is not set." -fi - -# traverses directory structure from process work directory to filesystem root -# first directory with .mvn subdirectory is considered project base directory -find_maven_basedir() { - if [ -z "$1" ] - then - echo "Path not specified to find_maven_basedir" - return 1 + if [ ! -x "${JAVACMD-}" ] || [ ! -x "${JAVACCMD-}" ]; then + echo "The java/javac command does not exist in PATH nor is JAVA_HOME set, so mvnw cannot run." >&2 + return 1 + fi fi +} - basedir="$1" - wdir="$1" - while [ "$wdir" != '/' ] ; do - if [ -d "$wdir"/.mvn ] ; then - basedir=$wdir - break - fi - # workaround for JBEAP-8937 (on Solaris 10/Sparc) - if [ -d "${wdir}" ]; then - wdir=$(cd "$wdir/.." || exit 1; pwd) - fi - # end of workaround +# hash string like Java String::hashCode +hash_string() { + str="${1:-}" h=0 + while [ -n "$str" ]; do + char="${str%"${str#?}"}" + h=$(((h * 31 + $(LC_CTYPE=C printf %d "'$char")) % 4294967296)) + str="${str#?}" done - printf '%s' "$(cd "$basedir" || exit 1; pwd)" + printf %x\\n $h } -# concatenates all lines of a file -concat_lines() { - if [ -f "$1" ]; then - # Remove \r in case we run on Windows within Git Bash - # and check out the repository with auto CRLF management - # enabled. Otherwise, we may read lines that are delimited with - # \r\n and produce $'-Xarg\r' rather than -Xarg due to word - # splitting rules. - tr -s '\r\n' ' ' < "$1" - fi +verbose() { :; } +[ "${MVNW_VERBOSE-}" != true ] || verbose() { printf %s\\n "${1-}"; } + +die() { + printf %s\\n "$1" >&2 + exit 1 } -log() { - if [ "$MVNW_VERBOSE" = true ]; then - printf '%s\n' "$1" - fi +trim() { + # MWRAPPER-139: + # Trims trailing and leading whitespace, carriage returns, tabs, and linefeeds. + # Needed for removing poorly interpreted newline sequences when running in more + # exotic environments such as mingw bash on Windows. + printf "%s" "${1}" | tr -d '[:space:]' +} + +scriptDir="$(dirname "$0")" +scriptName="$(basename "$0")" + +# parse distributionUrl and optional distributionSha256Sum, requires .mvn/wrapper/maven-wrapper.properties +while IFS="=" read -r key value; do + case "${key-}" in + distributionUrl) distributionUrl=$(trim "${value-}") ;; + distributionSha256Sum) distributionSha256Sum=$(trim "${value-}") ;; + esac +done <"$scriptDir/.mvn/wrapper/maven-wrapper.properties" +[ -n "${distributionUrl-}" ] || die "cannot read distributionUrl property in $scriptDir/.mvn/wrapper/maven-wrapper.properties" + +case "${distributionUrl##*/}" in +maven-mvnd-*bin.*) + MVN_CMD=mvnd.sh _MVNW_REPO_PATTERN=/maven/mvnd/ + case "${PROCESSOR_ARCHITECTURE-}${PROCESSOR_ARCHITEW6432-}:$(uname -a)" in + *AMD64:CYGWIN* | *AMD64:MINGW*) distributionPlatform=windows-amd64 ;; + :Darwin*x86_64) distributionPlatform=darwin-amd64 ;; + :Darwin*arm64) distributionPlatform=darwin-aarch64 ;; + :Linux*x86_64*) distributionPlatform=linux-amd64 ;; + *) + echo "Cannot detect native platform for mvnd on $(uname)-$(uname -m), use pure java version" >&2 + distributionPlatform=linux-amd64 + ;; + esac + distributionUrl="${distributionUrl%-bin.*}-$distributionPlatform.zip" + ;; +maven-mvnd-*) MVN_CMD=mvnd.sh _MVNW_REPO_PATTERN=/maven/mvnd/ ;; +*) MVN_CMD="mvn${scriptName#mvnw}" _MVNW_REPO_PATTERN=/org/apache/maven/ ;; +esac + +# apply MVNW_REPOURL and calculate MAVEN_HOME +# maven home pattern: ~/.m2/wrapper/dists/{apache-maven-,maven-mvnd--}/ +[ -z "${MVNW_REPOURL-}" ] || distributionUrl="$MVNW_REPOURL$_MVNW_REPO_PATTERN${distributionUrl#*"$_MVNW_REPO_PATTERN"}" +distributionUrlName="${distributionUrl##*/}" +distributionUrlNameMain="${distributionUrlName%.*}" +distributionUrlNameMain="${distributionUrlNameMain%-bin}" +MAVEN_USER_HOME="${MAVEN_USER_HOME:-${HOME}/.m2}" +MAVEN_HOME="${MAVEN_USER_HOME}/wrapper/dists/${distributionUrlNameMain-}/$(hash_string "$distributionUrl")" + +exec_maven() { + unset MVNW_VERBOSE MVNW_USERNAME MVNW_PASSWORD MVNW_REPOURL || : + exec "$MAVEN_HOME/bin/$MVN_CMD" "$@" || die "cannot exec $MAVEN_HOME/bin/$MVN_CMD" } -BASE_DIR=$(find_maven_basedir "$(dirname "$0")") -if [ -z "$BASE_DIR" ]; then - exit 1; +if [ -d "$MAVEN_HOME" ]; then + verbose "found existing MAVEN_HOME at $MAVEN_HOME" + exec_maven "$@" fi -MAVEN_PROJECTBASEDIR=${MAVEN_BASEDIR:-"$BASE_DIR"}; export MAVEN_PROJECTBASEDIR -log "$MAVEN_PROJECTBASEDIR" +case "${distributionUrl-}" in +*?-bin.zip | *?maven-mvnd-?*-?*.zip) ;; +*) die "distributionUrl is not valid, must match *-bin.zip or maven-mvnd-*.zip, but found '${distributionUrl-}'" ;; +esac -########################################################################################## -# Extension to allow automatically downloading the maven-wrapper.jar from Maven-central -# This allows using the maven wrapper in projects that prohibit checking in binary data. -########################################################################################## -wrapperJarPath="$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.jar" -if [ -r "$wrapperJarPath" ]; then - log "Found $wrapperJarPath" +# prepare tmp dir +if TMP_DOWNLOAD_DIR="$(mktemp -d)" && [ -d "$TMP_DOWNLOAD_DIR" ]; then + clean() { rm -rf -- "$TMP_DOWNLOAD_DIR"; } + trap clean HUP INT TERM EXIT else - log "Couldn't find $wrapperJarPath, downloading it ..." + die "cannot create temp dir" +fi - if [ -n "$MVNW_REPOURL" ]; then - wrapperUrl="$MVNW_REPOURL/org/apache/maven/wrapper/maven-wrapper/3.2.0/maven-wrapper-3.2.0.jar" - else - wrapperUrl="https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.2.0/maven-wrapper-3.2.0.jar" - fi - while IFS="=" read -r key value; do - # Remove '\r' from value to allow usage on windows as IFS does not consider '\r' as a separator ( considers space, tab, new line ('\n'), and custom '=' ) - safeValue=$(echo "$value" | tr -d '\r') - case "$key" in (wrapperUrl) wrapperUrl="$safeValue"; break ;; - esac - done < "$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.properties" - log "Downloading from: $wrapperUrl" - - if $cygwin; then - wrapperJarPath=$(cygpath --path --windows "$wrapperJarPath") - fi +mkdir -p -- "${MAVEN_HOME%/*}" - if command -v wget > /dev/null; then - log "Found wget ... using wget" - [ "$MVNW_VERBOSE" = true ] && QUIET="" || QUIET="--quiet" - if [ -z "$MVNW_USERNAME" ] || [ -z "$MVNW_PASSWORD" ]; then - wget $QUIET "$wrapperUrl" -O "$wrapperJarPath" || rm -f "$wrapperJarPath" - else - wget $QUIET --http-user="$MVNW_USERNAME" --http-password="$MVNW_PASSWORD" "$wrapperUrl" -O "$wrapperJarPath" || rm -f "$wrapperJarPath" - fi - elif command -v curl > /dev/null; then - log "Found curl ... using curl" - [ "$MVNW_VERBOSE" = true ] && QUIET="" || QUIET="--silent" - if [ -z "$MVNW_USERNAME" ] || [ -z "$MVNW_PASSWORD" ]; then - curl $QUIET -o "$wrapperJarPath" "$wrapperUrl" -f -L || rm -f "$wrapperJarPath" - else - curl $QUIET --user "$MVNW_USERNAME:$MVNW_PASSWORD" -o "$wrapperJarPath" "$wrapperUrl" -f -L || rm -f "$wrapperJarPath" - fi - else - log "Falling back to using Java to download" - javaSource="$MAVEN_PROJECTBASEDIR/.mvn/wrapper/MavenWrapperDownloader.java" - javaClass="$MAVEN_PROJECTBASEDIR/.mvn/wrapper/MavenWrapperDownloader.class" - # For Cygwin, switch paths to Windows format before running javac - if $cygwin; then - javaSource=$(cygpath --path --windows "$javaSource") - javaClass=$(cygpath --path --windows "$javaClass") - fi - if [ -e "$javaSource" ]; then - if [ ! -e "$javaClass" ]; then - log " - Compiling MavenWrapperDownloader.java ..." - ("$JAVA_HOME/bin/javac" "$javaSource") - fi - if [ -e "$javaClass" ]; then - log " - Running MavenWrapperDownloader.java ..." - ("$JAVA_HOME/bin/java" -cp .mvn/wrapper MavenWrapperDownloader "$wrapperUrl" "$wrapperJarPath") || rm -f "$wrapperJarPath" - fi - fi - fi +# Download and Install Apache Maven +verbose "Couldn't find MAVEN_HOME, downloading and installing it ..." +verbose "Downloading from: $distributionUrl" +verbose "Downloading to: $TMP_DOWNLOAD_DIR/$distributionUrlName" + +# select .zip or .tar.gz +if ! command -v unzip >/dev/null; then + distributionUrl="${distributionUrl%.zip}.tar.gz" + distributionUrlName="${distributionUrl##*/}" fi -########################################################################################## -# End of extension -########################################################################################## -# If specified, validate the SHA-256 sum of the Maven wrapper jar file -wrapperSha256Sum="" -while IFS="=" read -r key value; do - case "$key" in (wrapperSha256Sum) wrapperSha256Sum=$value; break ;; - esac -done < "$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.properties" -if [ -n "$wrapperSha256Sum" ]; then - wrapperSha256Result=false - if command -v sha256sum > /dev/null; then - if echo "$wrapperSha256Sum $wrapperJarPath" | sha256sum -c > /dev/null 2>&1; then - wrapperSha256Result=true +# verbose opt +__MVNW_QUIET_WGET=--quiet __MVNW_QUIET_CURL=--silent __MVNW_QUIET_UNZIP=-q __MVNW_QUIET_TAR='' +[ "${MVNW_VERBOSE-}" != true ] || __MVNW_QUIET_WGET='' __MVNW_QUIET_CURL='' __MVNW_QUIET_UNZIP='' __MVNW_QUIET_TAR=v + +# normalize http auth +case "${MVNW_PASSWORD:+has-password}" in +'') MVNW_USERNAME='' MVNW_PASSWORD='' ;; +has-password) [ -n "${MVNW_USERNAME-}" ] || MVNW_USERNAME='' MVNW_PASSWORD='' ;; +esac + +if [ -z "${MVNW_USERNAME-}" ] && command -v wget >/dev/null; then + verbose "Found wget ... using wget" + wget ${__MVNW_QUIET_WGET:+"$__MVNW_QUIET_WGET"} "$distributionUrl" -O "$TMP_DOWNLOAD_DIR/$distributionUrlName" || die "wget: Failed to fetch $distributionUrl" +elif [ -z "${MVNW_USERNAME-}" ] && command -v curl >/dev/null; then + verbose "Found curl ... using curl" + curl ${__MVNW_QUIET_CURL:+"$__MVNW_QUIET_CURL"} -f -L -o "$TMP_DOWNLOAD_DIR/$distributionUrlName" "$distributionUrl" || die "curl: Failed to fetch $distributionUrl" +elif set_java_home; then + verbose "Falling back to use Java to download" + javaSource="$TMP_DOWNLOAD_DIR/Downloader.java" + targetZip="$TMP_DOWNLOAD_DIR/$distributionUrlName" + cat >"$javaSource" <<-END + public class Downloader extends java.net.Authenticator + { + protected java.net.PasswordAuthentication getPasswordAuthentication() + { + return new java.net.PasswordAuthentication( System.getenv( "MVNW_USERNAME" ), System.getenv( "MVNW_PASSWORD" ).toCharArray() ); + } + public static void main( String[] args ) throws Exception + { + setDefault( new Downloader() ); + java.nio.file.Files.copy( java.net.URI.create( args[0] ).toURL().openStream(), java.nio.file.Paths.get( args[1] ).toAbsolutePath().normalize() ); + } + } + END + # For Cygwin/MinGW, switch paths to Windows format before running javac and java + verbose " - Compiling Downloader.java ..." + "$(native_path "$JAVACCMD")" "$(native_path "$javaSource")" || die "Failed to compile Downloader.java" + verbose " - Running Downloader.java ..." + "$(native_path "$JAVACMD")" -cp "$(native_path "$TMP_DOWNLOAD_DIR")" Downloader "$distributionUrl" "$(native_path "$targetZip")" +fi + +# If specified, validate the SHA-256 sum of the Maven distribution zip file +if [ -n "${distributionSha256Sum-}" ]; then + distributionSha256Result=false + if [ "$MVN_CMD" = mvnd.sh ]; then + echo "Checksum validation is not supported for maven-mvnd." >&2 + echo "Please disable validation by removing 'distributionSha256Sum' from your maven-wrapper.properties." >&2 + exit 1 + elif command -v sha256sum >/dev/null; then + if echo "$distributionSha256Sum $TMP_DOWNLOAD_DIR/$distributionUrlName" | sha256sum -c - >/dev/null 2>&1; then + distributionSha256Result=true fi - elif command -v shasum > /dev/null; then - if echo "$wrapperSha256Sum $wrapperJarPath" | shasum -a 256 -c > /dev/null 2>&1; then - wrapperSha256Result=true + elif command -v shasum >/dev/null; then + if echo "$distributionSha256Sum $TMP_DOWNLOAD_DIR/$distributionUrlName" | shasum -a 256 -c >/dev/null 2>&1; then + distributionSha256Result=true fi else - echo "Checksum validation was requested but neither 'sha256sum' or 'shasum' are available." - echo "Please install either command, or disable validation by removing 'wrapperSha256Sum' from your maven-wrapper.properties." + echo "Checksum validation was requested but neither 'sha256sum' or 'shasum' are available." >&2 + echo "Please install either command, or disable validation by removing 'distributionSha256Sum' from your maven-wrapper.properties." >&2 exit 1 fi - if [ $wrapperSha256Result = false ]; then - echo "Error: Failed to validate Maven wrapper SHA-256, your Maven wrapper might be compromised." >&2 - echo "Investigate or delete $wrapperJarPath to attempt a clean download." >&2 - echo "If you updated your Maven version, you need to update the specified wrapperSha256Sum property." >&2 + if [ $distributionSha256Result = false ]; then + echo "Error: Failed to validate Maven distribution SHA-256, your Maven distribution might be compromised." >&2 + echo "If you updated your Maven version, you need to update the specified distributionSha256Sum property." >&2 exit 1 fi fi -MAVEN_OPTS="$(concat_lines "$MAVEN_PROJECTBASEDIR/.mvn/jvm.config") $MAVEN_OPTS" +# unzip and move +if command -v unzip >/dev/null; then + unzip ${__MVNW_QUIET_UNZIP:+"$__MVNW_QUIET_UNZIP"} "$TMP_DOWNLOAD_DIR/$distributionUrlName" -d "$TMP_DOWNLOAD_DIR" || die "failed to unzip" +else + tar xzf${__MVNW_QUIET_TAR:+"$__MVNW_QUIET_TAR"} "$TMP_DOWNLOAD_DIR/$distributionUrlName" -C "$TMP_DOWNLOAD_DIR" || die "failed to untar" +fi + +# Find the actual extracted directory name (handles snapshots where filename != directory name) +actualDistributionDir="" -# For Cygwin, switch paths to Windows format before running java -if $cygwin; then - [ -n "$JAVA_HOME" ] && - JAVA_HOME=$(cygpath --path --windows "$JAVA_HOME") - [ -n "$CLASSPATH" ] && - CLASSPATH=$(cygpath --path --windows "$CLASSPATH") - [ -n "$MAVEN_PROJECTBASEDIR" ] && - MAVEN_PROJECTBASEDIR=$(cygpath --path --windows "$MAVEN_PROJECTBASEDIR") +# First try the expected directory name (for regular distributions) +if [ -d "$TMP_DOWNLOAD_DIR/$distributionUrlNameMain" ]; then + if [ -f "$TMP_DOWNLOAD_DIR/$distributionUrlNameMain/bin/$MVN_CMD" ]; then + actualDistributionDir="$distributionUrlNameMain" + fi fi -# Provide a "standardized" way to retrieve the CLI args that will -# work with both Windows and non-Windows executions. -MAVEN_CMD_LINE_ARGS="$MAVEN_CONFIG $*" -export MAVEN_CMD_LINE_ARGS +# If not found, search for any directory with the Maven executable (for snapshots) +if [ -z "$actualDistributionDir" ]; then + # enable globbing to iterate over items + set +f + for dir in "$TMP_DOWNLOAD_DIR"/*; do + if [ -d "$dir" ]; then + if [ -f "$dir/bin/$MVN_CMD" ]; then + actualDistributionDir="$(basename "$dir")" + break + fi + fi + done + set -f +fi + +if [ -z "$actualDistributionDir" ]; then + verbose "Contents of $TMP_DOWNLOAD_DIR:" + verbose "$(ls -la "$TMP_DOWNLOAD_DIR")" + die "Could not find Maven distribution directory in extracted archive" +fi -WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain +verbose "Found extracted Maven distribution directory: $actualDistributionDir" +printf %s\\n "$distributionUrl" >"$TMP_DOWNLOAD_DIR/$actualDistributionDir/mvnw.url" +mv -- "$TMP_DOWNLOAD_DIR/$actualDistributionDir" "$MAVEN_HOME" || [ -d "$MAVEN_HOME" ] || die "fail to move MAVEN_HOME" -# shellcheck disable=SC2086 # safe args -exec "$JAVACMD" \ - $MAVEN_OPTS \ - $MAVEN_DEBUG_OPTS \ - -classpath "$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.jar" \ - "-Dmaven.multiModuleProjectDirectory=${MAVEN_PROJECTBASEDIR}" \ - ${WRAPPER_LAUNCHER} $MAVEN_CONFIG "$@" +clean || : +exec_maven "$@" diff --git a/mvnw.cmd b/mvnw.cmd index f80fbad3e76..5761d948924 100644 --- a/mvnw.cmd +++ b/mvnw.cmd @@ -1,3 +1,4 @@ +<# : batch portion @REM ---------------------------------------------------------------------------- @REM Licensed to the Apache Software Foundation (ASF) under one @REM or more contributor license agreements. See the NOTICE file @@ -18,188 +19,171 @@ @REM ---------------------------------------------------------------------------- @REM ---------------------------------------------------------------------------- -@REM Apache Maven Wrapper startup batch script, version 3.2.0 -@REM -@REM Required ENV vars: -@REM JAVA_HOME - location of a JDK home dir +@REM Apache Maven Wrapper startup batch script, version 3.3.4 @REM @REM Optional ENV vars -@REM MAVEN_BATCH_ECHO - set to 'on' to enable the echoing of the batch commands -@REM MAVEN_BATCH_PAUSE - set to 'on' to wait for a keystroke before ending -@REM MAVEN_OPTS - parameters passed to the Java VM when running Maven -@REM e.g. to debug Maven itself, use -@REM set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000 -@REM MAVEN_SKIP_RC - flag to disable loading of mavenrc files +@REM MVNW_REPOURL - repo url base for downloading maven distribution +@REM MVNW_USERNAME/MVNW_PASSWORD - user and password for downloading maven +@REM MVNW_VERBOSE - true: enable verbose log; others: silence the output @REM ---------------------------------------------------------------------------- -@REM Begin all REM lines with '@' in case MAVEN_BATCH_ECHO is 'on' -@echo off -@REM set title of command window -title %0 -@REM enable echoing by setting MAVEN_BATCH_ECHO to 'on' -@if "%MAVEN_BATCH_ECHO%" == "on" echo %MAVEN_BATCH_ECHO% - -@REM set %HOME% to equivalent of $HOME -if "%HOME%" == "" (set "HOME=%HOMEDRIVE%%HOMEPATH%") - -@REM Execute a user defined script before this one -if not "%MAVEN_SKIP_RC%" == "" goto skipRcPre -@REM check for pre script, once with legacy .bat ending and once with .cmd ending -if exist "%USERPROFILE%\mavenrc_pre.bat" call "%USERPROFILE%\mavenrc_pre.bat" %* -if exist "%USERPROFILE%\mavenrc_pre.cmd" call "%USERPROFILE%\mavenrc_pre.cmd" %* -:skipRcPre - -@setlocal - -set ERROR_CODE=0 - -@REM To isolate internal variables from possible post scripts, we use another setlocal -@setlocal - -@REM ==== START VALIDATION ==== -if not "%JAVA_HOME%" == "" goto OkJHome - -echo. -echo Error: JAVA_HOME not found in your environment. >&2 -echo Please set the JAVA_HOME variable in your environment to match the >&2 -echo location of your Java installation. >&2 -echo. -goto error - -:OkJHome -if exist "%JAVA_HOME%\bin\java.exe" goto init - -echo. -echo Error: JAVA_HOME is set to an invalid directory. >&2 -echo JAVA_HOME = "%JAVA_HOME%" >&2 -echo Please set the JAVA_HOME variable in your environment to match the >&2 -echo location of your Java installation. >&2 -echo. -goto error - -@REM ==== END VALIDATION ==== - -:init - -@REM Find the project base dir, i.e. the directory that contains the folder ".mvn". -@REM Fallback to current working directory if not found. - -set MAVEN_PROJECTBASEDIR=%MAVEN_BASEDIR% -IF NOT "%MAVEN_PROJECTBASEDIR%"=="" goto endDetectBaseDir - -set EXEC_DIR=%CD% -set WDIR=%EXEC_DIR% -:findBaseDir -IF EXIST "%WDIR%"\.mvn goto baseDirFound -cd .. -IF "%WDIR%"=="%CD%" goto baseDirNotFound -set WDIR=%CD% -goto findBaseDir - -:baseDirFound -set MAVEN_PROJECTBASEDIR=%WDIR% -cd "%EXEC_DIR%" -goto endDetectBaseDir - -:baseDirNotFound -set MAVEN_PROJECTBASEDIR=%EXEC_DIR% -cd "%EXEC_DIR%" - -:endDetectBaseDir - -IF NOT EXIST "%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config" goto endReadAdditionalConfig - -@setlocal EnableExtensions EnableDelayedExpansion -for /F "usebackq delims=" %%a in ("%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config") do set JVM_CONFIG_MAVEN_PROPS=!JVM_CONFIG_MAVEN_PROPS! %%a -@endlocal & set JVM_CONFIG_MAVEN_PROPS=%JVM_CONFIG_MAVEN_PROPS% - -:endReadAdditionalConfig - -SET MAVEN_JAVA_EXE="%JAVA_HOME%\bin\java.exe" -set WRAPPER_JAR="%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.jar" -set WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain - -set WRAPPER_URL="https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.2.0/maven-wrapper-3.2.0.jar" - -FOR /F "usebackq tokens=1,2 delims==" %%A IN ("%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.properties") DO ( - IF "%%A"=="wrapperUrl" SET WRAPPER_URL=%%B -) - -@REM Extension to allow automatically downloading the maven-wrapper.jar from Maven-central -@REM This allows using the maven wrapper in projects that prohibit checking in binary data. -if exist %WRAPPER_JAR% ( - if "%MVNW_VERBOSE%" == "true" ( - echo Found %WRAPPER_JAR% - ) -) else ( - if not "%MVNW_REPOURL%" == "" ( - SET WRAPPER_URL="%MVNW_REPOURL%/org/apache/maven/wrapper/maven-wrapper/3.2.0/maven-wrapper-3.2.0.jar" - ) - if "%MVNW_VERBOSE%" == "true" ( - echo Couldn't find %WRAPPER_JAR%, downloading it ... - echo Downloading from: %WRAPPER_URL% - ) - - powershell -Command "&{"^ - "$webclient = new-object System.Net.WebClient;"^ - "if (-not ([string]::IsNullOrEmpty('%MVNW_USERNAME%') -and [string]::IsNullOrEmpty('%MVNW_PASSWORD%'))) {"^ - "$webclient.Credentials = new-object System.Net.NetworkCredential('%MVNW_USERNAME%', '%MVNW_PASSWORD%');"^ - "}"^ - "[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; $webclient.DownloadFile('%WRAPPER_URL%', '%WRAPPER_JAR%')"^ - "}" - if "%MVNW_VERBOSE%" == "true" ( - echo Finished downloading %WRAPPER_JAR% - ) -) -@REM End of extension - -@REM If specified, validate the SHA-256 sum of the Maven wrapper jar file -SET WRAPPER_SHA_256_SUM="" -FOR /F "usebackq tokens=1,2 delims==" %%A IN ("%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.properties") DO ( - IF "%%A"=="wrapperSha256Sum" SET WRAPPER_SHA_256_SUM=%%B +@IF "%__MVNW_ARG0_NAME__%"=="" (SET __MVNW_ARG0_NAME__=%~nx0) +@SET __MVNW_CMD__= +@SET __MVNW_ERROR__= +@SET __MVNW_PSMODULEP_SAVE=%PSModulePath% +@SET PSModulePath= +@FOR /F "usebackq tokens=1* delims==" %%A IN (`powershell -noprofile "& {$scriptDir='%~dp0'; $script='%__MVNW_ARG0_NAME__%'; icm -ScriptBlock ([Scriptblock]::Create((Get-Content -Raw '%~f0'))) -NoNewScope}"`) DO @( + IF "%%A"=="MVN_CMD" (set __MVNW_CMD__=%%B) ELSE IF "%%B"=="" (echo %%A) ELSE (echo %%A=%%B) ) -IF NOT %WRAPPER_SHA_256_SUM%=="" ( - powershell -Command "&{"^ - "$hash = (Get-FileHash \"%WRAPPER_JAR%\" -Algorithm SHA256).Hash.ToLower();"^ - "If('%WRAPPER_SHA_256_SUM%' -ne $hash){"^ - " Write-Output 'Error: Failed to validate Maven wrapper SHA-256, your Maven wrapper might be compromised.';"^ - " Write-Output 'Investigate or delete %WRAPPER_JAR% to attempt a clean download.';"^ - " Write-Output 'If you updated your Maven version, you need to update the specified wrapperSha256Sum property.';"^ - " exit 1;"^ - "}"^ - "}" - if ERRORLEVEL 1 goto error -) - -@REM Provide a "standardized" way to retrieve the CLI args that will -@REM work with both Windows and non-Windows executions. -set MAVEN_CMD_LINE_ARGS=%* - -%MAVEN_JAVA_EXE% ^ - %JVM_CONFIG_MAVEN_PROPS% ^ - %MAVEN_OPTS% ^ - %MAVEN_DEBUG_OPTS% ^ - -classpath %WRAPPER_JAR% ^ - "-Dmaven.multiModuleProjectDirectory=%MAVEN_PROJECTBASEDIR%" ^ - %WRAPPER_LAUNCHER% %MAVEN_CONFIG% %* -if ERRORLEVEL 1 goto error -goto end - -:error -set ERROR_CODE=1 - -:end -@endlocal & set ERROR_CODE=%ERROR_CODE% - -if not "%MAVEN_SKIP_RC%"=="" goto skipRcPost -@REM check for post script, once with legacy .bat ending and once with .cmd ending -if exist "%USERPROFILE%\mavenrc_post.bat" call "%USERPROFILE%\mavenrc_post.bat" -if exist "%USERPROFILE%\mavenrc_post.cmd" call "%USERPROFILE%\mavenrc_post.cmd" -:skipRcPost - -@REM pause the script if MAVEN_BATCH_PAUSE is set to 'on' -if "%MAVEN_BATCH_PAUSE%"=="on" pause - -if "%MAVEN_TERMINATE_CMD%"=="on" exit %ERROR_CODE% - -cmd /C exit /B %ERROR_CODE% +@SET PSModulePath=%__MVNW_PSMODULEP_SAVE% +@SET __MVNW_PSMODULEP_SAVE= +@SET __MVNW_ARG0_NAME__= +@SET MVNW_USERNAME= +@SET MVNW_PASSWORD= +@IF NOT "%__MVNW_CMD__%"=="" ("%__MVNW_CMD__%" %*) +@echo Cannot start maven from wrapper >&2 && exit /b 1 +@GOTO :EOF +: end batch / begin powershell #> + +$ErrorActionPreference = "Stop" +if ($env:MVNW_VERBOSE -eq "true") { + $VerbosePreference = "Continue" +} + +# calculate distributionUrl, requires .mvn/wrapper/maven-wrapper.properties +$distributionUrl = (Get-Content -Raw "$scriptDir/.mvn/wrapper/maven-wrapper.properties" | ConvertFrom-StringData).distributionUrl +if (!$distributionUrl) { + Write-Error "cannot read distributionUrl property in $scriptDir/.mvn/wrapper/maven-wrapper.properties" +} + +switch -wildcard -casesensitive ( $($distributionUrl -replace '^.*/','') ) { + "maven-mvnd-*" { + $USE_MVND = $true + $distributionUrl = $distributionUrl -replace '-bin\.[^.]*$',"-windows-amd64.zip" + $MVN_CMD = "mvnd.cmd" + break + } + default { + $USE_MVND = $false + $MVN_CMD = $script -replace '^mvnw','mvn' + break + } +} + +# apply MVNW_REPOURL and calculate MAVEN_HOME +# maven home pattern: ~/.m2/wrapper/dists/{apache-maven-,maven-mvnd--}/ +if ($env:MVNW_REPOURL) { + $MVNW_REPO_PATTERN = if ($USE_MVND -eq $False) { "/org/apache/maven/" } else { "/maven/mvnd/" } + $distributionUrl = "$env:MVNW_REPOURL$MVNW_REPO_PATTERN$($distributionUrl -replace "^.*$MVNW_REPO_PATTERN",'')" +} +$distributionUrlName = $distributionUrl -replace '^.*/','' +$distributionUrlNameMain = $distributionUrlName -replace '\.[^.]*$','' -replace '-bin$','' + +$MAVEN_M2_PATH = "$HOME/.m2" +if ($env:MAVEN_USER_HOME) { + $MAVEN_M2_PATH = "$env:MAVEN_USER_HOME" +} + +if (-not (Test-Path -Path $MAVEN_M2_PATH)) { + New-Item -Path $MAVEN_M2_PATH -ItemType Directory | Out-Null +} + +$MAVEN_WRAPPER_DISTS = $null +if ((Get-Item $MAVEN_M2_PATH).Target[0] -eq $null) { + $MAVEN_WRAPPER_DISTS = "$MAVEN_M2_PATH/wrapper/dists" +} else { + $MAVEN_WRAPPER_DISTS = (Get-Item $MAVEN_M2_PATH).Target[0] + "/wrapper/dists" +} + +$MAVEN_HOME_PARENT = "$MAVEN_WRAPPER_DISTS/$distributionUrlNameMain" +$MAVEN_HOME_NAME = ([System.Security.Cryptography.SHA256]::Create().ComputeHash([byte[]][char[]]$distributionUrl) | ForEach-Object {$_.ToString("x2")}) -join '' +$MAVEN_HOME = "$MAVEN_HOME_PARENT/$MAVEN_HOME_NAME" + +if (Test-Path -Path "$MAVEN_HOME" -PathType Container) { + Write-Verbose "found existing MAVEN_HOME at $MAVEN_HOME" + Write-Output "MVN_CMD=$MAVEN_HOME/bin/$MVN_CMD" + exit $? +} + +if (! $distributionUrlNameMain -or ($distributionUrlName -eq $distributionUrlNameMain)) { + Write-Error "distributionUrl is not valid, must end with *-bin.zip, but found $distributionUrl" +} + +# prepare tmp dir +$TMP_DOWNLOAD_DIR_HOLDER = New-TemporaryFile +$TMP_DOWNLOAD_DIR = New-Item -Itemtype Directory -Path "$TMP_DOWNLOAD_DIR_HOLDER.dir" +$TMP_DOWNLOAD_DIR_HOLDER.Delete() | Out-Null +trap { + if ($TMP_DOWNLOAD_DIR.Exists) { + try { Remove-Item $TMP_DOWNLOAD_DIR -Recurse -Force | Out-Null } + catch { Write-Warning "Cannot remove $TMP_DOWNLOAD_DIR" } + } +} + +New-Item -Itemtype Directory -Path "$MAVEN_HOME_PARENT" -Force | Out-Null + +# Download and Install Apache Maven +Write-Verbose "Couldn't find MAVEN_HOME, downloading and installing it ..." +Write-Verbose "Downloading from: $distributionUrl" +Write-Verbose "Downloading to: $TMP_DOWNLOAD_DIR/$distributionUrlName" + +$webclient = New-Object System.Net.WebClient +if ($env:MVNW_USERNAME -and $env:MVNW_PASSWORD) { + $webclient.Credentials = New-Object System.Net.NetworkCredential($env:MVNW_USERNAME, $env:MVNW_PASSWORD) +} +[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12 +$webclient.DownloadFile($distributionUrl, "$TMP_DOWNLOAD_DIR/$distributionUrlName") | Out-Null + +# If specified, validate the SHA-256 sum of the Maven distribution zip file +$distributionSha256Sum = (Get-Content -Raw "$scriptDir/.mvn/wrapper/maven-wrapper.properties" | ConvertFrom-StringData).distributionSha256Sum +if ($distributionSha256Sum) { + if ($USE_MVND) { + Write-Error "Checksum validation is not supported for maven-mvnd. `nPlease disable validation by removing 'distributionSha256Sum' from your maven-wrapper.properties." + } + Import-Module $PSHOME\Modules\Microsoft.PowerShell.Utility -Function Get-FileHash + if ((Get-FileHash "$TMP_DOWNLOAD_DIR/$distributionUrlName" -Algorithm SHA256).Hash.ToLower() -ne $distributionSha256Sum) { + Write-Error "Error: Failed to validate Maven distribution SHA-256, your Maven distribution might be compromised. If you updated your Maven version, you need to update the specified distributionSha256Sum property." + } +} + +# unzip and move +Expand-Archive "$TMP_DOWNLOAD_DIR/$distributionUrlName" -DestinationPath "$TMP_DOWNLOAD_DIR" | Out-Null + +# Find the actual extracted directory name (handles snapshots where filename != directory name) +$actualDistributionDir = "" + +# First try the expected directory name (for regular distributions) +$expectedPath = Join-Path "$TMP_DOWNLOAD_DIR" "$distributionUrlNameMain" +$expectedMvnPath = Join-Path "$expectedPath" "bin/$MVN_CMD" +if ((Test-Path -Path $expectedPath -PathType Container) -and (Test-Path -Path $expectedMvnPath -PathType Leaf)) { + $actualDistributionDir = $distributionUrlNameMain +} + +# If not found, search for any directory with the Maven executable (for snapshots) +if (!$actualDistributionDir) { + Get-ChildItem -Path "$TMP_DOWNLOAD_DIR" -Directory | ForEach-Object { + $testPath = Join-Path $_.FullName "bin/$MVN_CMD" + if (Test-Path -Path $testPath -PathType Leaf) { + $actualDistributionDir = $_.Name + } + } +} + +if (!$actualDistributionDir) { + Write-Error "Could not find Maven distribution directory in extracted archive" +} + +Write-Verbose "Found extracted Maven distribution directory: $actualDistributionDir" +Rename-Item -Path "$TMP_DOWNLOAD_DIR/$actualDistributionDir" -NewName $MAVEN_HOME_NAME | Out-Null +try { + Move-Item -Path "$TMP_DOWNLOAD_DIR/$MAVEN_HOME_NAME" -Destination $MAVEN_HOME_PARENT | Out-Null +} catch { + if (! (Test-Path -Path "$MAVEN_HOME" -PathType Container)) { + Write-Error "fail to move MAVEN_HOME" + } +} finally { + try { Remove-Item $TMP_DOWNLOAD_DIR -Recurse -Force | Out-Null } + catch { Write-Warning "Cannot remove $TMP_DOWNLOAD_DIR" } +} + +Write-Output "MVN_CMD=$MAVEN_HOME/bin/$MVN_CMD" diff --git a/okhttp/pom.xml b/okhttp/pom.xml index 90db59082e1..1d2904bdd1e 100644 --- a/okhttp/pom.xml +++ b/okhttp/pom.xml @@ -4,7 +4,7 @@ com.inrupt.client inrupt-client - 1.3.0-SNAPSHOT + 1.3.2-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.18.1 diff --git a/openid/pom.xml b/openid/pom.xml index 21bd84d1986..8c09c1707bc 100644 --- a/openid/pom.xml +++ b/openid/pom.xml @@ -4,7 +4,7 @@ com.inrupt.client inrupt-client - 1.3.0-SNAPSHOT + 1.3.2-SNAPSHOT inrupt-client-openid diff --git a/parser/pom.xml b/parser/pom.xml index 9fae31a532b..815343b5f1d 100644 --- a/parser/pom.xml +++ b/parser/pom.xml @@ -4,7 +4,7 @@ com.inrupt.client inrupt-client - 1.3.0-SNAPSHOT + 1.3.2-SNAPSHOT inrupt-client-parser diff --git a/performance/base/pom.xml b/performance/base/pom.xml index 30a05b6e9b8..cc974756efc 100644 --- a/performance/base/pom.xml +++ b/performance/base/pom.xml @@ -4,7 +4,7 @@ com.inrupt.client inrupt-client-performance-tests - 1.3.0-SNAPSHOT + 1.3.2-SNAPSHOT inrupt-client-performance-base-tests Inrupt Java Client Libraries - Performance Base Tests @@ -14,9 +14,20 @@ 2.1.1 - 3.10.2 + + + + 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 diff --git a/performance/pom.xml b/performance/pom.xml index 1d1940c0fb4..b7e3bc8fc4e 100644 --- a/performance/pom.xml +++ b/performance/pom.xml @@ -4,7 +4,7 @@ com.inrupt.client inrupt-client - 1.3.0-SNAPSHOT + 1.3.2-SNAPSHOT inrupt-client-performance-tests diff --git a/performance/uma/pom.xml b/performance/uma/pom.xml index 4576ac0e79d..19a61ce891d 100644 --- a/performance/uma/pom.xml +++ b/performance/uma/pom.xml @@ -4,7 +4,7 @@ com.inrupt.client inrupt-client-performance-tests - 1.3.0-SNAPSHOT + 1.3.2-SNAPSHOT inrupt-client-performance-uma-tests diff --git a/pom.xml b/pom.xml index 0349ff14792..0cf0579f4c6 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ com.inrupt.client inrupt-client - 1.3.0-SNAPSHOT + 1.3.2-SNAPSHOT Inrupt Java Client Libraries https://docs.inrupt.com/developer-tools/java/client-libraries/ @@ -20,75 +20,72 @@ 4.13.2 - 3.1.8 - 1.17.1 - 1.9.0 - 2.18.0 + 3.2.4 + 1.22.1 + 1.11.0 + 2.22.0 0.5.0 - 33.3.1-jre - 2.18.2 + 33.6.0-jre + 2.22.1 2.1.3 - 5.2.0 + 5.6.0 0.9.6 - 3.0.1 - 4.12.0 - 3.17.3 - 2.0.16 + 3.0.2 + 5.4.0 + 3.38.1 + 2.0.18 5.8.14 0.6.0 1.1.1 - 3.1.0 - 3.3.1 - 3.7.1 + 3.2.0 + 3.4.1 + 3.8.0 3.6.0 - 3.4.0 - 3.13.0 - 3.8.1 - 3.1.3 - 3.5.0 + 3.5.0 + 3.15.0 + 3.11.0 + 3.1.4 + 3.6.3 3.5.0 - 3.1.3 - 3.2.7 - 0.8.12 - 3.4.2 - 3.11.2 - 4.6 - 1.7.0 - 11.1.1 - 3.8.0 - 3.26.0 - 3.21.0 - 3.1.1 - 3.3.1 - 5.0.0.4389 - 3.3.1 - 3.5.2 + 3.1.4 + 3.2.8 + 0.8.15 + 3.5.1 + 3.12.0 + 5.1.1 + 3.9.0 + 3.28.0 + 3.22.0 + 3.3.1 + 3.5.0 + 5.7.0.6970 + 0.11.0 + 3.4.0 + 3.5.6 - 10.20.2 + 10.26.1 - 4.2.2 - 3.17.5 + 4.3.0 + 3.19.4 2.0.1 - 5.11.3 - 4.6.1 - 3.10.2 - 3.0.4 - 3.10.0 + 5.14.4 + 4.6.3 + 3.18.1 + 3.0.5 + 3.13.2 - 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 +105,6 @@ okhttp openid parser - quarkus rdf4j rdf-legacy solid @@ -120,21 +116,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,19 +137,19 @@ org.apache.commons commons-compress - 1.27.1 + 1.28.0 org.xmlunit xmlunit-core - 2.10.0 + 2.13.0 com.google.protobuf protobuf-java - 3.25.5 + 3.25.9 @@ -295,7 +280,7 @@ org.codehaus.mojo extra-enforcer-rules - 1.9.0 + 1.12.0 @@ -505,15 +490,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 @@ -527,11 +506,6 @@ - - org.owasp - dependency-check-maven - ${owasp.plugin.version} - @@ -633,28 +607,12 @@ - org.owasp - dependency-check-maven - - - - check - - - + org.sonatype.central + central-publishing-maven-plugin + true - 7 - true - - HTML - JSON - CSV - - - ./build-tools/owasp/suppressions.xml - - ${nvd.api.key} - ${nvd.api.datafeed} + central + true @@ -755,23 +713,6 @@ - - org.owasp - dependency-check-maven - ${owasp.plugin.version} - - - - aggregate - - - - - - ./build-tools/owasp/suppressions.xml - - - @@ -783,8 +724,20 @@ 4.10.0 + 4.6.2 + 3.10.2 + + java-17 + + [17,) + + + quarkus + reports + + publish @@ -834,26 +787,11 @@ true - - dependencies - - true - true - true - false - true - true - true - - java-21 [11,21) - - gradle - @@ -879,7 +817,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 - inrupt-client-1.2.0 + inrupt-client-1.3.0 diff --git a/quarkus/pom.xml b/quarkus/pom.xml index 6bcce8b83e4..3e950f529aa 100644 --- a/quarkus/pom.xml +++ b/quarkus/pom.xml @@ -4,7 +4,7 @@ com.inrupt.client inrupt-client - 1.3.0-SNAPSHOT + 1.3.2-SNAPSHOT inrupt-client-quarkus diff --git a/rdf-legacy/pom.xml b/rdf-legacy/pom.xml index d5ec52abbd5..928f022957d 100644 --- a/rdf-legacy/pom.xml +++ b/rdf-legacy/pom.xml @@ -4,7 +4,7 @@ com.inrupt.client inrupt-client - 1.3.0-SNAPSHOT + 1.3.2-SNAPSHOT inrupt-client-rdf-legacy @@ -17,7 +17,7 @@ 8 - 1.12.0 + 1.15.0 3.7.7 diff --git a/rdf4j/pom.xml b/rdf4j/pom.xml index a6a69d5cbe3..d9cbfe12bc0 100644 --- a/rdf4j/pom.xml +++ b/rdf4j/pom.xml @@ -4,7 +4,7 @@ com.inrupt.client inrupt-client - 1.3.0-SNAPSHOT + 1.3.2-SNAPSHOT inrupt-client-rdf4j @@ -15,7 +15,7 @@ 8 - 5.1.0 + 5.3.2 diff --git a/reports/pom.xml b/reports/pom.xml index 511e8273281..8c51217ce29 100644 --- a/reports/pom.xml +++ b/reports/pom.xml @@ -4,7 +4,7 @@ com.inrupt.client inrupt-client - 1.3.0-SNAPSHOT + 1.3.2-SNAPSHOT inrupt-client-report diff --git a/runtime/pom.xml b/runtime/pom.xml index 9f94ea40c67..77a9be4c4ad 100644 --- a/runtime/pom.xml +++ b/runtime/pom.xml @@ -5,7 +5,7 @@ com.inrupt.client inrupt-client - 1.3.0-SNAPSHOT + 1.3.2-SNAPSHOT .. diff --git a/solid/pom.xml b/solid/pom.xml index 1abe9be4eb4..774e03a7a83 100644 --- a/solid/pom.xml +++ b/solid/pom.xml @@ -4,7 +4,7 @@ com.inrupt.client inrupt-client - 1.3.0-SNAPSHOT + 1.3.2-SNAPSHOT inrupt-client-solid diff --git a/spring/pom.xml b/spring/pom.xml index 29da0ddbb95..214d5264ce1 100644 --- a/spring/pom.xml +++ b/spring/pom.xml @@ -4,7 +4,7 @@ com.inrupt.client inrupt-client - 1.3.0-SNAPSHOT + 1.3.2-SNAPSHOT inrupt-client-spring @@ -95,7 +95,7 @@ org.springframework spring-web - 6.2.0 + 7.0.8 provided @@ -107,7 +107,7 @@ [17,) - 6.4.1 + 7.1.0 diff --git a/test/pom.xml b/test/pom.xml index 38ee52651d0..c0f82f15e3e 100644 --- a/test/pom.xml +++ b/test/pom.xml @@ -4,7 +4,7 @@ com.inrupt.client inrupt-client - 1.3.0-SNAPSHOT + 1.3.2-SNAPSHOT inrupt-client-test diff --git a/uma/pom.xml b/uma/pom.xml index 825653106b3..6039165c87e 100644 --- a/uma/pom.xml +++ b/uma/pom.xml @@ -4,7 +4,7 @@ com.inrupt.client inrupt-client - 1.3.0-SNAPSHOT + 1.3.2-SNAPSHOT inrupt-client-uma diff --git a/vocabulary/pom.xml b/vocabulary/pom.xml index 93900050597..4e6e221b73e 100644 --- a/vocabulary/pom.xml +++ b/vocabulary/pom.xml @@ -4,7 +4,7 @@ com.inrupt.client inrupt-client - 1.3.0-SNAPSHOT + 1.3.2-SNAPSHOT inrupt-client-vocabulary diff --git a/webid/pom.xml b/webid/pom.xml index b071a58c1d4..20a472c2962 100644 --- a/webid/pom.xml +++ b/webid/pom.xml @@ -4,7 +4,7 @@ com.inrupt.client inrupt-client - 1.3.0-SNAPSHOT + 1.3.2-SNAPSHOT inrupt-client-webid