Merge pull request #183 from Ladicek/java-18

run tests with Java 18
smallrye · May 13, 2022 · 1121d96 · 1121d96
2 parents 991d53a + ac5063e
commit 1121d96
Show file tree

Hide file tree

Showing 9 changed files with 56 additions and 10 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -28,7 +28,9 @@ jobs:
         - 8
         - 11
         - 17
-        - 18-ea
+        - 18
+        # https://github.com/actions/setup-java/issues/323
+        #- 19-ea
         compiler:
         - javac
         - ecj
@@ -45,10 +47,10 @@ jobs:
     name: "Build with JDK ${{ matrix.java }} using ${{ matrix.compiler}} (parameters: ${{ matrix.parameters }}) on ${{ matrix.os }}"
     steps:
     - name: Checkout
-      uses: actions/checkout@v2
+      uses: actions/checkout@v3
 
     - name: Set up JDK ${{ matrix.java }}
-      uses: actions/setup-java@v2
+      uses: actions/setup-java@v3
       with:
         distribution: temurin
         java-version: ${{ matrix.java }}
@@ -70,12 +72,12 @@ jobs:
     name: 'Calcite regression test (JDK ${{ matrix.java }})'
     steps:
     - name: Checkout
-      uses: actions/checkout@v2
+      uses: actions/checkout@v3
       with:
         fetch-depth: 50
 
     - name: Set up JDK ${{ matrix.java }}
-      uses: actions/setup-java@v2
+      uses: actions/setup-java@v3
       with:
         distribution: temurin
         java-version: ${{ matrix.java }}
@@ -111,7 +113,7 @@ jobs:
        tar -czf calcite-work.tgz ../calcite 
 
     - name: Upload failure archive (if run failed)
-      uses: actions/upload-artifact@v1
+      uses: actions/upload-artifact@v3
       if: failure()
       with:
         name: calcite-work

diff --git a/maven-plugin/src/it/defaultFileset/pom.xml b/maven-plugin/src/it/defaultFileset/pom.xml
@@ -15,10 +15,16 @@
 
   <build>
     <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-compiler-plugin</artifactId>
+        <version>@version.maven-compiler-plugin@</version>
+      </plugin>
+
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-dependency-plugin</artifactId>
-        <version>3.2.0</version>
+        <version>@version.maven-dependency-plugin@</version>
         <executions>
           <execution>
             <id>unpack-dependency</id>

diff --git a/maven-plugin/src/it/dependencies/pom.xml b/maven-plugin/src/it/dependencies/pom.xml
@@ -29,6 +29,12 @@
 
   <build>
     <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-compiler-plugin</artifactId>
+        <version>@version.maven-compiler-plugin@</version>
+      </plugin>
+
       <plugin>
         <groupId>@project.groupId@</groupId>
         <artifactId>@project.artifactId@</artifactId>

diff --git a/maven-plugin/src/it/filesets/pom.xml b/maven-plugin/src/it/filesets/pom.xml
@@ -15,10 +15,16 @@
 
   <build>
     <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-compiler-plugin</artifactId>
+        <version>@version.maven-compiler-plugin@</version>
+      </plugin>
+
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-dependency-plugin</artifactId>
-        <version>3.2.0</version>
+        <version>@version.maven-dependency-plugin@</version>
         <executions>
           <execution>
             <id>unpack-dependency</id>

diff --git a/maven-plugin/src/it/jar/pom.xml b/maven-plugin/src/it/jar/pom.xml
@@ -29,10 +29,16 @@
 
   <build>
     <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-compiler-plugin</artifactId>
+        <version>@version.maven-compiler-plugin@</version>
+      </plugin>
+
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-shade-plugin</artifactId>
-        <version>3.3.0</version>
+        <version>@version.maven-shade-plugin@</version>
         <executions>
           <execution>
             <id>uberjar</id>

diff --git a/maven-plugin/src/it/multipleIndices/pom.xml b/maven-plugin/src/it/multipleIndices/pom.xml
@@ -15,10 +15,16 @@
 
   <build>
     <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-compiler-plugin</artifactId>
+        <version>@version.maven-compiler-plugin@</version>
+      </plugin>
+
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-dependency-plugin</artifactId>
-        <version>3.2.0</version>
+        <version>@version.maven-dependency-plugin@</version>
         <executions>
           <execution>
             <id>unpack-dependency</id>

diff --git a/maven-plugin/src/it/noFileset/pom.xml b/maven-plugin/src/it/noFileset/pom.xml
@@ -15,6 +15,12 @@
 
   <build>
     <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-compiler-plugin</artifactId>
+        <version>@version.maven-compiler-plugin@</version>
+      </plugin>
+
       <plugin>
         <groupId>@project.groupId@</groupId>
         <artifactId>@project.artifactId@</artifactId>

diff --git a/maven-plugin/src/it/smoketest/pom.xml b/maven-plugin/src/it/smoketest/pom.xml
@@ -15,6 +15,12 @@
 
   <build>
     <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-compiler-plugin</artifactId>
+        <version>@version.maven-compiler-plugin@</version>
+      </plugin>
+
       <plugin>
         <groupId>@project.groupId@</groupId>
         <artifactId>@project.artifactId@</artifactId>

diff --git a/pom.xml b/pom.xml
@@ -30,8 +30,10 @@
         <version.maven>3.8.1</version.maven>
         <version.maven-bundle-plugin>5.1.2</version.maven-bundle-plugin>
         <version.maven-compiler-plugin>3.10.1</version.maven-compiler-plugin>
+        <version.maven-dependency-plugin>3.3.0</version.maven-dependency-plugin>
         <version.maven-invoker-plugin>3.2.2</version.maven-invoker-plugin>
         <version.maven-plugin-tools>3.6.1</version.maven-plugin-tools>
+        <version.maven-shade-plugin>3.3.0</version.maven-shade-plugin>
         <version.mvn-jlink-wrapper>1.1.0</version.mvn-jlink-wrapper>
         <version.plexus-compiler-eclipse>2.11.1</version.plexus-compiler-eclipse>
         <version.plexus-utils>3.4.1</version.plexus-utils>