Skip to content

Commit 999aaee

Browse files
committed
more pom updates.
1 parent 6c9b690 commit 999aaee

2 files changed

Lines changed: 32 additions & 4 deletions

File tree

pom.xml

Lines changed: 31 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,8 @@ under the License.
9292
<!-- System-wide properties -->
9393
<maven.version>3.9.11</maven.version>
9494
<java.version>24</java.version>
95-
<jvm-arguments>-Xmx4g</jvm-arguments> <!-- use space to separate args -->
95+
<!-- removed: g -Duser.language=en -Duser.country=US -Dfile.encoding=UTF-8 -->
96+
<jvm.options>-Xmx4g</jvm.options> <!-- use space to separate args -->
9697
<charset.encoding>UTF-8</charset.encoding>
9798
<project.build.sourceEncoding>${charset.encoding}</project.build.sourceEncoding>
9899
<project.build.resourceEncoding>${charset.encoding}</project.build.resourceEncoding>
@@ -102,6 +103,7 @@ under the License.
102103
<!-- org.apache.maven plugins -->
103104
<maven-assembly-plugin.version>3.7.1</maven-assembly-plugin.version>
104105
<maven-compiler-plugin.version>3.14.0</maven-compiler-plugin.version>
106+
<maven-dependency-plugin.version>3.8.1</maven-dependency-plugin.version>
105107
<maven-deploy-plugin.version>3.1.4</maven-deploy-plugin.version>
106108
<maven-enforcer-plugin.version>3.6.1</maven-enforcer-plugin.version>
107109
<maven-gpg-plugin.version>3.2.8</maven-gpg-plugin.version>
@@ -142,6 +144,7 @@ under the License.
142144
<plugins>
143145

144146
<plugin>
147+
<groupId>org.apache.maven.plugins</groupId>
145148
<artifactId>maven-assembly-plugin</artifactId>
146149
<version>${maven-assembly-plugin.version}</version>
147150
</plugin>
@@ -151,13 +154,20 @@ under the License.
151154
<artifactId>maven-compiler-plugin</artifactId>
152155
<version>${maven-compiler-plugin.version}</version>
153156
<configuration>
157+
<fork>true</fork>
154158
<release>${java.version}</release>
155159
<compilerArgs>
156-
<arg></arg> <!-- comma separated or separate args -->
160+
<arg>-J${jvm.options}</arg> <!-- comma separated or separate args -->
157161
</compilerArgs>
158162
</configuration>
159163
</plugin>
160164

165+
<plugin>
166+
<groupId>org.apache.maven.plugins</groupId>
167+
<artifactId>maven-dependency-plugin</artifactId>
168+
<version>${maven-dependency-plugin.version}</version>
169+
</plugin>
170+
161171
<plugin>
162172
<!-- We want to deploy the artifacts to a staging location for perusal -->
163173
<!-- Apache Parent pom: apache-release profile -->
@@ -182,8 +192,9 @@ under the License.
182192
<version>[22,)</version>
183193
</requireJavaVersion>
184194
<requireMavenVersion>
185-
<version>[${maven.version},4.0.0)</version>
195+
<version>[${maven.version},)</version>
186196
</requireMavenVersion>
197+
<!-- <dependencyConvergence /> -->
187198
<bannedDependencies>
188199
<excludes>
189200
<!--LGPL licensed library-->
@@ -227,6 +238,10 @@ under the License.
227238
<docfilessubdirs>true</docfilessubdirs>
228239
<show>public</show>
229240
<doclint>all,-missing</doclint>
241+
<release>${java.version}</release>
242+
<additionalJOptions> <!-- requires -J prefix -->
243+
<additionalJOption>-J${jvm.options}</additionalJOption>
244+
</additionalJOptions>
230245
</configuration>
231246
<executions>
232247
<execution>
@@ -273,7 +288,7 @@ under the License.
273288
<configuration>
274289
<forkCount>1</forkCount>
275290
<reuseForks>true</reuseForks>
276-
<argLine>${jvm-arguments}</argLine> <!-- use space to separate args -->
291+
<argLine>${jvm.options}</argLine> <!-- use space to separate args -->
277292
<trimStackTrace>false</trimStackTrace>
278293
<useManifestOnlyJar>false</useManifestOnlyJar>
279294
<redirectTestOutputToFile>true</redirectTestOutputToFile>
@@ -380,6 +395,18 @@ under the License.
380395
</plugins>
381396
</pluginManagement>
382397
<plugins>
398+
<plugin>
399+
<groupId>org.apache.maven.plugins</groupId>
400+
<artifactId>maven-assembly-plugin</artifactId>
401+
</plugin>
402+
<plugin>
403+
<groupId>org.apache.maven.plugins</groupId>
404+
<artifactId>maven-compiler-plugin</artifactId>
405+
</plugin>
406+
<plugin>
407+
<groupId>org.apache.maven.plugins</groupId>
408+
<artifactId>maven-dependency-plugin</artifactId>
409+
</plugin>
383410
<plugin>
384411
<groupId>org.apache.maven.plugins</groupId>
385412
<artifactId>maven-deploy-plugin</artifactId>

src/main/java/org/apache/datasketches/filters/bloomfilter/package-info.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
* specific language governing permissions and limitations
1717
* under the License.
1818
*/
19+
1920
/**
2021
* BloomFilter package
2122
*/

0 commit comments

Comments
 (0)