Skip to content

Commit

Permalink
Merge branch 'javabrett-travis'
Browse files Browse the repository at this point in the history
  • Loading branch information
ceki committed Jan 30, 2018
2 parents cda79c4 + 2de3bc7 commit f8a590e
Show file tree
Hide file tree
Showing 2 changed files with 33 additions and 0 deletions.
3 changes: 3 additions & 0 deletions .travis.yml
@@ -1,4 +1,7 @@
dist: trusty
language: java
jdk:
- oraclejdk9
notifications:
email:
- notification@qos.ch
30 changes: 30 additions & 0 deletions pom.xml
Expand Up @@ -157,13 +157,18 @@
<version>1.1</version>
<executions>
<execution>
<id>toolchain</id>
<goals>
<goal>toolchain</goal>
</goals>
</execution>
</executions>
<configuration>
<toolchains>
<jdk>
<version>9</version>
</jdk>

<jdk>
<version>1.6</version>
</jdk>
Expand Down Expand Up @@ -459,6 +464,31 @@
</build>
</profile>

<profile>
<id>travis</id>
<activation>
<property>
<name>env.TRAVIS</name>
<value>true</value>
</property>
</activation>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-toolchains-plugin</artifactId>
<version>1.1</version>
<executions>
<execution>
<id>toolchain</id>
<phase>none</phase>
</execution>
</executions>
</plugin>
</plugins>
</build>
</profile>

</profiles>

<pluginRepositories>
Expand Down

0 comments on commit f8a590e

Please sign in to comment.