geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dwo...@apache.org
Subject svn commit: r683985 - in /geronimo/samples/trunk: pom.xml samples/pom.xml
Date Fri, 08 Aug 2008 14:37:16 GMT
Author: dwoods
Date: Fri Aug  8 07:37:15 2008
New Revision: 683985

URL: http://svn.apache.org/viewvc?rev=683985&view=rev
Log:
merged in relevant genesis-1.5-SNAPSHOT and build updates from branches/2.1

Modified:
    geronimo/samples/trunk/pom.xml
    geronimo/samples/trunk/samples/pom.xml

Modified: geronimo/samples/trunk/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/pom.xml?rev=683985&r1=683984&r2=683985&view=diff
==============================================================================
--- geronimo/samples/trunk/pom.xml (original)
+++ geronimo/samples/trunk/pom.xml Fri Aug  8 07:37:15 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>
@@ -71,8 +71,7 @@
                 <plugin>
                     <groupId>org.apache.geronimo.buildsupport</groupId>
                     <artifactId>geronimo-maven-plugin</artifactId>
-                    <version>2.2-SNAPSHOT</version>
-                    <!--<version>${geronimoVersion}</version>-->
+                    <version>${geronimoVersion}</version>
 
                     <configuration>
                         <assemblies>
@@ -206,6 +205,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-enforcer-plugin</artifactId>
+                <version>1.0-alpha-3</version>
                 <executions>
                     <execution>
                         <phase>validate</phase>
@@ -214,9 +214,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+ -->

Modified: geronimo/samples/trunk/samples/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/pom.xml?rev=683985&r1=683984&r2=683985&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/pom.xml (original)
+++ geronimo/samples/trunk/samples/pom.xml Fri Aug  8 07:37:15 2008
@@ -241,7 +241,6 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-javadoc-plugin</artifactId>
-                <version>2.2</version>
                 <configuration>
                     <aggregate>true</aggregate>
                     <minmemory>128m</minmemory>
@@ -306,7 +305,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>
@@ -341,4 +359,4 @@
             </build>
         </profile>
     </profiles>
-</project>
\ No newline at end of file
+</project>



Mime
View raw message