NOJIRA: Cleaning up Maven repository settings.

diff --git a/pom.xml b/pom.xml
index c59ab12ede6f183d894997bfa54e56968b781a07..0acd7e37a9f4d17dbbd65cf20c4b5a72d13af85e 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -1,13 +1,15 @@
 <?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
+<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
     <modelVersion>4.0.0</modelVersion>\r
     <groupId>org.collectionspace.services</groupId>\r
     <version>1.0</version>\r
     <artifactId>org.collectionspace.services</artifactId>\r
     <packaging>pom</packaging>\r
     <name>services</name>\r
-    \r
+\r
     <properties>\r
         <cspace.services.client.version>0.5-SNAPSHOT</cspace.services.client.version>\r
         <jboss.version>4.2.3.GA</jboss.version>\r
@@ -16,69 +18,31 @@
         <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
+\r
     <distributionManagement>\r
         <repository>\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
-        </repository>        \r
+        </repository>\r
         <snapshotRepository>\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
         </snapshotRepository>\r
     </distributionManagement>\r
-    \r
+\r
     <modules>\r
         <module>3rdparty</module>\r
         <module>services</module>\r
     </modules>\r
-    \r
-    <repositories>        \r
-        <repository>\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
-            <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
-        <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
-            <releases>\r
-                <enabled>false</enabled>\r
-            </releases>\r
-            <snapshots>\r
-                <enabled>true</enabled>\r
-            </snapshots>\r
-        </repository>\r
+\r
+    <repositories>\r
         <repository>\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>true</enabled>\r
-            </releases>\r
-            <snapshots>\r
-                <enabled>false</enabled>\r
-            </snapshots>\r
+            <id>collectionspace-remote-repos</id>\r
+            <name>collectionspace-remote-repos</name>\r
+            <url>http://source.collectionspace.org:8081/artifactory/remote-repos</url>\r
         </repository>\r
-        \r
         <repository>\r
             <id>repo1</id>\r
             <name>Maven repo1</name>\r
@@ -102,7 +66,8 @@
             <snapshots>\r
                 <enabled>false</enabled>\r
             </snapshots>\r
-        </repository><repository>\r
+        </repository>\r
+        <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
@@ -111,7 +76,7 @@
                 <enabled>false</enabled>\r
             </snapshots>\r
         </repository>\r
-        \r
+\r
         <repository>\r
             <id>maven-restlet</id>\r
             <name>Public online Restlet repository</name>\r
@@ -120,14 +85,14 @@
                 <enabled>false</enabled>\r
             </snapshots>\r
         </repository>\r
-        \r
+\r
         <repository>\r
             <id>jboss</id>\r
             <url>http://repository.jboss.org/maven2</url>\r
             <snapshots>\r
                 <enabled>false</enabled>\r
             </snapshots>\r
-        </repository>            \r
+        </repository>\r
         <!-- some security binaries available under .com only perhaps due to licensing issues -->\r
         <repository>\r
             <id>jboss</id>\r
@@ -135,11 +100,11 @@
             <snapshots>\r
                 <enabled>false</enabled>\r
             </snapshots>\r
-        </repository>                \r
-        \r
+        </repository>\r
+\r
         <repository>\r
-            <id>mojo</id>\r
-            <name>mojo repo</name>\r
+            <id>codehaus repo</id>\r
+            <name>codehaus repo</name>\r
             <url>http://repository.codehaus.org</url>\r
             <snapshots>\r
                 <enabled>false</enabled>\r
@@ -147,42 +112,45 @@
         </repository>\r
 \r
         <repository>\r
-            <id>public</id>\r
-            <url>http://maven.nuxeo.org/public</url>\r
+            <id>public-snapshot</id>\r
+            <url>http://maven.nuxeo.org/public-snapshot</url>\r
+            <!-- Nuxeo Snapshots Repository is disabled. -->\r
             <releases>\r
-                <enabled>true</enabled>\r
+                <enabled>false</enabled>\r
             </releases>\r
             <snapshots>\r
                 <enabled>false</enabled>\r
+                <updatePolicy>never</updatePolicy>\r
             </snapshots>\r
-        </repository> \r
-        <repository> \r
-            <id>public-snapshot</id>\r
-            <url>http://maven.nuxeo.org/public-snapshot</url>\r
+        </repository>\r
+        \r
+        <repository>\r
+            <id>public</id>\r
+            <url>http://maven.nuxeo.org/public</url>\r
+            <!-- Nuxeo Releases Repository is disabled. -->\r
             <releases>\r
                 <enabled>false</enabled>\r
             </releases>\r
             <snapshots>\r
-                <enabled>true</enabled>\r
-                <updatePolicy>never</updatePolicy>         \r
+                <enabled>false</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
+            <id>nuxeo-public</id>\r
+            <name>nuxeo-public</name>\r
+            <url>http://source.collectionspace.org:8081/artifactory/nuxeo-public</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>nuxeo-public-snapshot</id>\r
+            <name>nuxeo-public-snapshot</name>\r
+            <url>http://source.collectionspace.org:8081/artifactory/nuxeo-public-snapshot</url>\r
             <releases>\r
                 <enabled>false</enabled>\r
             </releases>\r
@@ -191,34 +159,22 @@
                 <updatePolicy>never</updatePolicy>\r
             </snapshots>\r
         </repository>\r
-        \r
+\r
+<!--\r
+ -->\r
+\r
+\r
     </repositories>\r
-    \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
+            <id>collectionspace-plugins-remote-repos</id>\r
+            <name>collectionspace-plugins-remote-repos</name>\r
+            <url>http://source.collectionspace.org:8081/artifactory/plugins-remote-repos</url>\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
             <name>maven repo</name>\r
@@ -227,37 +183,37 @@
                 <enabled>false</enabled>\r
             </snapshots>\r
         </pluginRepository>\r
-        \r
         <pluginRepository>\r
             <id>maven2-repository.dev.java.net</id>\r
             <url>http://download.java.net/maven/2</url>\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
             <snapshots>\r
-                <enabled>true</enabled>\r
+                <enabled>false</enabled>\r
             </snapshots>\r
+        </pluginRepository>\r
+        <pluginRepository>\r
+            <id>Codehaus Repository</id>\r
+            <url>http://repository.codehaus.org/</url>\r
             <releases>\r
-                <enabled>false</enabled>\r
+                <enabled>true</enabled>\r
             </releases>\r
+            <snapshots>\r
+                <enabled>false</enabled>\r
+            </snapshots>\r
         </pluginRepository>\r
     </pluginRepositories>\r
-    \r
+\r
     <build>\r
         <pluginManagement>\r
             <plugins>\r
-                           <plugin>\r
-                               <groupId>org.apache.maven.plugins</groupId>\r
-                               <artifactId>maven-javadoc-plugin</artifactId>\r
-                               <version>2.6.1</version>\r
-                               <configuration>\r
-                                   <show>public</show>\r
-                               </configuration>\r
-                           </plugin>\r
-               \r
+                <plugin>\r
+                    <groupId>org.apache.maven.plugins</groupId>\r
+                    <artifactId>maven-javadoc-plugin</artifactId>\r
+                    <version>2.6.1</version>\r
+                    <configuration>\r
+                        <show>public</show>\r
+                    </configuration>\r
+                </plugin>\r
+\r
                 <plugin>\r
                     <groupId>org.apache.maven.plugins</groupId>\r
                     <artifactId>maven-compiler-plugin</artifactId>\r
@@ -269,23 +225,22 @@
                 <plugin>\r
                     <groupId>org.apache.maven.plugins</groupId>\r
                     <artifactId>maven-assembly-plugin</artifactId>\r
-                    <configuration>\r
-                    </configuration>\r
+                    <configuration> </configuration>\r
                 </plugin>\r
-                <plugin>\r
+                <!--                <plugin>\r
                     <groupId>org.apache.maven.plugins</groupId>\r
                     <artifactId>maven-site-plugin</artifactId>\r
                     <configuration>\r
                         <dependencyLocationEnabled>false</dependencyLocationEnabled>\r
                         <unzipCommand>/usr/bin/unzip -o &gt; err.txt</unzipCommand>\r
                     </configuration>\r
-                </plugin>\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
-                        \r
+\r
                         <warSourceExcludes>WEB-INF/lib/*.jar</warSourceExcludes>\r
                         <archive>\r
                             <manifest>\r
@@ -294,7 +249,7 @@
                         </archive>\r
                     </configuration>\r
                 </plugin>\r
-                \r
+\r
             </plugins>\r
         </pluginManagement>\r
     </build>\r
@@ -333,15 +288,27 @@
 \r
     <reporting>\r
         <plugins>\r
-\r
             <plugin>\r
+                <groupId>org.apache.maven.plugins</groupId>\r
+                <artifactId>maven-project-info-reports-plugin</artifactId>\r
+                <configuration>\r
+                </configuration>\r
+               <reportSets>\r
+                       <reportSet>\r
+                  <reports>\r
+                     <report>dependencies</report>\r
+                  </reports>\r
+               </reportSet>\r
+               </reportSets>\r
+            </plugin>\r
+            <!--            <plugin>\r
                 <groupId>org.apache.maven.plugins</groupId>\r
                 <artifactId>maven-javadoc-plugin</artifactId>\r
                 <version>2.6.1</version>\r
                 <configuration>\r
                     <show>public</show>\r
                 </configuration>\r
-            </plugin>\r
+            </plugin> -->\r
         </plugins>\r
     </reporting>\r
 \r

diff --git a/services/collectionobject/sample/sample/pom.xml b/services/collectionobject/sample/sample/pom.xml
index 3dcdf951eb0f18fd68e71b900c241411c5a2ee75..d581a8df3ce0db8adf73544b14e7dc35e6a57c97 100644 (file)
--- a/services/collectionobject/sample/sample/pom.xml
+++ b/services/collectionobject/sample/sample/pom.xml
@@ -49,10 +49,12 @@
                 <enabled>true</enabled>
             </snapshots>            
         </repository>
+
+<!--
         <repository>
             <id>collectionspace-releases</id>
             <name>collectionspace-releases</name>
-            <url>http://source.collectionspace.org:8081/artifactory/public-nuxeo</url>            
+            <url>http://source.collectionspace.org:8081/artifactory/nuxeo-public</url>            
             <releases>
                 <enabled>true</enabled>
             </releases>
@@ -61,9 +63,9 @@
             </snapshots>            
         </repository>
         <repository>
-            <id>collectionspace-snapshots</id>
-            <name>collectionspace-snapshots</name>
-            <url>http://source.collectionspace.org:8081/artifactory/public-snapshot-nuxeo</url>
+            <id>nuxeo-public-snapshot</id>
+            <name>nuxeo-public-snapshot</name>
+            <url>http://source.collectionspace.org:8081/artifactory/nuxeo-public-snapshot</url>
             <releases>
                 <enabled>false</enabled>
             </releases>
@@ -71,6 +73,7 @@
                 <enabled>true</enabled>
             </snapshots>
         </repository>
+-->        
     </repositories>    
     
     <build>

diff --git a/services/organization/sample/sample/pom.xml b/services/organization/sample/sample/pom.xml
index 8ee997796574bf4aeb36134ea0190a9825542d6d..0575a52c1aed714369a0806b3483b79b54377e08 100644 (file)
--- a/services/organization/sample/sample/pom.xml
+++ b/services/organization/sample/sample/pom.xml
@@ -52,7 +52,7 @@
         <repository>\r
             <id>collectionspace-releases</id>\r
             <name>collectionspace-releases</name>\r
-            <url>http://source.collectionspace.org:8081/artifactory/public-nuxeo</url>            \r
+            <url>http://source.collectionspace.org:8081/artifactory/nuxeo-public</url>            \r
             <releases>\r
                 <enabled>true</enabled>\r
             </releases>\r
@@ -61,9 +61,9 @@
             </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
+            <id>nuxeo-public-snapshot</id>\r
+            <name>nuxeo-public-snapshot</name>\r
+            <url>http://source.collectionspace.org:8081/artifactory/nuxeo-public-snapshot</url>\r
             <releases>\r
                 <enabled>false</enabled>\r
             </releases>\r

diff --git a/services/person/sample/sample/pom.xml b/services/person/sample/sample/pom.xml
index a824954618b3b08a9dd5d10cff71be4ab46b3ad7..e444091c5f28fe4541bc9e698b8c35bd8b0609b0 100644 (file)
--- a/services/person/sample/sample/pom.xml
+++ b/services/person/sample/sample/pom.xml
@@ -50,9 +50,9 @@
             </snapshots>            \r
         </repository>\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>nuxeo-public</id>\r
+            <name>nuxeo-public</name>\r
+            <url>http://source.collectionspace.org:8081/artifactory/nuxeo-public</url>            \r
             <releases>\r
                 <enabled>true</enabled>\r
             </releases>\r
@@ -61,9 +61,9 @@
             </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
+            <id>nuxeo-public-snapshot</id>\r
+            <name>nuxeo-public-snapshot</name>\r
+            <url>http://source.collectionspace.org:8081/artifactory/nuxeo-public-snapshot</url>\r
             <releases>\r
                 <enabled>false</enabled>\r
             </releases>\r

diff --git a/services/pom.xml b/services/pom.xml
index a797a30ea87b8445702db7338cb42b0903ff35cd..2c270c449a6f6e504be1302bc8c13600e4edc9a6 100644 (file)
--- a/services/pom.xml
+++ b/services/pom.xml
@@ -241,11 +241,11 @@
                 <artifactId>hibernate-entitymanager</artifactId>
                 <version>3.4.0.GA</version>
             </dependency>
-            <dependency>
+<!--            <dependency>
                 <groupId>org.hibernate</groupId>
                 <artifactId>hibernate</artifactId>
                 <version>3.4.0.GA</version>
-            </dependency>
+            </dependency> -->
             <dependency>
                 <groupId>org.jvnet.hyperjaxb3</groupId>
                 <!-- for time type adapters -->

diff --git a/services/sdk/pom.xml b/services/sdk/pom.xml
index 7015b2638d86b125938784d3f57ce781ec794ed4..9846ceebac1437b86aad966daa1799637adc2bc1 100644 (file)
--- a/services/sdk/pom.xml
+++ b/services/sdk/pom.xml
@@ -14,8 +14,7 @@
                <profile>\r
                        <id>samples</id>\r
            <modules>\r
-        <module>import</module>\r
-        <module>sample</module>\r
+            <module>sample</module>\r
            </modules>\r
                </profile>\r
        </profiles>\r

diff --git a/services/sdk/sample/pom.xml b/services/sdk/sample/pom.xml
index 758ac50c1abe399b391426239f521172f766d6f2..972fabeb150dc4de0389d6ed09ece11f4193abfa 100644 (file)
--- a/services/sdk/sample/pom.xml
+++ b/services/sdk/sample/pom.xml
@@ -11,7 +11,7 @@
         <dependency>\r
             <groupId>org.collectionspace.services</groupId>\r
             <artifactId>org.collectionspace.services.collectionobject.client</artifactId>\r
-            <version>0.4</version>\r
+            <version>0.5-SNAPSHOT</version>\r
         </dependency>\r
         <dependency>\r
             <groupId>org.slf4j</groupId>\r
@@ -44,10 +44,11 @@
                 <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
+            <id>nuxeo-public</id>\r
+            <name>nuxeo-public</name>\r
+            <url>http://source.collectionspace.org:8081/artifactory/nuxeo-public</url>            \r
             <releases>\r
                 <enabled>true</enabled>\r
             </releases>\r
@@ -56,16 +57,16 @@
             </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
+            <id>nuxeo-public-snapshots</id>\r
+            <name>nuxeo-public-snapshots</name>\r
+            <url>http://source.collectionspace.org:8081/artifactory/nuxeo-public-snapshot</url>\r
             <releases>\r
                 <enabled>false</enabled>\r
             </releases>\r
             <snapshots>\r
                 <enabled>true</enabled>\r
             </snapshots>\r
-        </repository>\r
+        </repository> -->\r
     </repositories>    \r
     \r
     <build>\r

diff --git a/services/vocabulary/sample/sample/pom.xml b/services/vocabulary/sample/sample/pom.xml
index b921c9c204d3ce19ed22edfd410dcae354654056..a80b8ffad490bf94d7c943e6316237628e5b5eb0 100644 (file)
--- a/services/vocabulary/sample/sample/pom.xml
+++ b/services/vocabulary/sample/sample/pom.xml
@@ -36,8 +36,7 @@
             <snapshots>\r
                 <enabled>false</enabled>\r
             </snapshots>            \r
-        </repository>\r
-        \r
+        </repository>        \r
         <repository>\r
             <id>libs-snapshots-local</id>\r
             <name>libs-snapshots-local</name>\r
@@ -49,10 +48,11 @@
                 <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
+            <url>http://source.collectionspace.org:8081/artifactory/nuxeo-public</url>            \r
             <releases>\r
                 <enabled>true</enabled>\r
             </releases>\r
@@ -61,9 +61,9 @@
             </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
+            <id>nuxeo-public-snapshot</id>\r
+            <name>nuxeo-public-snapshot</name>\r
+            <url>http://source.collectionspace.org:8081/artifactory/nuxeo-public-snapshot</url>\r
             <releases>\r
                 <enabled>false</enabled>\r
             </releases>\r
@@ -71,6 +71,28 @@
                 <enabled>true</enabled>\r
             </snapshots>\r
         </repository>\r
+<!--        \r
+        <repository>\r
+            <id>nuxeo-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
+        <repository>\r
+            <id>nuxeo-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
     </repositories>    \r
     \r
     <build>\r