chore: Move CI to Java >=11 (INRIA#4173)

SirYwell · Sep 28, 2021 · e522c66 · e522c66
1 parent 5a56cc8
commit e522c66
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 16 deletions.
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -8,28 +8,26 @@ name: tests
 on:
   pull_request:
     branches:
-      master
+      - master
   push:
     branches:
-      master
+      - master
   schedule:
   - cron: "0 0 * * *"
 
 env:
-  JAVA_DISTRIBUTION: adopt
+  JAVA_DISTRIBUTION: temurin
 
 jobs:
   build:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        java: [8, 11, 15]
+        java: [11, 16]
         os: [ubuntu-latest, windows-latest]
         exclude:
           - os: windows-latest
-            java: 11
-          - os: windows-latest
-            java: 15
+            java: 16
 
 
     env:
@@ -77,7 +75,7 @@ jobs:
       - uses: actions/checkout@5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f # renovate: tag=v2.3.4
       - uses: actions/setup-java@3bc31aaf88e8fc94dc1e632d48af61be5ca8721c # renovate: tag=v2.3.0
         with:
-          java-version: 15
+          java-version: 16
           distribution: ${{ env.JAVA_DISTRIBUTION }}
 
       - name: Get date for cache # see https://github.com/actions/cache README
@@ -113,7 +111,7 @@ jobs:
           fetch-depth: 0
       - uses: actions/setup-java@3bc31aaf88e8fc94dc1e632d48af61be5ca8721c # renovate: tag=v2.3.0
         with:
-          java-version: 15
+          java-version: 16
           distribution: ${{ env.JAVA_DISTRIBUTION }}
       - uses: actions/setup-python@dc73133d4da04e56a135ae2246682783cc7c7cb6 # renovate: tag=v2.2.2
         with:

diff --git a/pom.xml b/pom.xml
@@ -38,7 +38,6 @@
   </licenses>
 
   <properties>
-    <java.src.version>1.8</java.src.version>
     <sonar.coverage.exclusions>
         **/support/gui/*
     </sonar.coverage.exclusions>

diff --git a/spoon-control-flow/pom.xml b/spoon-control-flow/pom.xml
@@ -28,10 +28,6 @@
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
                 <version>3.8.1</version>
-                <configuration>
-                    <source>1.8</source>
-                    <target>1.8</target>
-                </configuration>
             </plugin>
 
             <plugin>

diff --git a/spoon-pom/pom.xml b/spoon-pom/pom.xml
@@ -20,8 +20,7 @@
     <inceptionYear>2007</inceptionYear>
 
     <properties>
-        <java.src.version>1.8</java.src.version>
-        <java.test.version>1.8</java.test.version>
+        <maven.compiler.release>11</maven.compiler.release>
         <runtime.log>target/velocity.log</runtime.log>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.build.outputTimestamp>1</project.build.outputTimestamp>