Update magnolia to 6.3.0 (breaking - requires jdk17)

merkle-open · Sep 9, 2024 · 439995e · 439995e
1 parent 3a5aa33
commit 439995e
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 14 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
       - name: Maven setup
         uses: ./.github/actions/mvn-setup
         with:

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: 'main'
       # 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:

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
       - name: Maven setup
         uses: ./.github/actions/mvn-setup
         with:

diff --git a/pom.xml b/pom.xml
@@ -5,7 +5,7 @@
 
 	<groupId>com.namics.oss.magnolia</groupId>
 	<artifactId>magnolia-flexible-image-generator</artifactId>
-	<version>0.0.11-SNAPSHOT</version>
+	<version>0.1.0-SNAPSHOT</version>
 	<packaging>jar</packaging>
 
 	<name>${project.artifactId}</name>
@@ -29,24 +29,26 @@
 	</developers>
 
 	<properties>
-		<magnolia.version>6.2.40</magnolia.version>
+		<!-- check for new versions:  mvn versions:display-property-updates -->
+		<magnolia.version>6.3.0</magnolia.version>
 
 		<javax.servlet-api.version>4.0.1</javax.servlet-api.version>
 		<gson.version>2.10.1</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.surefire.plugin.version>3.2.2</mvn.surefire.plugin.version>
+		<mvn.surefire.plugin.version>3.5.0</mvn.surefire.plugin.version>
 		<mvn.source.plugin.version>3.3.0</mvn.source.plugin.version>
 		<mvn.javadoc.version>3.6.0</mvn.javadoc.version>
 		<mvn.gpg.plugin.version>3.1.0</mvn.gpg.plugin.version>
 		<mvn.nexus-staging.plugin.version>1.6.13</mvn.nexus-staging.plugin.version>
 
-		<javaVersion>11</javaVersion>
+		<javaVersion>17</javaVersion>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 	</properties>
 
@@ -94,6 +96,11 @@
 			<artifactId>gson</artifactId>
 			<version>${gson.version}</version>
 		</dependency>
+		<dependency>
+			<groupId>com.google.code.findbugs</groupId>
+			<artifactId>jsr305</artifactId>
+			<version>${jsr305.nullable.version}</version>
+		</dependency>
 
 
 		<!-- TESTING DEPENDENCIES -->