geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jb...@apache.org
Subject svn commit: r690040 - in /geronimo/server/trunk: framework/configs/pom.xml plugins/client/pom.xml plugins/corba/client-corba-yoko/pom.xml plugins/j2ee/j2ee-server/pom.xml plugins/pom.xml
Date Thu, 28 Aug 2008 22:59:17 GMT
Author: jbohn
Date: Thu Aug 28 15:59:16 2008
New Revision: 690040

URL: http://svn.apache.org/viewvc?rev=690040&view=rev
Log:
GERONIMO-4271 - add null version alias mappings for modules

Modified:
    geronimo/server/trunk/framework/configs/pom.xml
    geronimo/server/trunk/plugins/client/pom.xml
    geronimo/server/trunk/plugins/corba/client-corba-yoko/pom.xml
    geronimo/server/trunk/plugins/j2ee/j2ee-server/pom.xml
    geronimo/server/trunk/plugins/pom.xml

Modified: geronimo/server/trunk/framework/configs/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/pom.xml?rev=690040&r1=690039&r2=690040&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/pom.xml (original)
+++ geronimo/server/trunk/framework/configs/pom.xml Thu Aug 28 15:59:16 2008
@@ -86,6 +86,7 @@
                             <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}//car">${groupId}/${artifactId}/${version}/car</artifact-alias>
                         </plugin-artifact>
                     </commonInstance>
                 </configuration>

Modified: geronimo/server/trunk/plugins/client/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/client/pom.xml?rev=690040&r1=690039&r2=690040&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/client/pom.xml (original)
+++ geronimo/server/trunk/plugins/client/pom.xml Thu Aug 28 15:59:16 2008
@@ -44,4 +44,20 @@
         <module>geronimo-client-builder</module>
     </modules>
 
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.geronimo.buildsupport</groupId>
+                <artifactId>car-maven-plugin</artifactId>
+                <configuration>
+                    <commonInstance>
+                        <plugin-artifact>
+                            <artifact-alias server="client" key="${groupId}/${artifactId}//car">${groupId}/${artifactId}/${version}/car</artifact-alias>
+                        </plugin-artifact>
+                    </commonInstance>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
 </project>

Modified: geronimo/server/trunk/plugins/corba/client-corba-yoko/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/corba/client-corba-yoko/pom.xml?rev=690040&r1=690039&r2=690040&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/corba/client-corba-yoko/pom.xml (original)
+++ geronimo/server/trunk/plugins/corba/client-corba-yoko/pom.xml Thu Aug 28 15:59:16 2008
@@ -131,6 +131,7 @@
                     <instance>
                         <plugin-artifact>
                             <config-xml-content load="false"/>
+                            <artifact-alias server="client" key="${groupId}/${artifactId}//car">${groupId}/${artifactId}/${version}/car</artifact-alias>
                         </plugin-artifact>
                     </instance>
                 </configuration>

Modified: geronimo/server/trunk/plugins/j2ee/j2ee-server/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/j2ee/j2ee-server/pom.xml?rev=690040&r1=690039&r2=690040&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/j2ee/j2ee-server/pom.xml (original)
+++ geronimo/server/trunk/plugins/j2ee/j2ee-server/pom.xml Thu Aug 28 15:59:16 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/trunk/plugins/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/pom.xml?rev=690040&r1=690039&r2=690040&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/pom.xml (original)
+++ geronimo/server/trunk/plugins/pom.xml Thu Aug 28 15:59:16 2008
@@ -123,6 +123,7 @@
                             <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}//car">${groupId}/${artifactId}/${version}/car</artifact-alias>
                         </plugin-artifact>
                     </commonInstance>
                 </configuration>



Mime
View raw message