Author: rmannibucau
Date: Wed May 30 07:09:03 2012
New Revision: 1344119
URL: http://svn.apache.org/viewvc?rev=1344119&view=rev
Log:
ensure there is only one license and notice file and preparing for next staging
repo
Added:
openejb/trunk/javaee-api/src/main/legal/
openejb/trunk/javaee-api/src/main/legal/META-INF/
openejb/trunk/javaee-api/src/main/legal/META-INF/all/
- copied from r1344118,
openejb/trunk/javaee-api/src/main/resources/META-INF/all/
openejb/trunk/javaee-api/src/main/legal/META-INF/tomcat/
- copied from r1344118,
openejb/trunk/javaee-api/src/main/resources/META-INF/tomcat/
Removed:
openejb/trunk/javaee-api/src/main/resources/META-INF/all/
openejb/trunk/javaee-api/src/main/resources/META-INF/tomcat/
Modified:
openejb/trunk/javaee-api/pom.xml
openejb/trunk/javaee-api/src/main/assembly/javaee-api-libs.xml
Modified: openejb/trunk/javaee-api/pom.xml
URL:
http://svn.apache.org/viewvc/openejb/trunk/javaee-api/pom.xml?rev=1344119&r1=1344118&r2=1344119&view=diff
==============================================================================
--- openejb/trunk/javaee-api/pom.xml (original)
+++ openejb/trunk/javaee-api/pom.xml Wed May 30 07:09:03 2012
@@ -29,7 +29,7 @@
<artifactId>javaee-api</artifactId>
<packaging>jar</packaging>
<name>OpenEJB :: JavaEE Full API (zip and jar files)</name>
- <version>6.0-5-SNAPSHOT</version>
+ <version>6.0-4-SNAPSHOT</version>
<scm>
<connection>scm:svn:http://svn.apache.org/repos/asf/openejb/trunk/javaee-api</connection>
@@ -111,19 +111,13 @@
<Bundle-Activator>org.apache.openejb.javaee.api.activator.MultiActivator</Bundle-Activator>
</manifestEntries>
</transformer>
- <transformer
implementation="org.apache.maven.plugins.shade.resource.DontIncludeResourceTransformer">
- <resource>META-INF/all/*</resource>
- </transformer>
- <transformer
implementation="org.apache.maven.plugins.shade.resource.DontIncludeResourceTransformer">
- <resource>META-INF/tomcat/*</resource>
- </transformer>
<transformer
implementation="org.apache.maven.plugins.shade.resource.IncludeResourceTransformer">
<resource>META-INF/LICENSE</resource>
-
<file>${project.basedir}/src/main/resources/META-INF/tomcat/LICENSE</file>
+
<file>${project.basedir}/src/main/legal/META-INF/tomcat/LICENSE</file>
</transformer>
<transformer
implementation="org.apache.maven.plugins.shade.resource.IncludeResourceTransformer">
<resource>META-INF/NOTICE</resource>
-
<file>${project.basedir}/src/main/resources/META-INF/tomcat/NOTICE</file>
+
<file>${project.basedir}/src/main/legal/META-INF/tomcat/NOTICE</file>
</transformer>
</transformers>
<filters>
@@ -174,19 +168,13 @@
<Bundle-Activator>org.apache.openejb.javaee.api.activator.MultiActivator</Bundle-Activator>
</manifestEntries>
</transformer>
- <transformer
implementation="org.apache.maven.plugins.shade.resource.DontIncludeResourceTransformer">
- <resource>META-INF/all/*</resource>
- </transformer>
- <transformer
implementation="org.apache.maven.plugins.shade.resource.DontIncludeResourceTransformer">
- <resource>META-INF/tomcat/*</resource>
- </transformer>
<transformer
implementation="org.apache.maven.plugins.shade.resource.IncludeResourceTransformer">
<resource>META-INF/LICENSE</resource>
-
<file>${project.basedir}/src/main/resources/META-INF/all/LICENSE</file>
+
<file>${project.basedir}/src/main/legal/META-INF/all/LICENSE</file>
</transformer>
<transformer
implementation="org.apache.maven.plugins.shade.resource.IncludeResourceTransformer">
<resource>META-INF/NOTICE</resource>
-
<file>${project.basedir}/src/main/resources/META-INF/all/NOTICE</file>
+
<file>${project.basedir}/src/main/legal/META-INF/all/NOTICE</file>
</transformer>
<transformer
implementation="org.apache.maven.plugins.shade.resource.ApacheLicenseResourceTransformer">
</transformer>
@@ -205,6 +193,8 @@
<filter>
<artifact>*:*</artifact>
<excludes>
+ <exclude>META-INF/all/*</exclude>
+ <exclude>META-INF/tomcat/*</exclude>
<exclude>META-INF/LICENSE</exclude>
<exclude>META-INF/NOTICE</exclude>
<exclude>META-INF/README.txt</exclude>
Modified: openejb/trunk/javaee-api/src/main/assembly/javaee-api-libs.xml
URL:
http://svn.apache.org/viewvc/openejb/trunk/javaee-api/src/main/assembly/javaee-api-libs.xml?rev=1344119&r1=1344118&r2=1344119&view=diff
==============================================================================
--- openejb/trunk/javaee-api/src/main/assembly/javaee-api-libs.xml (original)
+++ openejb/trunk/javaee-api/src/main/assembly/javaee-api-libs.xml Wed May 30
07:09:03 2012
@@ -31,7 +31,6 @@
<outputDirectory>/</outputDirectory>
<includes>
<include>README.txt</include>
- <include>NOTICE</include>
</includes>
<excludes>
<exclude>all</exclude>
@@ -41,12 +40,12 @@
</fileSets>
<files>
<file>
- <source>${basedir}/src/main/resources/META-INF/all/LICENSE</source>
+ <source>${project.basedir}/src/main/legal/META-INF/all/LICENSE</source>
<outputDirectory>/</outputDirectory>
<destName>LICENSE</destName>
</file>
<file>
- <source>${basedir}/src/main/resources/META-INF/all/NOTICE</source>
+ <source>${project.basedir}/src/main/legal/META-INF/all/NOTICE</source>
<outputDirectory>/</outputDirectory>
<destName>NOTICE</destName>
</file>
