Merge pull request #106 from B3Partners/java-11

Upgrade naar Java 11 (drop java 8)
B3Partners · Jun 15, 2021 · 1c16163 · 1c16163
2 parents d85e8ea + 66c9db6
commit 1c16163
Show file tree

Hide file tree

Showing 8 changed files with 126 additions and 162 deletions.
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -1,18 +1,19 @@
 version: 2
 updates:
-- package-ecosystem: maven
-  directory: "/"
-  schedule:
-    interval: weekly
-    day: sunday
-    time: "06:00"
-    timezone: Europe/Amsterdam
-  open-pull-requests-limit: 25
-- package-ecosystem: "github-actions"
-  directory: "/"
-  schedule:
-    interval: "weekly"
-    day: saturday
-    timezone: Europe/Amsterdam
-  labels:
-  - "build infrastructure"
+  - package-ecosystem: maven
+    directory: "/"
+    schedule:
+      interval: weekly
+      day: sunday
+      time: "06:00"
+      timezone: Europe/Amsterdam
+    open-pull-requests-limit: 25
+
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      interval: "weekly"
+      day: saturday
+      timezone: Europe/Amsterdam
+    labels:
+      - "build infrastructure"
diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
@@ -8,7 +8,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        java: [ 8, 11 ]
+        java: [ 11 ]
 
     steps:
       - uses: actions/checkout@v2
@@ -18,16 +18,7 @@ jobs:
           key: maven-${{ hashFiles('**/pom.xml') }}
           restore-keys: |
             maven-
-      - name: Set up JDK 11 for toolchains
-        uses: actions/setup-java@v2
-        with:
-          java-version: 11
-          distribution: 'adopt'
-      - name: Set up JDK 8 for toolchains
-        uses: actions/setup-java@v2
-        with:
-          java-version: 8
-          distribution: 'adopt'
+
       - name: Set up JDK for build
         uses: actions/setup-java@v2
         with:
@@ -42,14 +33,12 @@ jobs:
         run: mvn -V -B -e install --global-toolchains .github/ubuntu-toolchains.xml
 
       - name: Javadoc
-        if: ${{ matrix.java == '8' }}
         run: |
           mvn javadoc:javadoc --global-toolchains .github/ubuntu-toolchains.xml
           mvn javadoc:test-javadoc --global-toolchains .github/ubuntu-toolchains.xml
 
       - name: Site
-        if: ${{ matrix.java == '8' }}
-        run: mvn -B -e site site:stage
+        run: mvn -B -e site site:stage --global-toolchains .github/ubuntu-toolchains.xml
 
       - name: Remove SNAPSHOT jars from repository
         run: |

diff --git a/.github/workflows/owasp.yml b/.github/workflows/owasp.yml
@@ -1,27 +1,31 @@
 name: GH OWASP dependency check
 
-on: [push]
+on: [ push ]
 
 jobs:
   build:
     name: OWASP dependency check
     runs-on: ubuntu-latest
-   
+
     steps:
-    - uses: actions/checkout@v2
-    - uses: actions/cache@v2
-      with:
-        path: ~/.m2/repository
-        key: maven-${{ hashFiles('**/pom.xml') }}
-        restore-keys: |
-          maven-
-    - name: Set up JDK 
-      uses: actions/setup-java@v2
-      with:
-        java-version: 11
-        distribution: 'zulu'
-    - name: OWASP Dependency Check
-      run: mvn org.owasp:dependency-check-maven:check -fae -B -Dorg.slf4j.simpleLogger.defaultLogLevel=WARN -DfailBuildOnCVSS=7 
-    - name: Remove any SNAPSHOT jars from repository
-      run: |
-        find ~/.m2/repository -name "*SNAPSHOT*" -type d | xargs rm -rf {}
+      - uses: actions/checkout@v2
+      - uses: actions/cache@v2
+        with:
+          path: ~/.m2/repository
+          key: maven-${{ hashFiles('**/pom.xml') }}
+          restore-keys: |
+            maven-
+
+      - name: Set up JDK
+        uses: actions/setup-java@v2
+        with:
+          java-version: 11
+          distribution: 'zulu'
+
+      - name: OWASP Dependency Check
+        run: mvn -U package org.owasp:dependency-check-maven:check -fae -B -Dorg.slf4j.simpleLogger.defaultLogLevel=WARN -DfailBuildOnCVSS=7 --global-toolchains .github/ubuntu-toolchains.xml
+
+      - name: Upload result to GitHub Code Scanning
+        uses: github/codeql-action/upload-sarif@v1
+        with:
+          sarif_file: target/dependency-check-report.sarif
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -1,54 +1,43 @@
-timestamps {
+node {
+    stage('Prepare') {
+        sh "ulimit -a"
+        sh "free -m"
+        checkout scm
+    }
 
     properties([
-        [$class: 'jenkins.model.BuildDiscarderProperty', strategy: [$class: 'LogRotator',
-            artifactDaysToKeepStr: '8',
-            artifactNumToKeepStr: '3',
-            daysToKeepStr: '15',
-            numToKeepStr: '5']
-        ]]);
-
-    final def jdks = ['OpenJDK11','OpenJDK8']
-
-    node {
-        stage('Prepare') {
-            sh "ulimit -a"
-            sh "free -m"
-            checkout scm
-        }
-
-        jdks.eachWithIndex { jdk, indexOfJdk ->
-            final String TEST_JDK_NAME = jdk.toString()
-
-            withEnv(["JAVA_HOME=${ tool TEST_JDK_NAME }", "PATH+MAVEN=${tool 'Maven CURRENT'}/bin:${env.JAVA_HOME}/bin"]) {
-
-                stage('Build') {
-                    echo "Building branch: ${env.BRANCH_NAME}"
-                    sh "mvn clean package -Dmaven.test.skip=true -B -V -e -fae -q --global-toolchains .jenkins/toolchains.xml"
-                }
-
-                stage('Check keystore') {
-                    echo "Check welke certificaten de komende 90 dagen verlopen"
-                    sh "./jks-certificate-expiry-checker.sh --keystore ./src/main/resources/pkioverheid.jks --password changeit -t90"
-                }
+        [$class: 'jenkins.model.BuildDiscarderProperty',
+            strategy: [
+                $class: 'LogRotator',
+                artifactDaysToKeepStr: '8',
+                artifactNumToKeepStr: '3',
+                daysToKeepStr: '15',
+                numToKeepStr: '5']
+        ]
+    ]);
+
+    withEnv([
+        "JAVA_HOME=${ tool 'OpenJDK11' }",
+        "PATH+MAVEN=${tool 'Maven CURRENT'}/bin:${ tool 'OpenJDK11' }/bin"
+    ]) {
+
+            stage('Build') {
+                echo "Building branch: ${env.BRANCH_NAME}"
+                sh "mvn clean package -Dmaven.test.skip=true -B -V -e -fae -q --global-toolchains .jenkins/toolchains.xml"
+            }
 
-                lock('http-8088') {
-                    stage('Test') {
-                        echo "Running unit tests"
-                        sh "mvn -e test -B --global-toolchains .jenkins/toolchains.xml"
-                    }
-                }
+            stage('Check keystore') {
+                echo "Check welke certificaten de komende 90 dagen verlopen"
+                sh "./jks-certificate-expiry-checker.sh --keystore ./src/main/resources/pkioverheid.jks --password changeit -t90"
+            }
 
-                if (TEST_JDK_NAME == 'OpenJDK11') {
-                    stage("cleanup Java 11 packages") {
-                        echo "Verwijder de Java 11 build artifacts uit lokale repo"
-                        sh "mvn build-helper:remove-project-artifact"
-                    }
+            lock('http-8088') {
+                stage('Test') {
+                    echo "Running unit tests"
+                    sh "mvn -e test -B --global-toolchains .jenkins/toolchains.xml"
                 }
             }
-        }
 
-        withEnv(["JAVA_HOME=${ tool 'OpenJDK8' }", "PATH+MAVEN=${tool 'Maven CURRENT'}/bin:${env.JAVA_HOME}/bin"]) {
             stage('Publish Test Results') {
                 junit allowEmptyResults: true, testResults: '**/target/surefire-reports/TEST-*.xml, **/target/failsafe-reports/TEST-*.xml'
             }
@@ -64,4 +53,3 @@ timestamps {
             }
         }
     }
-}
diff --git a/lgtm.yml b/lgtm.yml
@@ -1,6 +1,11 @@
 extraction:
   java:
     index:
-      java_version: 8
+      java_version: 11
       maven:
-        version: 3.6.3
+        version: "3.8.1"
+path_classifiers:
+  test:
+    - src/test
+  docs:
+    - src/site