Skip to content

Commit

Permalink
Build with JDK 14 EA in Travis
Browse files Browse the repository at this point in the history
  • Loading branch information
Godin committed Jun 30, 2019
1 parent 6be6564 commit 103c66f
Show file tree
Hide file tree
Showing 4 changed files with 53 additions and 0 deletions.
7 changes: 7 additions & 0 deletions .travis.sh
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,9 @@ case "$JDK" in
13-ea)
install_jdk $JDK13_EA_URL
;;
14-ea)
install_jdk $JDK14_EA_URL
;;
esac

# Do not use "~/.mavenrc" set by Travis (https://github.com/travis-ci/travis-ci/issues/3893),
Expand Down Expand Up @@ -104,6 +107,10 @@ case "$JDK" in
mvn -V -B -e verify -Dbytecode.version=13 \
--settings=./.travis/settings.xml
;;
14-ea)
mvn -V -B -e verify -Dbytecode.version=14 \
--settings=./.travis/settings.xml
;;
*)
echo "Incorrect JDK [$JDK]"
exit 1;
Expand Down
1 change: 1 addition & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,5 +29,6 @@ env:
- JDK=11
- JDK=12
- JDK=13-ea
- JDK=14-ea

script: ./.travis.sh
21 changes: 21 additions & 0 deletions org.jacoco.build/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -748,6 +748,27 @@
</build>
</profile>

<!--
Following profile enables compilation into bytecode version 13
when requested "bytecode.version" greater than 13,
because this is maximum that can be processed by
maven-shade-plugin and maven-plugin-plugin.
This is overridden for tests.
-->
<profile>
<id>java14-bytecode</id>
<activation>
<property>
<name>bytecode.version</name>
<value>14</value>
</property>
</activation>
<properties>
<maven.compiler.source>13</maven.compiler.source>
<maven.compiler.target>13</maven.compiler.target>
</properties>
</profile>

<!-- This profile enables use of ECJ -->
<profile>
<id>ecj</id>
Expand Down
24 changes: 24 additions & 0 deletions org.jacoco.core.test.validation/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -195,6 +195,30 @@
<module>../org.jacoco.core.test.validation.groovy</module>
</modules>
</profile>

<profile>
<id>java14-bytecode</id>
<activation>
<property>
<name>bytecode.version</name>
<value>14</value>
</property>
</activation>
<properties>
<!-- see respective profile in org.jacoco.build about this override -->
<maven.compiler.source>14</maven.compiler.source>
<maven.compiler.target>14</maven.compiler.target>
</properties>
<modules>
<module>../org.jacoco.core.test.validation.kotlin</module>
<module>../org.jacoco.core.test.validation.java7</module>
<module>../org.jacoco.core.test.validation.java8</module>
<!-- Groovy 2.5.7 doesn't support bytecode version 14
<module>../org.jacoco.core.test.validation.groovy</module>
-->
<module>../org.jacoco.core.test.validation.scala</module>
</modules>
</profile>
</profiles>

</project>

0 comments on commit 103c66f

Please sign in to comment.