diff options
| author | Dmitry Timofeev <dmitry-timofeev@users.noreply.github.com> | 2019-02-13 22:19:48 +0200 |
|---|---|---|
| committer | Decebal Suiu <decebal.suiu@gmail.com> | 2019-02-13 22:19:48 +0200 |
| commit | fd3942b69d6239fa3dfe80b1972a371b478fec03 (patch) | |
| tree | 0fd2745edcc3063e2efde053a3ed18a11017bfb6 | |
| parent | febdb302e7ca816b933daa75b5b46eb8bec31058 (diff) | |
| download | pf4j-fd3942b69d6239fa3dfe80b1972a371b478fec03.tar.gz pf4j-fd3942b69d6239fa3dfe80b1972a371b478fec03.zip | |
Make the project build on Java 11 (#278)
| -rw-r--r-- | .travis.yml | 1 | ||||
| -rw-r--r-- | demo/app/pom.xml | 1 | ||||
| -rw-r--r-- | demo/plugins/pom.xml | 1 | ||||
| -rw-r--r-- | pom.xml | 55 |
4 files changed, 37 insertions, 21 deletions
diff --git a/.travis.yml b/.travis.yml index 6856742..90b2770 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,5 +4,6 @@ jdk: # JDK7 is not supported anymore; https://github.com/travis-ci/travis-ci/issues/7884#issuecomment-308451879 # - oraclejdk7 - oraclejdk8 + - openjdk11 after_success: - mvn clean cobertura:cobertura coveralls:report diff --git a/demo/app/pom.xml b/demo/app/pom.xml index 6075e42..3335fbe 100644 --- a/demo/app/pom.xml +++ b/demo/app/pom.xml @@ -42,7 +42,6 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-jar-plugin</artifactId> - <version>2.3.1</version> <configuration> <archive> <manifest> diff --git a/demo/plugins/pom.xml b/demo/plugins/pom.xml index 5e03732..dc7a8fc 100644 --- a/demo/plugins/pom.xml +++ b/demo/plugins/pom.xml @@ -31,7 +31,6 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-compiler-plugin</artifactId> - <version>3.7.0</version> <configuration> <source>${java.version}</source> <target>${java.version}</target> @@ -48,7 +48,7 @@ <asm.version>7.0</asm.version> <junit.version>4.12</junit.version> - <mockito.version>2.0.28-beta</mockito.version> + <mockito.version>2.24.0</mockito.version> <cobertura.version>2.7</cobertura.version> <coveralls.version>3.1.0</coveralls.version> @@ -58,24 +58,39 @@ </properties> <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <version>2.3.2</version> - <configuration> - <source>${java.version}</source> - <target>${java.version}</target> - <optimize>true</optimize> - </configuration> - </plugin> + <pluginManagement> + <plugins> + <plugin> + <artifactId>maven-compiler-plugin</artifactId> + <version>3.8.0</version> + <configuration> + <showWarnings>true</showWarnings> + <source>${java.version}</source> + <target>${java.version}</target> + </configuration> + </plugin> + + <plugin> + <artifactId>maven-surefire-plugin</artifactId> + <version>2.22.1</version> + </plugin> + + <plugin> + <artifactId>maven-jar-plugin</artifactId> + <version>2.6</version> + </plugin> + </plugins> + </pluginManagement> + <plugins> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-javadoc-plugin</artifactId> - <version>2.8</version> + <version>3.0.1</version> <configuration> <skip>${javadoc.disabled}</skip> + <doclint>none</doclint> + <failOnWarnings>false</failOnWarnings> </configuration> <executions> <execution> @@ -89,7 +104,7 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-source-plugin</artifactId> - <version>2.2</version> + <version>3.0.1</version> <configuration> <skipSource>${source.disabled}</skipSource> </configuration> @@ -125,12 +140,11 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-resources-plugin</artifactId> - <version>2.4.3</version> + <version>3.1.0</version> </plugin> <plugin> <artifactId>maven-jar-plugin</artifactId> - <version>2.4</version> <configuration> <archive> <manifest> @@ -150,12 +164,15 @@ <profiles> <profile> - <id>jdk8-build</id> + <!-- Disable Javadoc generation on Java 11, as it fails with message on 11.0.2: + "error - The code being documented uses modules but the packages defined in https://docs.oracle.com/javase/7/docs/api/ are in the unnamed module." + --> + <id>jdk11-build</id> <activation> - <jdk>[1.8,)</jdk> + <jdk>[11, 12)</jdk> </activation> <properties> - <additionalparam>-Xdoclint:none</additionalparam> + <javadoc.disabled>true</javadoc.disabled> </properties> </profile> <profile> |