From dadde0aaa7b6b55565ea5fa0f7f6b490914d2048 Mon Sep 17 00:00:00 2001 From: vsonnier Date: Mon, 25 Jan 2016 20:38:07 +0100 Subject: [PATCH] Some more pedantic POM cleanups --- hppcrt-benchmarks/pom.xml | 57 ++-- hppcrt-template-processor/pom.xml | 117 ++++---- hppcrt/pom.xml | 467 +++++++++++++++--------------- pom.xml | 100 +++---- 4 files changed, 369 insertions(+), 372 deletions(-) diff --git a/hppcrt-benchmarks/pom.xml b/hppcrt-benchmarks/pom.xml index 556829b05..10eb51dec 100644 --- a/hppcrt-benchmarks/pom.xml +++ b/hppcrt-benchmarks/pom.xml @@ -20,9 +20,8 @@ UTF-8 1.11.3 - 1.7 benchmarks - + 0.7.1 7.0.9 7.0.0 @@ -32,17 +31,17 @@ - + junit junit ${version.junit} - + - com.carrotsearch.randomizedtesting - randomizedtesting-runner - ${version.randomizedtesting} + com.carrotsearch.randomizedtesting + randomizedtesting-runner + ${version.randomizedtesting} @@ -50,7 +49,7 @@ jmh-core ${jmh.version} - + org.openjdk.jmh jmh-generator-annprocess @@ -64,7 +63,7 @@ hppcrt ${project.version} - + com.carrotsearch @@ -78,8 +77,8 @@ fastutil ${fastutil.version} - - + + net.openhft koloboke-api-jdk8 @@ -94,23 +93,23 @@ - org.eclipse.collections - eclipse-collections-api - ${eclipse.collections.version} + org.eclipse.collections + eclipse-collections-api + ${eclipse.collections.version} - org.eclipse.collections - eclipse-collections - ${eclipse.collections.version} + org.eclipse.collections + eclipse-collections + ${eclipse.collections.version} - + org.javolution javolution-core-java ${javolution.version} - + @@ -134,16 +133,16 @@ org.openjdk.jmh.Main - - - *:* - - META-INF/*.SF - META-INF/*.DSA - META-INF/*.RSA - - - + + + *:* + + META-INF/*.SF + META-INF/*.DSA + META-INF/*.RSA + + + diff --git a/hppcrt-template-processor/pom.xml b/hppcrt-template-processor/pom.xml index 4ff1ac9b6..ae7a0e094 100644 --- a/hppcrt-template-processor/pom.xml +++ b/hppcrt-template-processor/pom.xml @@ -1,78 +1,77 @@ - 4.0.0 + 4.0.0 - + + com.github.vsonnier + hppcrt-parent + 0.7.3-SNAPSHOT + ../pom.xml + + + com.github.vsonnier - hppcrt-parent + hppcrt-template-processor 0.7.3-SNAPSHOT - ../pom.xml - + jar + + HPPC-RT Template Processor + Template Processor and Code Generation for HPPC-RT. + + + 1.7 + - - com.github.vsonnier - hppcrt-template-processor - 0.7.3-SNAPSHOT - jar + + + + com.google.guava + guava + ${version.guava} + + + org.antlr + antlr4 + ${version.antlr} + - HPPC-RT Template Processor - Template Processor and Code Generation for HPPC-RT. + + org.apache.velocity + velocity + ${version.velocity} + - - 1.7 - + + junit + junit + ${version.junit} + - - - - com.google.guava - guava - ${version.guava} - - - org.antlr - antlr4 - ${version.antlr} - - - - org.apache.velocity - velocity - ${version.velocity} - - - - junit - junit - ${version.junit} - - - - com.carrotsearch.randomizedtesting - randomizedtesting-runner - ${version.randomizedtesting} - - - + + com.carrotsearch.randomizedtesting + randomizedtesting-runner + ${version.randomizedtesting} + + - - + + org.antlr antlr4-maven-plugin - - antlr4 - - antlr4 - - - true - - + + antlr4 + + antlr4 + + + true + + - + diff --git a/hppcrt/pom.xml b/hppcrt/pom.xml index f11bd5fbf..f5e043fe0 100644 --- a/hppcrt/pom.xml +++ b/hppcrt/pom.xml @@ -1,235 +1,235 @@ - 4.0.0 + 4.0.0 - - com.github.vsonnier - hppcrt-parent - 0.7.3-SNAPSHOT - ../pom.xml - + + com.github.vsonnier + hppcrt-parent + 0.7.3-SNAPSHOT + ../pom.xml + - - com.github.vsonnier - hppcrt - 0.7.3-SNAPSHOT - bundle + + com.github.vsonnier + hppcrt + 0.7.3-SNAPSHOT + bundle - HPPC-RT Collections - High Performance Primitive Collections Realtime + HPPC-RT Collections + High Performance Primitive Collections Realtime (fork of HPPC from Carrotsearch) Fundamental data structures (maps, sets, lists, queues, heaps, sorts) generated for combinations of object and primitive types to conserve JVM memory and speed up execution. The Realtime fork intends to extend the existing collections, by tweaking to remove any dynamic allocations at runtime, and to obtain low variance execution times whatever the input nature. - - - - - - junit - junit - ${version.junit} - test - + - - com.carrotsearch.randomizedtesting - randomizedtesting-runner - ${version.randomizedtesting} - test - - - - - - install - - - - org.apache.maven.plugins - maven-antrun-plugin - - - generate.sources - generate-sources - - true - 256m - 512m - + + + + junit + junit + ${version.junit} + test + + + + com.carrotsearch.randomizedtesting + randomizedtesting-runner + ${version.randomizedtesting} + test + + + + + + install + + + + org.apache.maven.plugins + maven-antrun-plugin + + + generate.sources + generate-sources + + true + 256m + 512m + - - - - - - run - - - - - - com.github.vsonnier - hppcrt-template-processor - ${project.version} - + + + + + + run + + + + + + com.github.vsonnier + hppcrt-template-processor + ${project.version} + - org.apache.ant + org.apache.ant ant ${version.ant} - - - - - - - org.codehaus.mojo - build-helper-maven-plugin - - - add-source - generate-sources - - add-source - - - - ${project.basedir}/src/main/templates - ${project.build.directory}/generated-sources/main/java - - - + + + + + + org.codehaus.mojo + build-helper-maven-plugin + + + add-source + generate-sources + + add-source + + + + ${project.basedir}/src/main/templates + ${project.build.directory}/generated-sources/main/java + + + - - add-test-source - generate-sources - - add-test-source - - - - ${project.basedir}/src/test/templates - ${project.build.directory}/generated-sources/test/java - - - - - + + add-test-source + generate-sources + + add-test-source + + + + ${project.basedir}/src/test/templates + ${project.build.directory}/generated-sources/test/java + + + + + + + org.apache.maven.plugins + maven-source-plugin + + + attach-sources + + jar + + + + - - org.apache.maven.plugins - maven-source-plugin - - - attach-sources - - jar - - - - - - - - net.orfjackal.retrolambda - retrolambda-maven-plugin - - - retrolambda-classes - process-classes - - process-main - - - - - ${lib.bytecode.level} - false - - - - - - org.codehaus.mojo - animal-sniffer-maven-plugin - - - check-java-api - test - - check - - - - org.codehaus.mojo.signature - - ${lib.jdk.level} - 1.0 - - - - - + + + net.orfjackal.retrolambda + retrolambda-maven-plugin + + + retrolambda-classes + process-classes + + process-main + + + + + ${lib.bytecode.level} + false + + - - org.apache.maven.plugins - maven-javadoc-plugin - - - attach-javadocs - - ${project.build.sourceEncoding} - HPPC-RT v${project.version} API Documentation - HPPC-RT v${project.version} API Documentation -
High Performance Primitive Collections Realtime(HPPC-RT) v${project.version}
API Documentation]]>
- false - true - false - false - false - - - HPPC-RT - com.carrotsearch.hppcrt* - - - - - jar - - - - + + + org.codehaus.mojo + animal-sniffer-maven-plugin + + + check-java-api + test + + check + + + + org.codehaus.mojo.signature + + ${lib.jdk.level} + 1.0 + + + + + - - - com.carrotsearch.randomizedtesting - junit4-maven-plugin - - - junit4-tests - - junit4 - - - - **/*Test.* - - - **/*$* - **/Abstract* - + + org.apache.maven.plugins + maven-javadoc-plugin + + + attach-javadocs + + ${project.build.sourceEncoding} + HPPC-RT v${project.version} API Documentation + HPPC-RT v${project.version} API Documentation +
+ High Performance Primitive Collections Realtime(HPPC-RT) v${project.version}
API Documentation]]> +
+ false + true + false + false + false + + + HPPC-RT + com.carrotsearch.hppcrt* + + + + + jar + + + + - auto - 512m + + + com.carrotsearch.randomizedtesting + junit4-maven-plugin + + + junit4-tests + + junit4 + + + + **/*Test.* + + + **/*$* + **/Abstract* + - - - auto + 512m + + + + - - - - - - - - - - - + + + - - - - - quick - - true - - + + + + + + + + + + + + quick + + true + + - quicknodoc - - true + quicknodoc + + true true - - - + + + diff --git a/pom.xml b/pom.xml index 0dbdf6c0a..4a65cef5e 100644 --- a/pom.xml +++ b/pom.xml @@ -32,14 +32,14 @@ GitHub https://github.com/vsonnier/hppcrt/issues - - - - Announcements and bug reports mailing list - java-high-performance-primitive-collections+subscribe@googlegroups.com - java-high-performance-primitive-collections+unsubscribe@googlegroups.com - java-high-performance-primitive-collections@googlegroups.com - + + + + Announcements and bug reports mailing list + java-high-performance-primitive-collections+subscribe@googlegroups.com + java-high-performance-primitive-collections+unsubscribe@googlegroups.com + java-high-performance-primitive-collections@googlegroups.com + @@ -60,52 +60,52 @@ UTF-8 - + 1.8 1.8 - + 1.5 java15 - + 2.1.0 - + 19.0 4.12 - + 1.8 1.9.6 - - 4.5.1 + + 4.5.1 2.3.3 - + 3.0.0 3.5 2.10 2.8.2 2.10 - + 2.5.2 2.6 2.4.3 2.7 2.19.1 - + 1.4.1 - 2.10.3 + 2.10.3 2.4 - - 1.10 - 1.14 - + + 1.10 + 1.14 + 3.0.1 - + 3.3.3 - + true @@ -169,11 +169,11 @@ ${maven.compiler.source} ${maven.compiler.target} - -Xlint + -Xlint - + org.apache.maven.plugins maven-eclipse-plugin @@ -205,26 +205,26 @@ - - - org.apache.maven.plugins - maven-javadoc-plugin - ${version.maven-javadoc-plugin} - - false - false - false - false - protected - - **/KType* - **/*KType* - **/VType* - **/*VType* - **/Intrinsics* - - - + + + org.apache.maven.plugins + maven-javadoc-plugin + ${version.maven-javadoc-plugin} + + false + false + false + false + protected + + **/KType* + **/*KType* + **/VType* + **/*VType* + **/Intrinsics* + + + org.apache.maven.plugins @@ -277,13 +277,13 @@ build-helper-maven-plugin ${version.build-helper-maven-plugin} - - + + org.codehaus.mojo animal-sniffer-maven-plugin ${version.animal-sniffer-maven-plugin} - + net.orfjackal.retrolambda