|
@@ -54,9 +54,9 @@
|
|
|
|
|
|
<!-- Testing -->
|
|
<!-- Testing -->
|
|
<junit.version>4.12</junit.version>
|
|
<junit.version>4.12</junit.version>
|
|
- <junit.jupiter.version>5.0.0-RC2</junit.jupiter.version>
|
|
|
|
- <junit.vintage.version>${junit.version}.0-RC2</junit.vintage.version>
|
|
|
|
- <junit.platform.version>1.0.0-RC2</junit.platform.version>
|
|
|
|
|
|
+ <junit.jupiter.version>5.0.0</junit.jupiter.version>
|
|
|
|
+ <junit.vintage.version>${junit.version}.0</junit.vintage.version>
|
|
|
|
+ <junit.platform.version>1.0.0</junit.platform.version>
|
|
<utflute.version>0.8.1</utflute.version>
|
|
<utflute.version>0.8.1</utflute.version>
|
|
|
|
|
|
<!-- Crawler -->
|
|
<!-- Crawler -->
|
|
@@ -103,6 +103,16 @@
|
|
<test.include.path>**/*Test.java</test.include.path>
|
|
<test.include.path>**/*Test.java</test.include.path>
|
|
</properties>
|
|
</properties>
|
|
</profile>
|
|
</profile>
|
|
|
|
+ <profile>
|
|
|
|
+ <id>build-jdk9</id>
|
|
|
|
+ <activation>
|
|
|
|
+ <jdk>9</jdk>
|
|
|
|
+ </activation>
|
|
|
|
+ <properties>
|
|
|
|
+ <test.include.path>**/*Test.java</test.include.path>
|
|
|
|
+ <test.command.args>--add-modules java.xml.bind</test.command.args>
|
|
|
|
+ </properties>
|
|
|
|
+ </profile>
|
|
<profile>
|
|
<profile>
|
|
<id>integrationTests</id>
|
|
<id>integrationTests</id>
|
|
<properties>
|
|
<properties>
|
|
@@ -127,7 +137,7 @@
|
|
<plugins>
|
|
<plugins>
|
|
<plugin>
|
|
<plugin>
|
|
<artifactId>maven-compiler-plugin</artifactId>
|
|
<artifactId>maven-compiler-plugin</artifactId>
|
|
- <version>3.5.1</version>
|
|
|
|
|
|
+ <version>3.7.0</version>
|
|
<configuration>
|
|
<configuration>
|
|
<source>${maven.compiler.source}</source>
|
|
<source>${maven.compiler.source}</source>
|
|
<target>${maven.compiler.target}</target>
|
|
<target>${maven.compiler.target}</target>
|
|
@@ -149,7 +159,7 @@
|
|
</plugin>
|
|
</plugin>
|
|
<plugin>
|
|
<plugin>
|
|
<artifactId>maven-war-plugin</artifactId>
|
|
<artifactId>maven-war-plugin</artifactId>
|
|
- <version>3.0.0</version>
|
|
|
|
|
|
+ <version>3.1.0</version>
|
|
<configuration>
|
|
<configuration>
|
|
<webResources>
|
|
<webResources>
|
|
<resource>
|
|
<resource>
|
|
@@ -159,9 +169,8 @@
|
|
</configuration>
|
|
</configuration>
|
|
</plugin>
|
|
</plugin>
|
|
<plugin>
|
|
<plugin>
|
|
- <groupId>org.apache.maven.plugins</groupId>
|
|
|
|
<artifactId>maven-dependency-plugin</artifactId>
|
|
<artifactId>maven-dependency-plugin</artifactId>
|
|
- <version>2.10</version>
|
|
|
|
|
|
+ <version>3.0.2</version>
|
|
<executions>
|
|
<executions>
|
|
<execution>
|
|
<execution>
|
|
<id>unpack-provided</id>
|
|
<id>unpack-provided</id>
|
|
@@ -186,6 +195,9 @@
|
|
<includes>
|
|
<includes>
|
|
<include>${test.include.path}</include>
|
|
<include>${test.include.path}</include>
|
|
</includes>
|
|
</includes>
|
|
|
|
+ <configuration>
|
|
|
|
+ <argLine>${test.command.args}</argLine>
|
|
|
|
+ </configuration>
|
|
</configuration>
|
|
</configuration>
|
|
<dependencies>
|
|
<dependencies>
|
|
<dependency>
|
|
<dependency>
|
|
@@ -207,7 +219,7 @@
|
|
</plugin>
|
|
</plugin>
|
|
<plugin>
|
|
<plugin>
|
|
<artifactId>maven-javadoc-plugin</artifactId>
|
|
<artifactId>maven-javadoc-plugin</artifactId>
|
|
- <version>2.10.4</version>
|
|
|
|
|
|
+ <version>3.0.0-M1</version>
|
|
<configuration>
|
|
<configuration>
|
|
<encoding>UTF-8</encoding>
|
|
<encoding>UTF-8</encoding>
|
|
<docencoding>UTF-8</docencoding>
|
|
<docencoding>UTF-8</docencoding>
|
|
@@ -322,10 +334,9 @@
|
|
<goal>run</goal>
|
|
<goal>run</goal>
|
|
</goals>
|
|
</goals>
|
|
</plugin>
|
|
</plugin>
|
|
-
|
|
|
|
<plugin>
|
|
<plugin>
|
|
<artifactId>maven-resources-plugin</artifactId>
|
|
<artifactId>maven-resources-plugin</artifactId>
|
|
- <version>3.0.1</version>
|
|
|
|
|
|
+ <version>3.0.2</version>
|
|
<executions>
|
|
<executions>
|
|
<execution>
|
|
<execution>
|
|
<id>copy-resources-deb</id>
|
|
<id>copy-resources-deb</id>
|
|
@@ -421,12 +432,10 @@
|
|
</execution>
|
|
</execution>
|
|
</executions>
|
|
</executions>
|
|
</plugin>
|
|
</plugin>
|
|
-
|
|
|
|
<!-- zip, tarball -->
|
|
<!-- zip, tarball -->
|
|
<plugin>
|
|
<plugin>
|
|
- <groupId>org.apache.maven.plugins</groupId>
|
|
|
|
<artifactId>maven-assembly-plugin</artifactId>
|
|
<artifactId>maven-assembly-plugin</artifactId>
|
|
- <version>2.6</version>
|
|
|
|
|
|
+ <version>3.1.0</version>
|
|
<configuration>
|
|
<configuration>
|
|
<finalName>${project.artifactId}-${project.version}</finalName>
|
|
<finalName>${project.artifactId}-${project.version}</finalName>
|
|
<appendAssemblyId>false</appendAssemblyId>
|
|
<appendAssemblyId>false</appendAssemblyId>
|
|
@@ -446,7 +455,6 @@
|
|
</execution>
|
|
</execution>
|
|
</executions>
|
|
</executions>
|
|
</plugin>
|
|
</plugin>
|
|
-
|
|
|
|
<!-- deb -->
|
|
<!-- deb -->
|
|
<plugin>
|
|
<plugin>
|
|
<groupId>org.vafer</groupId>
|
|
<groupId>org.vafer</groupId>
|
|
@@ -691,7 +699,6 @@
|
|
</dataSet>
|
|
</dataSet>
|
|
</configuration>
|
|
</configuration>
|
|
</plugin>
|
|
</plugin>
|
|
-
|
|
|
|
<!-- rpm -->
|
|
<!-- rpm -->
|
|
<plugin>
|
|
<plugin>
|
|
<groupId>org.codehaus.mojo</groupId>
|
|
<groupId>org.codehaus.mojo</groupId>
|