Merge pull request #37 from openweb-nl/feature/upgrade-to-v16

Upgrade to Bloomreach V16
openweb-nl · Oct 6, 2024 · 909d600 · 909d600
2 parents 14d2948 + 9280eae
commit 909d600
Show file tree

Hide file tree

Showing 7 changed files with 64 additions and 80 deletions.
diff --git a/.github/dependabot.yml 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
@@ -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
@@ -36,7 +36,7 @@
   <dependencies>
     <dependency>
       <groupId>org.junit.jupiter</groupId>
-      <artifactId>junit-jupiter-engine</artifactId>
+      <artifactId>junit-jupiter</artifactId>
       <scope>test</scope>
     </dependency>
   </dependencies>

diff --git a/bootstrapgenerator/pom.xml b/bootstrapgenerator/pom.xml
@@ -67,11 +67,7 @@
     </dependency>
     <dependency>
       <groupId>org.junit.jupiter</groupId>
-      <artifactId>junit-jupiter-engine</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.junit.jupiter</groupId>
-      <artifactId>junit-jupiter-params</artifactId>
+      <artifactId>junit-jupiter</artifactId>
     </dependency>
   </dependencies>
   <build>

diff --git a/mavenplugin/pom.xml b/mavenplugin/pom.xml
@@ -47,6 +47,7 @@
     <dependency>
       <groupId>org.junit.vintage</groupId>
       <artifactId>junit-vintage-engine</artifactId>
+      <version>${junit-jupiter.version}</version>
       <scope>test</scope>
     </dependency>
     <dependency>

diff --git a/pom.xml b/pom.xml
@@ -74,37 +74,37 @@
   </licenses>
 
   <properties>
-    <commons-io.version>2.11.0</commons-io.version>
-    <commons-lang3.version>3.12.0</commons-lang3.version>
-    <groovy.version>4.0.8</groovy.version>
-    <snakeyaml.version>1.33</snakeyaml.version>
-    <hippo.repository.version>15.1.3</hippo.repository.version>
-    <hippo.services.version>15.1.3</hippo.services.version>
+    <maven.compiler.release>17</maven.compiler.release>
+    <commons-io.version>2.16.1</commons-io.version>
+    <commons-lang3.version>3.14.0</commons-lang3.version>
+    <groovy.version>4.0.23</groovy.version>
+    <snakeyaml.version>2.2</snakeyaml.version>
+    <hippo.repository.version>16.1.0</hippo.repository.version>
+    <hippo.services.version>16.1.0</hippo.services.version>
     <javax.jcr.version>2.0</javax.jcr.version>
-    <junit.jupiter.version>5.9.2</junit.jupiter.version>
-    <junit.vintage.version>5.9.2</junit.vintage.version>
-    <jackrabbit.version>2.21.14</jackrabbit.version>
-    <maven.plugin.api.version>3.8.7</maven.plugin.api.version>
-    <maven.dependency.plugin.version>3.2.0</maven.dependency.plugin.version>
-    <maven.compiler.plugin.version>3.8.1</maven.compiler.plugin.version>
-    <maven.source.plugin.version>3.2.1</maven.source.plugin.version>
-    <maven.release.plugin.version>2.5.3</maven.release.plugin.version>
-    <maven.javadoc.plugin.version>3.3.1</maven.javadoc.plugin.version>
-    <maven.gpg.plugin.version>3.0.1</maven.gpg.plugin.version>
-    <maven.deploy.plugin.version>3.0.0-M1</maven.deploy.plugin.version>
-    <maven.enforcer.plugin.version>3.0.0</maven.enforcer.plugin.version>
-    <maven.clean.plugin.version>3.1.0</maven.clean.plugin.version>
-    <maven.install.plugin.version>3.0.0-M1</maven.install.plugin.version>
-    <maven.jar.plugin.version>3.2.0</maven.jar.plugin.version>
-    <maven.resources.plugin.version>3.2.0</maven.resources.plugin.version>
-    <maven.site.plugin.version>3.9.1</maven.site.plugin.version>
-    <maven.surefire.plugin.version>3.0.0-M5</maven.surefire.plugin.version>
-    <maven.plugin.annotations.version>3.7.1</maven.plugin.annotations.version>
-    <maven.plugin.plugin.version>3.7.1</maven.plugin.plugin.version>
-    <maven.plugin.jacoco.version>0.8.7</maven.plugin.jacoco.version>
+    <junit-jupiter.version>5.10.1</junit-jupiter.version>
+    <jackrabbit.version>2.21.19-h4</jackrabbit.version>
+    <maven.plugin.api.version>3.9.8</maven.plugin.api.version>
+    <maven.dependency.plugin.version>3.8.0</maven.dependency.plugin.version>
+    <maven.compiler.plugin.version>3.13.0</maven.compiler.plugin.version>
+    <maven.source.plugin.version>3.3.1</maven.source.plugin.version>
+    <maven.release.plugin.version>3.1.1</maven.release.plugin.version>
+    <maven.javadoc.plugin.version>3.10.0</maven.javadoc.plugin.version>
+    <maven.gpg.plugin.version>3.2.5</maven.gpg.plugin.version>
+    <maven.deploy.plugin.version>3.1.3</maven.deploy.plugin.version>
+    <maven.enforcer.plugin.version>3.5.0</maven.enforcer.plugin.version>
+    <maven.clean.plugin.version>3.4.0</maven.clean.plugin.version>
+    <maven.install.plugin.version>3.1.3</maven.install.plugin.version>
+    <maven.jar.plugin.version>3.4.2</maven.jar.plugin.version>
+    <maven.resources.plugin.version>3.3.1</maven.resources.plugin.version>
+    <maven.site.plugin.version>3.20.0</maven.site.plugin.version>
+    <maven.surefire.plugin.version>3.5.0</maven.surefire.plugin.version>
+    <maven.plugin.annotations.version>3.15.0</maven.plugin.annotations.version>
+    <maven.plugin.plugin.version>3.15.0</maven.plugin.plugin.version>
+    <maven.plugin.jacoco.version>0.8.12</maven.plugin.jacoco.version>
     <apache.sling.version>1.6.0</apache.sling.version>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <slf4j.version>2.0.6</slf4j.version>
+    <slf4j.version>2.0.16</slf4j.version>
     <owasp.depcheck.plugin.version>6.3.2</owasp.depcheck.plugin.version>
   </properties>
 
@@ -164,20 +164,8 @@
       </dependency>
       <dependency>
         <groupId>org.junit.jupiter</groupId>
-        <artifactId>junit-jupiter-engine</artifactId>
-        <version>${junit.jupiter.version}</version>
-        <scope>test</scope>
-      </dependency>
-      <dependency>
-        <groupId>org.junit.jupiter</groupId>
-        <artifactId>junit-jupiter-params</artifactId>
-        <version>${junit.jupiter.version}</version>
-        <scope>test</scope>
-      </dependency>
-      <dependency>
-        <groupId>org.junit.vintage</groupId>
-        <artifactId>junit-vintage-engine</artifactId>
-        <version>${junit.vintage.version}</version>
+        <artifactId>junit-jupiter</artifactId>
+        <version>${junit-jupiter.version}</version>
         <scope>test</scope>
       </dependency>
       <dependency>
@@ -200,10 +188,6 @@
         <plugin>
           <artifactId>maven-compiler-plugin</artifactId>
           <version>${maven.compiler.plugin.version}</version>
-          <configuration>
-            <source>11</source>
-            <target>11</target>
-          </configuration>
         </plugin>
         <plugin>
           <artifactId>maven-clean-plugin</artifactId>
@@ -324,7 +308,7 @@
             <configuration>
               <rules>
                 <requireMavenVersion>
-                  <version>3.0.5</version>
+                  <version>3.8.8</version>
                 </requireMavenVersion>
               </rules>
             </configuration>
@@ -410,16 +394,13 @@
 
   <repositories>
     <repository>
-      <id>hippo-maven2</id>
-      <name>Hippo Maven 2</name>
-      <url>https://maven.onehippo.com/maven2/</url>
-      <snapshots>
-        <enabled>false</enabled>
-      </snapshots>
       <releases>
         <updatePolicy>never</updatePolicy>
+        <checksumPolicy>fail</checksumPolicy>
       </releases>
-      <layout>default</layout>
+      <id>bloomreach-maven2-enterprise</id>
+      <name>Bloomreach Maven 2 Enterprise</name>
+      <url>https://maven.bloomreach.com/repository/maven2-enterprise</url>
     </repository>
   </repositories>
 

diff --git a/updatersync/pom.xml b/updatersync/pom.xml
@@ -61,7 +61,7 @@
     </dependency>
     <dependency>
       <groupId>org.junit.jupiter</groupId>
-      <artifactId>junit-jupiter-engine</artifactId>
+      <artifactId>junit-jupiter</artifactId>
     </dependency>
     <dependency>
       <groupId>org.apache.sling</groupId>