jackrabbit-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ju...@apache.org
Subject svn commit: r607707 - in /jackrabbit/trunk: jackrabbit-ocm-nodemanagement/pom.xml jackrabbit-ocm/pom.xml pom.xml
Date Mon, 31 Dec 2007 09:58:09 GMT
Author: jukka
Date: Mon Dec 31 01:58:08 2007
New Revision: 607707

URL: http://svn.apache.org/viewvc?rev=607707&view=rev
Log:
JCR-995: Updated OCM POMs in preparation for release
    - Use dependency management for all dependencies
    - Correct SCM URLs

Modified:
    jackrabbit/trunk/jackrabbit-ocm-nodemanagement/pom.xml
    jackrabbit/trunk/jackrabbit-ocm/pom.xml
    jackrabbit/trunk/pom.xml

Modified: jackrabbit/trunk/jackrabbit-ocm-nodemanagement/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-ocm-nodemanagement/pom.xml?rev=607707&r1=607706&r2=607707&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-ocm-nodemanagement/pom.xml (original)
+++ jackrabbit/trunk/jackrabbit-ocm-nodemanagement/pom.xml Mon Dec 31 01:58:08 2007
@@ -1,21 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!--
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-  -->
+<!--
+   Licensed to the Apache Software Foundation (ASF) under one or more
+   contributor license agreements.  See the NOTICE file distributed with
+   this work for additional information regarding copyright ownership.
+   The ASF licenses this file to You under the Apache License, Version 2.0
+   (the "License"); you may not use this file except in compliance with
+   the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+  -->
 
 <project xmlns="http://maven.apache.org/POM/4.0.0"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
@@ -32,13 +32,11 @@
 		<version>1.4-SNAPSHOT</version>
 	</parent>
 	<artifactId>jackrabbit-ocm-nodemanagement</artifactId>
-	<packaging>jar</packaging>
 	<name>Jackrabbit OCM Node management</name>
 	<description>
 		This subproject contains the JCR Nodetype Management tools. This
 		tools convert a OCM class descriptor into JCR node types.
 	</description>
-	<inceptionYear>2007</inceptionYear>
 
 	<!-- ====================================================================== -->
 	<!-- D E P E N D E N C I E S                                                -->
@@ -51,7 +49,6 @@
 		<dependency>
 			<groupId>org.apache.jackrabbit</groupId>
 			<artifactId>jackrabbit-ocm</artifactId>
-			<version>1.4-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.apache.jackrabbit</groupId>
@@ -66,7 +63,6 @@
 		<dependency>
 			<groupId>junit</groupId>
 			<artifactId>junit</artifactId>
-			<version>3.8.1</version>
 			<scope>test</scope>
 		</dependency>
 		<dependency>
@@ -74,12 +70,11 @@
 			<artifactId>slf4j-log4j12</artifactId>
 			<scope>test</scope>
 		</dependency>
-
 	</dependencies>
+
 	<build>
 		<plugins>
 			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-surefire-plugin</artifactId>
 				<configuration>
 					<excludes>
@@ -89,4 +84,17 @@
 			</plugin>
 		</plugins>
 	</build>
+
+  <scm>
+    <connection>
+      scm:svn:http://svn.apache.org/repos/asf/jackrabbit/trunk/jackrabbit-ocm-nodemanagement
+    </connection>
+    <developerConnection>
+      scm:svn:https://svn.apache.org/repos/asf/jackrabbit/trunk/jackrabbit-ocm-nodemanagement
+    </developerConnection>
+    <url>
+      http://svn.apache.org/viewvc/asf/jackrabbit/trunk/jackrabbit-ocm-nodemanagement
+    </url>
+  </scm>
+
 </project>

Modified: jackrabbit/trunk/jackrabbit-ocm/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-ocm/pom.xml?rev=607707&r1=607706&r2=607707&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-ocm/pom.xml (original)
+++ jackrabbit/trunk/jackrabbit-ocm/pom.xml Mon Dec 31 01:58:08 2007
@@ -1,21 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!--
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-  -->
+<!--
+   Licensed to the Apache Software Foundation (ASF) under one or more
+   contributor license agreements.  See the NOTICE file distributed with
+   this work for additional information regarding copyright ownership.
+   The ASF licenses this file to You under the Apache License, Version 2.0
+   (the "License"); you may not use this file except in compliance with
+   the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+  -->
 
 <project xmlns="http://maven.apache.org/POM/4.0.0"
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
@@ -32,7 +32,6 @@
     <version>1.4-SNAPSHOT</version>
   </parent>
   <artifactId>jackrabbit-ocm</artifactId>
-  <packaging>jar</packaging>
   <name>Jackrabbit Object Content Mapping</name>
   <description>
     This Jackrabbit subproject is an object/JCR persistence and
@@ -43,7 +42,6 @@
     Java-based Criteria, as well as in JCR query language. It offers
     also features like version support and object locking.
   </description>
-  <inceptionYear>2007</inceptionYear>
 
   <!-- ====================================================================== -->
   <!-- B U I L D                                                              -->
@@ -72,6 +70,9 @@
   <profiles>
     <profile>
       <id>jdk1.4</id>
+      <properties>
+        <maven.test.skip>true</maven.test.skip>
+      </properties>
       <build>
         <plugins>
           <plugin>
@@ -92,7 +93,7 @@
               <classifier>jdk1.4</classifier>
             </configuration>
           </plugin>
-        </plugins>
+        </plugins>
       </build>
     </profile>
   </profiles>
@@ -108,7 +109,6 @@
     <dependency>
       <groupId>commons-digester</groupId>
       <artifactId>commons-digester</artifactId>
-      <version>1.7</version>
     </dependency>
     <dependency>
       <groupId>commons-collections</groupId>
@@ -117,7 +117,6 @@
     <dependency>
       <groupId>commons-lang</groupId>
       <artifactId>commons-lang</artifactId>
-      <version>2.1</version>
     </dependency>
 
     <dependency>
@@ -128,12 +127,10 @@
     <dependency>
       <groupId>cglib</groupId>
       <artifactId>cglib</artifactId>
-      <version>2.1_3</version>
     </dependency>
     <dependency>
       <groupId>commons-beanutils</groupId>
       <artifactId>commons-beanutils</artifactId>
-      <version>1.7.0</version>
     </dependency>
 
     <!-- Test -->
@@ -142,11 +139,11 @@
       <artifactId>jackrabbit-core</artifactId>
       <scope>test</scope>
     </dependency>
-    <dependency>
-      <groupId>org.apache.geronimo.specs</groupId>
-      <artifactId>geronimo-jta_1.0.1B_spec</artifactId>
-      <scope>test</scope>
-    </dependency>
+    <dependency>
+      <groupId>org.apache.geronimo.specs</groupId>
+      <artifactId>geronimo-jta_1.0.1B_spec</artifactId>
+      <scope>test</scope>
+    </dependency>
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
@@ -161,13 +158,13 @@
 
   <scm>
     <connection>
-      scm:svn:http://svn.apache.org/repos/asf/jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping
+      scm:svn:http://svn.apache.org/repos/asf/jackrabbit/trunk/jackrabbit-ocm
     </connection>
     <developerConnection>
-      scm:svn:https://svn.apache.org/repos/asf/jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping
+      scm:svn:https://svn.apache.org/repos/asf/jackrabbit/trunk/jackrabbit-ocm
     </developerConnection>
     <url>
-      http://svn.apache.org/viewvc/jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping
+      http://svn.apache.org/viewvc/asf/jackrabbit/trunk/jackrabbit-ocm
     </url>
   </scm>
 

Modified: jackrabbit/trunk/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/pom.xml?rev=607707&r1=607706&r2=607707&view=diff
==============================================================================
--- jackrabbit/trunk/pom.xml (original)
+++ jackrabbit/trunk/pom.xml Mon Dec 31 01:58:08 2007
@@ -70,6 +70,10 @@
     <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>
@@ -672,6 +676,21 @@
         <version>3.1</version>
       </dependency>
       <dependency>
+        <groupId>commons-digester</groupId>
+        <artifactId>commons-digester</artifactId>
+        <version>1.7</version>
+      </dependency>
+      <dependency>
+        <groupId>commons-lang</groupId>
+        <artifactId>commons-lang</artifactId>
+        <version>2.1</version>
+      </dependency>
+      <dependency>
+        <groupId>commons-beanutils</groupId>
+        <artifactId>commons-beanutils</artifactId>
+        <version>1.7.0</version>
+      </dependency>
+      <dependency>
         <groupId>org.apache.geronimo.specs</groupId>
         <artifactId>geronimo-jta_1.0.1B_spec</artifactId>
         <version>1.0.1</version>
@@ -713,6 +732,11 @@
       </dependency>
       <dependency>
         <groupId>org.apache.jackrabbit</groupId>
+        <artifactId>jackrabbit-jcr-servlet</artifactId>
+        <version>1.4-SNAPSHOT</version>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.jackrabbit</groupId>
         <artifactId>jackrabbit-jcr-server</artifactId>
         <version>1.4-SNAPSHOT</version>
       </dependency>
@@ -734,6 +758,16 @@
       <dependency>
         <groupId>org.apache.jackrabbit</groupId>
         <artifactId>jackrabbit-spi2jcr</artifactId>
+        <version>1.4-SNAPSHOT</version>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.jackrabbit</groupId>
+        <artifactId>jackrabbit-ocm</artifactId>
+        <version>1.4-SNAPSHOT</version>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.jackrabbit</groupId>
+        <artifactId>jackrabbit-ocm-nodemanagement</artifactId>
         <version>1.4-SNAPSHOT</version>
       </dependency>
       <dependency>



Mime
View raw message