Skip to content

Commit 89b0f62

Browse files
committed
The tiny bloomfilter change is to fix a SpotBugs error.
The POM change updates maven and most of the plugins to their latest versions.
1 parent 3afc66f commit 89b0f62

2 files changed

Lines changed: 22 additions & 57 deletions

File tree

pom.xml

Lines changed: 21 additions & 55 deletions
Original file line numberDiff line numberDiff line change
@@ -28,12 +28,12 @@ under the License.
2828
<parent>
2929
<groupId>org.apache</groupId>
3030
<artifactId>apache</artifactId>
31-
<version>29</version>
31+
<version>32</version>
3232
</parent>
3333

3434
<groupId>org.apache.datasketches</groupId>
3535
<artifactId>datasketches-java</artifactId>
36-
<version>5.1.0-SNAPSHOT</version>
36+
<version>6.0.0-SNAPSHOT</version>
3737
<packaging>jar</packaging>
3838

3939
<name>${project.artifactId}</name>
@@ -89,12 +89,13 @@ under the License.
8989

9090
<!-- Test -->
9191
<testng.version>7.5.1</testng.version>
92+
<!-- these are TestNG groups used for excluding / including groups of tests. See profiles section. -->
9293
<testng.generate-java-files>generate_java_files</testng.generate-java-files>
9394
<testng.check-cpp-files>check_cpp_files</testng.check-cpp-files>
9495
<testng.check-cpp-historical-files>check_cpp_historical_files</testng.check-cpp-historical-files>
9596

9697
<!-- System-wide properties -->
97-
<maven.version>3.5.0</maven.version>
98+
<maven.version>3.6.3</maven.version> <!-- may override parent, used in enforcer plugin -->
9899
<java.version>1.8</java.version>
99100
<maven.compiler.source>${java.version}</maven.compiler.source>
100101
<maven.compiler.target>${java.version}</maven.compiler.target>
@@ -105,28 +106,25 @@ under the License.
105106
<project.reporting.outputEncoding>${charset.encoding}</project.reporting.outputEncoding>
106107
<maven.build.timestamp.format>yyyy-MM-dd'T'HH-mm-ss'Z'</maven.build.timestamp.format>
107108

108-
<!-- org.codehaus plugins -->
109-
<!-- used for strict profile testing-->
110-
<plexus-compiler-javac-errorprone.version>2.8.5</plexus-compiler-javac-errorprone.version>
111-
<versions-maven-plugin.version>2.8.1</versions-maven-plugin.version>
109+
<!-- org.mojohaus plugins: used for checking & updating dependency versions -->
110+
<versions-maven-plugin.version>2.16.2</versions-maven-plugin.version>
112111

113112
<!-- Maven Plugins -->
114-
<maven-assembly-plugin.version>3.3.0</maven-assembly-plugin.version> <!-- overrides parent -->
115-
<maven-compiler-plugin.version>3.8.1</maven-compiler-plugin.version> <!-- overrides parent -->
116-
<maven-deploy-plugin.version>3.0.0-M1</maven-deploy-plugin.version> <!-- overrides parent -->
117-
<maven-enforcer-plugin.version>3.0.0</maven-enforcer-plugin.version> <!-- overrides parent -->
118-
<maven-failsafe-plugin.version>3.1.2</maven-failsafe-plugin.version>
119-
<maven-gpg-plugin.version>3.1.0</maven-gpg-plugin.version> <!-- overrides parent -->
120-
<maven-jar-plugin.version>3.2.0</maven-jar-plugin.version> <!-- overrides parent -->
121-
<maven-javadoc-plugin.version>3.3.1</maven-javadoc-plugin.version> <!-- overrides parent -->
122-
<maven-release-plugin.version>3.0.0-M4</maven-release-plugin.version> <!-- overrides parent -->
123-
<maven-remote-resources-plugin.version>[1.7.0,)</maven-remote-resources-plugin.version> <!-- overrides parent -->
124-
<maven-source-plugin.version>3.2.1</maven-source-plugin.version> <!-- overrides parent -->
125-
<maven-surefire-plugin.version>3.1.2</maven-surefire-plugin.version> <!-- overrides parent -->
113+
<maven-assembly-plugin.version>3.7.1</maven-assembly-plugin.version> <!-- may override parent -->
114+
<maven-compiler-plugin.version>3.13.0</maven-compiler-plugin.version> <!-- may override parent -->
115+
<maven-deploy-plugin.version>3.1.1</maven-deploy-plugin.version> <!-- may override parent -->
116+
<maven-enforcer-plugin.version>3.4.1</maven-enforcer-plugin.version> <!-- may override parent -->
117+
<maven-gpg-plugin.version>3.2.3</maven-gpg-plugin.version> <!-- may override parent -->
118+
<maven-jar-plugin.version>3.4.0</maven-jar-plugin.version> <!-- may override parent -->
119+
<maven-javadoc-plugin.version>3.6.3</maven-javadoc-plugin.version> <!-- may override parent -->
120+
<maven-release-plugin.version>3.0.1</maven-release-plugin.version> <!-- may override parent -->
121+
<maven-remote-resources-plugin.version>3.2.0</maven-remote-resources-plugin.version> <!-- may override parent -->
122+
<maven-source-plugin.version>3.3.1</maven-source-plugin.version> <!-- may override parent -->
123+
<maven-surefire-failsafe-plugins.version>3.2.5</maven-surefire-failsafe-plugins.version><!-- for surefire, failsafe and surefire-report, may override parent-->
126124
<!-- Apache Plugins -->
127-
<apache-rat-plugin.version>0.13</apache-rat-plugin.version> <!-- overrides parent -->
125+
<apache-rat-plugin.version>0.16.1</apache-rat-plugin.version> <!-- may override parent -->
128126
<!-- org.jacoco Maven Plugins -->
129-
<jacoco-maven-plugin.version>0.8.7</jacoco-maven-plugin.version>
127+
<jacoco-maven-plugin.version>0.8.12</jacoco-maven-plugin.version>
130128
<!-- org.eluder Maven Plugins -->
131129
<coveralls-repo-token></coveralls-repo-token>
132130
<coveralls-maven-plugin.version>4.3.0</coveralls-maven-plugin.version>
@@ -195,7 +193,7 @@ under the License.
195193
<configuration>
196194
<rules>
197195
<requireJavaVersion>
198-
<version>[1.8,1.9),[8],[11,12)</version>
196+
<version>[1.8.0,9.0),[11.0,12.0)</version>
199197
</requireJavaVersion>
200198
<requireMavenVersion>
201199
<version>[${maven.version},)</version>
@@ -288,7 +286,7 @@ under the License.
288286
<!-- Apache Parent pom, pluginManagement-->
289287
<groupId>org.apache.maven.plugins</groupId>
290288
<artifactId>maven-surefire-plugin</artifactId>
291-
<version>${maven-surefire-plugin.version}</version>
289+
<version>${maven-surefire-failsafe-plugins.version}</version>
292290
<configuration>
293291
<trimStackTrace>false</trimStackTrace>
294292
<useManifestOnlyJar>false</useManifestOnlyJar>
@@ -464,38 +462,6 @@ under the License.
464462
</build>
465463
</profile>
466464

467-
<profile>
468-
<id>strict</id>
469-
<!-- The error prone compiler is only currently supported for compilation in JDK 8 -->
470-
<activation>
471-
<jdk>[1.8, 1.9),8</jdk>
472-
</activation>
473-
<build>
474-
<pluginManagement>
475-
<plugins>
476-
<plugin>
477-
<groupId>org.apache.maven.plugins</groupId>
478-
<artifactId>maven-compiler-plugin</artifactId>
479-
<version>${maven-compiler-plugin.version}</version>
480-
<dependencies>
481-
<dependency>
482-
<groupId>org.codehaus.plexus</groupId>
483-
<artifactId>plexus-compiler-javac-errorprone</artifactId>
484-
<version>${plexus-compiler-javac-errorprone.version}</version>
485-
</dependency>
486-
</dependencies>
487-
<configuration>
488-
<source>${maven.compiler.source}</source>
489-
<target>${maven.compiler.target}</target>
490-
<compilerId>javac-with-errorprone</compilerId>
491-
<forceJavacCompilerUse>true</forceJavacCompilerUse>
492-
</configuration>
493-
</plugin>
494-
</plugins>
495-
</pluginManagement>
496-
</build>
497-
</profile>
498-
499465
<!-- This profile is used to release signed jars to the Apache Nexus repository.
500466
This must be executed from a git repository set at the proper Release branch (e.g., 1.1.X)
501467
and at a Release Candidate tag (e.g., 1.1.0-RC1).

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -813,8 +813,7 @@ public long[] toLongArray() {
813813
} else {
814814
wmem_.getLongArray(0, longs, 0, (int) (sizeBytes >>> 3));
815815
if (isEmpty()) {
816-
final long longMask = EMPTY_FLAG_MASK << (FLAGS_BYTE << 3);
817-
longs[0] |= longMask;
816+
longs[0] |= (EMPTY_FLAG_MASK << (FLAGS_BYTE << 3));
818817
}
819818
}
820819
return longs;

0 commit comments

Comments
 (0)