CSPACE-343: Updated POM files to use new CSpace repository and also to remove unneede...

diff --git a/3rdparty/nuxeo/nuxeo-platform-collectionspace/pom.xml b/3rdparty/nuxeo/nuxeo-platform-collectionspace/pom.xml
index 540859ee779fdac01aafc4ac8503a9c6dfdd04e9..f4e998a3c684f7f36abdc3df85e16d8f6c25a9ad 100644 (file)
--- a/3rdparty/nuxeo/nuxeo-platform-collectionspace/pom.xml
+++ b/3rdparty/nuxeo/nuxeo-platform-collectionspace/pom.xml
@@ -1,30 +1,57 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-
-  <parent>
-    <groupId>org.nuxeo.ecm.platform</groupId>
-    <artifactId>nuxeo-platform-parent</artifactId>
-    <version>5.2-SNAPSHOT</version>
-  </parent>
-
-  <artifactId>nuxeo-platform-collectionspace</artifactId>
-  <packaging>jar</packaging>
-  <name>Nuxeo CS extensions</name>
-  <description>
-    Nuxeo Enterprise Platform: CS extensions
-  </description>
-
-  <dependencies>
-    <dependency>
-      <groupId>org.nuxeo.ecm.core</groupId>
-      <artifactId>nuxeo-core-schema</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.nuxeo.ecm.platform</groupId>
-      <artifactId>nuxeo-platform-types-core</artifactId>
-    </dependency>
-  </dependencies>
-
-</project>
+<project xmlns="http://maven.apache.org/POM/4.0.0"\r
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"\r
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">\r
+\r
+  <parent>\r
+    <groupId>org.collectionspace.services</groupId>\r
+    <artifactId>org.collectionspace.services.3rdparty.nuxeo</artifactId>\r
+    <version>1.0</version>\r
+  </parent>\r
+\r
+  <modelVersion>4.0.0</modelVersion>\r
+  <groupId>org.collectionspace.services</groupId>\r
+  <artifactId>nuxeo-platform-collectionspace</artifactId>\r
+  <version>1.0</version>\r
+  <packaging>pom</packaging>\r
+  <name>Nuxeo CS extensions</name>\r
+  <description> Nuxeo Enterprise Platform: CS extensions </description>\r
+\r
+  <build>\r
+       <!--\r
+    <plugins>\r
+      <plugin>\r
+        <groupId>org.apache.maven.plugins</groupId>\r
+        <artifactId>maven-source-plugin</artifactId>\r
+        <version>2.0.2</version>\r
+        <executions>\r
+          <execution>\r
+            <id>attach-sources</id>\r
+            <goals>\r
+              <goal>jar</goal>\r
+            </goals>\r
+          </execution>\r
+        </executions>\r
+      </plugin>\r
+    </plugins>\r
+    -->\r
+\r
+    <pluginManagement>\r
+      <plugins>\r
+        <plugin>\r
+          <groupId>org.apache.maven.plugins</groupId>\r
+          <artifactId>maven-jar-plugin</artifactId>\r
+          <version>2.2</version>\r
+          <configuration>\r
+            <archive>\r
+              <manifestFile> src/main/resources/META-INF/MANIFEST.MF </manifestFile>\r
+              <manifestEntries>\r
+                <Bundle-Version>${eclipseVersion}</Bundle-Version>\r
+                <Bundle-ManifestVersion>2</Bundle-ManifestVersion>\r
+              </manifestEntries>\r
+            </archive>\r
+          </configuration>\r
+        </plugin>\r
+      </plugins>\r
+    </pluginManagement>\r
+  </build>\r
+</project>\r

diff --git a/3rdparty/nuxeo/pom.xml b/3rdparty/nuxeo/pom.xml
index 2248385a192252428fef120515b95739b164543c..825d536f6c80ff900454e7b7d495be99a27630d5 100644 (file)
--- a/3rdparty/nuxeo/pom.xml
+++ b/3rdparty/nuxeo/pom.xml
@@ -1,63 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>\r
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">\r
+\r
     <parent>\r
-        <artifactId>org.collectionspace.services.3rdparty</artifactId>\r
         <groupId>org.collectionspace.services</groupId>\r
+        <artifactId>org.collectionspace.services.3rdparty</artifactId>\r
         <version>1.0</version>\r
     </parent>\r
+\r
     <modelVersion>4.0.0</modelVersion>\r
     <groupId>org.collectionspace.services</groupId>\r
     <artifactId>org.collectionspace.services.3rdparty.nuxeo</artifactId>\r
-    <packaging>pom</packaging>\r
     <version>1.0</version>\r
+    <packaging>pom</packaging>\r
     <name>services.3rdparty.nuxeo</name>\r
 \r
-   \r
-    <repositories>\r
-        <repository>\r
-            <id>public</id>\r
-            <url>http://maven.nuxeo.org/public</url>\r
-            <releases>\r
-            </releases>\r
-            <snapshots>\r
-                <enabled>false</enabled>\r
-            </snapshots>\r
-        </repository>\r
-        <repository>\r
-            <id>public-snapshot</id>\r
-            <url>http://maven.nuxeo.org/public-snapshot</url>\r
-            <releases>\r
-                <enabled>false</enabled>\r
-            </releases>\r
-            <snapshots/>\r
-        </repository>\r
-    </repositories>\r
-\r
-    <pluginRepositories>\r
-        <pluginRepository>\r
-            <id>public</id>\r
-            <url>http://maven.nuxeo.org/public</url>\r
-            <name>Nuxeo virtual release repository</name>\r
-            <releases>\r
-            </releases>\r
-            <snapshots>\r
-                <enabled>false</enabled>\r
-            </snapshots>\r
-        </pluginRepository>\r
-        <pluginRepository>\r
-            <id>public-snapshot</id>\r
-            <url>http://maven.nuxeo.org/public-snapshot</url>\r
-            <name>Nuxeo virtual snapshot repository</name>\r
-            <releases>\r
-                <enabled>false</enabled>\r
-            </releases>\r
-            <snapshots>\r
-            </snapshots>\r
-        </pluginRepository>\r
-    </pluginRepositories>\r
+    <modules>\r
+        <module>nuxeo-platform-collectionspace</module>\r
+    </modules>\r
 \r
-    <dependencies>\r
-       \r
+    <dependencies>       \r
         <!-- jboss -->\r
         <dependency>\r
             <groupId>jboss</groupId>\r
@@ -115,8 +76,8 @@
         </dependency>\r
         <dependency>\r
             <groupId>org.osgi</groupId>\r
-            <artifactId>osgi-core</artifactId>\r
-            <version>4.1</version>\r
+            <artifactId>org.osgi.core</artifactId>\r
+            <version>4.1.0</version>\r
         </dependency>\r
 \r
     </dependencies>\r

diff --git a/pom.xml b/pom.xml
index 9ae5bb44af2cf71d668da9f6deb7c943bd28716e..9f340323179aa3969d12c6b1716ebd198e37d25f 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -17,14 +17,24 @@
     </properties>\r
     \r
     <modules>\r
+        <module>3rdparty</module>\r
         <module>services</module>\r
     </modules>\r
     <repositories>\r
+        <repository>\r
+            <id>CollectionSpace</id>\r
+            <url>http://source.collectionspace.org:8081/artifactory/repo</url>\r
+        </repository>        \r
         <repository>\r
             <id>maven repo</id>\r
             <name>maven repo</name>\r
             <url>http://repo1.maven.org/maven2/</url>\r
         </repository>\r
+        <repository>\r
+            <id>maven-restlet</id>\r
+            <name>Public online Restlet repository</name>\r
+            <url>http://maven.restlet.org</url>\r
+        </repository>\r
         <repository>\r
             <id>java.net</id>\r
             <name>java.net Maven Repository</name>\r

diff --git a/services/JaxRsServiceProvider/pom.xml b/services/JaxRsServiceProvider/pom.xml
index e60b0739b7cc90eda524f682aea5a364d9c612a9..b155b43f5d67e0baf8292ec8f4ecd7a34b2bdf9f 100644 (file)
--- a/services/JaxRsServiceProvider/pom.xml
+++ b/services/JaxRsServiceProvider/pom.xml
@@ -150,8 +150,8 @@
         </dependency>\r
         <dependency>\r
             <groupId>org.osgi</groupId>\r
-            <artifactId>osgi-core</artifactId>\r
-            <version>4.1</version>\r
+            <artifactId>org.osgi.core</artifactId>\r
+            <version>4.1.0</version>\r
         </dependency>\r
 \r
     </dependencies>\r

diff --git a/services/collectionobject/3rdparty/nuxeo-platform-cs-collectionobject/pom.xml b/services/collectionobject/3rdparty/nuxeo-platform-cs-collectionobject/pom.xml
index a92db9318e959f03df64e22bafd92e43a5fd1513..bd8d6b3b16e4053221dfa402ccb2e620921e8846 100644 (file)
--- a/services/collectionobject/3rdparty/nuxeo-platform-cs-collectionobject/pom.xml
+++ b/services/collectionobject/3rdparty/nuxeo-platform-cs-collectionobject/pom.xml
@@ -1,12 +1,12 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0"
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-    <!-- parent has to be nuxeo-platform to retain the manifest -->
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <parent>
-        <groupId>org.nuxeo.ecm.platform</groupId>
-        <artifactId>nuxeo-platform-parent</artifactId>
-        <version>5.2-SNAPSHOT</version>
+        <groupId>org.collectionspace.services</groupId>
+        <artifactId>nuxeo-platform-collectionspace</artifactId>
+        <version>1.0</version>
     </parent>
+    
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.collectionspace.services</groupId>
     <version>1.0</version>
@@ -14,23 +14,6 @@
     <packaging>jar</packaging>
     <name>services.collectionobject.3rdparty.nuxeo</name>
     <description>
-    CollectionObject Nuxeo document type
+        CollectionObject Nuxeo document type
     </description>
-    <properties>
-        <nuxeo.version.5.2>5.2.1-SNAPSHOT</nuxeo.version.5.2>
-        <nuxeo.version.1.5>1.5.1-SNAPSHOT</nuxeo.version.1.5>
-    </properties>
-    <dependencies>
-        <dependency>
-            <groupId>org.nuxeo.ecm.core</groupId>
-            <artifactId>nuxeo-core-schema</artifactId>
-            <version>${nuxeo.version.1.5}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.nuxeo.ecm.platform</groupId>
-            <artifactId>nuxeo-platform-types-core</artifactId>
-            <version>${nuxeo.version.5.2}</version>
-        </dependency>
-    </dependencies>
-
 </project>

diff --git a/services/collectionobject/3rdparty/pom.xml b/services/collectionobject/3rdparty/pom.xml
index e286b72df61b5d4db99e7fd01b5aa09476e25e01..1dcd0d1c9676d7716e623a5b3cd5663b01f4b2ff 100644 (file)
--- a/services/collectionobject/3rdparty/pom.xml
+++ b/services/collectionobject/3rdparty/pom.xml
@@ -4,8 +4,8 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">\r
 \r
     <parent>\r
-        <artifactId>org.collectionspace.services.collectionobject</artifactId>\r
         <groupId>org.collectionspace.services</groupId>\r
+        <artifactId>org.collectionspace.services.collectionobject</artifactId>\r
         <version>1.0</version>\r
     </parent>\r
 \r

diff --git a/services/common/pom.xml b/services/common/pom.xml
index 113107ef5e8c75a043720504fa3cb418322efe51..16906e47edfd02443959b2dbe7282d864d27466f 100644 (file)
--- a/services/common/pom.xml
+++ b/services/common/pom.xml
@@ -124,8 +124,8 @@
         </dependency>\r
         <dependency>\r
             <groupId>org.osgi</groupId>\r
-            <artifactId>osgi-core</artifactId>\r
-            <version>4.1</version>\r
+            <artifactId>org.osgi.core</artifactId>\r
+            <version>4.1.0</version>\r
         </dependency>\r
 \r
         <!-- fixme remove restlet dependencies once REST client is no more used -->\r

diff --git a/services/intake/3rdparty/nuxeo-platform-cs-intake/pom.xml b/services/intake/3rdparty/nuxeo-platform-cs-intake/pom.xml
index 3818ff2cb48940b9e1bdc1cee0281c4f1916413e..fdef1d2fc423fcb8d5810bc5aba45588e46cd397 100644 (file)
--- a/services/intake/3rdparty/nuxeo-platform-cs-intake/pom.xml
+++ b/services/intake/3rdparty/nuxeo-platform-cs-intake/pom.xml
@@ -1,12 +1,12 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0"
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-    <!-- parent has to be nuxeo-platform to retain the manifest -->
     <parent>
-        <groupId>org.nuxeo.ecm.platform</groupId>
-        <artifactId>nuxeo-platform-parent</artifactId>
-        <version>5.2-SNAPSHOT</version>
+        <groupId>org.collectionspace.services</groupId>
+        <artifactId>nuxeo-platform-collectionspace</artifactId>
+        <version>1.0</version>
     </parent>
+    
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.collectionspace.services</groupId>
     <version>1.0</version>
@@ -16,21 +16,4 @@
     <description>
     Intake Nuxeo Document Type
     </description>
-    <properties>
-        <nuxeo.version.5.2>5.2.1-SNAPSHOT</nuxeo.version.5.2>
-        <nuxeo.version.1.5>1.5.1-SNAPSHOT</nuxeo.version.1.5>
-    </properties>
-    <dependencies>
-        <dependency>
-            <groupId>org.nuxeo.ecm.core</groupId>
-            <artifactId>nuxeo-core-schema</artifactId>
-            <version>${nuxeo.version.1.5}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.nuxeo.ecm.platform</groupId>
-            <artifactId>nuxeo-platform-types-core</artifactId>
-            <version>${nuxeo.version.5.2}</version>
-        </dependency>
-    </dependencies>
-
 </project>

diff --git a/services/pom.xml b/services/pom.xml
index 4a1d9c3930f57a296fe160918b7686e80852d465..e6092187504e0ff0664e070f5971f312ce37ae2c 100644 (file)
--- a/services/pom.xml
+++ b/services/pom.xml
@@ -1,240 +1,197 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-    <parent>
-        <artifactId>org.collectionspace.services</artifactId>
-        <groupId>org.collectionspace.services</groupId>
-        <version>1.0</version>
-    </parent>
-    <modelVersion>4.0.0</modelVersion>
-    <groupId>org.collectionspace.services</groupId>
-    <version>1.0</version>
-    <artifactId>org.collectionspace.services.main</artifactId>
-    <packaging>pom</packaging>
-    <name>services.main</name>
-
-
-    <modules>
-        <!-- add modules below in the order based on dependencies -->
-        <module>common</module>
-        <module>authentication</module>
-        <module>relation</module>
-        <module>id</module>
-        <module>collectionobject</module>
-        <module>intake</module>
-        <module>JaxRsServiceProvider</module>
-        <module>client</module>
-        <module>IntegrationTests</module>
-    </modules>
-
-    <repositories>
-        <repository>
-            <id>maven-restlet</id>
-            <name>Public online Restlet repository</name>
-            <url>http://maven.restlet.org</url>
-        </repository>
-        <repository>
-            <id>public</id>
-            <url>http://maven.nuxeo.org/public</url>
-            <releases>
-            </releases>
-            <snapshots>
-                <enabled>false</enabled>
-            </snapshots>
-        </repository>
-        <repository>
-            <id>public-snapshot</id>
-            <url>http://maven.nuxeo.org/public-snapshot</url>
-            <releases>
-                <enabled>false</enabled>
-            </releases>
-            <snapshots>
-            </snapshots>
-        </repository>
-    </repositories>
-    
-    <pluginRepositories>
-        <pluginRepository>
-            <id>public</id>
-            <url>http://maven.nuxeo.org/public</url>
-            <name>Nuxeo virtual release repository</name>
-            <releases>
-            </releases>
-            <snapshots>
-                <enabled>false</enabled>
-            </snapshots>
-        </pluginRepository>
-        <pluginRepository>
-            <id>public-snapshot</id>
-            <url>http://maven.nuxeo.org/public-snapshot</url>
-            <name>Nuxeo virtual snapshot repository</name>
-            <releases>
-                <enabled>false</enabled>
-            </releases>
-            <snapshots>
-            </snapshots>
-        </pluginRepository>
-    </pluginRepositories>
-
-    <build>
-        <pluginManagement>
-            <plugins>
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-compiler-plugin</artifactId>
-                    <configuration>
-                        <source>1.5</source>
-                        <target>1.5</target>
-                    </configuration>
-                </plugin>
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-site-plugin</artifactId>
-                    <configuration>
-                        <unzipCommand>/usr/bin/unzip -o &gt; err.txt</unzipCommand>
-                    </configuration>
-                </plugin>
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-war-plugin</artifactId>
-                    <version>2.0.1</version>
-                    <configuration>
-                        <warSourceExcludes>WEB-INF/lib/*.jar</warSourceExcludes>
-                        <archive>
-                            <manifest>
-                                <addClasspath>true</addClasspath>
-
-                            </manifest>
-                        </archive>
-                    </configuration>
-                </plugin>
-                
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-dependency-plugin</artifactId>
-                    <executions>
-                        <execution>
-                            <id>classpath</id>
-                            <goals>
-                                <goal>build-classpath</goal>
-                            </goals>
-                            <configuration>
-                                <outputFile>classpath</outputFile>
-                            </configuration>
-                        </execution>
-                    </executions>
-                </plugin>
-
-
-            </plugins>
-        </pluginManagement>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <version>2.0.2</version>
-                <configuration>
-                    <source>1.6</source>
-                    <target>1.6</target>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-    <reporting>
-        <plugins>
-            <!--plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>taglist-maven-plugin</artifactId>
-                <version>2.1</version>
-                <configuration>
-                    <tags>
-                        <tag>@FIXME</tag>
-                        <tag>@fixme</tag>
-                        <tag>FIXME</tag>
-                        <tag>fixme</tag>
-                        <tag>@TODO</tag>
-                        <tag>@todo</tag>
-                        <tag>TODO</tag>
-                        <tag>todo</tag>
-                    </tags>
-                     <onlyAnalyze>org.collectionspace.*</onlyAnalyze>
-                </configuration>
-            </plugin-->
-
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>findbugs-maven-plugin</artifactId>
-                <version>2.0.1</version>
-                <configuration>
-                    <onlyAnalyze>org.collectionspace.*</onlyAnalyze>
-                </configuration>
-            </plugin>
-        </plugins>
-    </reporting>
-    <dependencyManagement>
-        <dependencies>
-            <dependency>
-                <groupId>net.java.dev.jaxb2-commons</groupId>
-                <artifactId>jaxb-fluent-api</artifactId>
-                <version>2.0.1</version>
-            </dependency>
-            <dependency>
-                <groupId>org.testng</groupId>
-                <artifactId>testng</artifactId>
-                <version>5.6</version>
-                <scope>test</scope>
-                <classifier>jdk15</classifier>
-            </dependency>
-            <dependency>
-                <groupId>org.jboss.resteasy</groupId>
-                <artifactId>jaxrs-api</artifactId>
-                <version>1.0.2.GA</version>
-            </dependency>
-            <dependency>
-                <groupId>net.java.dev.jaxb2-commons</groupId>
-                <artifactId>jaxb-fluent-api</artifactId>
-                <version>2.0.1</version>
-            </dependency>
-            <dependency>
-                <groupId>org.jvnet.jaxb2-commons</groupId>
-                <artifactId>property-listener-injector</artifactId>
-                <version>1.0</version>
-            </dependency>
-            <dependency>
-                <groupId>org.jvnet.jaxb2_commons</groupId>
-                <artifactId>runtime</artifactId>
-                <version>0.4.1</version>
-            </dependency>
-            <dependency>
-                <groupId>org.jboss.resteasy</groupId>
-                <artifactId>resteasy-jaxrs</artifactId>
-                <version>1.0.2.GA</version>
-            </dependency>
-            <dependency>
-                <groupId>commons-httpclient</groupId>
-                <artifactId>commons-httpclient</artifactId>
-                <version>3.1</version>
-            </dependency>
-            <dependency>
-                <groupId>com.sun.xml.bind</groupId>
-                <artifactId>jaxb-impl</artifactId>
-                <version>2.1.7</version>
-            </dependency>
-            <dependency>
-                <groupId>org.slf4j</groupId>
-                <artifactId>slf4j-api</artifactId>
-                <version>1.5.2</version>
-            </dependency>
-            <dependency>
-                <groupId>org.slf4j</groupId>
-                <artifactId>slf4j-log4j12</artifactId>
-                <version>1.5.2</version>
-            </dependency>
-            <dependency>
-                <groupId>mysql</groupId>
-                <artifactId>mysql-connector-java</artifactId>
-                <version>5.1.5</version>
-                <scope>test</scope>
-            </dependency>
-        </dependencies>
-    </dependencyManagement>
-</project>
+<?xml version="1.0" encoding="UTF-8"?>\r
+<project xmlns="http://maven.apache.org/POM/4.0.0"\r
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"\r
+    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">\r
+    <parent>\r
+        <artifactId>org.collectionspace.services</artifactId>\r
+        <groupId>org.collectionspace.services</groupId>\r
+        <version>1.0</version>\r
+    </parent>\r
+    <modelVersion>4.0.0</modelVersion>\r
+    <groupId>org.collectionspace.services</groupId>\r
+    <version>1.0</version>\r
+    <artifactId>org.collectionspace.services.main</artifactId>\r
+    <packaging>pom</packaging>\r
+    <name>services.main</name>\r
+\r
+    <modules>\r
+        <!-- add modules below in the order based on dependencies -->\r
+        <module>common</module>\r
+        <module>authentication</module>\r
+        <module>relation</module>\r
+        <module>id</module>\r
+        <module>collectionobject</module>\r
+        <module>intake</module>\r
+        <module>JaxRsServiceProvider</module>\r
+        <module>client</module>\r
+        <module>IntegrationTests</module>\r
+    </modules>\r
+\r
+    <repositories> </repositories>\r
+\r
+    <pluginRepositories>\r
+    </pluginRepositories>\r
+\r
+    <build>\r
+        <pluginManagement>\r
+            <plugins>\r
+                <plugin>\r
+                    <groupId>org.apache.maven.plugins</groupId>\r
+                    <artifactId>maven-compiler-plugin</artifactId>\r
+                    <configuration>\r
+                        <source>1.5</source>\r
+                        <target>1.5</target>\r
+                    </configuration>\r
+                </plugin>\r
+                <plugin>\r
+                    <groupId>org.apache.maven.plugins</groupId>\r
+                    <artifactId>maven-site-plugin</artifactId>\r
+                    <configuration>\r
+                        <unzipCommand>/usr/bin/unzip -o &gt; err.txt</unzipCommand>\r
+                    </configuration>\r
+                </plugin>\r
+                <plugin>\r
+                    <groupId>org.apache.maven.plugins</groupId>\r
+                    <artifactId>maven-war-plugin</artifactId>\r
+                    <version>2.0.1</version>\r
+                    <configuration>\r
+                        <warSourceExcludes>WEB-INF/lib/*.jar</warSourceExcludes>\r
+                        <archive>\r
+                            <manifest>\r
+                                <addClasspath>true</addClasspath>\r
+\r
+                            </manifest>\r
+                        </archive>\r
+                    </configuration>\r
+                </plugin>\r
+\r
+                <plugin>\r
+                    <groupId>org.apache.maven.plugins</groupId>\r
+                    <artifactId>maven-dependency-plugin</artifactId>\r
+                    <executions>\r
+                        <execution>\r
+                            <id>classpath</id>\r
+                            <goals>\r
+                                <goal>build-classpath</goal>\r
+                            </goals>\r
+                            <configuration>\r
+                                <outputFile>classpath</outputFile>\r
+                            </configuration>\r
+                        </execution>\r
+                    </executions>\r
+                </plugin>\r
+\r
+\r
+            </plugins>\r
+        </pluginManagement>\r
+        <plugins>\r
+            <plugin>\r
+                <groupId>org.apache.maven.plugins</groupId>\r
+                <artifactId>maven-compiler-plugin</artifactId>\r
+                <version>2.0.2</version>\r
+                <configuration>\r
+                    <source>1.6</source>\r
+                    <target>1.6</target>\r
+                </configuration>\r
+            </plugin>\r
+        </plugins>\r
+    </build>\r
+    <reporting>\r
+        <plugins>\r
+            <!--plugin>\r
+                <groupId>org.codehaus.mojo</groupId>\r
+                <artifactId>taglist-maven-plugin</artifactId>\r
+                <version>2.1</version>\r
+                <configuration>\r
+                    <tags>\r
+                        <tag>@FIXME</tag>\r
+                        <tag>@fixme</tag>\r
+                        <tag>FIXME</tag>\r
+                        <tag>fixme</tag>\r
+                        <tag>@TODO</tag>\r
+                        <tag>@todo</tag>\r
+                        <tag>TODO</tag>\r
+                        <tag>todo</tag>\r
+                    </tags>\r
+                     <onlyAnalyze>org.collectionspace.*</onlyAnalyze>\r
+                </configuration>\r
+            </plugin-->\r
+\r
+            <plugin>\r
+                <groupId>org.codehaus.mojo</groupId>\r
+                <artifactId>findbugs-maven-plugin</artifactId>\r
+                <version>2.0.1</version>\r
+                <configuration>\r
+                    <onlyAnalyze>org.collectionspace.*</onlyAnalyze>\r
+                </configuration>\r
+            </plugin>\r
+        </plugins>\r
+    </reporting>\r
+    <dependencyManagement>\r
+        <dependencies>\r
+            <dependency>\r
+                <groupId>net.java.dev.jaxb2-commons</groupId>\r
+                <artifactId>jaxb-fluent-api</artifactId>\r
+                <version>2.0.1</version>\r
+            </dependency>\r
+            <dependency>\r
+                <groupId>org.testng</groupId>\r
+                <artifactId>testng</artifactId>\r
+                <version>5.6</version>\r
+                <scope>test</scope>\r
+                <classifier>jdk15</classifier>\r
+            </dependency>\r
+            <dependency>\r
+                <groupId>org.jboss.resteasy</groupId>\r
+                <artifactId>jaxrs-api</artifactId>\r
+                <version>1.0.2.GA</version>\r
+            </dependency>\r
+            <dependency>\r
+                <groupId>net.java.dev.jaxb2-commons</groupId>\r
+                <artifactId>jaxb-fluent-api</artifactId>\r
+                <version>2.0.1</version>\r
+            </dependency>\r
+            <dependency>\r
+                <groupId>org.jvnet.jaxb2-commons</groupId>\r
+                <artifactId>property-listener-injector</artifactId>\r
+                <version>1.0</version>\r
+            </dependency>\r
+            <dependency>\r
+                <groupId>org.jvnet.jaxb2_commons</groupId>\r
+                <artifactId>runtime</artifactId>\r
+                <version>0.4.1</version>\r
+            </dependency>\r
+            <dependency>\r
+                <groupId>org.jboss.resteasy</groupId>\r
+                <artifactId>resteasy-jaxrs</artifactId>\r
+                <version>1.0.2.GA</version>\r
+            </dependency>\r
+            <dependency>\r
+                <groupId>commons-httpclient</groupId>\r
+                <artifactId>commons-httpclient</artifactId>\r
+                <version>3.1</version>\r
+            </dependency>\r
+            <dependency>\r
+                <groupId>com.sun.xml.bind</groupId>\r
+                <artifactId>jaxb-impl</artifactId>\r
+                <version>2.1.7</version>\r
+            </dependency>\r
+            <dependency>\r
+                <groupId>org.slf4j</groupId>\r
+                <artifactId>slf4j-api</artifactId>\r
+                <version>1.5.2</version>\r
+            </dependency>\r
+            <dependency>\r
+                <groupId>org.slf4j</groupId>\r
+                <artifactId>slf4j-log4j12</artifactId>\r
+                <version>1.5.2</version>\r
+            </dependency>\r
+            <dependency>\r
+                <groupId>mysql</groupId>\r
+                <artifactId>mysql-connector-java</artifactId>\r
+                <version>5.1.5</version>\r
+                <scope>test</scope>\r
+            </dependency>\r
+        </dependencies>\r
+    </dependencyManagement>\r
+</project>\r

diff --git a/services/relation/3rdparty/nuxeo-platform-cs-relation/pom.xml b/services/relation/3rdparty/nuxeo-platform-cs-relation/pom.xml
index b79f1a1db1b180efca6613a27d27f7ae34f237f4..86768f6eb874f954f33895ac141ebe02da268847 100644 (file)
--- a/services/relation/3rdparty/nuxeo-platform-cs-relation/pom.xml
+++ b/services/relation/3rdparty/nuxeo-platform-cs-relation/pom.xml
@@ -1,37 +1,19 @@
-
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-    <!-- parent has to be nuxeo-platform to retain the manifest -->
-    <parent>
-        <groupId>org.nuxeo.ecm.platform</groupId>
-        <artifactId>nuxeo-platform-parent</artifactId>
-        <version>5.2-SNAPSHOT</version>
-    </parent>
-    <modelVersion>4.0.0</modelVersion>
-    <groupId>org.collectionspace.services</groupId>
-    <version>1.0</version>
-    <artifactId>org.collectionspace.services.relation.3rdparty.nuxeo</artifactId>
-    <packaging>jar</packaging>
-    <name>services.relation.3rdparty.nuxeo</name>
-    <description>
-    CollectionSpace relation Nuxeo document type
-    </description>
-    <properties>
-        <nuxeo.version.5.2>5.2.1-SNAPSHOT</nuxeo.version.5.2>
-        <nuxeo.version.1.5>1.5.1-SNAPSHOT</nuxeo.version.1.5>
-    </properties>
-    <dependencies>
-        <dependency>
-            <groupId>org.nuxeo.ecm.core</groupId>
-            <artifactId>nuxeo-core-schema</artifactId>
-            <version>${nuxeo.version.1.5}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.nuxeo.ecm.platform</groupId>
-            <artifactId>nuxeo-platform-types-core</artifactId>
-            <version>${nuxeo.version.5.2}</version>
-        </dependency>
-    </dependencies>
-
-</project>
+<project xmlns="http://maven.apache.org/POM/4.0.0"\r
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"\r
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">\r
+\r
+    <parent>\r
+               <groupId>org.collectionspace.services</groupId>\r
+               <artifactId>nuxeo-platform-collectionspace</artifactId>\r
+               <version>1.0</version>\r
+    </parent>\r
+\r
+    <modelVersion>4.0.0</modelVersion>\r
+    <groupId>org.collectionspace.services</groupId>\r
+    <version>1.0</version>\r
+    <artifactId>org.collectionspace.services.relation.3rdparty.nuxeo</artifactId>\r
+    <packaging>jar</packaging>\r
+    <name>services.relation.3rdparty.nuxeo</name>\r
+    <description>CollectionSpace relation Nuxeo document type.</description>\r
+\r
+</project>\r