Author: rmannibucau
Date: Tue May 29 21:25:19 2012
New Revision: 1343999
URL: http://svn.apache.org/viewvc?rev=1343999&view=rev
Log:
back to 6.0-4-SNAPSHOT and updating NOTICE file
Added:
openejb/trunk/javaee-api/src/main/resources/META-INF/all/
openejb/trunk/javaee-api/src/main/resources/META-INF/all/LICENSE
- copied unchanged from r1343991,
openejb/tags/javaee-api-6.0-4/src/main/resources/META-INF/LICENSE-all
openejb/trunk/javaee-api/src/main/resources/META-INF/all/NOTICE
openejb/trunk/javaee-api/src/main/resources/META-INF/tomcat/
openejb/trunk/javaee-api/src/main/resources/META-INF/tomcat/LICENSE
- copied unchanged from r1343991,
openejb/tags/javaee-api-6.0-4/src/main/resources/META-INF/LICENSE-tomcat
openejb/trunk/javaee-api/src/main/resources/META-INF/tomcat/NOTICE
- copied unchanged from r1343991,
openejb/tags/javaee-api-6.0-4/src/main/resources/META-INF/NOTICE
Removed:
openejb/trunk/javaee-api/src/main/resources/META-INF/LICENSE-all
openejb/trunk/javaee-api/src/main/resources/META-INF/LICENSE-tomcat
openejb/trunk/javaee-api/src/main/resources/META-INF/NOTICE
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=1343999&r1=1343998&r2=1343999&view=diff
==============================================================================
--- openejb/trunk/javaee-api/pom.xml (original)
+++ openejb/trunk/javaee-api/pom.xml Tue May 29 21:25:19 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>
@@ -112,11 +112,18 @@
</manifestEntries>
</transformer>
<transformer
implementation="org.apache.maven.plugins.shade.resource.DontIncludeResourceTransformer">
- <resource>META-INF/LICENSE</resource>
+ <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/LICENSE-tomcat</file>
+
<file>${project.basedir}/src/main/resources/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>
</transformer>
</transformers>
<filters>
@@ -124,7 +131,7 @@
<artifact>org.apache.geronimo.specs:*</artifact>
<excludes>
<exclude>META-INF/*.txt</exclude>
- <exclude>META-INF/LICENCE</exclude>
+ <exclude>META-INF/LICENSE</exclude>
<exclude>javax/xml/bind/ContextFinder.class</exclude>
<exclude>javax/ws/rs/core/UriBuilder.class</exclude>
</excludes>
@@ -132,7 +139,10 @@
<filter>
<artifact>*:*</artifact>
<excludes>
- <exclude>META-INF/LICENSE*</exclude>
+ <exclude>META-INF/LICENSE</exclude>
+ <exclude>META-INF/NOTICE</exclude>
+ <exclude>META-INF/all/*</exclude>
+ <exclude>META-INF/plus/*</exclude>
<exclude>META-INF/README.txt</exclude>
</excludes>
</filter>
@@ -165,11 +175,18 @@
</manifestEntries>
</transformer>
<transformer
implementation="org.apache.maven.plugins.shade.resource.DontIncludeResourceTransformer">
- <resource>META-INF/LICENSE</resource>
+ <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/LICENSE-all</file>
+
<file>${project.basedir}/src/main/resources/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>
</transformer>
</transformers>
<filters>
@@ -177,7 +194,8 @@
<artifact>org.apache.geronimo.specs:*</artifact>
<excludes>
<exclude>META-INF/*.txt</exclude>
- <exclude>META-INF/LICENCE*</exclude>
+ <exclude>META-INF/LICENSE</exclude>
+ <exclude>META-INF/NOTICE</exclude>
<exclude>javax/xml/bind/ContextFinder.class</exclude>
<exclude>javax/ws/rs/core/UriBuilder.class</exclude>
</excludes>
@@ -185,7 +203,8 @@
<filter>
<artifact>*:*</artifact>
<excludes>
- <exclude>META-INF/LICENSE*</exclude>
+ <exclude>META-INF/LICENSE</exclude>
+ <exclude>META-INF/NOTICE</exclude>
<exclude>META-INF/README.txt</exclude>
</excludes>
</filter>
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=1343999&r1=1343998&r2=1343999&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 Tue May 29
21:25:19 2012
@@ -33,14 +33,23 @@
<include>README.txt</include>
<include>NOTICE</include>
</includes>
+ <excludes>
+ <exclude>all</exclude>
+ <exclude>plus</exclude>
+ </excludes>
</fileSet>
</fileSets>
<files>
<file>
- <source>${basedir}/src/main/resources/META-INF/LICENSE-all</source>
+ <source>${basedir}/src/main/resources/META-INF/all/LICENSE</source>
<outputDirectory>/</outputDirectory>
<destName>LICENSE</destName>
</file>
+ <file>
+ <source>${basedir}/src/main/resources/META-INF/all/NOTICE</source>
+ <outputDirectory>/</outputDirectory>
+ <destName>NOTICE</destName>
+ </file>
</files>
<dependencySets>
<dependencySet>
Added: openejb/trunk/javaee-api/src/main/resources/META-INF/all/NOTICE
URL:
http://svn.apache.org/viewvc/openejb/trunk/javaee-api/src/main/resources/META-INF/all/NOTICE?rev=1343999&view=auto
==============================================================================
--- openejb/trunk/javaee-api/src/main/resources/META-INF/all/NOTICE (added)
+++ openejb/trunk/javaee-api/src/main/resources/META-INF/all/NOTICE Tue May 29
21:25:19 2012
@@ -0,0 +1,15 @@
+
+OpenEJB :: JavaEE Full API (zip and jar files)
+Copyright 2011 The Apache Software Foundation
+
+This product includes software developed at
+The Apache Software Foundation (http://www.apache.org/).
+
+This product includes software developed by
+The W3C Consortium (http://www.w3.org/).
+
+Copyright (c) 1994-2002 World Wide Web Consortium,
+(Massachusetts Institute of Technology, Institut National
+de Recherche en Informatique et en Automatique, Keio
+University). All Rights Reserved.
+http://www.w3.org/Consortium/Legal/
