This is an automated email from the ASF dual-hosted git repository. leerho pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/datasketches-memory.git
commit 2b1997e09706b47cd9c752d0eb24d7c51f79f9b6 Author: Lee Rhodes <[email protected]> AuthorDate: Tue Mar 23 08:59:30 2021 -0700 Update GitHub Actions toolchains. --- .github/workflows/.toolchains.xml | 32 +++++++++++++++++++++- pom.xml | 17 ++++++++++++ .../datasketches/memory/AllocateDirectMap.java | 6 ++-- 3 files changed, 50 insertions(+), 5 deletions(-) diff --git a/.github/workflows/.toolchains.xml b/.github/workflows/.toolchains.xml index a7d1161..111252f 100644 --- a/.github/workflows/.toolchains.xml +++ b/.github/workflows/.toolchains.xml @@ -4,10 +4,40 @@ <type>jdk</type> <provides> <version>8</version> - <vendor>openjdk</vendor> + <vendor>adoptopenjdk</vendor> </provides> <configuration> <jdkHome>${JAVA_HOME}</jdkHome> </configuration> </toolchain> + <toolchain> + <type>jdk</type> + <provides> + <version>11</version> + <vendor>adoptopenjdk</vendor> + </provides> + <configuration> + <jdkHome>${env.JAVA11_HOME}</jdkHome> + </configuration> + </toolchain> + <toolchain> + <type>jdk</type> + <provides> + <version>15</version> + <vendor>adoptopenjdk</vendor> + </provides> + <configuration> + <jdkHome>${env.JAVA15_HOME}</jdkHome> + </configuration> + </toolchain> + <toolchain> + <type>jdk</type> + <provides> + <version>16</version> + <vendor>adoptopenjdk</vendor> + </provides> + <configuration> + <jdkHome>${env.JAVA16_HOME}</jdkHome> + </configuration> + </toolchain> </toolchains> \ No newline at end of file diff --git a/pom.xml b/pom.xml index bd84fe5..c53795b 100644 --- a/pom.xml +++ b/pom.xml @@ -121,6 +121,7 @@ under the License. <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-toolchains-plugin.version>3.0.0</maven-toolchains-plugin.version> <!-- Apache Plugins --> <apache-rat-plugin.version>0.13</apache-rat-plugin.version> <!-- overrides parent --> <!-- org.jacoco Maven Plugins --> @@ -358,6 +359,22 @@ under the License. </plugin> <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-toolchains-plugin</artifactId> + <version>${maven-toolchains-plugin.version}</version> + <configuration> + <toolchains> + <jdk><version>8</version></jdk> + </toolchains> + </configuration> + <executions> + <execution> + <goals><goal>toolchain</goal></goals> + </execution> + </executions> + </plugin> + + <plugin> <!-- Generates code coverage report from website. --> <groupId>org.jacoco</groupId> <artifactId>jacoco-maven-plugin</artifactId> diff --git a/src/main/java/org/apache/datasketches/memory/AllocateDirectMap.java b/src/main/java/org/apache/datasketches/memory/AllocateDirectMap.java index 0dbe16a..cc73064 100644 --- a/src/main/java/org/apache/datasketches/memory/AllocateDirectMap.java +++ b/src/main/java/org/apache/datasketches/memory/AllocateDirectMap.java @@ -41,13 +41,11 @@ import sun.nio.ch.FileChannelImpl; * (including those > 2GB). * * <p>To understand how it works, reference native code for map0, unmap0: - * <a href="http://hg.openjdk.java.net/jdk8u/jdk8u/jdk/file/f940e7a48b72/src/solaris/native/ - * sun/nio/ch/FileChannelImpl.c"> + * <a href="http://hg.openjdk.java.net/jdk8u/jdk8u/jdk/file/f940e7a48b72/src/solaris/native/sun/nio/ch/FileChannelImpl.c";> * FileChannelImpl.c</a></p> * * <p>To understand how it works, reference native code for load0(), isLoaded0(), and force0(): - * <a href="http://hg.openjdk.java.net/jdk8u/jdk8u/jdk/file/f940e7a48b72/src/solaris/native/ - * java/nio/MappedByteBuffer.c"> + * <a href="http://hg.openjdk.java.net/jdk8u/jdk8u/jdk/file/f940e7a48b72/src/solaris/native/java/nio/MappedByteBuffer.c";> * MappedByteBuffer.c</a></p> * * @author Roman Leventov --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
