Java 17 (#76)

* Oppdater til Java17

* Forenkle codeql

Author: jolarsen

.devcontainer/devcontainer.json

@@ -9,7 +9,7 @@
 			// Update the VARIANT arg to pick a Java version: 11, 16
 			// Append -bullseye or -buster to pin to an OS version.
 			// Use the -bullseye variants on local arm64/Apple Silicon.
-			"VARIANT": "16",
+			"VARIANT": "17",
 			// Options
 			"INSTALL_MAVEN": "true"
 		}

.github/workflows/build-pr.yml

@@ -18,8 +18,8 @@ jobs:
       - uses: actions/checkout@v2
       - uses: actions/setup-java@v2
         with:
-          java-version: '16'
-          distribution: 'adopt'
+          java-version: '17'
+          distribution: 'temurin'
           cache: 'maven'
       - name: Build
         shell: bash

.github/workflows/build.yml

@@ -20,8 +20,8 @@ jobs:
       - uses: actions/checkout@v2
       - uses: actions/setup-java@v2
         with:
-          java-version: '16'
-          distribution: 'adopt'
+          java-version: '17'
+          distribution: 'temurin'
           cache: 'maven'
       - name: Build artifacts & deploy
         shell: bash

.github/workflows/codeql-analysis.yml

@@ -33,21 +33,12 @@ jobs:
       - run: git checkout HEAD^2
         if: ${{ github.event_name == 'pull_request' }}
 
-      - name: Set cache key
-        run: |
-          echo "CACHE_KEY=$(expr $(date +%V) - 1 + 1)" >> $GITHUB_ENV
-          echo "PREVIOUS_CACHE_KEY=$(expr $(date +%V) - 1)" >> $GITHUB_ENV
-      - uses: actions/cache@v2
-        with:
-          path: ~/.m2
-          key: ${{ runner.os }}-codeql-${{ env.CACHE_KEY }}
-          restore-keys: |
-            ${{ runner.os }}-codeql-${{ env.PREVIOUS_CACHE_KEY }}
-
       - uses: actions/setup-java@v2
         with:
-          java-version: '16'
-          distribution: 'adopt'
+          java-version: '17'
+          distribution: 'temurin'
+          check-latest: true
+          cache: 'maven'
 
     # Initializes the CodeQL tools for scanning.
       - name: Initialize CodeQL

.github/workflows/release.yml

@@ -19,8 +19,8 @@ jobs:
       - name: Set up JDK
         uses: actions/setup-java@v2
         with:
-          java-version: '16'
-          distribution: 'adopt'
+          java-version: '17'
+          distribution: 'temurin'
           cache: 'maven'
       - name: Publish artifact
         env:

.java-version

@@ -1 +1 @@
-16
+17

pom.xml

@@ -40,7 +40,7 @@
 
 	<properties>
 		<revision>2.4.0-SNAPSHOT</revision>
-		<java.version>16</java.version>
+		<java.version>17</java.version>
 		<maven.compiler.source>${java.version}</maven.compiler.source>
 		<maven.compiler.target>${java.version}</maven.compiler.target>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -61,12 +61,12 @@
 			<dependency>
 				<groupId>org.assertj</groupId>
 				<artifactId>assertj-core</artifactId>
-				<version>3.20.2</version>
+				<version>3.22.0</version>
 			</dependency>
 			<dependency>
 				<groupId>com.fasterxml.jackson</groupId>
 				<artifactId>jackson-bom</artifactId>
-				<version>2.12.3</version>
+				<version>2.13.1</version>
 				<scope>import</scope>
 				<type>pom</type>
 			</dependency>
@@ -88,7 +88,7 @@
         <dependency>
             <groupId>org.junit.jupiter</groupId>
             <artifactId>junit-jupiter-engine</artifactId>
-            <version>5.7.2</version>
+            <version>5.8.2</version>
         </dependency>
 	</dependencies>
 
@@ -143,12 +143,12 @@
 				<plugin>
 					<groupId>org.apache.maven.plugins</groupId>
 					<artifactId>maven-jar-plugin</artifactId>
-					<version>3.2.0</version>
+					<version>3.2.2</version>
 				</plugin>
 				<plugin>
 					<groupId>org.apache.maven.plugins</groupId>
 					<artifactId>maven-javadoc-plugin</artifactId>
-					<version>3.3.0</version>
+					<version>3.3.1</version>
 				</plugin>
 				<plugin>
 					<groupId>org.apache.maven.plugins</groupId>
@@ -179,7 +179,7 @@
 				<plugin>
 					<groupId>org.sonarsource.scanner.maven</groupId>
 					<artifactId>sonar-maven-plugin</artifactId>
-					<version>3.9.0.2155</version>
+					<version>3.9.1.2184</version>
 				</plugin>
 			</plugins>
 		</pluginManagement>