From f72602d2c1dc6210976dd8132de0a47ed8555ce7 Mon Sep 17 00:00:00 2001 From: Lee Rhodes Date: Fri, 20 Feb 2026 10:36:33 -0800 Subject: [PATCH 01/15] update pom.xml and add testng.xml --- DS-Java-Memory-24.code-workspace | 13 --- pom.xml | 159 ++++++++++++++++--------------- src/test/resources/testng.xml | 28 ++++++ 3 files changed, 110 insertions(+), 90 deletions(-) delete mode 100644 DS-Java-Memory-24.code-workspace create mode 100644 src/test/resources/testng.xml diff --git a/DS-Java-Memory-24.code-workspace b/DS-Java-Memory-24.code-workspace deleted file mode 100644 index 5285c6ef..00000000 --- a/DS-Java-Memory-24.code-workspace +++ /dev/null @@ -1,13 +0,0 @@ -{ - "folders": [ - { - "path": "." - }, - { - "path": "../datasketches-java21" - } - ], - "settings": { - "maven.view": "flat" - } -} \ No newline at end of file diff --git a/pom.xml b/pom.xml index 681af90a..5bd43f2a 100644 --- a/pom.xml +++ b/pom.xml @@ -76,44 +76,52 @@ under the License. - 7.11.0 + 7.12.0 - 3.6.3 + 3.9.12 25 - ${java.version} - -Xmx4g -Duser.language=en -Duser.country=US -Dfile.encoding=UTF-8 ${jvm-arguments} + -Xmx4g + -Duser.language=en + -Duser.country=US + -Dfile.encoding=UTF-8 + ${jvm.mem} ${jvm.locale.language} ${jvm.locale.country} ${jvm.locale.encoding} UTF-8 ${charset.encoding} ${charset.encoding} ${charset.encoding} yyyy-MM-dd'T'HH-mm-ss'Z' - - 3.7.1 - 3.15.0 - 3.1.3 + + + 3.8.0 + 3.15.0 + 3.1.4 3.6.2 - 3.2.7 - 3.4.2 - 3.11.2 - 3.1.1 - 3.3.1 - - 3.5.2 + 3.2.8 + 3.5.0 + 3.12.0 + 3.3.1 + 3.4.0 + 3.5.4 + + 0.17 + + 3.2.0 - - 4.9.10 - - 0.16.1 - + + - 4.3.0 + 5.0.0 + + + + 9.0.2 + - 0.8.13 - - 2.18.0 + 0.8.14 + 1.0.0 @@ -133,6 +141,7 @@ under the License. + org.apache.maven.plugins maven-assembly-plugin ${maven-assembly-plugin.version} @@ -143,14 +152,10 @@ under the License. ${maven-compiler-plugin.version} true - - ${jvm-arguments} - - org.apache.maven.plugins maven-deploy-plugin @@ -169,11 +174,11 @@ under the License. - @@ -224,8 +229,11 @@ under the License. true public all,-missing - - ${jvm-arguments} + + ${jvm.mem} + ${jvm.locale.language} + ${jvm.locale.country} + ${jvm.locale.encoding} @@ -271,14 +279,18 @@ under the License. maven-surefire-plugin ${maven-surefire-failsafe-plugins.version} - ${jvm-arguments} + @{jvm.args} ${java.version} false false false - ${project.build.directory}/test-output/${maven.build.timestamp} + ${project.build.directory}/test-output + + src/test/resources/testng.xml + + false @@ -320,27 +332,24 @@ under the License. true - **/*.yaml - **/*.yml - **/.* - **/test/resources/**/*.txt - **/git.properties - LICENSE - NOTICE - **/*.code-workspace + StandardCollection + **/*.yaml + **/*.yml + **/.* + **/test/resources/**/*.txt + **/git.properties + **/doc/** + **/*.sk + LICENSE + NOTICE + **/*.code-workspace - - org.codehaus.mojo - versions-maven-plugin - ${versions-maven-plugin.version} - - - org.eluder.coveralls + com.github.hazendaz.maven coveralls-maven-plugin ${coveralls-maven-plugin.version} @@ -349,7 +358,13 @@ under the License. - + io.github.git-commit-id + git-commit-id-maven-plugin + ${git-commit-id-maven-plugin.version} + + + + org.jacoco jacoco-maven-plugin ${jacoco-maven-plugin.version} @@ -362,6 +377,7 @@ under the License. default-report + test report @@ -369,12 +385,6 @@ under the License. - - pl.project13.maven - git-commit-id-plugin - ${git-commit-id-plugin.version} - - @@ -423,21 +433,17 @@ under the License. apache-rat-plugin - org.codehaus.mojo - versions-maven-plugin + com.github.hazendaz.maven + coveralls-maven-plugin - org.eluder.coveralls - coveralls-maven-plugin + io.github.git-commit-id + git-commit-id-maven-plugin org.jacoco jacoco-maven-plugin - - pl.project13.maven - git-commit-id-plugin - @@ -458,11 +464,12 @@ under the License. - pl.project13.maven - git-commit-id-plugin - ${git-commit-id-plugin.version} + io.github.git-commit-id + git-commit-id-maven-plugin + ${git-commit-id-maven-plugin.version} + get-the-git-infos revision @@ -523,14 +530,12 @@ under the License. false false - false + true + true - ${java.version} (${java.vendor} ${java.vm.version}) - ${os.name} ${os.arch} ${os.version} - The Apache Software Foundation ${project.groupId}:${project.artifactId} - + ${git.branch} @@ -573,8 +578,8 @@ under the License. - pl.project13.maven - git-commit-id-plugin + io.github.git-commit-id + git-commit-id-maven-plugin org.apache.maven.plugins diff --git a/src/test/resources/testng.xml b/src/test/resources/testng.xml new file mode 100644 index 00000000..22cdce98 --- /dev/null +++ b/src/test/resources/testng.xml @@ -0,0 +1,28 @@ + + + + + + + + + + + From 7071b969bca4cf10aeb5b6243e23063eb9343195 Mon Sep 17 00:00:00 2001 From: Lee Rhodes Date: Mon, 23 Feb 2026 10:53:22 -0800 Subject: [PATCH 02/15] update pom --- pom.xml | 36 ++++++++++++++++++++++++++---------- 1 file changed, 26 insertions(+), 10 deletions(-) diff --git a/pom.xml b/pom.xml index 5bd43f2a..1ab1d47b 100644 --- a/pom.xml +++ b/pom.xml @@ -105,7 +105,8 @@ under the License. 3.3.1 3.4.0 3.5.4 - + + 0.17 @@ -115,7 +116,6 @@ under the License. 5.0.0 - 9.0.2 @@ -175,7 +175,7 @@ under the License. StandardCollection **/*.yaml @@ -343,7 +342,7 @@ under the License. LICENSE NOTICE **/*.code-workspace - + @@ -387,63 +386,79 @@ under the License. + + org.apache.maven.plugins maven-assembly-plugin + org.apache.maven.plugins maven-compiler-plugin + org.apache.maven.plugins maven-deploy-plugin + org.apache.maven.plugins maven-enforcer-plugin + org.apache.maven.plugins maven-jar-plugin + org.apache.maven.plugins maven-javadoc-plugin + org.apache.maven.plugins maven-release-plugin + org.apache.maven.plugins maven-source-plugin + org.apache.maven.plugins maven-surefire-plugin + org.apache.maven.plugins maven-toolchains-plugin + org.apache.rat apache-rat-plugin + com.github.hazendaz.maven coveralls-maven-plugin + io.github.git-commit-id git-commit-id-maven-plugin + org.jacoco jacoco-maven-plugin + @@ -534,6 +549,7 @@ under the License. true + The Apache Software Foundation ${project.groupId}:${project.artifactId} From c0754763be72b0bddcd7921344f97d4f5a6b932b Mon Sep 17 00:00:00 2001 From: Lee Rhodes Date: Mon, 23 Feb 2026 13:26:35 -0800 Subject: [PATCH 03/15] Update @BeforeSuite --- .../org/apache/datasketches/memory/internal/A_BeforeSuite.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/test/java/org/apache/datasketches/memory/internal/A_BeforeSuite.java b/src/test/java/org/apache/datasketches/memory/internal/A_BeforeSuite.java index af16ccc3..28ecbd02 100644 --- a/src/test/java/org/apache/datasketches/memory/internal/A_BeforeSuite.java +++ b/src/test/java/org/apache/datasketches/memory/internal/A_BeforeSuite.java @@ -23,7 +23,7 @@ public class A_BeforeSuite { - @BeforeSuite + @BeforeSuite(alwaysRun = true) public void printTestEnvironment() { System.out.println("===================================================="); System.out.println("TEST JDK: " + System.getProperty("java.version")); From 74c46ffd457c619a82adb9a1db43ce3a4fd16746 Mon Sep 17 00:00:00 2001 From: Lee Rhodes Date: Tue, 24 Feb 2026 10:13:04 -0800 Subject: [PATCH 04/15] update pom. --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 1ab1d47b..9dac775f 100644 --- a/pom.xml +++ b/pom.xml @@ -279,7 +279,7 @@ under the License. maven-surefire-plugin ${maven-surefire-failsafe-plugins.version} - @{jvm.args} + @{argLine} @{jvm.args} ${java.version} From 3082c724fd1d19a55662a637d03abc8ca3ab5fe4 Mon Sep 17 00:00:00 2001 From: Lee Rhodes Date: Tue, 24 Feb 2026 16:08:17 -0800 Subject: [PATCH 05/15] Removed DOCTYPE link as unnecessary --- src/test/resources/testng.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/test/resources/testng.xml b/src/test/resources/testng.xml index 22cdce98..363c8e0e 100644 --- a/src/test/resources/testng.xml +++ b/src/test/resources/testng.xml @@ -1,4 +1,4 @@ - + @@ -66,21 +63,21 @@ under the License. - + - + - + - + - + - - + + - + - + - + @@ -150,51 +147,51 @@ under the License. - + - + - + - + - + - + - + - + - + - + - + @@ -202,11 +199,11 @@ under the License. - + - + - + @@ -215,40 +212,40 @@ under the License. - + - + - + - + - + - + - + @@ -262,12 +259,12 @@ under the License. - + - + @@ -278,27 +275,27 @@ under the License. - + - + - + - + - + @@ -372,13 +369,13 @@ under the License. - + - + @@ -389,26 +386,26 @@ under the License. - + - + - + - + - + - + @@ -420,4 +417,4 @@ under the License. - \ No newline at end of file + diff --git a/tools/suppressions.xml b/tools/suppressions.xml index 58cdce75..7cd57c91 100644 --- a/tools/suppressions.xml +++ b/tools/suppressions.xml @@ -1,9 +1,5 @@ - - [![Build Status](https://travis-ci.org/apache/datasketches-memory.svg?branch=master)](https://travis-ci.org/apache/datasketches-memory) -[![Maven Central](https://maven-badges.herokuapp.com/maven-central/org.apache.datasketches/datasketches-memory/badge.svg)](https://maven-badges.herokuapp.com/maven-central/org.apache.datasketches/datasketches-memory) -[![Coverage Status](https://coveralls.io/repos/github/apache/datasketches-memory/badge.svg?branch=master)](https://coveralls.io/github/apache/datasketches-memory?branch=master) +[![Maven Central](https://img.shields.io/maven-central/v/org.apache.datasketches/datasketches-memory)](https://central.sonatype.com/artifact/org.apache.datasketches/datasketches-memory) +[![Coverage Status](https://coveralls.io/repos/github/apache/datasketches-memory/badge.svg?branch=main)](https://coveralls.io/github/apache/datasketches-memory?branch=main) ================= From b399cfdbf21553f77a62b67d3346930e77936c81 Mon Sep 17 00:00:00 2001 From: Lee Rhodes Date: Mon, 2 Mar 2026 15:32:11 -0800 Subject: [PATCH 14/15] Update pom, .mvn to align w/ ds-java --- .mvn/maven.config | 5 +++++ pom.xml | 3 ++- 2 files changed, 7 insertions(+), 1 deletion(-) create mode 100644 .mvn/maven.config diff --git a/.mvn/maven.config b/.mvn/maven.config new file mode 100644 index 00000000..87735fa0 --- /dev/null +++ b/.mvn/maven.config @@ -0,0 +1,5 @@ +# suppresses the warning: +# Direct modification of testCompileSourceRoots through add() is deprecated and will not work in Maven 4.0.0. Please use the add/remove methods instead. +# If you're using a plugin that causes this warning, please upgrade to the latest version and report an issue if the warning persists. +# To disable these warnings, set -Dmaven.project.sourceRoots.warningsDisabled=true on the command line or in the .mvn/maven.config file. +-Dmaven.project.sourceRoots.warningsDisabled=true diff --git a/pom.xml b/pom.xml index 9dac775f..e0a5fd4e 100644 --- a/pom.xml +++ b/pom.xml @@ -91,6 +91,7 @@ under the License. ${charset.encoding} ${charset.encoding} ${charset.encoding} + ${project.build.directory}/site yyyy-MM-dd'T'HH-mm-ss'Z' @@ -100,7 +101,7 @@ under the License. 3.1.4 3.6.2 3.2.8 - 3.5.0 + 3.4.2 3.12.0 3.3.1 3.4.0 From 9ed752547549b8e668930f388f7a578cce4c933b Mon Sep 17 00:00:00 2001 From: Lee Rhodes Date: Mon, 2 Mar 2026 18:35:04 -0800 Subject: [PATCH 15/15] Update pom --- pom.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/pom.xml b/pom.xml index e0a5fd4e..8122316e 100644 --- a/pom.xml +++ b/pom.xml @@ -227,6 +227,7 @@ under the License. ${maven-javadoc-plugin.version} org.apache.datasketches.memory/internal + ${project.reporting.outputDirectory} true public all,-missing