Bump vtp til java 17 (#834)

navikt · Nov 2, 2021 · 7ce5834 · 7ce5834
1 parent a1ee336
commit 7ce5834
Show file tree

Hide file tree

Showing 9 changed files with 19 additions and 46 deletions.
diff --git a/.github/.m2/settings.xml b/.github/.m2/settings.xml
@@ -34,12 +34,12 @@
     <servers>
         <server>
             <id>github</id>
-            <username>${env.GITHUB_USERNAME}</username>
+            <username>x-access-token</username>
             <password>${env.GITHUB_TOKEN}</password>
         </server>
         <server>
             <id>legacy-avhengigheter</id>
-            <username>${env.GITHUB_USERNAME}</username>
+            <username>x-access-token</username>
             <password>${env.GITHUB_PASSWORD}</password>
         </server>
     </servers>

diff --git a/.github/workflows/build-pr.yml b/.github/workflows/build-pr.yml
@@ -7,20 +7,12 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
-      - 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/repository
-          key: ${{ runner.os }}-maven-${{ env.CACHE_KEY }}
-          restore-keys: |
-            ${{ runner.os }}-maven-${{ env.PREVIOUS_CACHE_KEY }}
       - uses: actions/setup-java@v2
         with:
+          java-version: 17
           distribution: 'adopt'
-          java-version: 16
+          check-latest: true
+          cache: 'maven'
 
       - name: Set build version
         run: |
@@ -31,5 +23,4 @@ jobs:
           echo "Building $BUILD_VERSION"
           mvn package --batch-mode --settings .github/.m2/settings.xml --file pom.xml -Dchangelist= -Dsha1=-${BUILD_VERSION}
         env:
-          GITHUB_USERNAME: x-access-token
           GITHUB_TOKEN: ${{ secrets.GH_ACCESS_TOKEN }} # Må ha PAT pga avhengighet til private repo: navikt/legacy-avhengigheter
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -12,20 +12,12 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
-      - 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/repository
-          key: ${{ runner.os }}-maven-${{ env.CACHE_KEY }}
-          restore-keys: |
-            ${{ runner.os }}-maven-${{ env.PREVIOUS_CACHE_KEY }}
       - uses: actions/setup-java@v2
         with:
+          java-version: 17
           distribution: 'adopt'
-          java-version: 16
+          check-latest: true
+          cache: 'maven'
 
       - name: Set build version
         run: |
@@ -38,7 +30,6 @@ jobs:
           echo "Deployed artifacts"
           echo "TAG=${BUILD_VERSION}" >> $GITHUB_ENV
         env:
-          GITHUB_USERNAME: x-access-token
           GITHUB_TOKEN: ${{ secrets.GH_ACCESS_TOKEN }}  # Må ha PAT pga avhengighet til private repo: navikt/legacy-avhengigheter
 
       - name: Release Drafter

diff --git a/.github/workflows/release-kontrakt.yml b/.github/workflows/release-kontrakt.yml
@@ -13,19 +13,10 @@ jobs:
       - uses: actions/checkout@v2
       - uses: actions/setup-java@v2
         with:
+          java-version: 17
           distribution: 'adopt'
-          java-version: 16
-
-      - name: Set cache key
-        run: |
-          echo "CACHE_KEY=$(expr $(date +%V) - 1 + 1)-${{ github.event.pull_request.number }}" >> $GITHUB_ENV
-          echo "PREVIOUS_CACHE_KEY=$(expr $(date +%V) - 1 + 1)" >> $GITHUB_ENV
-      - uses: actions/cache@v2
-        with:
-          path: ~/.m2
-          key: ${{ runner.os }}-maven-${{ env.CACHE_KEY }}
-          restore-keys: |
-            ${{ runner.os }}-maven-${{ env.PREVIOUS_CACHE_KEY }}
+          check-latest: true
+          cache: 'maven'
 
       - name: Publish artifacts
         shell: bash

diff --git a/.java-version b/.java-version
@@ -1 +1 @@
-16
+17
diff --git a/Dockerfile b/Dockerfile
@@ -1,4 +1,4 @@
-FROM navikt/java:16
+FROM navikt/java:17
 
 LABEL org.opencontainers.image.source=https://github.com/navikt/vtp
 
@@ -14,5 +14,4 @@ ENV JAVA_OPTS="-Dlogback.configurationFile=logback.xml \
                		-XX:MaxRAMPercentage=75.0 \
                		-XX:+PrintFlagsFinal \
                		-Dfile.encoding=UTF8 \
-               		-Duser.timezone=Europe/Oslo \
-               		--illegal-access=permit"
+               		-Duser.timezone=Europe/Oslo"
diff --git a/mocks/pdl-mock/pom.xml b/mocks/pdl-mock/pom.xml
@@ -33,7 +33,7 @@
         <dependency>
             <groupId>io.github.kobylynskyi</groupId>
             <artifactId>graphql-codegen-maven-plugin</artifactId>
-            <version>5.2.0</version>
+            <version>${graphql-codegen-maven-plugin.version}</version>
         </dependency>
         <dependency>
             <groupId>com.distelli.graphql</groupId>
@@ -55,7 +55,7 @@
             <plugin>
                 <groupId>io.github.kobylynskyi</groupId>
                 <artifactId>graphql-codegen-maven-plugin</artifactId>
-                <version>5.2.0</version>
+                <version>${graphql-codegen-maven-plugin.version}</version>
                 <executions>
                     <execution>
                         <goals>

diff --git a/mocks/pom.xml b/mocks/pom.xml
@@ -43,7 +43,7 @@
             <dependency>
                 <groupId>com.graphql-java</groupId>
                 <artifactId>graphql-java-extended-scalars</artifactId>
-                <version>16.0.1</version>
+                <version>17.0</version>
                 <exclusions>
                     <exclusion>
                         <groupId>com.squareup.okhttp3</groupId>

diff --git a/pom.xml b/pom.xml
@@ -32,7 +32,7 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
 
-        <java.version>16</java.version>
+        <java.version>17</java.version>
 
         <kafka.version>2.8.0</kafka.version>
         <avro.version>1.11.0</avro.version>
@@ -44,6 +44,7 @@
         <okonomistotte.versjon>2.0_20190412163011_bb51d0e</okonomistotte.versjon>
         <swagger.version>1.6.3</swagger.version>
         <graphql-java.version>0.0.0-2021-05-17T23-49-29-83942204</graphql-java.version>
+        <graphql-codegen-maven-plugin.version>5.3.0</graphql-codegen-maven-plugin.version>
         <ch.qos.logback.version>1.2.6</ch.qos.logback.version>
         <mockito.version>3.12.4</mockito.version>
         <jupiter.version>5.8.1</jupiter.version>