Update magnolia to 6.3.0 (breaking - requires jdk17)

merkle-open · Sep 9, 2024 · 4bef132 · 4bef132
1 parent fccb545
commit 4bef132
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 19 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,11 +5,7 @@
 
  <groupId>com.namics.oss.magnolia</groupId>
  <artifactId>magnolia-appbuilder</artifactId>
-<<<<<<< HEAD
- <version>1.3.2-SNAPSHOT</version>
-=======
- <version>1.3.1</version>
->>>>>>> main
+ <version>1.4.0-SNAPSHOT</version>
  <packaging>jar</packaging>
 
  <name>${project.artifactId}</name>
@@ -33,18 +29,19 @@
  </developers>
 
  <properties>
- <magnolia.version>6.2.44</magnolia.version>
- <namics.oss.definitionbuilder.version>1.0.26</namics.oss.definitionbuilder.version>
+ <!-- mvn versions:display-property-updates -->
+ <magnolia.version>6.3.0</magnolia.version>
+ <namics.oss.definitionbuilder.version>1.2.0</namics.oss.definitionbuilder.version>
  <!--Test dependency versions-->
- <junit.version>5.10.2</junit.version>
- <mockito.version>5.11.0</mockito.version>
+ <junit.version>5.11.0</junit.version>
+ <mockito.version>5.13.0</mockito.version>
 
  <!-- Maven Plugins -->
  <mvn.compiler.plugin.version>3.13.0</mvn.compiler.plugin.version>
  <mvn.source.plugin.version>3.3.1</mvn.source.plugin.version>
- <mvn.surefire.plugin.version>3.2.5</mvn.surefire.plugin.version>
+ <mvn.surefire.plugin.version>3.5.0</mvn.surefire.plugin.version>
 
- <javaVersion>11</javaVersion>
+ <javaVersion>17</javaVersion>
  <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
  </properties>