Title: [1975] trunk: Fix build for Java 1.4.
Revision
1975
Author
joehni
Date
2012-06-08 16:49:03 -0500 (Fri, 08 Jun 2012)

Log Message

Fix build for Java 1.4.

Modified Paths


Diff

Modified: trunk/BUILD.txt (1974 => 1975)


--- trunk/BUILD.txt	2012-06-08 21:16:01 UTC (rev 1974)
+++ trunk/BUILD.txt	2012-06-08 21:49:03 UTC (rev 1975)
@@ -1,7 +1,6 @@
-Building with Maven 2 or 3
+For Java 5 or higher build with Maven 2.2 or 3
+For Java 1.4 build with Maven 2.0.11
 
-Requires at least Maven 2.0.11
-
 Before building:
 
 To build:

Modified: trunk/pom.xml (1974 => 1975)


--- trunk/pom.xml	2012-06-08 21:16:01 UTC (rev 1974)
+++ trunk/pom.xml	2012-06-08 21:49:03 UTC (rev 1975)
@@ -31,16 +31,6 @@
 
   <profiles>
     <profile>
-      <id>jdk15-le</id>
-      <activation>
-        <jdk>[,1.5]</jdk>
-      </activation>
-      <properties>
-        <version.hsqldb>1.8.0.10</version.hsqldb>
-        <version.org.hibernate.core>3.3.2.GA</version.org.hibernate.core>
-      </properties>
-    </profile>
-    <profile>
       <id>jdk15-ge</id>
       <activation>
         <jdk>[1.5,)</jdk>
@@ -50,6 +40,17 @@
       </modules>
     </profile>
     <profile>
+      <id>jdk15</id>
+      <activation>
+        <jdk>1.5</jdk>
+      </activation>
+      <properties>
+        <version.hsqldb>1.8.0.10</version.hsqldb>
+        <version.org.hibernate.core>3.3.2.GA</version.org.hibernate.core>
+      </properties>
+    </profile>
+    <profile>
+      <!-- build with Maven 2.0.10 !!! -->
       <id>jdk14</id>
       <activation>
         <jdk>1.4</jdk>
@@ -58,6 +59,9 @@
         <version.java.source>1.3</version.java.source>
         <version.java.target>1.3</version.java.target>
         <link.javadoc.javase>http://download.oracle.com/javase/1.4.2/docs/api/</link.javadoc.javase>
+        <!-- repeat Hibernate version dependencies, JDK intervals in activation is not supported with M2.0.x -->
+        <version.hsqldb>1.8.0.10</version.hsqldb>
+        <version.org.hibernate.core>3.3.2.GA</version.org.hibernate.core>
       </properties>
     </profile>
   </profiles>

To unsubscribe from this list please visit:

http://xircles.codehaus.org/manage_email

Reply via email to