Author: trustin
Date: Sun Sep 30 08:41:09 2007
New Revision: 580740
URL: http://svn.apache.org/viewvc?rev=580740&view=rev
Log:
Resolved issue: DIRMINA-446 (Find a way to copy license files in the root
directory into META-INF directories automatically)
* Used maven-antrun-plugin to copy all license files
* Removed unnecessary META-INF directories
Removed:
mina/trunk/core/src/main/resources/META-INF/
mina/trunk/example/src/main/resources/META-INF/
mina/trunk/filter-codec-netty/src/main/resources/META-INF/
mina/trunk/filter-compression/src/main/resources/META-INF/
mina/trunk/integration-jmx/src/main/resources/META-INF/
mina/trunk/integration-spring/src/main/resources/META-INF/
Modified:
mina/trunk/core/pom.xml
mina/trunk/filter-codec-http/pom.xml
mina/trunk/filter-codec-netty/pom.xml
mina/trunk/filter-compression/pom.xml
mina/trunk/integration-jmx/pom.xml
mina/trunk/integration-spring/pom.xml
mina/trunk/pom.xml
mina/trunk/protocol-http-client/pom.xml
mina/trunk/transport-apr/pom.xml
mina/trunk/transport-serial/pom.xml
Modified: mina/trunk/core/pom.xml
URL:
http://svn.apache.org/viewvc/mina/trunk/core/pom.xml?rev=580740&r1=580739&r2=580740&view=diff
==============================================================================
--- mina/trunk/core/pom.xml (original)
+++ mina/trunk/core/pom.xml Sun Sep 30 08:41:09 2007
@@ -8,7 +8,7 @@
</parent>
<artifactId>mina-core</artifactId>
<name>Apache MINA Core</name>
- <packaging>bundle</packaging>
+ <packaging>jar</packaging>
<dependencies>
</dependencies>
Modified: mina/trunk/filter-codec-http/pom.xml
URL:
http://svn.apache.org/viewvc/mina/trunk/filter-codec-http/pom.xml?rev=580740&r1=580739&r2=580740&view=diff
==============================================================================
--- mina/trunk/filter-codec-http/pom.xml (original)
+++ mina/trunk/filter-codec-http/pom.xml Sun Sep 30 08:41:09 2007
@@ -8,7 +8,7 @@
<modelVersion>4.0.0</modelVersion>
<artifactId>mina-filter-codec-http</artifactId>
<name>Apache MINA HTTP Codec</name>
- <packaging>bundle</packaging>
+ <packaging>jar</packaging>
<dependencies>
<dependency>
<groupId>org.apache.mina</groupId>
Modified: mina/trunk/filter-codec-netty/pom.xml
URL:
http://svn.apache.org/viewvc/mina/trunk/filter-codec-netty/pom.xml?rev=580740&r1=580739&r2=580740&view=diff
==============================================================================
--- mina/trunk/filter-codec-netty/pom.xml (original)
+++ mina/trunk/filter-codec-netty/pom.xml Sun Sep 30 08:41:09 2007
@@ -8,7 +8,7 @@
</parent>
<artifactId>mina-filter-codec-netty</artifactId>
<name>Apache MINA Netty Codec</name>
- <packaging>bundle</packaging>
+ <packaging>jar</packaging>
<dependencies>
<dependency>
Modified: mina/trunk/filter-compression/pom.xml
URL:
http://svn.apache.org/viewvc/mina/trunk/filter-compression/pom.xml?rev=580740&r1=580739&r2=580740&view=diff
==============================================================================
--- mina/trunk/filter-compression/pom.xml (original)
+++ mina/trunk/filter-compression/pom.xml Sun Sep 30 08:41:09 2007
@@ -8,7 +8,7 @@
</parent>
<artifactId>mina-filter-compression</artifactId>
<name>Apache MINA Compression Filter</name>
- <packaging>bundle</packaging>
+ <packaging>jar</packaging>
<dependencies>
<dependency>
Modified: mina/trunk/integration-jmx/pom.xml
URL:
http://svn.apache.org/viewvc/mina/trunk/integration-jmx/pom.xml?rev=580740&r1=580739&r2=580740&view=diff
==============================================================================
--- mina/trunk/integration-jmx/pom.xml (original)
+++ mina/trunk/integration-jmx/pom.xml Sun Sep 30 08:41:09 2007
@@ -8,7 +8,7 @@
</parent>
<artifactId>mina-integration-jmx</artifactId>
<name>Apache MINA JMX Integration</name>
- <packaging>bundle</packaging>
+ <packaging>jar</packaging>
<dependencies>
<dependency>
<groupId>org.apache.mina</groupId>
Modified: mina/trunk/integration-spring/pom.xml
URL:
http://svn.apache.org/viewvc/mina/trunk/integration-spring/pom.xml?rev=580740&r1=580739&r2=580740&view=diff
==============================================================================
--- mina/trunk/integration-spring/pom.xml (original)
+++ mina/trunk/integration-spring/pom.xml Sun Sep 30 08:41:09 2007
@@ -8,7 +8,7 @@
</parent>
<artifactId>mina-integration-spring</artifactId>
<name>Apache MINA Spring Integration</name>
- <packaging>bundle</packaging>
+ <packaging>jar</packaging>
<dependencies>
<dependency>
<groupId>org.apache.mina</groupId>
Modified: mina/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/mina/trunk/pom.xml?rev=580740&r1=580739&r2=580740&view=diff
==============================================================================
--- mina/trunk/pom.xml (original)
+++ mina/trunk/pom.xml Sun Sep 30 08:41:09 2007
@@ -314,6 +314,7 @@
</tagBase>
</configuration>
</plugin>
+ <!--
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
@@ -325,6 +326,48 @@
<Export-Package>org.apache.mina.*</Export-Package>
</instructions>
</configuration>
+ </plugin>
+ -->
+ <plugin>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>add-license</id>
+ <phase>package</phase>
+ <configuration>
+ <tasks>
+ <taskdef resource="net/sf/antcontrib/antlib.xml"/>
+ <if>
+ <equals arg1="${project.packaging}" arg2="jar"/>
+ <then>
+ <jar
destfile="${project.build.directory}/${project.build.finalName}.jar"
update="yes">
+ <zipfileset dir="${basedir}/.." prefix="META-INF/">
+ <include name="LICENSE.*"/>
+ <include name="NOTICE.*"/>
+ </zipfileset>
+ </jar>
+ <jar
destfile="${project.build.directory}/${project.build.finalName}-sources.jar"
update="yes">
+ <zipfileset dir="${basedir}/.." prefix="META-INF/">
+ <include name="LICENSE.*"/>
+ <include name="NOTICE.*"/>
+ </zipfileset>
+ </jar>
+ </then>
+ </if>
+ </tasks>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ </executions>
+ <dependencies>
+ <dependency>
+ <groupId>ant-contrib</groupId>
+ <artifactId>ant-contrib</artifactId>
+ <version>1.0b2</version>
+ </dependency>
+ </dependencies>
</plugin>
</plugins>
</build>
Modified: mina/trunk/protocol-http-client/pom.xml
URL:
http://svn.apache.org/viewvc/mina/trunk/protocol-http-client/pom.xml?rev=580740&r1=580739&r2=580740&view=diff
==============================================================================
--- mina/trunk/protocol-http-client/pom.xml (original)
+++ mina/trunk/protocol-http-client/pom.xml Sun Sep 30 08:41:09 2007
@@ -25,7 +25,7 @@
<modelVersion>4.0.0</modelVersion>
<artifactId>mina-protocol-http-client</artifactId>
<name>Apache MINA HTTP Client</name>
- <packaging>bundle</packaging>
+ <packaging>jar</packaging>
<dependencies>
<dependency>
<groupId>org.apache.mina</groupId>
Modified: mina/trunk/transport-apr/pom.xml
URL:
http://svn.apache.org/viewvc/mina/trunk/transport-apr/pom.xml?rev=580740&r1=580739&r2=580740&view=diff
==============================================================================
--- mina/trunk/transport-apr/pom.xml (original)
+++ mina/trunk/transport-apr/pom.xml Sun Sep 30 08:41:09 2007
@@ -8,7 +8,7 @@
</parent>
<artifactId>mina-transport-apr</artifactId>
<name>Apache MINA APR Communication Support</name>
- <packaging>bundle</packaging>
+ <packaging>jar</packaging>
<dependencies>
<dependency>
<groupId>org.apache.mina</groupId>
Modified: mina/trunk/transport-serial/pom.xml
URL:
http://svn.apache.org/viewvc/mina/trunk/transport-serial/pom.xml?rev=580740&r1=580739&r2=580740&view=diff
==============================================================================
--- mina/trunk/transport-serial/pom.xml (original)
+++ mina/trunk/transport-serial/pom.xml Sun Sep 30 08:41:09 2007
@@ -8,7 +8,7 @@
</parent>
<artifactId>mina-transport-serial</artifactId>
<name>Apache MINA Serial Communication support</name>
- <packaging>bundle</packaging>
+ <packaging>jar</packaging>
<dependencies>
<dependency>
<groupId>org.apache.mina</groupId>
