Update magnolia to 6.3.0 (breaking - requires jdk17)

merkle-open · Sep 9, 2024 · 1d1cf31 · 1d1cf31
1 parent 0903ea9
commit 1d1cf31
Show file tree

Hide file tree

Showing 6 changed files with 34 additions and 18 deletions.
diff --git a/.github/workflows/deploy-snapshot.yml b/.github/workflows/deploy-snapshot.yml
@@ -15,10 +15,10 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v2
       # Setup Java environment
-      - name: Set up JDK 11
+      - name: Set up JDK 17
         uses: actions/setup-java@v1
         with:
-          java-version: 11
+          java-version: 17
       # Run maven verify
       - name: Maven verify
         run: mvn verify --batch-mode

diff --git a/.github/workflows/release-and-deploy-release.yml b/.github/workflows/release-and-deploy-release.yml
@@ -17,10 +17,10 @@ jobs:
         with:
           fetch-depth: '0'
       # Setup Java environment
-      - name: Set up JDK 11
+      - name: Set up JDK 17
         uses: actions/setup-java@v1
         with:
-          java-version: 11
+          java-version: 17
       - name: Maven setup
         uses: ./.github/actions/mvn-setup
         with:
@@ -52,10 +52,10 @@ jobs:
         with:
           ref: 'master'
       # Setup Java environment
-      - name: Set up JDK 11
+      - name: Set up JDK 17
         uses: actions/setup-java@v1
         with:
-          java-version: 11
+          java-version: 17
       # Run maven verify
       - name: Maven verify
         run: mvn verify --batch-mode

diff --git a/.github/workflows/verify.yml b/.github/workflows/verify.yml
@@ -16,10 +16,10 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v2
       # Setup Java environment
-      - name: Set up JDK 11
+      - name: Set up JDK 17
         uses: actions/setup-java@v1
         with:
-          java-version: 11
+          java-version: 17
       # Run maven verify
       - name: Maven verify
         run: mvn verify --batch-mode
diff --git a/json2properties-generator/pom.xml b/json2properties-generator/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.namics.oss.magnolia</groupId>
         <artifactId>magnolia-dictionary-parent</artifactId>
-        <version>1.2.9-SNAPSHOT</version>
+        <version>1.3.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>json2properties-generator</artifactId>

diff --git a/magnolia-dictionary/pom.xml b/magnolia-dictionary/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.namics.oss.magnolia</groupId>
         <artifactId>magnolia-dictionary-parent</artifactId>
-        <version>1.2.9-SNAPSHOT</version>
+        <version>1.3.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>magnolia-dictionary</artifactId>
@@ -24,6 +24,10 @@
             <groupId>info.magnolia.site</groupId>
             <artifactId>magnolia-site</artifactId>
         </dependency>
+        <dependency>
+            <groupId>info.magnolia.site</groupId>
+            <artifactId>magnolia-site-jcr</artifactId>
+        </dependency>
         <dependency>
             <groupId>info.magnolia.publishing</groupId>
             <artifactId>magnolia-publishing-core</artifactId>
@@ -40,5 +44,9 @@
             <groupId>org.apache.poi</groupId>
             <artifactId>poi</artifactId>
         </dependency>
+        <dependency>
+            <groupId>com.google.code.findbugs</groupId>
+            <artifactId>jsr305</artifactId>
+        </dependency>
     </dependencies>
 </project>
diff --git a/pom.xml b/pom.xml
@@ -5,7 +5,7 @@
 
     <groupId>com.namics.oss.magnolia</groupId>
     <artifactId>magnolia-dictionary-parent</artifactId>
-    <version>1.2.9-SNAPSHOT</version>
+    <version>1.3.0-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <name>${project.artifactId}</name>
@@ -34,19 +34,21 @@
     </modules>
 
     <properties>
-        <magnolia.version>6.2.40</magnolia.version>
-        <poi.version>5.2.4</poi.version>
-        <gson.version>2.10.1</gson.version>
+        <!-- check for new versions:  mvn versions:display-property-updates -->
+        <magnolia.version>6.3.0</magnolia.version>
+        <poi.version>5.3.0</poi.version>
+        <gson.version>2.11.0</gson.version>
+        <jsr305.nullable.version>3.0.2</jsr305.nullable.version>
 
         <!--Test dependency versions-->
-        <junit.version>5.10.1</junit.version>
-        <mockito.version>5.7.0</mockito.version>
+        <junit.version>5.11.0</junit.version>
+        <mockito.version>5.13.0</mockito.version>
 
         <!-- Maven Plugins -->
         <mvn.compiler.plugin.version>3.11.0</mvn.compiler.plugin.version>
         <mvn.source.plugin.version>3.3.0</mvn.source.plugin.version>
         <mvn.javadoc.version>3.5.0</mvn.javadoc.version>
-        <mvn.surefire.plugin.version>3.2.2</mvn.surefire.plugin.version>
+        <mvn.surefire.plugin.version>3.5.0</mvn.surefire.plugin.version>
         <mvn.gpg.plugin.version>3.0.1</mvn.gpg.plugin.version>
         <mvn.nexus-staging.plugin.version>1.6.13</mvn.nexus-staging.plugin.version>
         <mvn.plugin.version>3.9.0</mvn.plugin.version>
@@ -56,7 +58,7 @@
         <git.branch>unknown</git.branch>
         <git.commit.id>unknown</git.commit.id>
         <git.commit.time>unknown</git.commit.time>
-        <java.version>11</java.version>
+        <java.version>17</java.version>
         <encoding>UTF-8</encoding>
         <project.build.sourceEncoding>${encoding}</project.build.sourceEncoding>
         <maven.deploy.skip>true</maven.deploy.skip>
@@ -100,6 +102,12 @@
                 <version>${gson.version}</version>
             </dependency>
 
+            <dependency>
+                <groupId>com.google.code.findbugs</groupId>
+                <artifactId>jsr305</artifactId>
+                <version>${jsr305.nullable.version}</version>
+            </dependency>
+
             <!-- TESTING DEPENDENCIES -->
             <dependency>
                 <groupId>org.junit.jupiter</groupId>