From: Richard Millet <richard.millet@berkeley.edu>
Date: Tue, 2 Mar 2010 00:52:25 +0000 (+0000)
Subject: CSPACE-1078: Updated Artifactory repos settings and apparently fixed the problem... 
X-Git-Url: https://git.aero2k.de/?a=commitdiff_plain;h=a35fa971b60063de3bb734db7a91609f5d1209c2;p=tmp%2Fjakarta-migration.git

CSPACE-1078: Updated Artifactory repos settings and apparently fixed the problem with Maven making unneeded update checks for the Nuxeo snapshot artifacts.  Also added specific versions to some of our dependency declarations.
---

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