Author: rmannibucau
Date: Tue May 29 20:56:58 2012
New Revision: 1343979
URL: http://svn.apache.org/viewvc?rev=1343979&view=rev
Log:
some typos in licence names
Added:
openejb/trunk/javaee-api/src/main/resources/META-INF/LICENSE-all
- copied unchanged from r1343962,
openejb/trunk/javaee-api/src/main/resources/META-INF/LICENCE-all
openejb/trunk/javaee-api/src/main/resources/META-INF/LICENSE-tomcat
- copied unchanged from r1343962,
openejb/trunk/javaee-api/src/main/resources/META-INF/LICENCE-tomcat
Removed:
openejb/trunk/javaee-api/src/main/resources/META-INF/LICENCE-all
openejb/trunk/javaee-api/src/main/resources/META-INF/LICENCE-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=1343979&r1=1343978&r2=1343979&view=diff
==============================================================================
--- openejb/trunk/javaee-api/pom.xml (original)
+++ openejb/trunk/javaee-api/pom.xml Tue May 29 20:56:58 2012
@@ -112,8 +112,8 @@
</manifestEntries>
</transformer>
<transformer
implementation="org.apache.maven.plugins.shade.resource.IncludeResourceTransformer">
- <resource>META-INF/LICENCE-tomcat</resource>
- <file>META-INF/LICENCE</file>
+ <resource>META-INF/LICENSE</resource>
+
<file>${project.basedir}/src/main/resources/META-INF/LICENSE-tomcat</file>
</transformer>
</transformers>
<filters>
@@ -129,7 +129,7 @@
<filter>
<artifact>*:*</artifact>
<excludes>
- <exclude>META-INF/LICENCE-*</exclude>
+ <exclude>META-INF/LICENSE*</exclude>
<exclude>META-INF/README.txt</exclude>
</excludes>
</filter>
@@ -162,8 +162,8 @@
</manifestEntries>
</transformer>
<transformer
implementation="org.apache.maven.plugins.shade.resource.IncludeResourceTransformer">
- <resource>META-INF/LICENCE-all</resource>
- <file>META-INF/LICENCE</file>
+ <resource>META-INF/LICENSE</resource>
+
<file>${project.basedir}/src/main/resources/META-INF/LICENSE-all</file>
</transformer>
</transformers>
<filters>
@@ -179,7 +179,7 @@
<filter>
<artifact>*:*</artifact>
<excludes>
- <exclude>META-INF/LICENCE*</exclude>
+ <exclude>META-INF/LICENSE*</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=1343979&r1=1343978&r2=1343979&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
20:56:58 2012
@@ -37,9 +37,9 @@
</fileSets>
<files>
<file>
- <source>${basedir}/src/main/resources/META-INF/LICENCE-all</source>
+ <source>${basedir}/src/main/resources/META-INF/LICENSE-all</source>
<outputDirectory>/</outputDirectory>
- <destName>LICENCE</destName>
+ <destName>LICENSE</destName>
</file>
</files>
<dependencySets>
