Merge pull request #2187 from olamy/feature/jdk-10-build

Feature/jdk 10 build
This commit is contained in:
Greg Wilkins 2018-02-21 16:39:48 +11:00 committed by GitHub
commit 1cf4f2a4d4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 54 additions and 2 deletions

View File

@ -70,7 +70,8 @@ public class ModulesTest
modules.registerAll();
// Check versions
assertThat("java.version.platform", args.getProperties().getString("java.version.platform"),anyOf(equalTo("8"),equalTo("9")));
assertThat("java.version.platform", args.getProperties().getString("java.version.platform"), //
anyOf(equalTo("8"),equalTo("9"),equalTo( "10" )));
List<String> moduleNames = new ArrayList<>();
for (Module mod : modules)

51
pom.xml
View File

@ -617,7 +617,7 @@
<plugin>
<groupId>org.jacoco</groupId>
<artifactId>jacoco-maven-plugin</artifactId>
<version>0.7.9</version>
<version>0.8.0</version>
</plugin>
<plugin>
<groupId>com.agilejava.docbkx</groupId>
@ -1003,6 +1003,55 @@
</dependencyManagement>
<profiles>
<!-- use last snapshot of jacoco and failsafe for jdk10 -->
<profile>
<id>jdk10</id>
<activation>
<jdk>10</jdk>
</activation>
<build>
<pluginManagement>
<plugins>
<plugin>
<groupId>org.jacoco</groupId>
<artifactId>jacoco-maven-plugin</artifactId>
<version>0.8.1-SNAPSHOT</version>
<configuration>
<skip>true</skip>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-failsafe-plugin</artifactId>
<version>2.21.0-SNAPSHOT</version>
</plugin>
</plugins>
</pluginManagement>
</build>
<pluginRepositories>
<pluginRepository>
<id>oss.snapshots</id>
<name>OSS Snapshots</name>
<url>https://oss.sonatype.org/content/repositories/snapshots</url>
<releases>
<enabled>false</enabled>
</releases>
<snapshots>
<enabled>true</enabled>
</snapshots>
</pluginRepository>
<pluginRepository>
<id>apache.snapshots</id>
<url>https://repository.apache.org/content/repositories/snapshots</url>
<releases>
<enabled>false</enabled>
</releases>
<snapshots>
<enabled>true</enabled>
</snapshots>
</pluginRepository>
</pluginRepositories>
</profile>
<profile>
<id>errorprone</id>
<build>

View File

@ -42,6 +42,7 @@
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-failsafe-plugin</artifactId>
<executions>
<execution>
@ -88,6 +89,7 @@
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-failsafe-plugin</artifactId>
<configuration>
<argLine>-Xbootclasspath/p:${project.build.directory}/alpn/alpn-boot-${alpn.version}.jar</argLine>