This is an automated email from the ASF dual-hosted git repository. leerho pushed a commit to branch integrateJava17_v3 in repository https://gitbox.apache.org/repos/asf/datasketches-memory.git
commit 66600b4693641ff7c1ca7f3390b80c89752d5de9 Author: Lee Rhodes <[email protected]> AuthorDate: Wed Feb 14 11:53:03 2024 -0800 Temporary commit --- .github/workflows/.toolchains.xml | 26 +++++++++++++++++++--- .github/workflows/auto-jdk-matrix.yml | 15 ++++++++----- .../apache/datasketches/memory/internal/Util.java | 2 +- pom.xml | 2 +- 4 files changed, 35 insertions(+), 10 deletions(-) diff --git a/.github/workflows/.toolchains.xml b/.github/workflows/.toolchains.xml index 5f40493..a2adc14 100644 --- a/.github/workflows/.toolchains.xml +++ b/.github/workflows/.toolchains.xml @@ -4,7 +4,7 @@ <type>jdk</type> <provides> <version>1.8</version> - <vendor>openjdk</vendor> + <vendor>Azul Systems, Inc.</vendor> </provides> <configuration> <jdkHome>${env.JAVA8_HOME}</jdkHome> @@ -14,7 +14,7 @@ <type>jdk</type> <provides> <version>8</version> - <vendor>openjdk</vendor> + <vendor>Azul Systems, Inc.</vendor> </provides> <configuration> <jdkHome>${env.JAVA8_HOME}</jdkHome> @@ -24,10 +24,30 @@ <type>jdk</type> <provides> <version>11</version> - <vendor>openjdk</vendor> + <vendor>Eclipse Adoptium</vendor> </provides> <configuration> <jdkHome>${env.JAVA11_HOME}</jdkHome> </configuration> </toolchain> + <toolchain> + <type>jdk</type> + <provides> + <version>17</version> + <vendor>Eclipse Adoptium</vendor> + </provides> + <configuration> + <jdkHome>${env.JAVA17_HOME}</jdkHome> + </configuration> + </toolchain> + <toolchain> + <type>jdk</type> + <provides> + <version>21</version> + <vendor>Oracle</vendor> + </provides> + <configuration> + <jdkHome>${env.JAVA21_HOME}</jdkHome> + </configuration> + </toolchain> </toolchains> \ No newline at end of file diff --git a/.github/workflows/auto-jdk-matrix.yml b/.github/workflows/auto-jdk-matrix.yml index c0ec959..ed8668b 100644 --- a/.github/workflows/auto-jdk-matrix.yml +++ b/.github/workflows/auto-jdk-matrix.yml @@ -12,26 +12,29 @@ env: jobs: build: name: Build, Test, Install - runs-on: macOS-latest - + runs-on: ubuntu-latest strategy: fail-fast: false + matrix: + jdk: [ 8,11 ] + env: + JDK_VERSION: ${{ matrix.jdk }} steps: - name: "Checkout ${{ github.ref }} ( ${{ github.sha }} )" - uses: actions/[email protected] + uses: actions/[email protected] with: persist-credentials: false - name: Cache local Maven repository - uses: actions/[email protected] + uses: actions/[email protected] with: path: ~/.m2/repository key: build-${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }} restore-keys: build-${{ runner.os }}-maven- - name: Install Matrix JDK - uses: actions/setup-java@v3 + uses: actions/[email protected] with: java-version: | 8 @@ -39,6 +42,8 @@ jobs: distribution: 'temurin' java-package: jdk architecture: x64 +# Architecture options: x86, x64, armv7, aarch64, ppc64le +# setup-java@v3 has a "with cache" option - name: Echo Java Version run: > diff --git a/datasketches-memory-java8/src/main/java/org/apache/datasketches/memory/internal/Util.java b/datasketches-memory-java8/src/main/java/org/apache/datasketches/memory/internal/Util.java index d60a67d..8c93c76 100644 --- a/datasketches-memory-java8/src/main/java/org/apache/datasketches/memory/internal/Util.java +++ b/datasketches-memory-java8/src/main/java/org/apache/datasketches/memory/internal/Util.java @@ -316,7 +316,7 @@ public final class Util { * @return the absolute path of the given resource file's shortName. */ public static String getResourcePath(final String shortFileName) { - Objects.requireNonNull(shortFileName, "input parameter " + shortFileName + " cannot be null."); + Objects.requireNonNull(shortFileName, "input parameter 'String shortFileName' cannot be null."); try { final URL url = Util.class.getClassLoader().getResource(shortFileName); Objects.requireNonNull(url, "resource " + shortFileName + " could not be acquired."); diff --git a/pom.xml b/pom.xml index d64b46a..734014d 100644 --- a/pom.xml +++ b/pom.xml @@ -127,7 +127,7 @@ under the License. <maven-release-plugin.version>3.0.0-M4</maven-release-plugin.version> <!-- overrides parent --> <maven-remote-resources-plugin.version>1.7.0</maven-remote-resources-plugin.version> <!-- overrides parent --> <maven-source-plugin.version>3.2.1</maven-source-plugin.version> <!-- overrides parent --> - <maven-surefire-plugin.version>3.0.0-M5</maven-surefire-plugin.version> <!-- overrides parent --> + <maven-surefire-plugin.version>3.1.2</maven-surefire-plugin.version> <!-- overrides parent --> <maven-toolchains-plugin.version>3.0.0</maven-toolchains-plugin.version> <maven-install-plugin.version>3.0.0-M1</maven-install-plugin.version> <maven-exec-plugin.version>3.0.0</maven-exec-plugin.version> --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
