diff --git a/.github/dependabot.yml b/.github/dependabot.yml new file mode 100644 index 0000000..8082b04 --- /dev/null +++ b/.github/dependabot.yml @@ -0,0 +1,14 @@ +version: 2 +updates: + - package-ecosystem: "maven" + directory: "/" + registries: + - hippo-maven2-enterprise + schedule: + interval: "daily" +registries: + hippo-maven2-enterprise: + type: maven-repository + url: https://maven.bloomreach.com/repository/maven2-enterprise/ + username: ${{ secrets.BLOOMREACH_USER }} + password: ${{ secrets.BLOOMREACH_PASSWORD }} diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index 9cb2068..889bd38 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@ -1,11 +1,3 @@ -# This workflow will build a Java project with Maven, and cache/restore any dependencies to improve the workflow execution time -# For more information see: https://docs.github.com/en/actions/automating-builds-and-tests/building-and-testing-java-with-maven - -# This workflow uses actions that are not certified by GitHub. -# They are provided by a third-party and are governed by -# separate terms of service, privacy policy, and support -# documentation. - name: Java CI with Maven on: @@ -16,20 +8,20 @@ on: jobs: build: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v3 - - name: Set up JDK 11 + - uses: actions/checkout@v4 + - name: Set up JDK 17 uses: actions/setup-java@v3 with: - java-version: '11' distribution: 'temurin' - cache: maven + java-version: '17' + - name: Set up Maven settings + uses: whelk-io/maven-settings-xml-action@v22 + with: + servers: > + [ + { "id": "bloomreach-maven2-enterprise", "username": "${{ secrets.BLOOMREACH_USER }}", "password": "${{ secrets.BLOOMREACH_PASSWORD }}" } + ] - name: Build with Maven - run: mvn -B verify --file pom.xml - - # Optional: Uploads the full dependency graph to GitHub to improve the quality of Dependabot alerts this repository can receive - - name: Maven Dependency Tree Dependency Submission - uses: advanced-security/maven-dependency-submission-action@v3 + run: mvn -B package diff --git a/annotations/pom.xml b/annotations/pom.xml index ce15e2f..17d973c 100644 --- a/annotations/pom.xml +++ b/annotations/pom.xml @@ -36,7 +36,7 @@ org.junit.jupiter - junit-jupiter-engine + junit-jupiter test diff --git a/bootstrapgenerator/pom.xml b/bootstrapgenerator/pom.xml index 3eab481..dab1d70 100644 --- a/bootstrapgenerator/pom.xml +++ b/bootstrapgenerator/pom.xml @@ -67,11 +67,7 @@ org.junit.jupiter - junit-jupiter-engine - - - org.junit.jupiter - junit-jupiter-params + junit-jupiter diff --git a/mavenplugin/pom.xml b/mavenplugin/pom.xml index 8bad93a..d415d20 100644 --- a/mavenplugin/pom.xml +++ b/mavenplugin/pom.xml @@ -47,6 +47,7 @@ org.junit.vintage junit-vintage-engine + ${junit-jupiter.version} test diff --git a/pom.xml b/pom.xml index 8e85498..8e9115e 100644 --- a/pom.xml +++ b/pom.xml @@ -74,37 +74,37 @@ - 2.11.0 - 3.12.0 - 4.0.8 - 1.33 - 15.1.3 - 15.1.3 + 17 + 2.16.1 + 3.14.0 + 4.0.23 + 2.2 + 16.1.0 + 16.1.0 2.0 - 5.9.2 - 5.9.2 - 2.21.14 - 3.8.7 - 3.2.0 - 3.8.1 - 3.2.1 - 2.5.3 - 3.3.1 - 3.0.1 - 3.0.0-M1 - 3.0.0 - 3.1.0 - 3.0.0-M1 - 3.2.0 - 3.2.0 - 3.9.1 - 3.0.0-M5 - 3.7.1 - 3.7.1 - 0.8.7 + 5.10.1 + 2.21.19-h4 + 3.9.8 + 3.8.0 + 3.13.0 + 3.3.1 + 3.1.1 + 3.10.0 + 3.2.5 + 3.1.3 + 3.5.0 + 3.4.0 + 3.1.3 + 3.4.2 + 3.3.1 + 3.20.0 + 3.5.0 + 3.15.0 + 3.15.0 + 0.8.12 1.6.0 UTF-8 - 2.0.6 + 2.0.16 6.3.2 @@ -164,20 +164,8 @@ org.junit.jupiter - junit-jupiter-engine - ${junit.jupiter.version} - test - - - org.junit.jupiter - junit-jupiter-params - ${junit.jupiter.version} - test - - - org.junit.vintage - junit-vintage-engine - ${junit.vintage.version} + junit-jupiter + ${junit-jupiter.version} test @@ -200,10 +188,6 @@ maven-compiler-plugin ${maven.compiler.plugin.version} - - 11 - 11 - maven-clean-plugin @@ -324,7 +308,7 @@ - 3.0.5 + 3.8.8 @@ -410,16 +394,13 @@ - hippo-maven2 - Hippo Maven 2 - https://maven.onehippo.com/maven2/ - - false - never + fail - default + bloomreach-maven2-enterprise + Bloomreach Maven 2 Enterprise + https://maven.bloomreach.com/repository/maven2-enterprise diff --git a/updatersync/pom.xml b/updatersync/pom.xml index 88af0d0..c47f4f6 100644 --- a/updatersync/pom.xml +++ b/updatersync/pom.xml @@ -61,7 +61,7 @@ org.junit.jupiter - junit-jupiter-engine + junit-jupiter org.apache.sling