You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by jd...@apache.org on 2008/03/13 19:35:42 UTC
svn commit: r636826 - in /geronimo/genesis/trunk: bootstrap.xml
config/geronimo-skin/pom.xml config/pom.xml config/project-config/pom.xml
legal-bundle/pom.xml plugins/maven-maven-plugin/pom.xml plugins/pom.xml
plugins/tools-maven-plugin/pom.xml
Author: jdillon
Date: Thu Mar 13 11:35:24 2008
New Revision: 636826
URL: http://svn.apache.org/viewvc?rev=636826&view=rev
Log:
Drop relativePath, fix up the bootstrap (need to build legal-bundle and tools-m-p before building everything)
Modified:
geronimo/genesis/trunk/bootstrap.xml
geronimo/genesis/trunk/config/geronimo-skin/pom.xml
geronimo/genesis/trunk/config/pom.xml
geronimo/genesis/trunk/config/project-config/pom.xml
geronimo/genesis/trunk/legal-bundle/pom.xml
geronimo/genesis/trunk/plugins/maven-maven-plugin/pom.xml
geronimo/genesis/trunk/plugins/pom.xml
geronimo/genesis/trunk/plugins/tools-maven-plugin/pom.xml
Modified: geronimo/genesis/trunk/bootstrap.xml
URL: http://svn.apache.org/viewvc/geronimo/genesis/trunk/bootstrap.xml?rev=636826&r1=636825&r2=636826&view=diff
==============================================================================
--- geronimo/genesis/trunk/bootstrap.xml (original)
+++ geronimo/genesis/trunk/bootstrap.xml Thu Mar 13 11:35:24 2008
@@ -34,16 +34,6 @@
</sequential>
</macrodef>
- <macrodef name="build-stage">
- <attribute name="name"/>
- <sequential>
- <exec executable="mvn${platform.script.ext}" dir="${basedir}">
- <arg value="-N"/>
- <arg value="install"/>
- </exec>
- </sequential>
- </macrodef>
-
<target name="init" depends="init:discover, init:windows, init:defaults">
<record name="${basedir}/bootstrap.log"/>
<echo>Starting bootstrap build...</echo>
@@ -64,33 +54,12 @@
<property name="maven.repo.local" value="${user.home}/.m2/repository"/>
</target>
-
- <!-- ===== -->
- <!-- Steps -->
- <!-- ===== -->
-
- <target name="bootstrap" depends="clean, stage1, stage2, stage3"/>
-
- <target name="stage1" depends="init">
- <build-stage name="bootstrap"/>
- </target>
-
- <target name="stage2" depends="init">
+ <target name="bootstrap" depends="clean">
+ <echo>Bootstrapping...</echo>
<mvn goal="install" dir="legal-bundle"/>
- </target>
-
- <target name="stage3" depends="init">
- <mvn goal="install" dir="plugins"/>
- </target>
-
- <target name="stage4" depends="init">
+ <mvn goal="install" dir="plugins/tools-maven-plugin"/>
<mvn goal="install"/>
</target>
-
-
- <!-- ======== -->
- <!-- Cleaning -->
- <!-- ======== -->
<target name="clean" depends="init">
<echo>Cleaning...</echo>
@@ -103,7 +72,11 @@
</fileset>
</delete>
- <mvn goal="clean"/>
+ <delete>
+ <fileset dir="${basedir}">
+ <include name="**/target/**"/>
+ </fileset>
+ </delete>
</target>
</project>
Modified: geronimo/genesis/trunk/config/geronimo-skin/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/genesis/trunk/config/geronimo-skin/pom.xml?rev=636826&r1=636825&r2=636826&view=diff
==============================================================================
--- geronimo/genesis/trunk/config/geronimo-skin/pom.xml (original)
+++ geronimo/genesis/trunk/config/geronimo-skin/pom.xml Thu Mar 13 11:35:24 2008
@@ -28,7 +28,6 @@
<groupId>org.apache.geronimo.genesis.config</groupId>
<artifactId>config</artifactId>
<version>1.5-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
</parent>
<artifactId>geronimo-skin</artifactId>
Modified: geronimo/genesis/trunk/config/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/genesis/trunk/config/pom.xml?rev=636826&r1=636825&r2=636826&view=diff
==============================================================================
--- geronimo/genesis/trunk/config/pom.xml (original)
+++ geronimo/genesis/trunk/config/pom.xml Thu Mar 13 11:35:24 2008
@@ -28,7 +28,6 @@
<groupId>org.apache.geronimo.genesis</groupId>
<artifactId>genesis</artifactId>
<version>1.5-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
</parent>
<groupId>org.apache.geronimo.genesis.config</groupId>
Modified: geronimo/genesis/trunk/config/project-config/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/genesis/trunk/config/project-config/pom.xml?rev=636826&r1=636825&r2=636826&view=diff
==============================================================================
--- geronimo/genesis/trunk/config/project-config/pom.xml (original)
+++ geronimo/genesis/trunk/config/project-config/pom.xml Thu Mar 13 11:35:24 2008
@@ -28,7 +28,6 @@
<groupId>org.apache.geronimo.genesis.config</groupId>
<artifactId>config</artifactId>
<version>1.5-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
</parent>
<artifactId>project-config</artifactId>
@@ -484,20 +483,6 @@
<artifactId>maven-project-info-reports-plugin</artifactId>
<version>2.0.1</version>
</plugin>
-
-<!--
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-checkstyle-plugin</artifactId>
- <version>2.1</version>
- <configuration>
- -->
-<!-- Pulled as resource from checkstyle-config plugin -->
-<!--
- <configLocation>org/apache/geronimo/checkstyle.xml</configLocation>
- </configuration>
- </plugin>
--->
</plugins>
</reporting>
Modified: geronimo/genesis/trunk/legal-bundle/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/genesis/trunk/legal-bundle/pom.xml?rev=636826&r1=636825&r2=636826&view=diff
==============================================================================
--- geronimo/genesis/trunk/legal-bundle/pom.xml (original)
+++ geronimo/genesis/trunk/legal-bundle/pom.xml Thu Mar 13 11:35:24 2008
@@ -28,7 +28,6 @@
<groupId>org.apache.geronimo.genesis</groupId>
<artifactId>genesis</artifactId>
<version>1.5-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
</parent>
<artifactId>legal-bundle</artifactId>
Modified: geronimo/genesis/trunk/plugins/maven-maven-plugin/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/genesis/trunk/plugins/maven-maven-plugin/pom.xml?rev=636826&r1=636825&r2=636826&view=diff
==============================================================================
--- geronimo/genesis/trunk/plugins/maven-maven-plugin/pom.xml (original)
+++ geronimo/genesis/trunk/plugins/maven-maven-plugin/pom.xml Thu Mar 13 11:35:24 2008
@@ -28,7 +28,6 @@
<groupId>org.apache.geronimo.genesis.plugins</groupId>
<artifactId>plugins</artifactId>
<version>1.5-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
</parent>
<artifactId>maven-maven-plugin</artifactId>
Modified: geronimo/genesis/trunk/plugins/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/genesis/trunk/plugins/pom.xml?rev=636826&r1=636825&r2=636826&view=diff
==============================================================================
--- geronimo/genesis/trunk/plugins/pom.xml (original)
+++ geronimo/genesis/trunk/plugins/pom.xml Thu Mar 13 11:35:24 2008
@@ -28,7 +28,6 @@
<groupId>org.apache.geronimo.genesis</groupId>
<artifactId>genesis</artifactId>
<version>1.5-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
</parent>
<groupId>org.apache.geronimo.genesis.plugins</groupId>
Modified: geronimo/genesis/trunk/plugins/tools-maven-plugin/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/genesis/trunk/plugins/tools-maven-plugin/pom.xml?rev=636826&r1=636825&r2=636826&view=diff
==============================================================================
--- geronimo/genesis/trunk/plugins/tools-maven-plugin/pom.xml (original)
+++ geronimo/genesis/trunk/plugins/tools-maven-plugin/pom.xml Thu Mar 13 11:35:24 2008
@@ -28,7 +28,6 @@
<groupId>org.apache.geronimo.genesis.plugins</groupId>
<artifactId>plugins</artifactId>
<version>1.5-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
</parent>
<artifactId>tools-maven-plugin</artifactId>