diff --git a/.github/workflows/deploy-snapshot.yml b/.github/workflows/deploy-snapshot.yml index b9182bf..a46cfd7 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 # 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 index c0c8163..3b478d6 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: '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 index 5e235b0..8fd935f 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 # Run maven verify - name: Maven verify run: mvn verify --batch-mode diff --git a/json2properties-generator/pom.xml b/json2properties-generator/pom.xml index 3a7ef36..9eb2e26 100644 --- a/json2properties-generator/pom.xml +++ b/json2properties-generator/pom.xml @@ -6,7 +6,7 @@ com.namics.oss.magnolia magnolia-dictionary-parent - 1.2.9-SNAPSHOT + 1.3.0-SNAPSHOT json2properties-generator diff --git a/magnolia-dictionary/pom.xml b/magnolia-dictionary/pom.xml index acaa28c..8ed4ac8 100644 --- a/magnolia-dictionary/pom.xml +++ b/magnolia-dictionary/pom.xml @@ -6,7 +6,7 @@ com.namics.oss.magnolia magnolia-dictionary-parent - 1.2.9-SNAPSHOT + 1.3.0-SNAPSHOT magnolia-dictionary @@ -24,6 +24,10 @@ info.magnolia.site magnolia-site + + info.magnolia.site + magnolia-site-jcr + info.magnolia.publishing magnolia-publishing-core @@ -40,5 +44,9 @@ org.apache.poi poi + + com.google.code.findbugs + jsr305 + \ No newline at end of file diff --git a/pom.xml b/pom.xml index ac656bd..be4a772 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ com.namics.oss.magnolia magnolia-dictionary-parent - 1.2.9-SNAPSHOT + 1.3.0-SNAPSHOT pom ${project.artifactId} @@ -34,19 +34,21 @@ - 6.2.40 - 5.2.4 - 2.10.1 + + 6.3.0 + 5.3.0 + 2.11.0 + 3.0.2 - 5.10.1 - 5.7.0 + 5.11.0 + 5.13.0 3.11.0 3.3.0 3.5.0 - 3.2.2 + 3.5.0 3.0.1 1.6.13 3.9.0 @@ -56,7 +58,7 @@ unknown unknown unknown - 11 + 17 UTF-8 ${encoding} true @@ -100,6 +102,12 @@ ${gson.version} + + com.google.code.findbugs + jsr305 + ${jsr305.nullable.version} + + org.junit.jupiter