CSPACE-1078: Updated Artifactory repos settings and apparently fixed the problem...

diff --git a/pom.xml b/pom.xml
index f4591e35972c0acb0d97157cc96be18201d3d203..7a98c0b7e01b72c0c971dcfd6f5eef05d1d8949a 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -22,8 +22,7 @@
             <id>libs-releases-local</id>\r
             <name>libs-releases-local</name>\r
             <url>http://source.collectionspace.org:8081/artifactory/libs-releases-local</url>\r
-        </repository>\r
-        \r
+        </repository>        \r
         <snapshotRepository>\r
             <id>libs-snapshots-local</id>\r
             <name>libs-snapshots-local</name>\r
@@ -36,52 +35,31 @@
         <module>services</module>\r
     </modules>\r
     \r
-    <repositories>\r
-        \r
-        <repository>\r
-            <id>maven2-repository.dev.java.net</id>\r
-            <name>Java.net Maven 2 Repository</name>\r
-            <url>http://download.java.net/maven/2</url>\r
-            <snapshots>\r
-                <enabled>false</enabled>\r
-            </snapshots>\r
-        </repository>\r
-        <repository>\r
-            <id>maven-repository.dev.java.net</id>\r
-            <name>Java.net Maven 1 Repository (legacy)</name>\r
-            <url>http://download.java.net/maven/1</url>\r
-            <layout>legacy</layout>\r
-            <snapshots>\r
-                <enabled>false</enabled>\r
-            </snapshots>\r
-        </repository>\r
-<!--\r
+    <repositories>        \r
         <repository>\r
-            <id>collectionspace-releases</id>\r
-            <name>collectionspace-releases</name>\r
-            <url>http://source.collectionspace.org:8081/artifactory/public-nuxeo</url>\r
+            <id>libs-releases</id>\r
+            <url>http://source.collectionspace.org:8081/artifactory/libs-releases</url>\r
             <releases>\r
                 <enabled>true</enabled>\r
             </releases>\r
             <snapshots>\r
                 <enabled>false</enabled>\r
             </snapshots>\r
-        </repository>\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
+            <id>libs-snapshots</id>\r
+            <url>http://source.collectionspace.org:8081/artifactory/libs-snapshots</url>\r
             <releases>\r
                 <enabled>false</enabled>\r
             </releases>\r
             <snapshots>\r
                 <enabled>true</enabled>\r
             </snapshots>\r
-        </repository>\r
--->\r
+        </repository>        \r
         <repository>\r
-            <id>libs-snapshots</id>\r
-            <url>http://source.collectionspace.org:8081/artifactory/libs-snapshots</url>\r
+            <id>libs-snapshots-local</id>\r
+            <name>libs-snapshots-local</name>\r
+            <url>http://source.collectionspace.org:8081/artifactory/libs-snapshots-local</url>\r
             <releases>\r
                 <enabled>false</enabled>\r
             </releases>\r
@@ -89,66 +67,60 @@
                 <enabled>true</enabled>\r
             </snapshots>\r
         </repository>\r
-\r
         <repository>\r
-            <id>libs-snapshots-local</id>\r
-            <name>libs-snapshots-local</name>\r
-            <url>http://source.collectionspace.org:8081/artifactory/libs-snapshots-local</url>\r
+            <id>libs-releases-local</id>\r
+            <name>libs-releases-local</name>\r
+            <url>http://source.collectionspace.org:8081/artifactory/libs-releases-local</url>\r
             <releases>\r
-                <enabled>false</enabled>\r
+                <enabled>true</enabled>\r
             </releases>\r
             <snapshots>\r
-                <enabled>true</enabled>\r
+                <enabled>false</enabled>\r
             </snapshots>\r
         </repository>\r
         \r
         <repository>\r
-            <id>maven repo</id>\r
-            <name>maven repo</name>\r
+            <id>repo1</id>\r
+            <name>Maven repo1</name>\r
             <url>http://repo1.maven.org/maven2</url>\r
             <snapshots>\r
                 <enabled>false</enabled>\r
             </snapshots>\r
         </repository>\r
         <repository>\r
-            <id>maven-restlet</id>\r
-            <name>Public online Restlet repository</name>\r
-            <url>http://maven.restlet.org</url>\r
+            <id>repo2</id>\r
+            <name>Maven repo2</name>\r
+            <url>http://repo2.maven.org/maven2</url>\r
             <snapshots>\r
                 <enabled>false</enabled>\r
             </snapshots>\r
-        </repository>        \r
-<!--        \r
+        </repository>\r
         <repository>\r
-            <id>java.net</id>\r
-            <name>java.net Maven Repository</name>\r
-            <url>https://maven-repository.dev.java.net/nonav/repository</url>\r
+            <id>maven2-repository.dev.java.net</id>\r
+            <name>Java.net Maven 2 Repository</name>\r
+            <url>http://download.java.net/maven/2</url>\r
+            <snapshots>\r
+                <enabled>false</enabled>\r
+            </snapshots>\r
+        </repository><repository>\r
+            <id>maven1-repository.dev.java.net</id>\r
+            <name>Java.net Maven 1 Repository</name>\r
+            <url>http://download.java.net/maven/1</url>\r
             <layout>legacy</layout>\r
             <snapshots>\r
                 <enabled>false</enabled>\r
             </snapshots>\r
         </repository>\r
--->        \r
         \r
-        <!--        \r
-            <repository>\r
-            <id>maven2-repository.dev.java.net</id>\r
-            <name>Java.net Maven 2 Repository</name>\r
-            <url>http://download.java.net/maven/2</url>\r
-            <snapshots>\r
-            <enabled>false</enabled>\r
-            </snapshots>            \r
-            </repository>\r
-        -->        \r
-        <!--\r
-            <repository>\r
-            <id>sun</id>\r
-            <url>http://download.java.net/maven/2</url>\r
+        <repository>\r
+            <id>maven-restlet</id>\r
+            <name>Public online Restlet repository</name>\r
+            <url>http://maven.restlet.org</url>\r
             <snapshots>\r
-            <enabled>false</enabled>\r
-            </snapshots>            \r
-            </repository>\r
-        -->        \r
+                <enabled>false</enabled>\r
+            </snapshots>\r
+        </repository>\r
+        \r
         <repository>\r
             <id>jboss</id>\r
             <url>http://repository.jboss.org/maven2</url>\r
@@ -164,41 +136,86 @@
                 <enabled>false</enabled>\r
             </snapshots>\r
         </repository>                \r
+        \r
         <repository>\r
             <id>mojo</id>\r
             <name>mojo repo</name>\r
             <url>http://repository.codehaus.org</url>\r
             <snapshots>\r
-                <enabled>true</enabled>\r
+                <enabled>false</enabled>\r
             </snapshots>\r
         </repository>\r
 \r
-<!--\r
-    <repository>\r
-      <id>public</id>\r
-      <url>http://maven.nuxeo.org/public</url>\r
-      <releases>\r
-        <enabled>true</enabled>\r
-      </releases>\r
-      <snapshots>\r
-        <enabled>false</enabled>\r
-      </snapshots>\r
-    </repository>\r
--->    \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
-        <enabled>true</enabled>\r
-      </snapshots>\r
-    </repository>\r
-\r
+        <repository>\r
+            <id>public</id>\r
+            <url>http://maven.nuxeo.org/public</url>\r
+            <releases>\r
+                <enabled>true</enabled>\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
+                <enabled>true</enabled>\r
+            </snapshots>\r
+        </repository>\r
+        \r
+        <repository>\r
+            <id>collectionspace-releases</id>\r
+            <name>collectionspace-releases</name>\r
+            <url>http://source.collectionspace.org:8081/artifactory/public-nuxeo</url>\r
+            <releases>\r
+                <enabled>true</enabled>\r
+            </releases>\r
+            <snapshots>\r
+                <enabled>false</enabled>\r
+            </snapshots>\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
+            <releases>\r
+                <enabled>false</enabled>\r
+            </releases>\r
+            <snapshots>\r
+                <enabled>true</enabled>\r
+            </snapshots>\r
+        </repository>\r
+        \r
     </repositories>\r
     \r
     <pluginRepositories>\r
+        <pluginRepository>\r
+            <id>collectionspace-releases</id>\r
+            <name>collectionspace-releases</name>\r
+            <url>http://source.collectionspace.org:8081/artifactory/plugins-releases</url>\r
+            <releases>\r
+                <enabled>true</enabled>\r
+            </releases>\r
+            <snapshots>\r
+                <enabled>false</enabled>\r
+            </snapshots>\r
+        </pluginRepository>\r
+        \r
+        <pluginRepository>\r
+            <id>collectionspace-releases</id>\r
+            <name>collectionspace-releases</name>\r
+            <url>http://source.collectionspace.org:8081/artifactory/plugins-snapshots</url>\r
+            <releases>\r
+                <enabled>false</enabled>\r
+            </releases>\r
+            <snapshots>\r
+                <enabled>true</enabled>\r
+            </snapshots>\r
+        </pluginRepository>\r
         \r
         <pluginRepository>\r
             <id>maven repo</id>\r
@@ -214,22 +231,17 @@
             <url>http://download.java.net/maven/2</url>\r
         </pluginRepository>\r
         \r
-        <pluginRepository>\r
-            <id>maven-repository.dev.java.net</id>\r
-            <name>Java.net Maven 1 Repository (legacy)</name>\r
-            <url>http://download.java.net/maven/1</url>\r
-            <layout>legacy</layout>\r
-        </pluginRepository>\r
-\r
         <!-- use snapshort codehaus for cargo plugin -->\r
         <pluginRepository>\r
             <id>codehaus snapshot repository</id>\r
             <url>http://snapshots.repository.codehaus.org/</url>\r
-            <releases>\r
+            <snapshots>\r
                 <enabled>true</enabled>\r
+            </snapshots>\r
+            <releases>\r
+                <enabled>false</enabled>\r
             </releases>\r
         </pluginRepository>\r
-\r
     </pluginRepositories>\r
     \r
     <build>\r

diff --git a/services/JaxRsServiceProvider/pom.xml b/services/JaxRsServiceProvider/pom.xml
index 13c0da45d9e7b53b46767ecd5cfa3fa504809dad..885edabcc3003036b6c3da1f90e0f83f0fc63219 100644 (file)
--- a/services/JaxRsServiceProvider/pom.xml
+++ b/services/JaxRsServiceProvider/pom.xml
@@ -274,7 +274,7 @@
             <plugin>\r
                 <groupId>org.codehaus.cargo</groupId>\r
                 <artifactId>cargo-maven2-plugin</artifactId>\r
-                <version>0.3-SNAPSHOT</version>\r
+                <version>0.3</version>\r
                 <!-- Container configuration -->\r
                 <configuration>\r
                     <container>\r

diff --git a/services/pom.xml b/services/pom.xml
index 05087e5fa531d535ae8196242b15f030b9d44f45..95bb2eff16e006ddb208b2d0dc9af3b69baf7cba 100644 (file)
--- a/services/pom.xml
+++ b/services/pom.xml
@@ -43,6 +43,27 @@
     <build>
         <pluginManagement>
             <plugins>
+                <plugin>
+                    <groupId>org.codehaus.mojo</groupId>
+                    <artifactId>jboss-maven-plugin</artifactId>
+                    <version>1.4</version>
+                    <configuration>
+                        <jbossHome>${jboss.dir}</jbossHome>
+                    </configuration>
+                </plugin>
+                
+                <plugin>
+                    <groupId>org.jvnet.hyperjaxb3</groupId>
+                    <artifactId>maven-hyperjaxb3-plugin</artifactId>
+                    <version>0.5.4</version>
+                </plugin>
+                
+                <plugin>
+                    <groupId>org.jvnet.jaxb2.maven2</groupId>
+                    <artifactId>maven-jaxb2-plugin</artifactId>
+                    <version>0.7.2</version>
+                </plugin>
+                
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-compiler-plugin</artifactId>