CSPACE-343: Updated POM files to use new CSpace repository URLS that now uses a ...

diff --git a/3rdparty/nuxeo/nuxeo-platform-collectionspace/pom.xml b/3rdparty/nuxeo/nuxeo-platform-collectionspace/pom.xml
index f4e998a3c684f7f36abdc3df85e16d8f6c25a9ad..9ef05f661e73b12bc650eded025253c6df97b6b9 100644 (file)
--- a/3rdparty/nuxeo/nuxeo-platform-collectionspace/pom.xml
+++ b/3rdparty/nuxeo/nuxeo-platform-collectionspace/pom.xml
@@ -9,49 +9,27 @@
   </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
+        <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
-    -->\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/pom.xml b/pom.xml
index 9f340323179aa3969d12c6b1716ebd198e37d25f..b8cdb950594f06e378b81d9fe781bcecda203406 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -14,21 +14,27 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>\r
         <nuxeo.version.5.2>5.2.1-SNAPSHOT</nuxeo.version.5.2>\r
         <nuxeo.version.1.5>1.5.1-SNAPSHOT</nuxeo.version.1.5>\r
-    </properties>\r
-    \r
+    </properties>    \r
     <modules>\r
         <module>3rdparty</module>\r
         <module>services</module>\r
     </modules>\r
+        \r
     <repositories>\r
         <repository>\r
-            <id>CollectionSpace</id>\r
-            <url>http://source.collectionspace.org:8081/artifactory/repo</url>\r
-        </repository>        \r
+            <id>collectionspace-releases</id>\r
+            <name>collectionspace-releases</name>\r
+            <url>http://source.collectionspace.org:8081/artifactory/public-nuxeo</url>\r
+        </repository>\r
+        <repository>\r
+            <id>collectionspace-snapshots</id>\r
+            <name>collectionspace-snapshots</name>\r
+            <url>http://source.collectionspace.org:8081/artifactory/public-snapshot-nuxeo</url>\r
+        </repository>\r
         <repository>\r
             <id>maven repo</id>\r
             <name>maven repo</name>\r
-            <url>http://repo1.maven.org/maven2/</url>\r
+            <url>http://repo1.maven.org/maven2</url>\r
         </repository>\r
         <repository>\r
             <id>maven-restlet</id>\r
@@ -58,8 +64,9 @@
             <id>mojo</id>\r
             <name>mojo repo</name>\r
             <url>http://svn.codehaus.org/mojo/trunk/mojo/jboss-maven-plugin</url>\r
-        </repository>\r
+        </repository>        \r
     </repositories>\r
+    \r
     <pluginRepositories>\r
         <pluginRepository>\r
             <id>java.net</id>\r