Skip to content

Commit 34aaa8b

Browse files
committed
This huge update does not impact any code. It is mostly Javadoc updates.
There are also a few pom updates and some updates to the GH Action workflows.
1 parent f42af45 commit 34aaa8b

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

46 files changed

+146
-174
lines changed

.github/workflows/auto-jdk-matrix.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ name: DataSketches-Java Auto JDK Matrix Test & Install
33
on:
44
pull_request:
55
push:
6-
branches: [ master ]
6+
branches: [ master, main ]
77
workflow_dispatch:
88

99
env:

.github/workflows/auto-os-matrix.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ name: DataSketches-Java Auto OS Matrix Test & Install
33
on:
44
pull_request:
55
push:
6-
branches: [ master ]
6+
branches: [ master, main ]
77
workflow_dispatch:
88

99
env:
@@ -55,8 +55,6 @@ jobs:
5555
distribution: 'temurin'
5656
java-package: jdk
5757
architecture: x64
58-
# Architecture options: x86, x64, armv7, aarch64, ppc64le
59-
# setup-java@v4 has a "with cache" option
6058

6159
- name: Echo Java Version
6260
run: >
@@ -75,6 +73,8 @@ jobs:
7573
-D skipTests=true
7674
${{matrix.os.skip_gpg}}
7775
76+
# Architecture options: x86, x64, armv7, aarch64, ppc64le
77+
# setup-java@v4 has a "with cache" option
7878
# Lifecycle: validate, compile, test, package, verify, install, deploy
7979
# -B batch mode
8080
# -V show Version without stopping

.github/workflows/javadoc.yml

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ name: JavaDoc
22

33
on:
44
push:
5-
branches: [7.0.X, master]
5+
branches: [ master, main ]
66
workflow_dispatch:
77

88
jobs:
@@ -22,12 +22,15 @@ jobs:
2222
- name: Echo Java Version
2323
run: java -version
2424

25+
- name: Print Current workflow
26+
run: >
27+
cat .github/workflows/javadoc.yml
28+
2529
- name: Generate JavaDoc
2630
run: mvn javadoc:javadoc
2731

2832
- name: Deploy JavaDoc
2933
uses: JamesIves/github-pages-deploy-action@v4.6.8
30-
#uses: JamesIves/github-pages-deploy-action@881db5376404c5c8d621010bcbec0310b58d5e29 #alternate
3134
with:
3235
token: ${{ secrets.GITHUB_TOKEN }}
3336
folder: target/reports/apidocs

.github/workflows/manual-coverage.yml

Lines changed: 0 additions & 71 deletions
This file was deleted.

pom.xml

Lines changed: 56 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -95,40 +95,42 @@ under the License.
9595
<!-- System-wide properties -->
9696
<maven.version>3.6.3</maven.version>
9797
<java.version>17</java.version>
98+
<add-modules>--add-modules=jdk.incubator.foreign</add-modules>
9899
<maven.compiler.source>${java.version}</maven.compiler.source>
99100
<maven.compiler.target>${java.version}</maven.compiler.target>
100-
<argLine>-Xmx4g -Duser.language=en -Duser.country=US -Dfile.encoding=UTF-8 --add-modules=jdk.incubator.foreign</argLine>
101+
<argLine>-Xmx4g -Duser.language=en -Duser.country=US -Dfile.encoding=UTF-8 ${add-modules}</argLine>
101102
<charset.encoding>UTF-8</charset.encoding>
102103
<project.build.sourceEncoding>${charset.encoding}</project.build.sourceEncoding>
103104
<project.build.resourceEncoding>${charset.encoding}</project.build.resourceEncoding>
104105
<project.reporting.outputEncoding>${charset.encoding}</project.reporting.outputEncoding>
105106
<maven.build.timestamp.format>yyyy-MM-dd'T'HH-mm-ss'Z'</maven.build.timestamp.format>
106107

107108
<!-- org.apache.maven plugins -->
108-
<maven-assembly-plugin.version>3.7.1</maven-assembly-plugin.version>
109-
<maven-compiler-plugin.version>3.13.0</maven-compiler-plugin.version>
110-
<maven-deploy-plugin.version>3.1.3</maven-deploy-plugin.version>
111-
<maven-enforcer-plugin.version>3.5.0</maven-enforcer-plugin.version>
112-
<maven-gpg-plugin.version>3.2.5</maven-gpg-plugin.version>
113-
<maven-jar-plugin.version>3.4.2</maven-jar-plugin.version>
114-
<maven-javadoc-plugin.version>3.8.0</maven-javadoc-plugin.version>
115-
<maven-release-plugin.version>3.1.1</maven-release-plugin.version>
116-
<maven-remote-resources-plugin.version>3.2.0</maven-remote-resources-plugin.version>
117-
<maven-source-plugin.version>3.3.1</maven-source-plugin.version>
118-
<maven-surefire-failsafe-plugins.version>3.4.0</maven-surefire-failsafe-plugins.version> <!-- for surefire, failsafe and surefire-report-->
119-
<!-- com.github plugins -->
120-
<git-commit-id-plugin.version>4.9.10</git-commit-id-plugin.version>
121-
<!-- org.apache.creadur plugins -->
122-
<apache-rat-plugin.version>0.16.1</apache-rat-plugin.version>
123-
<!-- org.eluder maven plugins -->
124-
<coveralls-repo-token></coveralls-repo-token>
125-
<coveralls-maven-plugin.version>4.3.0</coveralls-maven-plugin.version>
126-
<!-- org.jacoco maven plugins -->
127-
<jacoco-maven-plugin.version>0.8.12</jacoco-maven-plugin.version>
128-
<!-- org.mojohaus plugins -->
129-
<versions-maven-plugin.version>2.17.1</versions-maven-plugin.version>
130-
<!-- other -->
131-
<lifecycle-mapping.version>1.0.0</lifecycle-mapping.version>
109+
<maven-assembly-plugin.version>3.7.1</maven-assembly-plugin.version>
110+
<maven-compiler-plugin.version>3.13.0</maven-compiler-plugin.version>
111+
<maven-deploy-plugin.version>3.1.3</maven-deploy-plugin.version>
112+
<maven-enforcer-plugin.version>3.5.0</maven-enforcer-plugin.version>
113+
<maven-gpg-plugin.version>3.2.7</maven-gpg-plugin.version>
114+
<maven-jar-plugin.version>3.4.2</maven-jar-plugin.version>
115+
<maven-javadoc-plugin.version>3.11.1</maven-javadoc-plugin.version>
116+
<maven-release-plugin.version>3.1.1</maven-release-plugin.version>
117+
<maven-remote-resources-plugin.version>3.2.0</maven-remote-resources-plugin.version>
118+
<maven-source-plugin.version>3.3.1</maven-source-plugin.version>
119+
<maven-surefire-failsafe-plugins.version>3.5.2</maven-surefire-failsafe-plugins.version> <!-- for surefire, failsafe and surefire-report -->
120+
<maven-toolchains-plugin.version>3.2.0</maven-toolchains-plugin.version>
121+
<!-- com.github plugins -->
122+
<git-commit-id-plugin.version>4.9.10</git-commit-id-plugin.version>
123+
<!-- org.apache.creadur plugins -->
124+
<apache-rat-plugin.version>0.16.1</apache-rat-plugin.version>
125+
<!-- org.eluder maven plugins -->
126+
<coveralls-repo-token></coveralls-repo-token>
127+
<coveralls-maven-plugin.version>4.3.0</coveralls-maven-plugin.version>
128+
<!-- org.jacoco.maven plugins -->
129+
<jacoco-maven-plugin.version>0.8.12</jacoco-maven-plugin.version>
130+
<!-- org.mojohaus plugins -->
131+
<versions-maven-plugin.version>2.17.1</versions-maven-plugin.version>
132+
<!-- other -->
133+
<lifecycle-mapping.version>1.0.0</lifecycle-mapping.version>
132134
</properties>
133135

134136
<dependencies>
@@ -145,13 +147,6 @@ under the License.
145147
<version>${testng.version}</version>
146148
<scope>test</scope>
147149
</dependency>
148-
<!--
149-
<dependency>
150-
<groupId>org.apache.datasketches</groupId>
151-
<artifactId>datasketches-java-common</artifactId>
152-
<version>1.0.0</version>
153-
</dependency>
154-
-->
155150
</dependencies>
156151

157152
<build>
@@ -169,7 +164,7 @@ under the License.
169164
<version>${maven-compiler-plugin.version}</version>
170165
<configuration>
171166
<compilerArgs>
172-
<arg>--add-modules=jdk.incubator.foreign</arg>
167+
<arg>${add-modules}</arg>
173168
</compilerArgs>
174169
</configuration>
175170
</plugin>
@@ -195,10 +190,10 @@ under the License.
195190
<configuration>
196191
<rules>
197192
<requireJavaVersion>
198-
<version>[17,18)</version>
193+
<version>${java.version}</version>
199194
</requireJavaVersion>
200195
<requireMavenVersion>
201-
<version>[${maven.version},)</version>
196+
<version>[${maven.version},4.0.0)</version>
202197
</requireMavenVersion>
203198
<bannedDependencies>
204199
<excludes>
@@ -243,7 +238,7 @@ under the License.
243238
<docfilessubdirs>true</docfilessubdirs>
244239
<show>public</show>
245240
<additionalOptions>
246-
<additionalOption>--add-modules=jdk.incubator.foreign</additionalOption>
241+
<additionalOption>${add-modules}</additionalOption>
247242
</additionalOptions>
248243
</configuration>
249244
<executions>
@@ -289,7 +284,7 @@ under the License.
289284
<artifactId>maven-surefire-plugin</artifactId>
290285
<version>${maven-surefire-failsafe-plugins.version}</version>
291286
<configuration>
292-
<argLine>--add-modules=jdk.incubator.foreign</argLine>
287+
<argLine>${add-modules}</argLine>
293288
<trimStackTrace>false</trimStackTrace>
294289
<useManifestOnlyJar>false</useManifestOnlyJar>
295290
<redirectTestOutputToFile>true</redirectTestOutputToFile>
@@ -298,6 +293,26 @@ under the License.
298293
</configuration>
299294
</plugin>
300295

296+
<plugin>
297+
<groupId>org.apache.maven.plugins</groupId>
298+
<artifactId>maven-toolchains-plugin</artifactId>
299+
<version>${maven-toolchains-plugin.version}</version>
300+
<executions>
301+
<execution>
302+
<goals>
303+
<goal>toolchain</goal>
304+
</goals>
305+
</execution>
306+
</executions>
307+
<configuration>
308+
<toolchains>
309+
<jdk>
310+
<version>${java.version}</version>
311+
</jdk>
312+
</toolchains>
313+
</configuration>
314+
</plugin>
315+
301316
<plugin>
302317
<groupId>org.apache.rat</groupId>
303318
<artifactId>apache-rat-plugin</artifactId>
@@ -402,6 +417,10 @@ under the License.
402417
<groupId>org.apache.maven.plugins</groupId>
403418
<artifactId>maven-surefire-plugin</artifactId>
404419
</plugin>
420+
<plugin>
421+
<groupId>org.apache.maven.plugins</groupId>
422+
<artifactId>maven-toolchains-plugin</artifactId>
423+
</plugin>
405424
<plugin>
406425
<groupId>org.apache.rat</groupId>
407426
<artifactId>apache-rat-plugin</artifactId>

src/main/java/org/apache/datasketches/filters/bloomfilter/BloomFilter.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,8 @@
3333
import org.apache.datasketches.memory.XxHash;
3434

3535
/**
36-
* <p>A Bloom filter is a data structure that can be used for probabilistic
37-
* set membership.</p>
36+
* A Bloom filter is a data structure that can be used for probabilistic
37+
* set membership.
3838
*
3939
* <p>When querying a Bloom filter, there are no false positives. Specifically:
4040
* When querying an item that has already been inserted to the filter, the filter will

src/main/java/org/apache/datasketches/filters/bloomfilter/BloomFilterBuilder.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@
2525
import org.apache.datasketches.memory.WritableMemory;
2626

2727
/**
28-
* <p>This class provides methods to help estimate the correct parameters when
29-
* creating a Bloom filter, and methods to create the filter using those values.</p>
28+
* This class provides methods to help estimate the correct parameters when
29+
* creating a Bloom filter, and methods to create the filter using those values.
3030
*
3131
* <p>The underlying math is described in the
3232
* <a href='https://en.wikipedia.org/wiki/Bloom_filter#Optimal_number_of_hash_functions'>

src/main/java/org/apache/datasketches/frequencies/ItemsSketch.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,10 +55,10 @@
5555
import org.apache.datasketches.memory.WritableMemory;
5656

5757
/**
58-
* <p>This sketch is useful for tracking approximate frequencies of items of type <i>&lt;T&gt;</i>
58+
* This sketch is useful for tracking approximate frequencies of items of type <i>&lt;T&gt;</i>
5959
* with optional associated counts (<i>&lt;T&gt;</i> item, <i>long</i> count) that are members of a
6060
* multiset of such items. The true frequency of an item is defined to be the sum of associated
61-
* counts.</p>
61+
* counts.
6262
*
6363
* <p>This implementation provides the following capabilities:</p>
6464
* <ul>

src/main/java/org/apache/datasketches/frequencies/LongsSketch.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,9 +54,9 @@
5454
import org.apache.datasketches.memory.WritableMemory;
5555

5656
/**
57-
* <p>This sketch is useful for tracking approximate frequencies of <i>long</i> items with optional
57+
* This sketch is useful for tracking approximate frequencies of <i>long</i> items with optional
5858
* associated counts (<i>long</i> item, <i>long</i> count) that are members of a multiset of
59-
* such items. The true frequency of an item is defined to be the sum of associated counts.</p>
59+
* such items. The true frequency of an item is defined to be the sum of associated counts.
6060
*
6161
* <p>This implementation provides the following capabilities:</p>
6262
* <ul>

src/main/java/org/apache/datasketches/frequencies/PreambleUtil.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@
3131
/**
3232
* This class defines the preamble data structure and provides basic utilities for some of the key
3333
* fields.
34+
*
3435
* <p>
3536
* The intent of the design of this class was to isolate the detailed knowledge of the bit and byte
3637
* layout of the serialized form of the sketches derived from the Sketch class into one place. This

0 commit comments

Comments
 (0)