You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@datasketches.apache.org by le...@apache.org on 2025/05/10 23:58:13 UTC
(datasketches-java) 03/03: Disabled workflows.
This is an automated email from the ASF dual-hosted git repository.
leerho pushed a commit to branch main24
in repository https://gitbox.apache.org/repos/asf/datasketches-java.git
commit 256ee592d88ca3b0125f632845a00947553d775d
Author: Lee Rhodes <le...@gmail.com>
AuthorDate: Sat May 10 16:57:57 2025 -0700
Disabled workflows.
filters.BloomFilter, common.Util uses XxHash now in
o.a.datasketches.hash
POM aligned with ds-memory pom
---
.github/workflows/auto-jdk-matrix.yml | 14 +++++++-------
.github/workflows/auto-os-matrix.yml | 14 +++++++-------
.github/workflows/check_cpp_files.yml | 14 +++++++-------
.github/workflows/codeql-analysis.yml | 14 +++++++-------
.github/workflows/javadoc.yml | 4 ++--
pom.xml | 8 +++++---
.../datasketches/filters/bloomfilter/BloomFilter.java | 2 +-
src/main/java/org/apache/datasketches/tuple/Util.java | 4 ++--
8 files changed, 38 insertions(+), 36 deletions(-)
diff --git a/.github/workflows/auto-jdk-matrix.yml b/.github/workflows/auto-jdk-matrix.yml
index 0afbaf06..176d1fd6 100644
--- a/.github/workflows/auto-jdk-matrix.yml
+++ b/.github/workflows/auto-jdk-matrix.yml
@@ -1,13 +1,13 @@
name: Auto JDK Matrix Test & Install
on:
- push:
- paths-ignore: [ '**/*.html', '**/*.md', '**/*.txt', '**/*.xml', '**/*.yaml', '**/*.yml', '**/LICENSE', '**/NOTICE' ]
- branches: [ 'main', '[0-9]+.[0-9]+.[Xx]' ]
- pull_request:
- paths-ignore: [ '**/*.html', '**/*.md', '**/*.txt', '**/*.xml', '**/*.yaml', '**/*.yml', '**/LICENSE', '**/NOTICE' ]
- # The branches below must be a subset of the branches above
- branches: [ 'main', '[0-9]+.[0-9]+.[Xx]' ]
+# push:
+# paths-ignore: [ '**/*.html', '**/*.md', '**/*.txt', '**/*.xml', '**/*.yaml', '**/*.yml', '**/LICENSE', '**/NOTICE' ]
+# branches: [ 'main', '[0-9]+.[0-9]+.[Xx]' ]
+# pull_request:
+# paths-ignore: [ '**/*.html', '**/*.md', '**/*.txt', '**/*.xml', '**/*.yaml', '**/*.yml', '**/LICENSE', '**/NOTICE' ]
+# # The branches below must be a subset of the branches above
+# branches: [ 'main', '[0-9]+.[0-9]+.[Xx]' ]
workflow_dispatch:
env:
diff --git a/.github/workflows/auto-os-matrix.yml b/.github/workflows/auto-os-matrix.yml
index 83ecc1ff..413b7a95 100644
--- a/.github/workflows/auto-os-matrix.yml
+++ b/.github/workflows/auto-os-matrix.yml
@@ -1,13 +1,13 @@
name: Auto OS Matrix Test & Install
on:
- push:
- paths-ignore: [ '**/*.html', '**/*.md', '**/*.txt', '**/*.xml', '**/*.yaml', '**/*.yml', '**/LICENSE', '**/NOTICE' ]
- branches: [ 'main', '[0-9]+.[0-9]+.[Xx]' ]
- pull_request:
- paths-ignore: [ '**/*.html', '**/*.md', '**/*.txt', '**/*.xml', '**/*.yaml', '**/*.yml', '**/LICENSE', '**/NOTICE' ]
- # The branches below must be a subset of the branches above
- branches: [ 'main', '[0-9]+.[0-9]+.[Xx]' ]
+# push:
+# paths-ignore: [ '**/*.html', '**/*.md', '**/*.txt', '**/*.xml', '**/*.yaml', '**/*.yml', '**/LICENSE', '**/NOTICE' ]
+# branches: [ 'main', '[0-9]+.[0-9]+.[Xx]' ]
+# pull_request:
+# paths-ignore: [ '**/*.html', '**/*.md', '**/*.txt', '**/*.xml', '**/*.yaml', '**/*.yml', '**/LICENSE', '**/NOTICE' ]
+# # The branches below must be a subset of the branches above
+# branches: [ 'main', '[0-9]+.[0-9]+.[Xx]' ]
workflow_dispatch:
env:
diff --git a/.github/workflows/check_cpp_files.yml b/.github/workflows/check_cpp_files.yml
index 243eda98..778859d0 100644
--- a/.github/workflows/check_cpp_files.yml
+++ b/.github/workflows/check_cpp_files.yml
@@ -1,13 +1,13 @@
name: CPP SerDe Compatibility Test
on:
- push:
- paths-ignore: [ '**/*.html', '**/*.md', '**/*.txt', '**/*.xml', '**/*.yaml', '**/*.yml', '**/LICENSE', '**/NOTICE' ]
- branches: [ 'main', '[0-9]+.[0-9]+.[Xx]' ]
- pull_request:
- paths-ignore: [ '**/*.html', '**/*.md', '**/*.txt', '**/*.xml', '**/*.yaml', '**/*.yml', '**/LICENSE', '**/NOTICE' ]
- # The branches below must be a subset of the branches above
- branches: [ 'main', '[0-9]+.[0-9]+.[Xx]' ]
+# push:
+# paths-ignore: [ '**/*.html', '**/*.md', '**/*.txt', '**/*.xml', '**/*.yaml', '**/*.yml', '**/LICENSE', '**/NOTICE' ]
+# branches: [ 'main', '[0-9]+.[0-9]+.[Xx]' ]
+# pull_request:
+# paths-ignore: [ '**/*.html', '**/*.md', '**/*.txt', '**/*.xml', '**/*.yaml', '**/*.yml', '**/LICENSE', '**/NOTICE' ]
+# # The branches below must be a subset of the branches above
+# branches: [ 'main', '[0-9]+.[0-9]+.[Xx]' ]
workflow_dispatch:
jobs:
diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
index bb42fe34..f3fde1de 100644
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql-analysis.yml
@@ -1,13 +1,13 @@
name: "CodeQL"
on:
- push:
- paths-ignore: [ '**/*.html', '**/*.md', '**/*.txt', '**/*.xml', '**/*.yaml', '**/*.yml', '**/LICENSE', '**/NOTICE' ]
- branches: [ 'main', '[0-9]+.[0-9]+.[Xx]' ]
- pull_request:
- paths-ignore: [ '**/*.html', '**/*.md', '**/*.txt', '**/*.xml', '**/*.yaml', '**/*.yml', '**/LICENSE', '**/NOTICE' ]
- # The branches below must be a subset of the branches above
- branches: [ 'main', '[0-9]+.[0-9]+.[Xx]' ]
+# push:
+# paths-ignore: [ '**/*.html', '**/*.md', '**/*.txt', '**/*.xml', '**/*.yaml', '**/*.yml', '**/LICENSE', '**/NOTICE' ]
+# branches: [ 'main', '[0-9]+.[0-9]+.[Xx]' ]
+# pull_request:
+# paths-ignore: [ '**/*.html', '**/*.md', '**/*.txt', '**/*.xml', '**/*.yaml', '**/*.yml', '**/LICENSE', '**/NOTICE' ]
+# # The branches below must be a subset of the branches above
+# branches: [ 'main', '[0-9]+.[0-9]+.[Xx]' ]
workflow_dispatch:
jobs:
diff --git a/.github/workflows/javadoc.yml b/.github/workflows/javadoc.yml
index 4862d64e..977c87b2 100644
--- a/.github/workflows/javadoc.yml
+++ b/.github/workflows/javadoc.yml
@@ -1,8 +1,8 @@
name: JavaDoc
on:
- push:
- branches: main
+# push:
+# branches: main
workflow_dispatch:
jobs:
diff --git a/pom.xml b/pom.xml
index bcc76b53..8da8c577 100644
--- a/pom.xml
+++ b/pom.xml
@@ -86,7 +86,7 @@ under the License.
<datasketches-memory.version>6.0.0</datasketches-memory.version>
<!-- Test -->
- <testng.version>7.10.2</testng.version>
+ <testng.version>7.11.0</testng.version>
<!-- these are TestNG groups used for excluding / including groups of tests. See profiles section. -->
<testng.generate-java-files>generate_java_files</testng.generate-java-files>
<testng.check-cpp-files>check_cpp_files</testng.check-cpp-files>
@@ -114,9 +114,9 @@ under the License.
<maven-jar-plugin.version>3.4.2</maven-jar-plugin.version>
<maven-javadoc-plugin.version>3.11.2</maven-javadoc-plugin.version>
<maven-release-plugin.version>3.1.1</maven-release-plugin.version>
- <maven-remote-resources-plugin.version>3.2.0</maven-remote-resources-plugin.version>
<maven-source-plugin.version>3.3.1</maven-source-plugin.version>
- <maven-surefire-failsafe-plugins.version>3.5.2</maven-surefire-failsafe-plugins.version> <!-- for surefire, failsafe and surefire-report -->
+ <!-- for surefire, failsafe and surefire-report: -->
+ <maven-surefire-failsafe-plugins.version>3.5.2</maven-surefire-failsafe-plugins.version>
<maven-toolchains-plugin.version>3.2.0</maven-toolchains-plugin.version>
<!-- com.github plugins -->
<git-commit-id-plugin.version>4.9.10</git-commit-id-plugin.version>
@@ -340,6 +340,7 @@ under the License.
<exclude>**/*.sk</exclude>
<exclude>LICENSE</exclude>
<exclude>NOTICE</exclude>
+ <exclude>**/*.code-workspace</exclude>
</excludes>
</configuration>
</plugin>
@@ -668,5 +669,6 @@ under the License.
</pluginManagement>
</build>
</profile>
+
</profiles>
</project>
diff --git a/src/main/java/org/apache/datasketches/filters/bloomfilter/BloomFilter.java b/src/main/java/org/apache/datasketches/filters/bloomfilter/BloomFilter.java
index 7c166a29..a56a5eee 100644
--- a/src/main/java/org/apache/datasketches/filters/bloomfilter/BloomFilter.java
+++ b/src/main/java/org/apache/datasketches/filters/bloomfilter/BloomFilter.java
@@ -26,11 +26,11 @@ import java.nio.charset.StandardCharsets;
import org.apache.datasketches.common.Family;
import org.apache.datasketches.common.SketchesArgumentException;
import org.apache.datasketches.common.SketchesStateException;
+import org.apache.datasketches.hash.XxHash;
import org.apache.datasketches.memory.Buffer;
import org.apache.datasketches.memory.Memory;
import org.apache.datasketches.memory.WritableBuffer;
import org.apache.datasketches.memory.WritableMemory;
-import org.apache.datasketches.memory.XxHash;
/**
* A Bloom filter is a data structure that can be used for probabilistic
diff --git a/src/main/java/org/apache/datasketches/tuple/Util.java b/src/main/java/org/apache/datasketches/tuple/Util.java
index 92193ca5..bda6e7c2 100644
--- a/src/main/java/org/apache/datasketches/tuple/Util.java
+++ b/src/main/java/org/apache/datasketches/tuple/Util.java
@@ -22,8 +22,8 @@ package org.apache.datasketches.tuple;
import static java.nio.charset.StandardCharsets.UTF_8;
import static org.apache.datasketches.common.Util.ceilingPowerOf2;
import static org.apache.datasketches.hash.MurmurHash3.hash;
-import static org.apache.datasketches.memory.XxHash.hashCharArr;
-import static org.apache.datasketches.memory.XxHash.hashString;
+import static org.apache.datasketches.hash.XxHash.hashCharArr;
+import static org.apache.datasketches.hash.XxHash.hashString;
import java.lang.reflect.Array;
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@datasketches.apache.org
For additional commands, e-mail: commits-help@datasketches.apache.org