Author: apetrelli
Date: Fri Jan 11 12:16:43 2008
New Revision: 611289
URL: http://svn.apache.org/viewvc?rev=611289&view=rev
Log:
WW-2379
Removed the dependencies from the jdk14 assembly.
Re-added the license of Retrotranslator.
Added:
struts/struts2/trunk/assembly/src/main/resources/RETROTRANSLATOR-LICENSE.txt
(with props)
Modified:
struts/struts2/trunk/assembly/src/main/assembly/lib-jdk14.xml
Modified: struts/struts2/trunk/assembly/src/main/assembly/lib-jdk14.xml
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/assembly/src/main/assembly/lib-jdk14.xml?rev=611289&r1=611288&r2=611289&view=diff
==============================================================================
--- struts/struts2/trunk/assembly/src/main/assembly/lib-jdk14.xml (original)
+++ struts/struts2/trunk/assembly/src/main/assembly/lib-jdk14.xml Fri Jan 11
12:16:43 2008
@@ -27,31 +27,28 @@
<dependencySet useTransitiveFiltering="true">
<outputDirectory>jdk14</outputDirectory>
<outputFileNameMapping>${artifactId}-${version}.${extension}</outputFileNameMapping>
- <excludes>
- <exclude>com.opensymphony:xwork:jar:default</exclude>
- <exclude>org.apache.struts:*:jar</exclude>
- </excludes>
+ <includes>
+ <include>net.sf.retrotranslator:retrotranslator-runtime</include>
+ <include>backport-util-concurrent:backport-util-concurrent</include>
+ </includes>
</dependencySet>
<dependencySet useTransitiveFiltering="true">
<outputDirectory>jdk14</outputDirectory>
<outputFileNameMapping>${artifactId}-${version}-jdk14.${extension}</outputFileNameMapping>
<includes>
- <include>*:jdk14</include>
+ <include>org.apache.struts:*:jar:jdk14</include>
</includes>
</dependencySet>
</dependencySets>
<fileSets>
<fileSet>
- <directory>../jdk14</directory>
- <outputDirectory>jdk14</outputDirectory>
+ <directory>src/main/resources</directory>
+ <outputDirectory></outputDirectory>
<includes>
<include>README*</include>
<include>*LICENSE*</include>
<include>NOTICE*</include>
</includes>
- <excludes>
- <exclude>ASM-*</exclude>
- </excludes>
</fileSet>
</fileSets>
</assembly>
Added:
struts/struts2/trunk/assembly/src/main/resources/RETROTRANSLATOR-LICENSE.txt
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/assembly/src/main/resources/RETROTRANSLATOR-LICENSE.txt?rev=611289&view=auto
==============================================================================
---
struts/struts2/trunk/assembly/src/main/resources/RETROTRANSLATOR-LICENSE.txt
(added)
+++
struts/struts2/trunk/assembly/src/main/resources/RETROTRANSLATOR-LICENSE.txt
Fri Jan 11 12:16:43 2008
@@ -0,0 +1,29 @@
+ Retrotranslator: a Java bytecode transformer that translates Java classes
+ compiled with JDK 5.0 into classes that can be run on JVM 1.4.
+
+ Copyright (c) 2005, 2006 Taras Puchko
+ All rights reserved.
+
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions
+ are met:
+ 1. Redistributions of source code must retain the above copyright
+ notice, this list of conditions and the following disclaimer.
+ 2. Redistributions in binary form must reproduce the above copyright
+ notice, this list of conditions and the following disclaimer in the
+ documentation and/or other materials provided with the distribution.
+ 3. Neither the name of the copyright holders nor the names of its
+ contributors may be used to endorse or promote products derived from
+ this software without specific prior written permission.
+
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ THE POSSIBILITY OF SUCH DAMAGE.
Propchange:
struts/struts2/trunk/assembly/src/main/resources/RETROTRANSLATOR-LICENSE.txt
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
struts/struts2/trunk/assembly/src/main/resources/RETROTRANSLATOR-LICENSE.txt
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
