Skip to content

Commit

Permalink
Merge pull request eclipse#418 from nikhilnanivadekar/master
Browse files Browse the repository at this point in the history
Upgrade Maven plugins, add a Java 9 build on Travis.
  • Loading branch information
donraab committed Dec 4, 2017
2 parents 1ce1afd + 17ef170 commit 4103466
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 53 deletions.
50 changes: 0 additions & 50 deletions .travis-command-jdk9.sh

This file was deleted.

6 changes: 6 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ addons:
apt:
packages:
- oracle-java8-installer
- oracle-java9-installer

before_install:
- wget https://archive.apache.org/dist/maven/maven-3/3.5.0/binaries/apache-maven-3.5.0-bin.zip
Expand Down Expand Up @@ -44,6 +45,11 @@ matrix:
- DESC="compile jmh-tests and performance-tests"
- CMD="mvn install --projects jmh-tests,performance-tests --also-make --activate-profiles all -DskipTests=true --batch-mode --show-version --errors"

- jdk: oraclejdk9
env:
- DESC="unit tests Java 9"
- CMD="mvn install --projects '!scala-unit-tests,!jmh-scala-tests,!jmh-tests,!p2-repository' --batch-mode --show-version --errors"

script: eval travis_wait 35 $CMD

cache:
Expand Down
6 changes: 3 additions & 3 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -233,7 +233,7 @@

<plugin>
<artifactId>maven-javadoc-plugin</artifactId>
<version>2.10.4</version>
<version>3.0.0-M1</version>
</plugin>

<plugin>
Expand Down Expand Up @@ -271,7 +271,7 @@

<plugin>
<artifactId>maven-enforcer-plugin</artifactId>
<version>1.4.1</version>
<version>3.0.0-M1</version>
<executions>
<execution>
<id>enforce</id>
Expand Down Expand Up @@ -311,7 +311,7 @@
<artifactId>clirr-maven-plugin</artifactId>
<version>2.7</version>
</plugin>

<plugin>
<groupId>net.alchim31.maven</groupId>
<artifactId>scala-maven-plugin</artifactId>
Expand Down

0 comments on commit 4103466

Please sign in to comment.