diff --git a/.github/workflows/deploy-snapshot.yml b/.github/workflows/deploy-snapshot.yml
index 43dbd29..5df9123 100644
--- 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
index dcdec71..c351a02 100644
--- 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
index 43ef9e5..84e70f4 100644
--- 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
index fa1899d..f2aa403 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,11 +5,7 @@
com.namics.oss.magnolia
magnolia-appbuilder
-<<<<<<< HEAD
- 1.3.2-SNAPSHOT
-=======
- 1.3.1
->>>>>>> main
+ 1.4.0-SNAPSHOT
jar
${project.artifactId}
@@ -33,18 +29,19 @@
- 6.2.44
- 1.0.26
+
+ 6.3.0
+ 1.2.0
- 5.10.2
- 5.11.0
+ 5.11.0
+ 5.13.0
3.13.0
3.3.1
- 3.2.5
+ 3.5.0
- 11
+ 17
UTF-8