Skip to content

Commit

Permalink
Inline java-parent-pom
Browse files Browse the repository at this point in the history
  • Loading branch information
leventov committed Feb 23, 2019
1 parent 86e5c58 commit 6a6e296
Showing 1 changed file with 49 additions and 12 deletions.
61 changes: 49 additions & 12 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@

<parent>
<groupId>net.openhft</groupId>
<artifactId>java-parent-pom</artifactId>
<version>1.1.18</version>
<artifactId>root-parent-pom</artifactId>
<version>1.1.13</version>
<relativePath />
</parent>

Expand All @@ -34,10 +34,6 @@
<url>https://github.com/OpenHFT/Zero-Allocation-Hashing</url>
<packaging>bundle</packaging>

<properties>
<maven-compiler-plugin.version>3.8.0</maven-compiler-plugin.version>
</properties>

<dependencies>

<dependency>
Expand Down Expand Up @@ -70,13 +66,55 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>${maven-compiler-plugin.version}</version>
<version>3.8.0</version>
<configuration>
<source>1.7</source>
<target>1.7</target>
<verbose>true</verbose>
<encoding>UTF-8</encoding>
</configuration>
</plugin>

<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<systemPropertyVariables>
<project.build.directory>${project.build.directory}</project.build.directory>
</systemPropertyVariables>
<enableAssertions>true</enableAssertions>
</configuration>
</plugin>

<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
<executions>
<execution>
<id>attach-sources</id>
<goals>
<goal>jar</goal>
</goals>
</execution>
</executions>
</plugin>

<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<executions>
<execution>
<id>attach-javadocs</id>
<goals>
<goal>jar</goal>
</goals>
</execution>
</executions>
<configuration>
<additionalparam>${javadoc.opts}</additionalparam>
</configuration>
</plugin>

<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-gpg-plugin</artifactId>
Expand Down Expand Up @@ -118,6 +156,7 @@
<scmBranch>gh-pages</scmBranch>
</configuration>
</plugin>

<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
Expand Down Expand Up @@ -162,14 +201,12 @@

<profiles>
<profile>
<id>old-jdk</id>
<id>doclint-java8-disable</id>
<activation>
<jdk>,1.7]</jdk>
<jdk>[1.8,)</jdk>
</activation>
<properties>
<!-- The last version of maven-compiler-plugin that doesn't include
'parameters' flag that is apparently absent on javac 6 and 7 -->
<maven-compiler-plugin.version>3.6.1</maven-compiler-plugin.version>
<javadoc.opts>-Xdoclint:none</javadoc.opts>
</properties>
</profile>
</profiles>
Expand Down

0 comments on commit 6a6e296

Please sign in to comment.