diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 84ee4c29..dd4ab6b3 100644 --- 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 index 9413fbd1..0e4f1db8 100644 --- a/maven-plugin/src/it/defaultFileset/pom.xml +++ b/maven-plugin/src/it/defaultFileset/pom.xml @@ -15,10 +15,16 @@ + + org.apache.maven.plugins + maven-compiler-plugin + @version.maven-compiler-plugin@ + + org.apache.maven.plugins maven-dependency-plugin - 3.2.0 + @version.maven-dependency-plugin@ unpack-dependency diff --git a/maven-plugin/src/it/dependencies/pom.xml b/maven-plugin/src/it/dependencies/pom.xml index 96f553b2..468f626b 100644 --- a/maven-plugin/src/it/dependencies/pom.xml +++ b/maven-plugin/src/it/dependencies/pom.xml @@ -29,6 +29,12 @@ + + org.apache.maven.plugins + maven-compiler-plugin + @version.maven-compiler-plugin@ + + @project.groupId@ @project.artifactId@ diff --git a/maven-plugin/src/it/filesets/pom.xml b/maven-plugin/src/it/filesets/pom.xml index 678ad7a7..aef72188 100644 --- a/maven-plugin/src/it/filesets/pom.xml +++ b/maven-plugin/src/it/filesets/pom.xml @@ -15,10 +15,16 @@ + + org.apache.maven.plugins + maven-compiler-plugin + @version.maven-compiler-plugin@ + + org.apache.maven.plugins maven-dependency-plugin - 3.2.0 + @version.maven-dependency-plugin@ unpack-dependency diff --git a/maven-plugin/src/it/jar/pom.xml b/maven-plugin/src/it/jar/pom.xml index a65e6536..4f39ba31 100644 --- a/maven-plugin/src/it/jar/pom.xml +++ b/maven-plugin/src/it/jar/pom.xml @@ -29,10 +29,16 @@ + + org.apache.maven.plugins + maven-compiler-plugin + @version.maven-compiler-plugin@ + + org.apache.maven.plugins maven-shade-plugin - 3.3.0 + @version.maven-shade-plugin@ uberjar diff --git a/maven-plugin/src/it/multipleIndices/pom.xml b/maven-plugin/src/it/multipleIndices/pom.xml index 4f81e95c..c924f011 100644 --- a/maven-plugin/src/it/multipleIndices/pom.xml +++ b/maven-plugin/src/it/multipleIndices/pom.xml @@ -15,10 +15,16 @@ + + org.apache.maven.plugins + maven-compiler-plugin + @version.maven-compiler-plugin@ + + org.apache.maven.plugins maven-dependency-plugin - 3.2.0 + @version.maven-dependency-plugin@ unpack-dependency diff --git a/maven-plugin/src/it/noFileset/pom.xml b/maven-plugin/src/it/noFileset/pom.xml index 1da9269a..b4cffa71 100644 --- a/maven-plugin/src/it/noFileset/pom.xml +++ b/maven-plugin/src/it/noFileset/pom.xml @@ -15,6 +15,12 @@ + + org.apache.maven.plugins + maven-compiler-plugin + @version.maven-compiler-plugin@ + + @project.groupId@ @project.artifactId@ diff --git a/maven-plugin/src/it/smoketest/pom.xml b/maven-plugin/src/it/smoketest/pom.xml index 95c9f989..15cbe242 100644 --- a/maven-plugin/src/it/smoketest/pom.xml +++ b/maven-plugin/src/it/smoketest/pom.xml @@ -15,6 +15,12 @@ + + org.apache.maven.plugins + maven-compiler-plugin + @version.maven-compiler-plugin@ + + @project.groupId@ @project.artifactId@ diff --git a/pom.xml b/pom.xml index b926e14c..c8bd3b08 100644 --- a/pom.xml +++ b/pom.xml @@ -30,8 +30,10 @@ 3.8.1 5.1.2 3.10.1 + 3.3.0 3.2.2 3.6.1 + 3.3.0 1.1.0 2.11.1 3.4.1