Skip to content

Commit

Permalink
Update build for release
Browse files Browse the repository at this point in the history
  • Loading branch information
jodastephen committed Aug 19, 2018
1 parent 3bb5d08 commit baeb59e
Show file tree
Hide file tree
Showing 2 changed files with 24 additions and 28 deletions.
1 change: 0 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ jdk:
- oraclejdk10
- oraclejdk9
- oraclejdk8
- openjdk7
cache:
directories:
- "$HOME/.m2/repository"
Expand Down
51 changes: 24 additions & 27 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

<!-- ==================================================================== -->
<!-- Build requires Java SE 8 or later -->
<!-- Releases require Java SE 8 or later -->
<!-- Releases require Java SE 9 or later -->
<!-- ==================================================================== -->
<modelVersion>4.0.0</modelVersion>
<groupId>org.threeten</groupId>
Expand Down Expand Up @@ -183,6 +183,7 @@
<configuration>
<instructions>
<Import-Package>!sun.util.calendar,*</Import-Package>
<Require-Capability>osgi.ee;filter:="(&amp;(osgi.ee=JavaSE)(version=1.6))"</Require-Capability>
</instructions>
</configuration>
</execution>
Expand Down Expand Up @@ -454,20 +455,7 @@
</goals>
</pluginExecutionFilter>
<action>
<ignore></ignore>
</action>
</pluginExecution>
<pluginExecution>
<pluginExecutionFilter>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-toolchains-plugin</artifactId>
<versionRange>[1.0,)</versionRange>
<goals>
<goal>toolchain</goal>
</goals>
</pluginExecutionFilter>
<action>
<ignore></ignore>
<ignore />
</action>
</pluginExecution>
</pluginExecutions>
Expand Down Expand Up @@ -591,6 +579,16 @@

<!-- ==================================================================== -->
<profiles>
<!-- Setup for Java 9+ -->
<profile>
<id>java9plus</id>
<activation>
<jdk>[9,)</jdk>
</activation>
<properties>
<maven.compiler.release>6</maven.compiler.release>
</properties>
</profile>
<!-- extra javadoc jar file -->
<profile>
<id>attach-additional-javadoc</id>
Expand Down Expand Up @@ -636,26 +634,25 @@
</activation>
<build>
<plugins>
<!-- Use Java 6 -->
<!-- Enforce Java 9 -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-toolchains-plugin</artifactId>
<artifactId>maven-enforcer-plugin</artifactId>
<executions>
<execution>
<phase>validate</phase>
<id>enforce-maven</id>
<goals>
<goal>toolchain</goal>
<goal>enforce</goal>
</goals>
<configuration>
<rules>
<requireJavaVersion>
<version>9</version>
</requireJavaVersion>
</rules>
</configuration>
</execution>
</executions>
<configuration>
<toolchains>
<jdk>
<version>1.6</version>
<vendor>sun</vendor>
</jdk>
</toolchains>
</configuration>
</plugin>
<!-- Sign artifacts -->
<plugin>
Expand Down

0 comments on commit baeb59e

Please sign in to comment.