Skip to content

Commit

Permalink
Merge pull request square#2507 from yschimke/java8_new
Browse files Browse the repository at this point in the history
build with new alpn-boot and jdk 8 in travis
  • Loading branch information
swankjesse committed Apr 24, 2016
2 parents a44b5ec + 6f18cc3 commit 209c6c5
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 2 deletions.
5 changes: 5 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,3 +24,8 @@ sudo: false
cache:
directories:
- $HOME/.m2

addons:
apt:
packages:
- oracle-java8-installer
11 changes: 9 additions & 2 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -46,8 +46,8 @@
<airlift.version>0.7</airlift.version>
<!-- ALPN library targeted to Java 7 -->
<alpn.jdk7.version>7.1.2.v20141202</alpn.jdk7.version>
<!-- ALPN library targeted to Java 8 update 25. -->
<alpn.jdk8.version>8.1.2.v20141202</alpn.jdk8.version>
<!-- ALPN library targeted to Java 8 update 71 - 74 -->
<alpn.jdk8.version>8.1.7.v20160121</alpn.jdk8.version>
<android.version>4.1.1.4</android.version>
<apache.http.version>4.2.2</apache.http.version>
<bouncycastle.version>1.50</bouncycastle.version>
Expand Down Expand Up @@ -293,6 +293,13 @@
</pluginManagement>
</build>
</profile>
<profile>
<id>jdk9</id>
<activation>
<jdk>9</jdk>
</activation>
<!-- Not currently used, but visible in Intellij etc -->
</profile>
</profiles>
</project>

0 comments on commit 209c6c5

Please sign in to comment.