This is an automated email from the ASF dual-hosted git repository. leerho pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/datasketches-memory17.git
commit 42704d4a6814ba1cdc242194d49419d3dcbc2c77 Author: Lee Rhodes <[email protected]> AuthorDate: Sun Oct 1 16:38:09 2023 -0700 Updates to toolchains.xml, BaseStateTest.java, pom.xml, README.md --- .github/workflows/.toolchains.xml | 28 ++++------- README.md | 18 +++++++ pom.xml | 55 ++++++++++++++-------- .../memory/internal/BaseStateTest.java | 2 +- 4 files changed, 63 insertions(+), 40 deletions(-) diff --git a/.github/workflows/.toolchains.xml b/.github/workflows/.toolchains.xml index c415d5d..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,7 +24,7 @@ <type>jdk</type> <provides> <version>11</version> - <vendor>openjdk</vendor> + <vendor>Eclipse Adoptium</vendor> </provides> <configuration> <jdkHome>${env.JAVA11_HOME}</jdkHome> @@ -33,31 +33,21 @@ <toolchain> <type>jdk</type> <provides> - <version>12</version> - <vendor>openjdk</vendor> - </provides> - <configuration> - <jdkHome>${env.JAVA12_HOME}</jdkHome> - </configuration> - </toolchain> - <toolchain> - <type>jdk</type> - <provides> - <version>13</version> - <vendor>openjdk</vendor> + <version>17</version> + <vendor>Eclipse Adoptium</vendor> </provides> <configuration> - <jdkHome>${env.JAVA13_HOME}</jdkHome> + <jdkHome>${env.JAVA17_HOME}</jdkHome> </configuration> </toolchain> <toolchain> <type>jdk</type> <provides> - <version>17</version> - <vendor>openjdk</vendor> + <version>21</version> + <vendor>Oracle</vendor> </provides> <configuration> - <jdkHome>${env.JAVA17_HOME}</jdkHome> + <jdkHome>${env.JAVA21_HOME}</jdkHome> </configuration> </toolchain> </toolchains> \ No newline at end of file diff --git a/README.md b/README.md index 076825a..4398851 100644 --- a/README.md +++ b/README.md @@ -1 +1,19 @@ +<!-- + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. +--> # datasketches-memory17 diff --git a/pom.xml b/pom.xml index 84cd565..b297e2b 100644 --- a/pom.xml +++ b/pom.xml @@ -34,7 +34,7 @@ under the License. <artifactId>datasketches-memory</artifactId> <version>3.0.0-SNAPSHOT</version> <!-- Required for multi-module project --> - <packaging>pom</packaging> + <packaging>jar</packaging> <name>${project.artifactId}</name> <description>High-performance native memory access with Panama.</description> @@ -83,7 +83,7 @@ under the License. </developers> <!-- - NOTE: + Note: The datasketches-memory submodule uses the Maven project-aggregation feature and does not inherit from this root module as a parent; so that there is no runtime dependency on the parent project (root module). As a result, some properties from this POM (including the version) are duplicated in the datasketches-memory @@ -101,13 +101,16 @@ under the License. <!-- Test --> <!-- Version 7.4.0 fails to locate jquery.min.js for reporting on debian systems. Version 7.5 has a serious security bug, for Java 8 use 7.5.1. - For Java 9+ use 7.8+ --> + For Java 9+ use 7.6+. + TestNG runtime only requires jquery. + --> <testng.version>7.5.1</testng.version> + <jquery.version>3.6.1</jquery.version> <!-- System-wide properties --> <maven.version>3.5.0</maven.version> <java.version>17</java.version> - <jdk-toolchain.version>8</jdk-toolchain.version> + <jdk-toolchain.version>${java.version}</jdk-toolchain.version> <maven.compiler.source>${java.version}</maven.compiler.source> <maven.compiler.target>${java.version}</maven.compiler.target> <argLine>-Xmx4g -Duser.language=en -Duser.country=US -Dfile.encoding=UTF-8</argLine> @@ -174,6 +177,18 @@ under the License. </repositories> <dependencies> + <dependency> + <groupId>org.testng</groupId> + <artifactId>testng</artifactId> + <scope>test</scope> + </dependency> + <!-- + <dependency> + <groupId>org.webjars</groupId> + <artifactId>jquery</artifactId> + <scope>test</scope> + </dependency> + --> <dependency> <!-- Used for xxHash testing --> <groupId>net.openhft</groupId> @@ -190,6 +205,14 @@ under the License. <version>${testng.version}</version> <scope>test</scope> </dependency> + <!-- + <dependency> + <groupId>org.webjars</groupId> + <artifactId>jquery</artifactId> + <version>${jquery.version}</version> + <scope>test</scope> + </dependency> + --> <dependency> <!-- Used for xxHash testing --> <groupId>net.openhft</groupId> @@ -371,6 +394,11 @@ under the License. <jdkToolchain> <version>${jdk-toolchain.version}</version> </jdkToolchain> + <!-- + <configuration> + <argLine>${argline} --add-module --patch-module ... </argline> + </configuration> + --> <reportsDirectory>${project.build.directory}/test-output/${maven.build.timestamp}</reportsDirectory> </configuration> </plugin> @@ -382,7 +410,7 @@ under the License. <configuration> <toolchains> <jdk> - <version>[1.8,1.9),[8],[11,14),[17,18)</version> + <version>[1.8,1.9),[8],[11,14),[17,18),[21,21)</version> </jdk> </toolchains> </configuration> @@ -500,6 +528,7 @@ under the License. </build> </profile> + <!-- <profile> <id>only-eclipse</id> <activation> @@ -525,22 +554,8 @@ under the License. </pluginManagement> </build> </profile> - + --> </profiles> - <!-- This Maven project is divided into an aggregator project (the root), that manages a group of submodules that - inherit configuration from this root module. - A multi-module project is used to target different version-specific features of the Java language APIs. - Furthermore, it is a structure that is supported in most IDEs allowing minimal disruption to developers that - contribute to this project - <modules> - <module>datasketches-memory-java8</module> - <module>datasketches-memory-java8-tests</module> - <module>datasketches-memory-java11</module> - <module>datasketches-memory</module> - <module>datasketches-memory-resources</module> - </modules> - --> - </project> diff --git a/src/test/java/org/apache/datasketches/memory/internal/BaseStateTest.java b/src/test/java/org/apache/datasketches/memory/internal/BaseStateTest.java index b6016e8..e27a776 100644 --- a/src/test/java/org/apache/datasketches/memory/internal/BaseStateTest.java +++ b/src/test/java/org/apache/datasketches/memory/internal/BaseStateTest.java @@ -101,7 +101,7 @@ public class BaseStateTest { * @param s value to print */ static void println(String s) { - System.out.println(s); //disable here + //System.out.println(s); //disable here } } --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
