diff options
| author | Danny van Bruggen <hexagonaal@gmail.com> | 2017-09-28 22:55:39 +0200 |
|---|---|---|
| committer | Danny van Bruggen <hexagonaal@gmail.com> | 2017-09-28 22:55:39 +0200 |
| commit | fe49b11d3dc5d40f49cc8f5a9191325ec5e9f675 (patch) | |
| tree | 9d6fc8cdddbffbd4c828f3d7622a8fc8a46d9a5c | |
| parent | 163346317928f20e5bddffb586782ae450875e4d (diff) | |
| parent | 50c8a21e58b07f63d08d171cbb32cc0434d000b5 (diff) | |
| download | javaparser-fe49b11d3dc5d40f49cc8f5a9191325ec5e9f675.tar.gz | |
Merge branch 'issue_1172_work_with_jdk9' into find_root_node
| -rw-r--r-- | .travis.yml | 1 | ||||
| -rw-r--r-- | javaparser-core/pom.xml | 4 | ||||
| -rw-r--r-- | javaparser-testing/pom.xml | 12 | ||||
| -rw-r--r-- | pom.xml | 4 |
4 files changed, 9 insertions, 12 deletions
diff --git a/.travis.yml b/.travis.yml index b14d42872..87e4eb6ca 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,6 +4,7 @@ install: mvn install -DskipTests=true script: mvn test jdk: - oraclejdk8 + - oraclejdk9 notifications: webhooks: urls: diff --git a/javaparser-core/pom.xml b/javaparser-core/pom.xml index a5e667393..5022a9e39 100644 --- a/javaparser-core/pom.xml +++ b/javaparser-core/pom.xml @@ -57,7 +57,7 @@ <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>animal-sniffer-maven-plugin</artifactId> - <version>1.15</version> + <version>1.16</version> <configuration> <signature> <!-- Make sure only the API of this JDK is used --> @@ -79,7 +79,7 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-enforcer-plugin</artifactId> - <version>1.4.1</version> + <version>3.0.0-M1</version> <executions> <execution> <id>enforce-versions</id> diff --git a/javaparser-testing/pom.xml b/javaparser-testing/pom.xml index 994bf4c53..91dd112de 100644 --- a/javaparser-testing/pom.xml +++ b/javaparser-testing/pom.xml @@ -23,10 +23,6 @@ </license> </licenses> - <properties> - <junit.version>4.12</junit.version> - <jbehave.version>4.1</jbehave.version> - </properties> <build> <plugins> <plugin> @@ -90,15 +86,15 @@ <scope>test</scope> </dependency> <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <version>${junit.version}</version> + <groupId>org.junit.jupiter</groupId> + <artifactId>junit-jupiter-api</artifactId> + <version>5.0.0</version> <scope>test</scope> </dependency> <dependency> <groupId>org.jbehave</groupId> <artifactId>jbehave-core</artifactId> - <version>${jbehave.version}</version> + <version>4.1</version> <scope>test</scope> </dependency> <dependency> @@ -126,7 +126,7 @@ <!-- Maven Plugins --> <javacc-maven-plugin.version>2.8.2</javacc-maven-plugin.version> <maven-clean-plugin.version>3.0.0</maven-clean-plugin.version> - <maven-compiler-plugin.version>3.6.1</maven-compiler-plugin.version> + <maven-compiler-plugin.version>3.7.0</maven-compiler-plugin.version> <maven-install-plugin.version>2.5.2</maven-install-plugin.version> <maven-jar-plugin.version>3.0.2</maven-jar-plugin.version> <maven-release-plugin.version>2.5.3</maven-release-plugin.version> @@ -134,7 +134,7 @@ <maven-jacoco-plugin.version>0.7.9</maven-jacoco-plugin.version> <maven-coveralls-plugin.version>4.3.0</maven-coveralls-plugin.version> <maven-source-plugin.version>3.0.1</maven-source-plugin.version> - <bnd-maven-plugin.version>3.3.0</bnd-maven-plugin.version> + <bnd-maven-plugin.version>3.4.0</bnd-maven-plugin.version> </properties> <scm> |