maven-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bentm...@apache.org
Subject svn commit: r895051 - in /maven/core-integration-testing/trunk/core-it-suite/src/test: java/org/apache/maven/it/MavenITmng1957JdkActivationWithVersionRangeTest.java resources/mng-1957/pom.xml
Date Fri, 01 Jan 2010 18:48:10 GMT
Author: bentmann
Date: Fri Jan  1 18:48:10 2010
New Revision: 895051

URL: http://svn.apache.org/viewvc?rev=895051&view=rev
Log:
[MNG-4512] [regression] Profile activation based on JDK version range fails if current version
is close to range boundary

o Strengthened responsible IT

Modified:
    maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1957JdkActivationWithVersionRangeTest.java
    maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-1957/pom.xml

Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1957JdkActivationWithVersionRangeTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1957JdkActivationWithVersionRangeTest.java?rev=895051&r1=895050&r2=895051&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1957JdkActivationWithVersionRangeTest.java
(original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1957JdkActivationWithVersionRangeTest.java
Fri Jan  1 18:48:10 2010
@@ -37,7 +37,7 @@
 
     public MavenITmng1957JdkActivationWithVersionRangeTest()
     {
-        super( "[2.1.0-M2,)" );
+        super( "[2.1.0,3.0-alpha-1),[3.0-alpha-6,)" );
     }
 
     /**
@@ -61,6 +61,7 @@
         assertEquals( "PASSED", props.getProperty( "project.properties.jdkProperty3" ) );
         assertEquals( null, props.getProperty( "project.properties.jdkProperty4" ) );
         assertEquals( null, props.getProperty( "project.properties.jdkProperty5" ) );
+        assertEquals( "PASSED", props.getProperty( "project.properties.jdkProperty6" ) );
     }
 
 }

Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-1957/pom.xml
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-1957/pom.xml?rev=895051&r1=895050&r2=895051&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-1957/pom.xml
(original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-1957/pom.xml
Fri Jan  1 18:48:10 2010
@@ -57,6 +57,7 @@
 
   <profiles>
     <profile>
+      <!-- lower-bound only, matching -->
       <id>test-1</id>
       <activation>
         <jdk>[1.4,)</jdk>
@@ -66,6 +67,7 @@
       </properties>
     </profile>
     <profile>
+      <!-- upper-bound only, matching -->
       <id>test-2</id>
       <activation>
         <jdk>(,100)</jdk>
@@ -75,6 +77,7 @@
       </properties>
     </profile>
     <profile>
+      <!-- lower-bound and upper-bound, matching -->
       <id>test-3</id>
       <activation>
         <jdk>(1.3,100)</jdk>
@@ -84,6 +87,7 @@
       </properties>
     </profile>
     <profile>
+      <!-- lower-bound only, not matching -->
       <id>test-4</id>
       <activation>
         <jdk>(100,)</jdk>
@@ -93,6 +97,7 @@
       </properties>
     </profile>
     <profile>
+      <!-- upper-bound only, not matching -->
       <id>test-5</id>
       <activation>
         <jdk>(,1.4)</jdk>
@@ -101,5 +106,45 @@
         <jdkProperty5>FAILED</jdkProperty5>
       </properties>
     </profile>
+    <profile>
+      <!-- bounds close to current Java version (MNG-4512) -->
+      <id>test-6a</id>
+      <activation>
+        <jdk>[1.4,1.5)</jdk>
+      </activation>
+      <properties>
+        <jdkProperty6>PASSED</jdkProperty6>
+      </properties>
+    </profile>
+    <profile>
+      <!-- bounds close to current Java version (MNG-4512) -->
+      <id>test-6b</id>
+      <activation>
+        <jdk>[1.5,1.6)</jdk>
+      </activation>
+      <properties>
+        <jdkProperty6>PASSED</jdkProperty6>
+      </properties>
+    </profile>
+    <profile>
+      <!-- bounds close to current Java version (MNG-4512) -->
+      <id>test-6c</id>
+      <activation>
+        <jdk>[1.6,1.7)</jdk>
+      </activation>
+      <properties>
+        <jdkProperty6>PASSED</jdkProperty6>
+      </properties>
+    </profile>
+    <profile>
+      <!-- bounds close to current Java version (MNG-4512) -->
+      <id>test-6d</id>
+      <activation>
+        <jdk>[1.7,1.8)</jdk>
+      </activation>
+      <properties>
+        <jdkProperty6>PASSED</jdkProperty6>
+      </properties>
+    </profile>
   </profiles>
 </project>



Mime
View raw message