Mercurial > hg > thermostat

changeset 2288:96940b61b718

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Update cacio dependency review-thread: http://icedtea.classpath.org/pipermail/thermostat/2016-May/018707.html reviewed-by: omajid, jerboaa PR2282
author Mario Torre <neugens.limasoftware@gmail.com>
date Wed, 04 May 2016 17:30:06 +0200
parents 981f2ef6d5a9
children fa7923c23a0e
files pom.xml
diffstat 1 files changed, 21 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/pom.xml	Wed May 04 17:30:00 2016 +0200
+++ b/pom.xml	Wed May 04 17:30:06 2016 +0200
@@ -97,10 +97,9 @@
       </properties>
     </profile>
     <profile>
-      <!-- Workaround for PR2282: Caciocavallo tests fail with JDK 8 u40+ -->
-      <id>java-8-plus-skip-cacio-tests</id>
+      <id>java-9-plus-skip-cacio-tests</id>
       <activation>
-        <jdk>[1.8,)</jdk>
+        <jdk>[1.9,)</jdk>
       </activation>
       <build>
         <plugins>
@@ -115,6 +114,24 @@
       </build>
     </profile>
     <profile>
+      <id>cacio-version-jdk8</id>
+      <activation>
+        <jdk>[1.8,1.9)</jdk>
+      </activation>
+      <properties>
+        <cacio-version>1.9</cacio-version>
+      </properties>
+    </profile>
+    <profile>
+      <id>cacio-version-jdk7</id>
+      <activation>
+        <jdk>[1.7,1.8)</jdk>
+      </activation>
+      <properties>
+        <cacio-version>1.3</cacio-version>
+      </properties>
+    </profile>
+    <profile>
       <id>skip-license-check-on-skip-tests</id>
       <activation>
         <property>
@@ -569,7 +586,7 @@
       <dependency>
         <groupId>net.java.openjdk.cacio</groupId>
         <artifactId>cacio-tta</artifactId>
-        <version>1.3</version>
+        <version>${cacio-version}</version>
       </dependency>
       <dependency>
         <groupId>net.sourceforge.expectj</groupId>