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/10 18:20:24 UTC
svn commit: r635605 - in /geronimo/genesis/trunk:
config/project-config/pom.xml plugins/pom.xml pom.xml
Author: djencks
Date: Mon Mar 10 10:20:17 2008
New Revision: 635605
URL: http://svn.apache.org/viewvc?rev=635605&view=rev
Log:
Rearrange stuff, add a couple plugins in general use, and add a 'full' profile to build source and javadoc
Modified:
geronimo/genesis/trunk/config/project-config/pom.xml
geronimo/genesis/trunk/plugins/pom.xml
geronimo/genesis/trunk/pom.xml
Modified: geronimo/genesis/trunk/config/project-config/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/genesis/trunk/config/project-config/pom.xml?rev=635605&r1=635604&r2=635605&view=diff
==============================================================================
--- geronimo/genesis/trunk/config/project-config/pom.xml (original)
+++ geronimo/genesis/trunk/config/project-config/pom.xml Mon Mar 10 10:20:17 2008
@@ -197,55 +197,47 @@
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <version>2.3</version>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <version>1.1</version>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <version>2.1</version>
<configuration>
- <forkMode>once</forkMode>
- <argLine>-enableassertions -Dgeronimo.bootstrap.logging.enabled=false -Dlog4j.configuration=org/apache/geronimo/test-log4j.properties</argLine>
- <workingDirectory>${project.build.directory}</workingDirectory>
-
- <!-- Override the default, do not accept Test* as test classes -->
- <excludes>
- <exclude>**/Abstract*.java</exclude>
- <exclude>**/Test*.java</exclude>
- </excludes>
- <includes>
- <include>**/*Test.java</include>
- </includes>
+ <tarLongFileMode>gnu</tarLongFileMode>
</configuration>
</plugin>
-
+
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-clean-plugin</artifactId>
<version>2.1.1</version>
</plugin>
-
+
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-one-plugin</artifactId>
- <version>1.1</version>
+ <artifactId>maven-clover-plugin</artifactId>
+ <version>2.4</version>
</plugin>
-
+
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-antrun-plugin</artifactId>
- <version>1.1</version>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <version>2.0-alpha-4</version>
</plugin>
-
+
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-assembly-plugin</artifactId>
- <version>2.1</version>
- <configuration>
- <tarLongFileMode>gnu</tarLongFileMode>
- </configuration>
+ <artifactId>maven-eclipse-plugin</artifactId>
+ <version>2.4</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-clover-plugin</artifactId>
- <version>2.4</version>
+ <artifactId>maven-enforcer-plugin</artifactId>
+ <version>1.0-alpha-3</version>
</plugin>
<plugin>
@@ -253,12 +245,56 @@
<artifactId>maven-jar-plugin</artifactId>
<version>2.1</version>
</plugin>
-
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-one-plugin</artifactId>
+ <version>1.1</version>
+ </plugin>
+
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-rar-plugin</artifactId>
<version>2.2</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>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <version>2.3</version>
+ <configuration>
+ <forkMode>once</forkMode>
+ <argLine>-enableassertions -Dgeronimo.bootstrap.logging.enabled=false -Dlog4j.configuration=org/apache/geronimo/test-log4j.properties</argLine>
+ <workingDirectory>${project.build.directory}</workingDirectory>
+
+ <!-- Override the default, do not accept Test* as test classes -->
+ <excludes>
+ <exclude>**/Abstract*.java</exclude>
+ <exclude>**/Test*.java</exclude>
+ </excludes>
+ <includes>
+ <include>**/*Test.java</include>
+ </includes>
+ </configuration>
+ </plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -278,33 +314,21 @@
</plugin>
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-eclipse-plugin</artifactId>
- <version>2.4</version>
- </plugin>
-
- <plugin>
<groupId>org.codehaus.mojo</groupId>
- <artifactId>jspc-maven-plugin</artifactId>
- <version>1.4.5</version>
+ <artifactId>build-helper-maven-plugin</artifactId>
+ <version>1.0</version>
</plugin>
-
+
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>groovy-maven-plugin</artifactId>
<version>1.0-alpha-2</version>
</plugin>
-
+
<plugin>
<groupId>org.codehaus.mojo</groupId>
- <artifactId>build-helper-maven-plugin</artifactId>
- <version>1.0</version>
- </plugin>
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-dependency-plugin</artifactId>
- <version>2.0-alpha-4</version>
+ <artifactId>jspc-maven-plugin</artifactId>
+ <version>1.4.5</version>
</plugin>
<!--
@@ -322,23 +346,6 @@
<groupId>org.apache.geronimo.genesis.plugins</groupId>
<artifactId>maven-maven-plugin</artifactId>
<version>1.4-SNAPSHOT</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:1.4-SNAPSHOT</resourceBundle>
- </resourceBundles>
- </configuration>
- </execution>
- </executions>
</plugin>
</plugins>
</pluginManagement>
Modified: geronimo/genesis/trunk/plugins/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/genesis/trunk/plugins/pom.xml?rev=635605&r1=635604&r2=635605&view=diff
==============================================================================
--- geronimo/genesis/trunk/plugins/pom.xml (original)
+++ geronimo/genesis/trunk/plugins/pom.xml Mon Mar 10 10:20:17 2008
@@ -70,15 +70,6 @@
<build>
<resources>
<resource>
- <directory>${pom.basedir}</directory>
- <targetPath>META-INF</targetPath>
- <includes>
- <include>LICENSE.txt</include>
- <include>NOTICE.txt</include>
- </includes>
- </resource>
-
- <resource>
<directory>${pom.basedir}/src/main/resources</directory>
</resource>
</resources>
@@ -109,7 +100,7 @@
</goals>
<configuration>
<resourceBundles>
- <resourceBundle>org.apache.geronimo.genesis:legal-bundle:${version}</resourceBundle>
+ <resourceBundle>org.apache.geronimo.genesis:legal-bundle:${legalBundleVersion}</resourceBundle>
</resourceBundles>
</configuration>
</execution>
Modified: geronimo/genesis/trunk/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/genesis/trunk/pom.xml?rev=635605&r1=635604&r2=635605&view=diff
==============================================================================
--- geronimo/genesis/trunk/pom.xml (original)
+++ geronimo/genesis/trunk/pom.xml Mon Mar 10 10:20:17 2008
@@ -54,6 +54,8 @@
<properties>
<!-- 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.4-SNAPSHOT</legalBundleVersion>
</properties>
<build>
@@ -190,7 +192,7 @@
<!--
NOTE: The staged build is used to get around a problem with Maven
- and extention plugins.
+ and extension plugins.
See http://issues.apache.org/jira/browse/GERONIMO-2172 for more details.
-->
@@ -264,6 +266,46 @@
<altDeploymentRepository>${deploy.altRepository}</altDeploymentRepository>
<updateReleaseInfo>true</updateReleaseInfo>
</configuration>
+ </plugin>
+
+ <!-- We want the JavaDoc JAR published with the release -->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <inherited>true</inherited>
+ <configuration>
+ <source>1.5</source>
+ </configuration>
+ <executions>
+ <execution>
+ <id>attach-javadocs</id>
+ <goals>
+ <goal>jar</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+
+ <profile>
+ <id>full</id>
+
+ <build>
+ <plugins>
+
+ <!-- We want a source jar -->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-source-plugin</artifactId>
+ <executions>
+ <execution>
+ <goals>
+ <goal>jar</goal>
+ </goals>
+ </execution>
+ </executions>
</plugin>
<!-- We want the JavaDoc JAR published with the release -->