Get things mostly building on Java 9.
This upgrades a bunch of Maven plugins, upgrades Proguard to 6.0, and adds some fiddly profile stuff to point Proguard at the right set of JDK jmods since rt.jar no longer exists for Java 9, and ignores a bunch more samskivert library stuff since it references Java modules that we don't use (like java.sql).
This commit is contained in:
@@ -109,7 +109,7 @@
|
|||||||
<plugin>
|
<plugin>
|
||||||
<groupId>org.apache.maven.plugins</groupId>
|
<groupId>org.apache.maven.plugins</groupId>
|
||||||
<artifactId>maven-compiler-plugin</artifactId>
|
<artifactId>maven-compiler-plugin</artifactId>
|
||||||
<version>3.3</version>
|
<version>3.7.0</version>
|
||||||
<configuration>
|
<configuration>
|
||||||
<source>1.7</source>
|
<source>1.7</source>
|
||||||
<target>1.7</target>
|
<target>1.7</target>
|
||||||
@@ -127,7 +127,7 @@
|
|||||||
<plugin>
|
<plugin>
|
||||||
<groupId>org.apache.maven.plugins</groupId>
|
<groupId>org.apache.maven.plugins</groupId>
|
||||||
<artifactId>maven-resources-plugin</artifactId>
|
<artifactId>maven-resources-plugin</artifactId>
|
||||||
<version>2.7</version>
|
<version>3.0.2</version>
|
||||||
<configuration>
|
<configuration>
|
||||||
<encoding>UTF-8</encoding>
|
<encoding>UTF-8</encoding>
|
||||||
</configuration>
|
</configuration>
|
||||||
@@ -136,7 +136,7 @@
|
|||||||
<plugin>
|
<plugin>
|
||||||
<groupId>org.apache.maven.plugins</groupId>
|
<groupId>org.apache.maven.plugins</groupId>
|
||||||
<artifactId>maven-javadoc-plugin</artifactId>
|
<artifactId>maven-javadoc-plugin</artifactId>
|
||||||
<version>2.10.3</version>
|
<version>3.0.0-M1</version>
|
||||||
<configuration>
|
<configuration>
|
||||||
<quiet>true</quiet>
|
<quiet>true</quiet>
|
||||||
<show>public</show>
|
<show>public</show>
|
||||||
@@ -147,23 +147,23 @@
|
|||||||
<plugin>
|
<plugin>
|
||||||
<groupId>com.github.wvengen</groupId>
|
<groupId>com.github.wvengen</groupId>
|
||||||
<artifactId>proguard-maven-plugin</artifactId>
|
<artifactId>proguard-maven-plugin</artifactId>
|
||||||
<version>2.0.8</version>
|
<version>2.0.14</version>
|
||||||
<executions>
|
<executions>
|
||||||
<execution>
|
<execution>
|
||||||
<phase>package</phase>
|
<phase>package</phase>
|
||||||
<goals><goal>proguard</goal></goals>
|
<goals><goal>proguard</goal></goals>
|
||||||
</execution>
|
</execution>
|
||||||
</executions>
|
</executions>
|
||||||
<dependencies>
|
<dependencies>
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>net.sf.proguard</groupId>
|
<groupId>net.sf.proguard</groupId>
|
||||||
<artifactId>proguard-base</artifactId>
|
<artifactId>proguard-base</artifactId>
|
||||||
<version>5.1</version>
|
<version>6.0.3</version>
|
||||||
<scope>runtime</scope>
|
<scope>runtime</scope>
|
||||||
</dependency>
|
</dependency>
|
||||||
</dependencies>
|
</dependencies>
|
||||||
<configuration>
|
<configuration>
|
||||||
<proguardVersion>5.1</proguardVersion>
|
<proguardVersion>6.0.3</proguardVersion>
|
||||||
<outputDirectory>${project.build.directory}</outputDirectory>
|
<outputDirectory>${project.build.directory}</outputDirectory>
|
||||||
<outjar>${project.build.finalName}.jar</outjar>
|
<outjar>${project.build.finalName}.jar</outjar>
|
||||||
<injar>${project.build.finalName}.jar</injar>
|
<injar>${project.build.finalName}.jar</injar>
|
||||||
@@ -172,8 +172,21 @@
|
|||||||
<inclusion>
|
<inclusion>
|
||||||
<groupId>com.samskivert</groupId>
|
<groupId>com.samskivert</groupId>
|
||||||
<artifactId>samskivert</artifactId>
|
<artifactId>samskivert</artifactId>
|
||||||
<filter>!**/Log4JLogger*,!**/*.java,com/samskivert/Log.class,**/samskivert/io/**,
|
<filter>
|
||||||
**/samskivert/swing/**,**/samskivert/text/**,**/samskivert/util/**</filter>
|
!**/*.java,
|
||||||
|
!**/swing/RuntimeAdjust*,
|
||||||
|
!**/swing/util/ButtonUtil*,
|
||||||
|
!**/util/CalendarUtil*,
|
||||||
|
!**/util/Calendars*,
|
||||||
|
!**/util/Log4JLogger*,
|
||||||
|
!**/util/PrefsConfig*,
|
||||||
|
!**/util/SignalUtil*,
|
||||||
|
com/samskivert/Log.class,
|
||||||
|
**/samskivert/io/**,
|
||||||
|
**/samskivert/swing/**,
|
||||||
|
**/samskivert/text/**,
|
||||||
|
**/samskivert/util/**
|
||||||
|
</filter>
|
||||||
</inclusion>
|
</inclusion>
|
||||||
<inclusion>
|
<inclusion>
|
||||||
<groupId>jregistrykey</groupId>
|
<groupId>jregistrykey</groupId>
|
||||||
@@ -201,7 +214,7 @@
|
|||||||
<plugin>
|
<plugin>
|
||||||
<groupId>org.apache.maven.plugins</groupId>
|
<groupId>org.apache.maven.plugins</groupId>
|
||||||
<artifactId>maven-jar-plugin</artifactId>
|
<artifactId>maven-jar-plugin</artifactId>
|
||||||
<version>2.6</version>
|
<version>3.1.0</version>
|
||||||
<configuration>
|
<configuration>
|
||||||
<archive>
|
<archive>
|
||||||
<manifest>
|
<manifest>
|
||||||
@@ -222,7 +235,7 @@
|
|||||||
<plugin>
|
<plugin>
|
||||||
<groupId>org.sonatype.plugins</groupId>
|
<groupId>org.sonatype.plugins</groupId>
|
||||||
<artifactId>nexus-staging-maven-plugin</artifactId>
|
<artifactId>nexus-staging-maven-plugin</artifactId>
|
||||||
<version>1.6.6</version>
|
<version>1.6.8</version>
|
||||||
<extensions>true</extensions>
|
<extensions>true</extensions>
|
||||||
<inherited>false</inherited>
|
<inherited>false</inherited>
|
||||||
<configuration>
|
<configuration>
|
||||||
@@ -323,6 +336,28 @@
|
|||||||
<rt.jar.path>${java.home}/lib/rt.jar</rt.jar.path>
|
<rt.jar.path>${java.home}/lib/rt.jar</rt.jar.path>
|
||||||
</properties>
|
</properties>
|
||||||
</profile>
|
</profile>
|
||||||
|
<profile>
|
||||||
|
<id>java-9-jdk</id>
|
||||||
|
<activation>
|
||||||
|
<file><exists>${java.home}/jmods/java.base.jmod</exists></file>
|
||||||
|
</activation>
|
||||||
|
<build>
|
||||||
|
<plugins>
|
||||||
|
<plugin>
|
||||||
|
<groupId>com.github.wvengen</groupId>
|
||||||
|
<artifactId>proguard-maven-plugin</artifactId>
|
||||||
|
<configuration>
|
||||||
|
<libs>
|
||||||
|
<lib>${java.home}/jmods/java.base.jmod</lib>
|
||||||
|
<lib>${java.home}/jmods/java.desktop.jmod</lib>
|
||||||
|
<lib>${java.home}/jmods/java.logging.jmod</lib>
|
||||||
|
<lib>${java.home}/jmods/jdk.jsobject.jmod</lib>
|
||||||
|
</libs>
|
||||||
|
</configuration>
|
||||||
|
</plugin>
|
||||||
|
</plugins>
|
||||||
|
</build>
|
||||||
|
</profile>
|
||||||
|
|
||||||
<!-- finagling to deal with plugin.jar not being bundled with OpenJDK -->
|
<!-- finagling to deal with plugin.jar not being bundled with OpenJDK -->
|
||||||
<profile>
|
<profile>
|
||||||
|
|||||||
Reference in New Issue
Block a user