You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by dw...@apache.org on 2008/08/08 16:16:53 UTC
svn commit: r683972 - in /geronimo/samples/branches/2.1: pom.xml
samples/pom.xml
Author: dwoods
Date: Fri Aug 8 07:16:53 2008
New Revision: 683972
URL: http://svn.apache.org/viewvc?rev=683972&view=rev
Log:
included missing versionId settings for some maven plugins, updated one spec version to match the level used in the 2.1.2 server, upgraded to genesis-1.5-SNAPSHOT which turns off unique snapshot timestamps on published artifacts
Modified:
geronimo/samples/branches/2.1/pom.xml
geronimo/samples/branches/2.1/samples/pom.xml
Modified: geronimo/samples/branches/2.1/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/pom.xml?rev=683972&r1=683971&r2=683972&view=diff
==============================================================================
--- geronimo/samples/branches/2.1/pom.xml (original)
+++ geronimo/samples/branches/2.1/pom.xml Fri Aug 8 07:16:53 2008
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.geronimo.genesis.config</groupId>
<artifactId>project-config</artifactId>
- <version>1.4</version>
+ <version>1.5-SNAPSHOT</version>
</parent>
<groupId>org.apache.geronimo.samples</groupId>
@@ -70,6 +70,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-enforcer-plugin</artifactId>
+ <version>1.0-alpha-3</version>
<executions>
<execution>
<phase>validate</phase>
@@ -78,9 +79,9 @@
</goals>
<configuration>
<rules>
- <!-- Allow any Java >= 1.5, but not 1.6 or above -->
+ <!-- Allow any Java >= 1.5 -->
<requireJavaVersion>
- <version>[1.5,1.6)</version>
+ <version>[1.5,)</version>
</requireJavaVersion>
<!-- Require Maven 2.0.9+ -->
@@ -102,4 +103,4 @@
</plugin>
</plugins>
</build>
-</project>
\ No newline at end of file
+</project>
Modified: geronimo/samples/branches/2.1/samples/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/pom.xml?rev=683972&r1=683971&r2=683972&view=diff
==============================================================================
--- geronimo/samples/branches/2.1/samples/pom.xml (original)
+++ geronimo/samples/branches/2.1/samples/pom.xml Fri Aug 8 07:16:53 2008
@@ -84,7 +84,7 @@
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-servlet_2.5_spec</artifactId>
- <version>1.1.2</version>
+ <version>1.2</version>
<scope>provided</scope>
</dependency>
</dependencies>
@@ -123,6 +123,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-ear-plugin</artifactId>
+ <version>2.3</version>
<configuration>
<resourcesDir>${project.build.outputDirectory}</resourcesDir>
<archive>
@@ -131,9 +132,11 @@
</archive>
</configuration>
</plugin>
+
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
+ <version>2.1</version>
<configuration>
<archive>
<!-- Do not include META-INF/maven to avoid long file problems on windows -->
@@ -227,7 +230,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
- <version>2.2</version>
+ <version>2.3</version>
<configuration>
<aggregate>true</aggregate>
<minmemory>128m</minmemory>
@@ -266,11 +269,13 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-report-plugin</artifactId>
+ <version>2.3</version>
<inherited>false</inherited>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-pmd-plugin</artifactId>
+ <version>2.2</version>
<inherited>false</inherited>
</plugin>
<plugin>
@@ -292,7 +297,26 @@
<defaultGoal>validate</defaultGoal>
<plugins>
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
+ <version>1.1</version>
+ <dependencies>
+ <dependency>
+ <groupId>oro</groupId>
+ <artifactId>oro</artifactId>
+ <version>2.0.8</version>
+ </dependency>
+ <dependency>
+ <groupId>ant</groupId>
+ <artifactId>ant-apache-oro</artifactId>
+ <version>1.6.4</version>
+ </dependency>
+ <dependency>
+ <groupId>ant</groupId>
+ <artifactId>ant-optional</artifactId>
+ <version>1.5.3-1</version>
+ </dependency>
+ </dependencies>
<inherited>false</inherited>
<executions>
<execution>
@@ -327,4 +351,4 @@
</build>
</profile>
</profiles>
-</project>
\ No newline at end of file
+</project>