geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dwo...@apache.org
Subject svn commit: r709433 - in /geronimo/plugins/tuscany/trunk: ./ geronimo-tuscany-http-jetty/ geronimo-tuscany-http-tomcat/ geronimo-tuscany/ samples/helloworld-service/ tuscany-jetty/ tuscany-tomcat/
Date Fri, 31 Oct 2008 14:37:13 GMT
Author: dwoods
Date: Fri Oct 31 07:37:13 2008
New Revision: 709433

URL: http://svn.apache.org/viewvc?rev=709433&view=rev
Log:
GERONIMO-4343 Upgrade to Genesis 1.5-SNAPSHOT and the new Geronimo 2.2 way of using maven-remote-resources-plugin
and ianal-maven-plugin for auto LICENSE/NOTICE file inclusion

Added:
    geronimo/plugins/tuscany/trunk/LICENSE.txt
      - copied unchanged from r709428, geronimo/plugins/tuscany/trunk/tuscany-tomcat/LICENSE.txt
    geronimo/plugins/tuscany/trunk/NOTICE.txt
      - copied, changed from r709428, geronimo/plugins/tuscany/trunk/tuscany-tomcat/NOTICE.txt
Removed:
    geronimo/plugins/tuscany/trunk/geronimo-tuscany-http-jetty/LICENSE.txt
    geronimo/plugins/tuscany/trunk/geronimo-tuscany-http-jetty/NOTICE.txt
    geronimo/plugins/tuscany/trunk/geronimo-tuscany-http-tomcat/LICENSE.txt
    geronimo/plugins/tuscany/trunk/geronimo-tuscany-http-tomcat/NOTICE.txt
    geronimo/plugins/tuscany/trunk/geronimo-tuscany/LICENSE.txt
    geronimo/plugins/tuscany/trunk/geronimo-tuscany/NOTICE.txt
    geronimo/plugins/tuscany/trunk/samples/helloworld-service/LICENSE.txt
    geronimo/plugins/tuscany/trunk/samples/helloworld-service/NOTICE.txt
    geronimo/plugins/tuscany/trunk/tuscany-jetty/LICENSE.txt
    geronimo/plugins/tuscany/trunk/tuscany-jetty/NOTICE.txt
    geronimo/plugins/tuscany/trunk/tuscany-tomcat/LICENSE.txt
    geronimo/plugins/tuscany/trunk/tuscany-tomcat/NOTICE.txt
Modified:
    geronimo/plugins/tuscany/trunk/pom.xml

Copied: geronimo/plugins/tuscany/trunk/NOTICE.txt (from r709428, geronimo/plugins/tuscany/trunk/tuscany-tomcat/NOTICE.txt)
URL: http://svn.apache.org/viewvc/geronimo/plugins/tuscany/trunk/NOTICE.txt?p2=geronimo/plugins/tuscany/trunk/NOTICE.txt&p1=geronimo/plugins/tuscany/trunk/tuscany-tomcat/NOTICE.txt&r1=709428&r2=709433&rev=709433&view=diff
==============================================================================
--- geronimo/plugins/tuscany/trunk/tuscany-tomcat/NOTICE.txt (original)
+++ geronimo/plugins/tuscany/trunk/NOTICE.txt Fri Oct 31 07:37:13 2008
@@ -1,5 +1,5 @@
 Apache Geronimo 
-Copyright 2003-2007 The Apache Software Foundation
+Copyright 2003-2008 The Apache Software Foundation
 
 This product includes software developed by
 The Apache Software Foundation (http://www.apache.org/).

Modified: geronimo/plugins/tuscany/trunk/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/plugins/tuscany/trunk/pom.xml?rev=709433&r1=709432&r2=709433&view=diff
==============================================================================
--- geronimo/plugins/tuscany/trunk/pom.xml (original)
+++ geronimo/plugins/tuscany/trunk/pom.xml Fri Oct 31 07:37:13 2008
@@ -24,7 +24,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.plugins</groupId>
@@ -613,11 +613,34 @@
                     <extensions>true</extensions>
                 </plugin>
 
-
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-enforcer-plugin</artifactId>
-                    <version>1.0-alpha-2</version>
+                    <version>1.0-alpha-3</version>
+                </plugin>
+
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-remote-resources-plugin</artifactId>
+                    <version>1.0</version>
+                    <executions>
+                        <execution>
+                            <goals>
+                                <goal>process</goal>
+                            </goals>
+                            <configuration>
+                                <resourceBundles>
+                                    <resourceBundle>org.apache:apache-jar-resource-bundle:1.4</resourceBundle>
+                                </resourceBundles>
+                            </configuration>
+                        </execution>
+                    </executions>
+                </plugin>
+
+                <plugin>
+                    <groupId>org.codehaus.mojo</groupId>
+                    <artifactId>ianal-maven-plugin</artifactId>
+                    <version>1.0-alpha-1-SNAPSHOT</version>
                 </plugin>
 
                 <plugin>
@@ -657,9 +680,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>
                                 
                                 <!-- Allow any Maven >= 2.0.5 -->
@@ -673,40 +696,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>install-legal-files</id>
-                        <phase>generate-resources</phase>
-                        <goals>
-                            <goal>copy-legal-files</goal>
-                        </goals>
-                        <configuration>
-                            <!-- Fail the build if no legal files were copied -->
-                            <strict>true</strict>
-                        </configuration>
-                    </execution>
-
-                    <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>
-
-            <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
                 <configuration>



Mime
View raw message