jackrabbit-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ju...@apache.org
Subject svn commit: r698480 - /jackrabbit/trunk/pom.xml
Date Wed, 24 Sep 2008 09:39:02 GMT
Author: jukka
Date: Wed Sep 24 02:39:01 2008
New Revision: 698480

URL: http://svn.apache.org/viewvc?rev=698480&view=rev
Log:
JCR-1756: Include OCM in the main Jackrabbit build when using Java 5

Applied proposed patch.

Modified:
    jackrabbit/trunk/pom.xml

Modified: jackrabbit/trunk/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/pom.xml?rev=698480&r1=698479&r2=698480&view=diff
==============================================================================
--- jackrabbit/trunk/pom.xml (original)
+++ jackrabbit/trunk/pom.xml Wed Sep 24 02:39:01 2008
@@ -75,10 +75,6 @@
     <module>jackrabbit-spi-commons</module>
     <module>jackrabbit-jcr2spi</module>
     <module>jackrabbit-spi2jcr</module>
-    <!-- TODO: OCM requires Java 5
-    <module>jackrabbit-ocm</module>
-    <module>jackrabbit-ocm-nodemanagement</module>
-    -->
   </modules>
 
   <build>
@@ -202,6 +198,17 @@
   </reporting>
 
   <profiles>
+    <!-- JCR-1756: Include OCM in the main Jackrabbit build when using Java 5 -->
+    <profile>
+      <id>java5</id>
+      <activation>
+        <jdk>!1.4</jdk>
+      </activation>
+      <modules>
+        <module>jackrabbit-ocm</module>
+        <module>jackrabbit-ocm-nodemanagement</module>
+      </modules>
+    </profile>
     <!-- JCR-661: The antrun tools.jar dependency is not needed on macs -->
     <profile>
       <id>non-mac</id>



Mime
View raw message