geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dwo...@apache.org
Subject svn commit: r722628 [2/2] - in /geronimo/daytrader/branches/2.1: ./ bin/ bin/dbscripts/derby/ daytrader-db2-datasource/ daytrader-derby-datasource/ daytrader-jetty/ daytrader-jetty/src/main/plan/ daytrader-jms/ daytrader-oracle-datasource/ daytrader-to...
Date Tue, 02 Dec 2008 22:04:03 GMT
Modified: geronimo/daytrader/branches/2.1/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/daytrader/branches/2.1/pom.xml?rev=722628&r1=722627&r2=722628&view=diff
==============================================================================
--- geronimo/daytrader/branches/2.1/pom.xml (original)
+++ geronimo/daytrader/branches/2.1/pom.xml Tue Dec  2 14:04:01 2008
@@ -22,14 +22,14 @@
     <parent>
         <groupId>org.apache.geronimo.genesis.config</groupId>
         <artifactId>project-config</artifactId>
-        <version>1.4</version>
+        <version>1.5</version>
     </parent>
 
     <groupId>org.apache.geronimo.daytrader</groupId>
     <artifactId>daytrader</artifactId>
     <name>DayTrader :: Performance Benchmark Sample</name>
     <packaging>pom</packaging>
-    <version>2.1-SNAPSHOT</version>
+    <version>2.1.3</version>
     <description>Java EE 5.0 Performance Benchmark Sample Application</description>
 
     <properties>
@@ -145,6 +145,7 @@
         <module>modules/json-proxy</module>
         <module>modules/dojo-ui-web</module>
         <module>modules/dojo-ui-ear</module>
+        <!-- c-m-p built plugins -->
         <module>daytrader-derby-datasource</module>
         <!-- see profiles -->
         <!--<module>daytrader-db2-datasource</module>-->
@@ -184,8 +185,7 @@
                 <plugin>
                     <groupId>org.apache.geronimo.buildsupport</groupId>
                     <artifactId>geronimo-maven-plugin</artifactId>
-                    <version>2.1-SNAPSHOT</version>
-                    <!--<version>${geronimoVersion}</version>-->
+                    <version>${geronimoVersion}</version>
 
                     <configuration>
                         <assemblies>
@@ -328,14 +328,14 @@
                         </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>
 
-                                <!-- Allow any Maven >= 2.0.5 -->
+                                <!-- Allow any Maven >= 2.0.9 -->
                                 <requireMavenVersion>
-                                    <version>[2.0.5,)</version>
+                                    <version>[2.0.9,)</version>
                                 </requireMavenVersion>
                             </rules>
                         </configuration>
@@ -344,27 +344,6 @@
             </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>
-                        <!-- Do not Fail the build if no legal files were found
-                        <configuration>
-                            <strict>true</strict>
-                        </configuration>
-                        -->
-                    </execution>
-                </executions>
-            </plugin>
-
-            <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
                 <configuration>



Mime
View raw message