Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

run tests with Java 18 #183

Merged
merged 3 commits into from
May 13, 2022
Merged

run tests with Java 18 #183

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
750b0db
run tests with Java 18
Ladicek Apr 8, 2022
869465f
use latest versions of some GitHub actions
Ladicek May 12, 2022
ac5063e
improve invoker tests to use Maven plugin versions managed by the mai…
Ladicek May 12, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 8 additions & 6 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,9 @@ jobs:
- 8
- 11
- 17
- 18-ea
- 18
# https://github.com/actions/setup-java/issues/323
#- 19-ea
compiler:
- javac
- ecj
Expand All @@ -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 }}
Expand All @@ -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 }}
Expand Down Expand Up @@ -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
Expand Down
8 changes: 7 additions & 1 deletion maven-plugin/src/it/defaultFileset/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
6 changes: 6 additions & 0 deletions maven-plugin/src/it/dependencies/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
8 changes: 7 additions & 1 deletion maven-plugin/src/it/filesets/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
8 changes: 7 additions & 1 deletion maven-plugin/src/it/jar/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
8 changes: 7 additions & 1 deletion maven-plugin/src/it/multipleIndices/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
6 changes: 6 additions & 0 deletions maven-plugin/src/it/noFileset/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
6 changes: 6 additions & 0 deletions maven-plugin/src/it/smoketest/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 2 additions & 0 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down