Author: ieb
Date: Tue Nov 18 13:47:29 2008
New Revision: 718724
URL: http://svn.apache.org/viewvc?rev=718724&view=rev
Log:
SHINDIG-222
Added in the recomended poms and fixed all the jar and war artifacts to
contain the necessary legal files.
Modified:
incubator/shindig/trunk/features/pom.xml
incubator/shindig/trunk/java/common/pom.xml
incubator/shindig/trunk/java/gadgets/pom.xml
incubator/shindig/trunk/java/samples/pom.xml
incubator/shindig/trunk/java/server/pom.xml
incubator/shindig/trunk/java/social-api/pom.xml
incubator/shindig/trunk/pom.xml
Modified: incubator/shindig/trunk/features/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/features/pom.xml?rev=718724&r1=718723&r2=718724&view=diff
==============================================================================
--- incubator/shindig/trunk/features/pom.xml (original)
+++ incubator/shindig/trunk/features/pom.xml Tue Nov 18 13:47:29 2008
@@ -162,6 +162,15 @@
<exclude>target/**</exclude>
</excludes>
</resource>
+ <resource>
+ <targetPath>META-INF</targetPath>
+ <directory>${basedir}/../</directory>
+ <includes>
+ <include>NOTICE</include>
+ <include>LICENSE</include>
+ <include>DISCLAIMER</include>
+ </includes>
+ </resource>
</resources>
</build>
Modified: incubator/shindig/trunk/java/common/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/common/pom.xml?rev=718724&r1=718723&r2=718724&view=diff
==============================================================================
--- incubator/shindig/trunk/java/common/pom.xml (original)
+++ incubator/shindig/trunk/java/common/pom.xml Tue Nov 18 13:47:29 2008
@@ -57,6 +57,15 @@
<resource>
<directory>conf</directory>
</resource>
+ <resource>
+ <targetPath>META-INF</targetPath>
+ <directory>${basedir}/../../</directory>
+ <includes>
+ <include>NOTICE</include>
+ <include>LICENSE</include>
+ <include>DISCLAIMER</include>
+ </includes>
+ </resource>
</resources>
</build>
Modified: incubator/shindig/trunk/java/gadgets/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/pom.xml?rev=718724&r1=718723&r2=718724&view=diff
==============================================================================
--- incubator/shindig/trunk/java/gadgets/pom.xml (original)
+++ incubator/shindig/trunk/java/gadgets/pom.xml Tue Nov 18 13:47:29 2008
@@ -95,6 +95,15 @@
<include>oauth.json</include>
</includes>
</resource>
+ <resource>
+ <targetPath>META-INF</targetPath>
+ <directory>${basedir}/../../</directory>
+ <includes>
+ <include>NOTICE</include>
+ <include>LICENSE</include>
+ <include>DISCLAIMER</include>
+ </includes>
+ </resource>
</resources>
</build>
Modified: incubator/shindig/trunk/java/samples/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/samples/pom.xml?rev=718724&r1=718723&r2=718724&view=diff
==============================================================================
--- incubator/shindig/trunk/java/samples/pom.xml (original)
+++ incubator/shindig/trunk/java/samples/pom.xml Tue Nov 18 13:47:29 2008
@@ -45,8 +45,19 @@
<url>http://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/rt/eclipselink/maven.repo</url>
</repository>
</repositories>
-
-
+ <build>
+ <resources>
+ <resource>
+ <targetPath>META-INF</targetPath>
+ <directory>${basedir}/../../</directory>
+ <includes>
+ <include>NOTICE</include>
+ <include>LICENSE</include>
+ <include>DISCLAIMER</include>
+ </includes>
+ </resource>
+ </resources>
+ </build>
<dependencies>
<!-- project dependencies -->
<dependency>
Modified: incubator/shindig/trunk/java/server/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/server/pom.xml?rev=718724&r1=718723&r2=718724&view=diff
==============================================================================
--- incubator/shindig/trunk/java/server/pom.xml (original)
+++ incubator/shindig/trunk/java/server/pom.xml Tue Nov 18 13:47:29 2008
@@ -58,6 +58,15 @@
<include>**/*.*</include>
</includes>
</resource>
+ <resource>
+ <targetPath>META-INF</targetPath>
+ <directory>${basedir}/../../</directory>
+ <includes>
+ <include>NOTICE</include>
+ <include>LICENSE</include>
+ <include>DISCLAIMER</include>
+ </includes>
+ </resource>
</webResources>
</configuration>
</plugin>
@@ -96,6 +105,15 @@
<resource>
<directory>conf</directory>
</resource>
+ <resource>
+ <targetPath>META-INF</targetPath>
+ <directory>${basedir}/../../</directory>
+ <includes>
+ <include>NOTICE</include>
+ <include>LICENSE</include>
+ <include>DISCLAIMER</include>
+ </includes>
+ </resource>
</resources>
</build>
Modified: incubator/shindig/trunk/java/social-api/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/pom.xml?rev=718724&r1=718723&r2=718724&view=diff
==============================================================================
--- incubator/shindig/trunk/java/social-api/pom.xml (original)
+++ incubator/shindig/trunk/java/social-api/pom.xml Tue Nov 18 13:47:29 2008
@@ -51,6 +51,15 @@
<include>**/*.*</include>
</includes>
</resource>
+ <resource>
+ <targetPath>META-INF</targetPath>
+ <directory>${basedir}/../../</directory>
+ <includes>
+ <include>NOTICE</include>
+ <include>LICENSE</include>
+ <include>DISCLAIMER</include>
+ </includes>
+ </resource>
</resources>
</build>
Modified: incubator/shindig/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/pom.xml?rev=718724&r1=718723&r2=718724&view=diff
==============================================================================
--- incubator/shindig/trunk/pom.xml (original)
+++ incubator/shindig/trunk/pom.xml Tue Nov 18 13:47:29 2008
@@ -513,6 +513,23 @@
<plugins>
<plugin>
+ <groupId>org.apache.geronimo.genesis.plugins</groupId>
+ <artifactId>tools-maven-plugin</artifactId>
+ <version>1.4</version>
+ <executions>
+ <execution>
+ <id>verify-legal-files</id>
+ <phase>verify</phase>
+ <goals>
+ <goal>verify-legal-files</goal>
+ </goals>
+ <configuration>
+ <strict>true</strict>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-war-plugin</artifactId>
</plugin>
@@ -550,7 +567,7 @@
</execution>
</executions>
<configuration>
- <excludeResources>true</excludeResources>
+ <excludeResources>false</excludeResources>
<attach>true</attach>
</configuration>
</plugin>
@@ -630,6 +647,7 @@
</excludes>
</configuration>
</plugin>
+
</plugins>
<pluginManagement>
