Skip to content
This repository has been archived by the owner on Jun 27, 2023. It is now read-only.

Commit

Permalink
Some more pedantic POM cleanups
Browse files Browse the repository at this point in the history
  • Loading branch information
@vsonnier
vsonnier committed Jan 25, 2016
1 parent 4af3457 commit dadde0a
Show file tree
Hide file tree
Showing 4 changed files with 369 additions and 372 deletions.
57 changes: 28 additions & 29 deletions hppcrt-benchmarks/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,8 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<jmh.version>1.11.3</jmh.version>
<javac.target>1.7</javac.target>
<uberjar.name>benchmarks</uberjar.name>

<hppc.version>0.7.1</hppc.version>
<fastutil.version>7.0.9</fastutil.version>
<eclipse.collections.version>7.0.0</eclipse.collections.version>
Expand All @@ -32,25 +31,25 @@

<!-- Dependencies. -->
<dependencies>

<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>${version.junit}</version>
</dependency>

<dependency>
<groupId>com.carrotsearch.randomizedtesting</groupId>
<artifactId>randomizedtesting-runner</artifactId>
<version>${version.randomizedtesting}</version>
<groupId>com.carrotsearch.randomizedtesting</groupId>
<artifactId>randomizedtesting-runner</artifactId>
<version>${version.randomizedtesting}</version>
</dependency>

<dependency>
<groupId>org.openjdk.jmh</groupId>
<artifactId>jmh-core</artifactId>
<version>${jmh.version}</version>
</dependency>

<dependency>
<groupId>org.openjdk.jmh</groupId>
<artifactId>jmh-generator-annprocess</artifactId>
Expand All @@ -64,7 +63,7 @@
<artifactId>hppcrt</artifactId>
<version>${project.version}</version>
</dependency>

<!-- Original HPPC -->
<dependency>
<groupId>com.carrotsearch</groupId>
Expand All @@ -78,8 +77,8 @@
<artifactId>fastutil</artifactId>
<version>${fastutil.version}</version>
</dependency>
<!-- Koloboke -->

<!-- Koloboke -->
<dependency>
<groupId>net.openhft</groupId>
<artifactId>koloboke-api-jdk8</artifactId>
Expand All @@ -94,23 +93,23 @@

<!-- Eclipse Collections, formerly Goldman Sachs collections -->
<dependency>
<groupId>org.eclipse.collections</groupId>
<artifactId>eclipse-collections-api</artifactId>
<version>${eclipse.collections.version}</version>
<groupId>org.eclipse.collections</groupId>
<artifactId>eclipse-collections-api</artifactId>
<version>${eclipse.collections.version}</version>
</dependency>
<dependency>
<groupId>org.eclipse.collections</groupId>
<artifactId>eclipse-collections</artifactId>
<version>${eclipse.collections.version}</version>
<groupId>org.eclipse.collections</groupId>
<artifactId>eclipse-collections</artifactId>
<version>${eclipse.collections.version}</version>
</dependency>

<!-- Javolution -->
<dependency>
<groupId>org.javolution</groupId>
<artifactId>javolution-core-java</artifactId>
<version>${javolution.version}</version>
</dependency>

</dependencies>

<!-- Build tuning. -->
Expand All @@ -134,16 +133,16 @@
<mainClass>org.openjdk.jmh.Main</mainClass>
</transformer>
</transformers>
<filters>
<filter>
<artifact>*:*</artifact>
<excludes>
<exclude>META-INF/*.SF</exclude>
<exclude>META-INF/*.DSA</exclude>
<exclude>META-INF/*.RSA</exclude>
</excludes>
</filter>
</filters>
<filters>
<filter>
<artifact>*:*</artifact>
<excludes>
<exclude>META-INF/*.SF</exclude>
<exclude>META-INF/*.DSA</exclude>
<exclude>META-INF/*.RSA</exclude>
</excludes>
</filter>
</filters>
</configuration>
</execution>
</executions>
Expand Down
117 changes: 58 additions & 59 deletions hppcrt-template-processor/pom.xml
View file
Original file line number Diff line number Diff line change
@@ -1,78 +1,77 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">

<modelVersion>4.0.0</modelVersion>
<modelVersion>4.0.0</modelVersion>

<parent>
<parent>
<groupId>com.github.vsonnier</groupId>
<artifactId>hppcrt-parent</artifactId>
<version>0.7.3-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

<!-- Project info. -->
<groupId>com.github.vsonnier</groupId>
<artifactId>hppcrt-parent</artifactId>
<artifactId>hppcrt-template-processor</artifactId>
<version>0.7.3-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<packaging>jar</packaging>

<name>HPPC-RT Template Processor</name>
<description>Template Processor and Code Generation for HPPC-RT.</description>

<properties>
<version.velocity>1.7</version.velocity>
</properties>

<!-- Project info. -->
<groupId>com.github.vsonnier</groupId>
<artifactId>hppcrt-template-processor</artifactId>
<version>0.7.3-SNAPSHOT</version>
<packaging>jar</packaging>
<!-- Dependencies. -->
<dependencies>
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
<version>${version.guava}</version>
</dependency>
<dependency>
<groupId>org.antlr</groupId>
<artifactId>antlr4</artifactId>
<version>${version.antlr}</version>
</dependency>

<name>HPPC-RT Template Processor</name>
<description>Template Processor and Code Generation for HPPC-RT.</description>
<dependency>
<groupId>org.apache.velocity</groupId>
<artifactId>velocity</artifactId>
<version>${version.velocity}</version>
</dependency>

<properties>
<version.velocity>1.7</version.velocity>
</properties>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>${version.junit}</version>
</dependency>

<!-- Dependencies. -->
<dependencies>
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
<version>${version.guava}</version>
</dependency>
<dependency>
<groupId>org.antlr</groupId>
<artifactId>antlr4</artifactId>
<version>${version.antlr}</version>
</dependency>

<dependency>
<groupId>org.apache.velocity</groupId>
<artifactId>velocity</artifactId>
<version>${version.velocity}</version>
</dependency>

<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>${version.junit}</version>
</dependency>

<dependency>
<groupId>com.carrotsearch.randomizedtesting</groupId>
<artifactId>randomizedtesting-runner</artifactId>
<version>${version.randomizedtesting}</version>
</dependency>

</dependencies>
<dependency>
<groupId>com.carrotsearch.randomizedtesting</groupId>
<artifactId>randomizedtesting-runner</artifactId>
<version>${version.randomizedtesting}</version>
</dependency>
</dependencies>

<!-- Build tuning, run ANTLRv4 to build from grammar -->
<build>
<!-- Build tuning, run ANTLRv4 to build from grammar -->
<build>
<plugins>
<plugin>
<groupId>org.antlr</groupId>
<artifactId>antlr4-maven-plugin</artifactId>
<executions>
<execution>
<id>antlr4</id>
<goals>
<goal>antlr4</goal>
</goals>
<configuration>
<visitor>true</visitor>
</configuration>
</execution>
<execution>
<id>antlr4</id>
<goals>
<goal>antlr4</goal>
</goals>
<configuration>
<visitor>true</visitor>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
</build>
</project>
Loading

1 comment on commit dadde0a

@vsonnier
Copy link
Owner Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

XML tidy by Notepad++, mostly :)

Please sign in to comment.