geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dwo...@apache.org
Subject svn commit: r835033 - in /geronimo/server/branches/2.1: framework/configs/plugin/pom.xml pom.xml
Date Wed, 11 Nov 2009 19:43:59 GMT
Author: dwoods
Date: Wed Nov 11 19:43:59 2009
New Revision: 835033

URL: http://svn.apache.org/viewvc?rev=835033&view=rev
Log:
rollback to genesis 1.3.1, but include new nexus repo settings.  update plugin builds to use
property values in parent pom

Modified:
    geronimo/server/branches/2.1/framework/configs/plugin/pom.xml
    geronimo/server/branches/2.1/pom.xml

Modified: geronimo/server/branches/2.1/framework/configs/plugin/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/framework/configs/plugin/pom.xml?rev=835033&r1=835032&r2=835033&view=diff
==============================================================================
--- geronimo/server/branches/2.1/framework/configs/plugin/pom.xml (original)
+++ geronimo/server/branches/2.1/framework/configs/plugin/pom.xml Wed Nov 11 19:43:59 2009
@@ -123,8 +123,9 @@
                             <config-xml-content>
                                 <gbean name="DownloadedPluginRepos">
                                     <attribute name="repositoryList">http://geronimo.apache.org/plugins/plugin-repository-list-2.1.5.txt</attribute>
-                                    <!--<attribute name="userRepositories">~/.m2/repository</attribute>-->
-                                    <attribute name="userRepositories">http://geronimo.apache.org/plugins/geronimo-2.1.4</attribute>
+                                    <attribute name="userRepositories">${PluginSrcRepoLocal}</attribute>
+                                    <attribute name="userRepositories">${PluginSrcRepoCentral}</attribute>
+                                    <attribute name="userRepositories">${PluginSrcRepoSnapshots}</attribute>
                                 </gbean>
                             </config-xml-content>
                         </plugin-artifact>

Modified: geronimo/server/branches/2.1/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/pom.xml?rev=835033&r1=835032&r2=835033&view=diff
==============================================================================
--- geronimo/server/branches/2.1/pom.xml (original)
+++ geronimo/server/branches/2.1/pom.xml Wed Nov 11 19:43:59 2009
@@ -23,9 +23,9 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.apache.geronimo.genesis</groupId>
-        <artifactId>genesis-java5-flava</artifactId>
-        <version>2.0</version>
+        <groupId>org.apache.geronimo.genesis.config</groupId>
+        <artifactId>project-config</artifactId>
+        <version>1.3.1</version>
     </parent>
 
     <groupId>org.apache.geronimo</groupId>
@@ -44,6 +44,14 @@
         <url>http://geronimo.apache.org/</url>
     </organization>
 
+    <licenses>
+        <license>
+            <name>The Apache Software License, Version 2.0</name>
+            <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+            <distribution>repo</distribution>
+        </license>
+    </licenses>
+
     <scm>
         <connection>scm:svn:http://svn.apache.org/repos/asf/geronimo/server/branches/2.1</connection>
         <developerConnection>scm:svn:https://svn.apache.org/repos/asf/geronimo/server/branches/2.1</developerConnection>
@@ -132,6 +140,11 @@
         <PluginSrcRepoCentral>http://repo1.maven.org/maven2/</PluginSrcRepoCentral>
         <PluginSrcRepoApacheSnapshots>http://repository.apache.org/snapshots/</PluginSrcRepoApacheSnapshots>
         <PluginSrcRepoApacheIncubating>http://people.apache.org/repo/m2-incubating-repository/</PluginSrcRepoApacheIncubating>
+
+        <!-- New Nexus repo settings from apache-6.pom -->
+        <distMgmtSnapshotsName>Apache Development Snapshot Repository</distMgmtSnapshotsName>
+        <distMgmtSnapshotsUrl>https://repository.apache.org/content/repositories/snapshots</distMgmtSnapshotsUrl>
+        <organization.logo>http://www.apache.org/images/asf_logo_wide.gif</organization.logo>
     </properties>
 
     <dependencyManagement>
@@ -2087,6 +2100,8 @@
     </dependencyManagement>
 
     <build>
+        <defaultGoal>install</defaultGoal>
+
         <pluginManagement>
             <plugins>
                 <plugin>
@@ -2585,13 +2600,21 @@
 
     <url>http://geronimo.apache.org/maven/${siteId}/${version}</url>
     <distributionManagement>
-        <!--
-        NOTE: The repository and snapshotRepository are picked up from Genesis.
-        -->
         <site>
             <id>geronimo-website</id>
             <url>${staging.siteURL}/${siteId}/${version}</url>
         </site>
+        <!-- New Nexus repo settings from apache-6.pom -->
+        <repository>
+            <id>apache.releases.https</id>
+            <name>Apache Release Distribution Repository</name>
+            <url>https://repository.apache.org/service/local/staging/deploy/maven2</url>
+        </repository>
+        <snapshotRepository>
+            <id>apache.snapshots.https</id>
+            <name>${distMgmtSnapshotsName}</name>
+            <url>${distMgmtSnapshotsUrl}</url>
+        </snapshotRepository>
     </distributionManagement>
 
     <profiles>



Mime
View raw message