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/11 07:46:44 UTC
svn commit: r635818 - in /geronimo/genesis/trunk: bootstrap bootstrap.bat
bootstrap.xml config/pom.xml config/project-config/pom.xml pom.xml
Author: djencks
Date: Mon Mar 10 23:46:42 2008
New Revision: 635818
URL: http://svn.apache.org/viewvc?rev=635818&view=rev
Log:
Move some plugins around, bring back bootstrap but without a profile
Added:
geronimo/genesis/trunk/bootstrap
- copied unchanged from r635810, geronimo/genesis/trunk/bootstrap
geronimo/genesis/trunk/bootstrap.bat
- copied unchanged from r635810, geronimo/genesis/trunk/bootstrap.bat
geronimo/genesis/trunk/bootstrap.xml
- copied, changed from r635810, geronimo/genesis/trunk/bootstrap.xml
Modified:
geronimo/genesis/trunk/config/pom.xml
geronimo/genesis/trunk/config/project-config/pom.xml
geronimo/genesis/trunk/pom.xml
Copied: geronimo/genesis/trunk/bootstrap.xml (from r635810, geronimo/genesis/trunk/bootstrap.xml)
URL: http://svn.apache.org/viewvc/geronimo/genesis/trunk/bootstrap.xml?p2=geronimo/genesis/trunk/bootstrap.xml&p1=geronimo/genesis/trunk/bootstrap.xml&r1=635810&r2=635818&rev=635818&view=diff
==============================================================================
--- geronimo/genesis/trunk/bootstrap.xml (original)
+++ geronimo/genesis/trunk/bootstrap.xml Mon Mar 10 23:46:42 2008
@@ -38,7 +38,7 @@
<attribute name="name"/>
<sequential>
<exec executable="mvn${platform.script.ext}" dir="${basedir}">
- <arg value="-Dstage=@{name}"/>
+ <arg value="-N"/>
<arg value="install"/>
</exec>
</sequential>
@@ -69,17 +69,21 @@
<!-- Steps -->
<!-- ===== -->
- <target name="bootstrap" depends="clean, stage1, stage2"/>
+ <target name="bootstrap" depends="clean, stage1, stage2, stage3"/>
<target name="stage1" depends="init">
<build-stage name="bootstrap"/>
</target>
<target name="stage2" depends="init">
- <mvn goal="install"/>
+ <mvn goal="install" dir="plugins"/>
</target>
-
+ <target name="stage3" depends="init">
+ <mvn goal="install"/>
+ </target>
+
+
<!-- ======== -->
<!-- Cleaning -->
<!-- ======== -->
Modified: geronimo/genesis/trunk/config/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/genesis/trunk/config/pom.xml?rev=635818&r1=635817&r2=635818&view=diff
==============================================================================
--- geronimo/genesis/trunk/config/pom.xml (original)
+++ geronimo/genesis/trunk/config/pom.xml Mon Mar 10 23:46:42 2008
@@ -62,12 +62,38 @@
</execution>
</executions>
</plugin>
+ <plugin>
+ <groupId>org.apache.geronimo.genesis.plugins</groupId>
+ <artifactId>tools-maven-plugin</artifactId>
+ <version>1.4-SNAPSHOT</version>
+ </plugin>
</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>
+
+ <!-- Tools includes custom packagings, install as extension to pick them up -->
+ <extensions>true</extensions>
+
+ <executions>
+ <execution>
+ <id>verify-legal-files</id>
+ <phase>verify</phase>
+ <goals>
+ <goal>verify-legal-files</goal>
+ </goals>
+ <configuration>
+ <!-- Fail the build if no legal files were found -->
+ <strict>true</strict>
+ </configuration>
+ </execution>
+ </executions>
</plugin>
</plugins>
</build>
Modified: geronimo/genesis/trunk/config/project-config/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/genesis/trunk/config/project-config/pom.xml?rev=635818&r1=635817&r2=635818&view=diff
==============================================================================
--- geronimo/genesis/trunk/config/project-config/pom.xml (original)
+++ geronimo/genesis/trunk/config/project-config/pom.xml Mon Mar 10 23:46:42 2008
@@ -183,6 +183,7 @@
<pluginManagement>
<plugins>
+ <!-- maven-remote-resources-plugin and tools-maven-plugin are in parent pom -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
@@ -248,24 +249,6 @@
<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.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>2.3</version>
<configuration>
@@ -326,12 +309,6 @@
<plugin>
<groupId>org.apache.geronimo.genesis.plugins</groupId>
- <artifactId>tools-maven-plugin</artifactId>
- <version>1.4-SNAPSHOT</version>
- </plugin>
-
- <plugin>
- <groupId>org.apache.geronimo.genesis.plugins</groupId>
<artifactId>maven-maven-plugin</artifactId>
<version>1.4-SNAPSHOT</version>
</plugin>
@@ -361,10 +338,6 @@
</plugin>
-->
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-remote-resources-plugin</artifactId>
- </plugin>
</plugins>
</build>
@@ -447,23 +420,10 @@
<profiles>
<profile>
- <id>default</id>
-
- <activation>
- <activeByDefault>true</activeByDefault>
- </activation>
- </profile>
-
- <profile>
<id>tools</id>
<build>
<plugins>
- <plugin>
- <groupId>org.apache.geronimo.genesis.plugins</groupId>
- <artifactId>tools-maven-plugin</artifactId>
- </plugin>
-
<plugin>
<groupId>org.apache.geronimo.genesis.plugins</groupId>
<artifactId>maven-maven-plugin</artifactId>
Modified: geronimo/genesis/trunk/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/genesis/trunk/pom.xml?rev=635818&r1=635817&r2=635818&view=diff
==============================================================================
--- geronimo/genesis/trunk/pom.xml (original)
+++ geronimo/genesis/trunk/pom.xml Mon Mar 10 23:46:42 2008
@@ -55,7 +55,7 @@
<!-- set siteId to artifactId for any "top level" project rooting a website -->
<siteId>genesis</siteId>
<!-- IMPORTANT update this to the release version before releasing -->
- <legalBundleVersion>1.5-SNAPSHOT</legalBundleVersion>
+ <legalBundleVersion>1.4-SNAPSHOT</legalBundleVersion>
</properties>
<build>