[jboss-cvs] JBossAS SVN: r104328 - in trunk: tools/maven/conf and 1 other directory.

[jboss-cvs-commits at lists.jboss.org]

Author: pgier
Date: 2010-04-29 14:49:24 -0400 (Thu, 29 Apr 2010)
New Revision: 104328

Modified:
   trunk/README.txt
   trunk/pom.xml
   trunk/tools/maven/conf/settings.xml
Log:
[JBAS-7983] Configure settings in included Maven 2 dist that allow build.sh to locate the jboss public repository group.

Modified: trunk/README.txt
===================================================================
--- trunk/README.txt	2010-04-29 18:41:14 UTC (rev 104327)
+++ trunk/README.txt	2010-04-29 18:49:24 UTC (rev 104328)
@@ -15,7 +15,9 @@
 Building
 -------------------
 From the root directory, run the build script "./build.sh" or "build.bat"
-Or call maven directly "mvn install"
+If you want to call maven directly "mvn install", you must add the jboss repository 
+configuration to your Maven settings.  See the JBoss build wiki for more information about
+repostiory config.
 
 For slightly faster builds, the maven enforcer plugin can be skipped.
 ./build.sh -P-enforce

Modified: trunk/pom.xml
===================================================================
--- trunk/pom.xml	2010-04-29 18:41:14 UTC (rev 104327)
+++ trunk/pom.xml	2010-04-29 18:49:24 UTC (rev 104328)
@@ -489,43 +489,6 @@
     See http://community.jboss.org/wiki/MavenGettingStarted-Users
   -->
 
-  <!-- Repositories -->
-  <!--<repositories>
-    <repository>
-      <id>jboss-public-repository-group</id>
-      <name>JBoss Public Maven Repository Group</name>
-      <url>https://repository.jboss.org/nexus/content/groups/public/</url>
-      <layout>default</layout>
-      <releases>
-        <enabled>true</enabled>
-	<updatePolicy>never</updatePolicy>
-      </releases>
-      <snapshots>
-        <enabled>true</enabled>
-	<updatePolicy>never</updatePolicy>
-      </snapshots>
-    </repository>
-  </repositories>
-  -->
-
-  <!-- Plugin Repositories -->
-  <!--<pluginRepositories>
-    <pluginRepository>
-      <id>jboss-public-repository-group</id>
-      <name>JBoss Public Maven Repository Group</name>
-      <url>https://repository.jboss.org/nexus/content/groups/public/</url>
-      <layout>default</layout>
-      <releases>
-        <enabled>true</enabled>
-	<updatePolicy>never</updatePolicy>
-      </releases>
-      <snapshots>
-        <enabled>true</enabled>
-	<updatePolicy>never</updatePolicy>
-      </snapshots>
-    </pluginRepository>
-  </pluginRepositories>
- --> 
   <profiles>
     
     <!-- By default build all modules -->

Modified: trunk/tools/maven/conf/settings.xml
===================================================================
--- trunk/tools/maven/conf/settings.xml	2010-04-29 18:41:14 UTC (rev 104327)
+++ trunk/tools/maven/conf/settings.xml	2010-04-29 18:49:24 UTC (rev 104328)
@@ -244,14 +244,49 @@
       </properties>
     </profile>
     -->
+    
+    <profile>
+      <id>jboss-public-repository</id>
+      <repositories>
+        <repository>
+          <id>jboss-public-repository-group</id>
+          <name>JBoss Public Maven Repository Group</name>
+          <url>https://repository.jboss.org/nexus/content/groups/public/</url>
+          <layout>default</layout>
+          <releases>
+            <enabled>true</enabled>
+            <updatePolicy>never</updatePolicy>
+          </releases>
+          <snapshots>
+            <enabled>true</enabled>
+            <updatePolicy>daily</updatePolicy>
+          </snapshots>
+        </repository>
+      </repositories>
+      <pluginRepositories>
+        <pluginRepository>
+          <id>jboss-public-repository-group</id>
+          <name>JBoss Public Maven Repository Group</name>
+          <url>https://repository.jboss.org/nexus/content/groups/public/</url>
+          <layout>default</layout>
+          <releases>
+            <enabled>true</enabled>
+            <updatePolicy>never</updatePolicy>
+          </releases>
+          <snapshots>
+            <enabled>true</enabled>
+            <updatePolicy>daily</updatePolicy>
+          </snapshots>
+        </pluginRepository>
+      </pluginRepositories>
+    </profile>
   </profiles>
 
   <!-- activeProfiles
    | List of profiles that are active for all builds.
-   |
+   |-->
   <activeProfiles>
-    <activeProfile>alwaysActiveProfile</activeProfile>
-    <activeProfile>anotherAlwaysActiveProfile</activeProfile>
+    <activeProfile>jboss-public-repository</activeProfile>
   </activeProfiles>
-  -->
+
 </settings>