You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by dj...@apache.org on 2008/03/22 00:11:32 UTC

svn commit: r639905 - in /geronimo/genesis/trunk: bootstrap.xml config/pom.xml legal-bundle/ plugins/pom.xml pom.xml

Author: djencks
Date: Fri Mar 21 16:11:25 2008
New Revision: 639905

URL: http://svn.apache.org/viewvc?rev=639905&view=rev
Log:
Use latest released maven-remote-resources-plugin and resource bundle

Removed:
    geronimo/genesis/trunk/legal-bundle/
Modified:
    geronimo/genesis/trunk/bootstrap.xml
    geronimo/genesis/trunk/config/pom.xml
    geronimo/genesis/trunk/plugins/pom.xml
    geronimo/genesis/trunk/pom.xml

Modified: geronimo/genesis/trunk/bootstrap.xml
URL: http://svn.apache.org/viewvc/geronimo/genesis/trunk/bootstrap.xml?rev=639905&r1=639904&r2=639905&view=diff
==============================================================================
--- geronimo/genesis/trunk/bootstrap.xml (original)
+++ geronimo/genesis/trunk/bootstrap.xml Fri Mar 21 16:11:25 2008
@@ -56,7 +56,6 @@
     
     <target name="bootstrap" depends="clean">
         <echo>Bootstrapping...</echo>
-        <mvn goal="install" dir="legal-bundle"/>
         <mvn goal="install" dir="plugins/tools-maven-plugin"/>
         <mvn goal="install"/>
     </target>

Modified: geronimo/genesis/trunk/config/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/genesis/trunk/config/pom.xml?rev=639905&r1=639904&r2=639905&view=diff
==============================================================================
--- geronimo/genesis/trunk/config/pom.xml (original)
+++ geronimo/genesis/trunk/config/pom.xml Fri Mar 21 16:11:25 2008
@@ -45,23 +45,6 @@
         <pluginManagement>
             <plugins>
                 <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-remote-resources-plugin</artifactId>
-                    <version>1.0-beta-2</version>
-                    <executions>
-                      <execution>
-                        <goals>
-                          <goal>process</goal>
-                        </goals>
-                        <configuration>
-                          <resourceBundles>
-                              <resourceBundle>org.apache.geronimo.genesis:legal-bundle:${legalBundleVersion}</resourceBundle>
-                          </resourceBundles>
-                        </configuration>
-                      </execution>
-                    </executions>
-                </plugin>
-                <plugin>
                     <groupId>org.apache.geronimo.genesis.plugins</groupId>
                     <artifactId>tools-maven-plugin</artifactId>
                     <version>1.5-SNAPSHOT</version>
@@ -69,10 +52,6 @@
             </plugins>
         </pluginManagement>
         <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-remote-resources-plugin</artifactId>
-            </plugin>
             <plugin>
                 <groupId>org.apache.geronimo.genesis.plugins</groupId>
                 <artifactId>tools-maven-plugin</artifactId>

Modified: geronimo/genesis/trunk/plugins/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/genesis/trunk/plugins/pom.xml?rev=639905&r1=639904&r2=639905&view=diff
==============================================================================
--- geronimo/genesis/trunk/plugins/pom.xml (original)
+++ geronimo/genesis/trunk/plugins/pom.xml Fri Mar 21 16:11:25 2008
@@ -80,31 +80,8 @@
                     <artifactId>maven-plugin-plugin</artifactId>
                     <version>2.3</version>
                 </plugin>
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-remote-resources-plugin</artifactId>
-                    <version>1.0-beta-2</version>
-                    <executions>
-                      <execution>
-                        <goals>
-                          <goal>process</goal>
-                        </goals>
-                        <configuration>
-                          <resourceBundles>
-                              <resourceBundle>org.apache.geronimo.genesis:legal-bundle:${legalBundleVersion}</resourceBundle>
-                          </resourceBundles>
-                        </configuration>
-                      </execution>
-                    </executions>
-                </plugin>
             </plugins>
         </pluginManagement>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-remote-resources-plugin</artifactId>
-            </plugin>
-        </plugins>
     </build>
     
     <modules>

Modified: geronimo/genesis/trunk/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/genesis/trunk/pom.xml?rev=639905&r1=639904&r2=639905&view=diff
==============================================================================
--- geronimo/genesis/trunk/pom.xml (original)
+++ geronimo/genesis/trunk/pom.xml Fri Mar 21 16:11:25 2008
@@ -124,6 +124,25 @@
 
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-remote-resources-plugin</artifactId>
+                    <version>1.0</version>
+                    <executions>
+                        <execution>
+                            <id>process</id>
+                            <goals>
+                                <goal>process</goal>
+                            </goals>
+                            <configuration>
+                                <resourceBundles>
+                                    <resourceBundle>org.apache:apache-jar-resource-bundle:1.4</resourceBundle>
+                                </resourceBundles>
+                            </configuration>
+                        </execution>
+                    </executions>
+                </plugin>
+
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-site-plugin</artifactId>
                     <version>2.0-beta-6</version>
                 </plugin>
@@ -173,6 +192,11 @@
 
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-remote-resources-plugin</artifactId>
+            </plugin>
+
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-stage-plugin</artifactId>
             </plugin>
 
@@ -187,7 +211,6 @@
     </distributionManagement>
 
     <modules>
-        <module>legal-bundle</module>
         <module>config</module>
         <module>plugins</module>
     </modules>