You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by jb...@apache.org on 2008/08/27 23:35:43 UTC

svn commit: r689629 - in /geronimo/server/branches/2.1: framework/configs/pom.xml plugins/j2ee/j2ee-server/pom.xml plugins/pom.xml

Author: jbohn
Date: Wed Aug 27 14:35:43 2008
New Revision: 689629

URL: http://svn.apache.org/viewvc?rev=689629&view=rev
Log:
GERONIMO-4271 - add artifact-alias entries to map dependencies from plugins created for prior releases of 2.1

Modified:
    geronimo/server/branches/2.1/framework/configs/pom.xml
    geronimo/server/branches/2.1/plugins/j2ee/j2ee-server/pom.xml
    geronimo/server/branches/2.1/plugins/pom.xml

Modified: geronimo/server/branches/2.1/framework/configs/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/framework/configs/pom.xml?rev=689629&r1=689628&r2=689629&view=diff
==============================================================================
--- geronimo/server/branches/2.1/framework/configs/pom.xml (original)
+++ geronimo/server/branches/2.1/framework/configs/pom.xml Wed Aug 27 14:35:43 2008
@@ -86,6 +86,9 @@
                             <source-repository>http://repo1.maven.org/maven2/</source-repository>
                             <source-repository>http://people.apache.org/repo/m2-snapshot-repository/</source-repository>
                             <source-repository>http://people.apache.org/repo/m2-incubating-repository/</source-repository>
+                            <artifact-alias key="${groupId}/${artifactId}/2.1.2/car">${groupId}/${artifactId}/${version}/car</artifact-alias>
+                            <artifact-alias key="${groupId}/${artifactId}/2.1.1/car">${groupId}/${artifactId}/${version}/car</artifact-alias>
+                            <artifact-alias key="${groupId}/${artifactId}/2.1/car">${groupId}/${artifactId}/${version}/car</artifact-alias>
                         </plugin-artifact>
                     </commonInstance>
                 </configuration>

Modified: geronimo/server/branches/2.1/plugins/j2ee/j2ee-server/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/j2ee/j2ee-server/pom.xml?rev=689629&r1=689628&r2=689629&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/j2ee/j2ee-server/pom.xml (original)
+++ geronimo/server/branches/2.1/plugins/j2ee/j2ee-server/pom.xml Wed Aug 27 14:35:43 2008
@@ -110,12 +110,6 @@
                         <includeVersion>true</includeVersion>
                     </useMavenDependencies>
                     <category>JavaEE</category>
-
-                    <instance>
-                        <plugin-artifact>
-                            <artifact-alias key="org.apache.geronimo.configs/j2ee-server//car">org.apache.geronimo.configs/j2ee-server/${geronimoVersion}/car</artifact-alias>
-                        </plugin-artifact>
-                    </instance>
                 </configuration>
             </plugin>
         </plugins>

Modified: geronimo/server/branches/2.1/plugins/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/pom.xml?rev=689629&r1=689628&r2=689629&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/pom.xml (original)
+++ geronimo/server/branches/2.1/plugins/pom.xml Wed Aug 27 14:35:43 2008
@@ -109,6 +109,9 @@
                             <source-repository>http://repo1.maven.org/maven2/</source-repository>
                             <source-repository>http://people.apache.org/repo/m2-snapshot-repository/</source-repository>
                             <source-repository>http://people.apache.org/repo/m2-incubating-repository/</source-repository>
+                            <artifact-alias key="${groupId}/${artifactId}/2.1.2/car">${groupId}/${artifactId}/${version}/car</artifact-alias>
+                            <artifact-alias key="${groupId}/${artifactId}/2.1.1/car">${groupId}/${artifactId}/${version}/car</artifact-alias>
+                            <artifact-alias key="${groupId}/${artifactId}/2.1/car">${groupId}/${artifactId}/${version}/car</artifact-alias>
                         </plugin-artifact>
                     </commonInstance>
                 </configuration>