From: Richard Millet <richard.millet@berkeley.edu>
Date: Tue, 22 Dec 2009 17:30:55 +0000 (+0000)
Subject: NOJIRA: Updating repository settings.
X-Git-Url: https://git.aero2k.de/?a=commitdiff_plain;h=d5544438e751fa093ab5e2cef865c199ac891ef1;p=tmp%2Fjakarta-migration.git

NOJIRA: Updating repository settings.
---

diff --git a/pom.xml b/pom.xml
index 3a6fd1ed9..745fa4cd7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,13 +1,13 @@
 <?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">
-
+    
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.collectionspace.services</groupId>
     <version>1.0</version>
     <artifactId>org.collectionspace.services</artifactId>
     <packaging>pom</packaging>
     <name>services</name>
-
+    
     <properties>
         <jboss.version>4.2.3.GA</jboss.version>
         <jboss.ejb.version>3.0</jboss.ejb.version>
@@ -15,39 +15,46 @@
         <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>
-
+    
     <distributionManagement>
         <repository>
             <id>libs-releases-local</id>
             <name>libs-releases-local</name>
             <url>http://source.collectionspace.org:8081/artifactory/libs-releases-local</url>
         </repository>
-
+        
         <snapshotRepository>
             <id>libs-snapshots-local</id>
             <name>libs-snapshots-local</name>
             <url>http://source.collectionspace.org:8081/artifactory/libs-snapshots-local</url>
         </snapshotRepository>
     </distributionManagement>
-
+    
     <modules>
         <module>3rdparty</module>
         <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>
+<!--
         <repository>
             <id>collectionspace-releases</id>
             <name>collectionspace-releases</name>
@@ -70,7 +77,19 @@
                 <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>
+            <releases>
+                <enabled>false</enabled>
+            </releases>
+            <snapshots>
+                <enabled>true</enabled>
+            </snapshots>
+        </repository>
+        
         <repository>
             <id>maven repo</id>
             <name>maven repo</name>
@@ -86,7 +105,8 @@
             <snapshots>
                 <enabled>false</enabled>
             </snapshots>
-        </repository>
+        </repository>        
+<!--        
         <repository>
             <id>java.net</id>
             <name>java.net Maven Repository</name>
@@ -96,33 +116,34 @@
                 <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>
+            </snapshots>            
             </repository>
-        -->
+        -->        
         <!--
             <repository>
             <id>sun</id>
             <url>http://download.java.net/maven/2</url>
             <snapshots>
             <enabled>false</enabled>
-            </snapshots>
+            </snapshots>            
             </repository>
-        -->
+        -->        
         <repository>
             <id>jboss</id>
             <url>http://repository.jboss.org/maven2</url>
             <snapshots>
                 <enabled>false</enabled>
             </snapshots>
-        </repository>
+        </repository>            
         <!-- some security binaries available under .com only perhaps due to licensing issues -->
         <repository>
             <id>jboss</id>
@@ -130,7 +151,7 @@
             <snapshots>
                 <enabled>false</enabled>
             </snapshots>
-        </repository>
+        </repository>                
         <repository>
             <id>mojo</id>
             <name>mojo repo</name>
@@ -140,15 +161,47 @@
             </snapshots>
         </repository>
 
-    </repositories>
+<!--
+    <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>
+ -->
 
+    </repositories>
+    
     <pluginRepositories>
-
+        
+        <pluginRepository>
+            <id>maven repo</id>
+            <name>maven repo</name>
+            <url>http://repo2.maven.org/maven2</url>
+            <snapshots>
+                <enabled>false</enabled>
+            </snapshots>
+        </pluginRepository>
+        
         <pluginRepository>
             <id>maven2-repository.dev.java.net</id>
             <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>
@@ -166,10 +219,19 @@
         </pluginRepository>
 
     </pluginRepositories>
-
+    
     <build>
         <pluginManagement>
             <plugins>
+		            <plugin>
+		                <groupId>org.apache.maven.plugins</groupId>
+		                <artifactId>maven-javadoc-plugin</artifactId>
+		                <version>2.6.1</version>
+		                <configuration>
+		                    <show>public</show>
+		                </configuration>
+		            </plugin>
+            	
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-compiler-plugin</artifactId>
@@ -197,7 +259,7 @@
                     <artifactId>maven-war-plugin</artifactId>
                     <version>2.0.1</version>
                     <configuration>
-
+                        
                         <warSourceExcludes>WEB-INF/lib/*.jar</warSourceExcludes>
                         <archive>
                             <manifest>
@@ -206,7 +268,7 @@
                         </archive>
                     </configuration>
                 </plugin>
-
+                
             </plugins>
         </pluginManagement>
     </build>