You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by jd...@apache.org on 2008/04/23 19:59:24 UTC
svn commit: r650968 - in /geronimo/server/trunk: ./
assemblies/geronimo-framework/ assemblies/geronimo-jetty6-javaee5/
assemblies/geronimo-jetty6-minimal/ assemblies/geronimo-tomcat6-javaee5/
assemblies/geronimo-tomcat6-minimal/ plugins/activemq/geroni...
Author: jdillon
Date: Wed Apr 23 10:59:20 2008
New Revision: 650968
URL: http://svn.apache.org/viewvc?rev=650968&view=rev
Log:
Use ianal-maven-plugin to help ensure that project artifacts contain legal muck
Removed:
geronimo/server/trunk/plugins/activemq/geronimo-activemq-ra/src/main/rar/META-INF/LICENSE.txt
geronimo/server/trunk/plugins/activemq/geronimo-activemq-ra/src/main/rar/META-INF/NOTICE.txt
geronimo/server/trunk/plugins/console/console-ear/src/main/
Modified:
geronimo/server/trunk/assemblies/geronimo-framework/pom.xml
geronimo/server/trunk/assemblies/geronimo-jetty6-javaee5/pom.xml
geronimo/server/trunk/assemblies/geronimo-jetty6-minimal/pom.xml
geronimo/server/trunk/assemblies/geronimo-tomcat6-javaee5/pom.xml
geronimo/server/trunk/assemblies/geronimo-tomcat6-minimal/pom.xml
geronimo/server/trunk/plugins/activemq/geronimo-activemq-ra/pom.xml
geronimo/server/trunk/plugins/console/console-ear/pom.xml
geronimo/server/trunk/plugins/console/console-portal-driver/pom.xml
geronimo/server/trunk/pom.xml
geronimo/server/trunk/testsupport/test-deployment-j2ee_1.3/test-rar-j2ee_1.3/pom.xml
geronimo/server/trunk/testsupport/test-deployment-j2ee_1.4/test-rar-j2ee_1.4/pom.xml
geronimo/server/trunk/testsupport/test-deployment-javaee_5/test-rar-javaee_5/pom.xml
Modified: geronimo/server/trunk/assemblies/geronimo-framework/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/assemblies/geronimo-framework/pom.xml?rev=650968&r1=650967&r2=650968&view=diff
==============================================================================
--- geronimo/server/trunk/assemblies/geronimo-framework/pom.xml (original)
+++ geronimo/server/trunk/assemblies/geronimo-framework/pom.xml Wed Apr 23 10:59:20 2008
@@ -202,6 +202,27 @@
</execution>
</executions>
</plugin>
+
+ <!--
+ HACK: Assemblies contain legal files with .txt extentions.
+ -->
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>ianal-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <goals>
+ <goal>verify-legal-files</goal>
+ </goals>
+ <configuration>
+ <requiredFiles>
+ <requiredFile>LICENSE.txt</requiredFile>
+ <requiredFile>NOTICE.txt</requiredFile>
+ </requiredFiles>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
</build>
Modified: geronimo/server/trunk/assemblies/geronimo-jetty6-javaee5/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/assemblies/geronimo-jetty6-javaee5/pom.xml?rev=650968&r1=650967&r2=650968&view=diff
==============================================================================
--- geronimo/server/trunk/assemblies/geronimo-jetty6-javaee5/pom.xml (original)
+++ geronimo/server/trunk/assemblies/geronimo-jetty6-javaee5/pom.xml Wed Apr 23 10:59:20 2008
@@ -672,6 +672,27 @@
</execution>
</executions>
</plugin>
+
+ <!--
+ HACK: Assemblies contain legal files with .txt extentions.
+ -->
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>ianal-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <goals>
+ <goal>verify-legal-files</goal>
+ </goals>
+ <configuration>
+ <requiredFiles>
+ <requiredFile>LICENSE.txt</requiredFile>
+ <requiredFile>NOTICE.txt</requiredFile>
+ </requiredFiles>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
</build>
Modified: geronimo/server/trunk/assemblies/geronimo-jetty6-minimal/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/assemblies/geronimo-jetty6-minimal/pom.xml?rev=650968&r1=650967&r2=650968&view=diff
==============================================================================
--- geronimo/server/trunk/assemblies/geronimo-jetty6-minimal/pom.xml (original)
+++ geronimo/server/trunk/assemblies/geronimo-jetty6-minimal/pom.xml Wed Apr 23 10:59:20 2008
@@ -326,6 +326,27 @@
</execution>
</executions>
</plugin>
+
+ <!--
+ HACK: Assemblies contain legal files with .txt extentions.
+ -->
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>ianal-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <goals>
+ <goal>verify-legal-files</goal>
+ </goals>
+ <configuration>
+ <requiredFiles>
+ <requiredFile>LICENSE.txt</requiredFile>
+ <requiredFile>NOTICE.txt</requiredFile>
+ </requiredFiles>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
</build>
Modified: geronimo/server/trunk/assemblies/geronimo-tomcat6-javaee5/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/assemblies/geronimo-tomcat6-javaee5/pom.xml?rev=650968&r1=650967&r2=650968&view=diff
==============================================================================
--- geronimo/server/trunk/assemblies/geronimo-tomcat6-javaee5/pom.xml (original)
+++ geronimo/server/trunk/assemblies/geronimo-tomcat6-javaee5/pom.xml Wed Apr 23 10:59:20 2008
@@ -644,7 +644,27 @@
</execution>
</executions>
</plugin>
-
+
+ <!--
+ HACK: Assemblies contain legal files with .txt extentions.
+ -->
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>ianal-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <goals>
+ <goal>verify-legal-files</goal>
+ </goals>
+ <configuration>
+ <requiredFiles>
+ <requiredFile>LICENSE.txt</requiredFile>
+ <requiredFile>NOTICE.txt</requiredFile>
+ </requiredFiles>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
</build>
Modified: geronimo/server/trunk/assemblies/geronimo-tomcat6-minimal/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/assemblies/geronimo-tomcat6-minimal/pom.xml?rev=650968&r1=650967&r2=650968&view=diff
==============================================================================
--- geronimo/server/trunk/assemblies/geronimo-tomcat6-minimal/pom.xml (original)
+++ geronimo/server/trunk/assemblies/geronimo-tomcat6-minimal/pom.xml Wed Apr 23 10:59:20 2008
@@ -326,7 +326,27 @@
</execution>
</executions>
</plugin>
-
+
+ <!--
+ HACK: Assemblies contain legal files with .txt extentions.
+ -->
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>ianal-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <goals>
+ <goal>verify-legal-files</goal>
+ </goals>
+ <configuration>
+ <requiredFiles>
+ <requiredFile>LICENSE.txt</requiredFile>
+ <requiredFile>NOTICE.txt</requiredFile>
+ </requiredFiles>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
</build>
Modified: geronimo/server/trunk/plugins/activemq/geronimo-activemq-ra/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/activemq/geronimo-activemq-ra/pom.xml?rev=650968&r1=650967&r2=650968&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/activemq/geronimo-activemq-ra/pom.xml (original)
+++ geronimo/server/trunk/plugins/activemq/geronimo-activemq-ra/pom.xml Wed Apr 23 10:59:20 2008
@@ -169,13 +169,44 @@
</dependency>
</dependencies>
+ <!--
+ HACK: The maven-rar-plugin (v2.2 at least) does not work well with the maven-remote-resources-plugin
+ so we use this hack to get our generated legal files installed.
+ -->
+
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <executions>
+ <execution>
+ <phase>compile</phase>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ <configuration>
+ <tasks>
+ <copy todir="${project.build.outputDirectory}">
+ <fileset dir="${project.basedir}/src/main/rar">
+ <include name="**"/>
+ </fileset>
+ </copy>
+ </tasks>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-rar-plugin</artifactId>
<configuration>
+ <archive>
+ <addMavenDescriptor>false</addMavenDescriptor>
+ </archive>
<includeJar>false</includeJar>
+ <rarSourceDirectory>${project.build.outputDirectory}</rarSourceDirectory>
</configuration>
</plugin>
</plugins>
Modified: geronimo/server/trunk/plugins/console/console-ear/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-ear/pom.xml?rev=650968&r1=650967&r2=650968&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-ear/pom.xml (original)
+++ geronimo/server/trunk/plugins/console/console-ear/pom.xml Wed Apr 23 10:59:20 2008
@@ -33,7 +33,6 @@
<packaging>ear</packaging>
<dependencies>
-
<dependency>
<groupId>org.apache.geronimo.plugins</groupId>
<artifactId>console-portal-driver</artifactId>
@@ -47,7 +46,6 @@
<version>${version}</version>
<type>war</type>
</dependency>
-
</dependencies>
<build>
@@ -73,6 +71,10 @@
<bundleFileName>base-portlets.war</bundleFileName>
</webModule>
</modules>
+ <!--
+ HACK: Include legal muck from maven-remote-resources-plugin
+ -->
+ <resourcesDir>${project.build.outputDirectory}</resourcesDir>
</configuration>
</plugin>
</plugins>
Modified: geronimo/server/trunk/plugins/console/console-portal-driver/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-portal-driver/pom.xml?rev=650968&r1=650967&r2=650968&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-portal-driver/pom.xml (original)
+++ geronimo/server/trunk/plugins/console/console-portal-driver/pom.xml Wed Apr 23 10:59:20 2008
@@ -97,10 +97,11 @@
<targetPath>WEB-INF</targetPath>
</resource>
<resource>
- <directory>${pom.basedir}</directory>
+ <directory>${project.build.outputDirectory}/META-INF</directory>
<includes>
- <include>LICENSE.txt</include>
- <include>NOTICE.txt</include>
+ <include>LICENSE</include>
+ <include>NOTICE</include>
+ <include>DEPENDENCIES</include>
</includes>
<targetPath>META-INF</targetPath>
</resource>
Modified: geronimo/server/trunk/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/pom.xml?rev=650968&r1=650967&r2=650968&view=diff
==============================================================================
--- geronimo/server/trunk/pom.xml (original)
+++ geronimo/server/trunk/pom.xml Wed Apr 23 10:59:20 2008
@@ -2197,6 +2197,12 @@
</execution>
</executions>
</plugin>
+
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>ianal-maven-plugin</artifactId>
+ <version>1.0-alpha-1-SNAPSHOT</version>
+ </plugin>
</plugins>
</pluginManagement>
@@ -2229,11 +2235,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-remote-resources-plugin</artifactId>
- </plugin>
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<source>1.5</source>
@@ -2250,13 +2251,26 @@
<linkModules>true</linkModules>
</configuration>
</plugin>
-
+
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-release-plugin</artifactId>
- <configuration>
- <tagBase>https://svn.apache.org/repos/asf/geronimo/server/tags</tagBase>
- </configuration>
+ <artifactId>maven-remote-resources-plugin</artifactId>
+ </plugin>
+
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>ianal-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <goals>
+ <goal>verify-legal-files</goal>
+ </goals>
+ <configuration>
+ <!-- Fail the build if any artifacts are missing legal files -->
+ <strict>true</strict>
+ </configuration>
+ </execution>
+ </executions>
</plugin>
</plugins>
</build>
Modified: geronimo/server/trunk/testsupport/test-deployment-j2ee_1.3/test-rar-j2ee_1.3/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsupport/test-deployment-j2ee_1.3/test-rar-j2ee_1.3/pom.xml?rev=650968&r1=650967&r2=650968&view=diff
==============================================================================
--- geronimo/server/trunk/testsupport/test-deployment-j2ee_1.3/test-rar-j2ee_1.3/pom.xml (original)
+++ geronimo/server/trunk/testsupport/test-deployment-j2ee_1.3/test-rar-j2ee_1.3/pom.xml Wed Apr 23 10:59:20 2008
@@ -45,5 +45,47 @@
<scope>provided</scope>
</dependency>
</dependencies>
+
+ <!--
+ HACK: The maven-rar-plugin (v2.2 at least) does not work well with the maven-remote-resources-plugin
+ so we use this hack to get our generated legal files installed.
+ -->
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <executions>
+ <execution>
+ <phase>compile</phase>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ <configuration>
+ <tasks>
+ <copy todir="${project.build.outputDirectory}">
+ <fileset dir="${project.basedir}/src/main/rar">
+ <include name="**"/>
+ </fileset>
+ </copy>
+ </tasks>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-rar-plugin</artifactId>
+ <configuration>
+ <archive>
+ <addMavenDescriptor>false</addMavenDescriptor>
+ </archive>
+ <rarSourceDirectory>${project.build.outputDirectory}</rarSourceDirectory>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
</project>
Modified: geronimo/server/trunk/testsupport/test-deployment-j2ee_1.4/test-rar-j2ee_1.4/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsupport/test-deployment-j2ee_1.4/test-rar-j2ee_1.4/pom.xml?rev=650968&r1=650967&r2=650968&view=diff
==============================================================================
--- geronimo/server/trunk/testsupport/test-deployment-j2ee_1.4/test-rar-j2ee_1.4/pom.xml (original)
+++ geronimo/server/trunk/testsupport/test-deployment-j2ee_1.4/test-rar-j2ee_1.4/pom.xml Wed Apr 23 10:59:20 2008
@@ -45,5 +45,47 @@
<scope>provided</scope>
</dependency>
</dependencies>
+
+ <!--
+ HACK: The maven-rar-plugin (v2.2 at least) does not work well with the maven-remote-resources-plugin
+ so we use this hack to get our generated legal files installed.
+ -->
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <executions>
+ <execution>
+ <phase>compile</phase>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ <configuration>
+ <tasks>
+ <copy todir="${project.build.outputDirectory}">
+ <fileset dir="${project.basedir}/src/main/rar">
+ <include name="**"/>
+ </fileset>
+ </copy>
+ </tasks>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-rar-plugin</artifactId>
+ <configuration>
+ <archive>
+ <addMavenDescriptor>false</addMavenDescriptor>
+ </archive>
+ <rarSourceDirectory>${project.build.outputDirectory}</rarSourceDirectory>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
</project>
Modified: geronimo/server/trunk/testsupport/test-deployment-javaee_5/test-rar-javaee_5/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsupport/test-deployment-javaee_5/test-rar-javaee_5/pom.xml?rev=650968&r1=650967&r2=650968&view=diff
==============================================================================
--- geronimo/server/trunk/testsupport/test-deployment-javaee_5/test-rar-javaee_5/pom.xml (original)
+++ geronimo/server/trunk/testsupport/test-deployment-javaee_5/test-rar-javaee_5/pom.xml Wed Apr 23 10:59:20 2008
@@ -45,5 +45,47 @@
<scope>provided</scope>
</dependency>
</dependencies>
+
+ <!--
+ HACK: The maven-rar-plugin (v2.2 at least) does not work well with the maven-remote-resources-plugin
+ so we use this hack to get our generated legal files installed.
+ -->
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <executions>
+ <execution>
+ <phase>compile</phase>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ <configuration>
+ <tasks>
+ <copy todir="${project.build.outputDirectory}">
+ <fileset dir="${project.basedir}/src/main/rar">
+ <include name="**"/>
+ </fileset>
+ </copy>
+ </tasks>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-rar-plugin</artifactId>
+ <configuration>
+ <archive>
+ <addMavenDescriptor>false</addMavenDescriptor>
+ </archive>
+ <rarSourceDirectory>${project.build.outputDirectory}</rarSourceDirectory>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
</project>