Author: radu
Date: Thu Aug 25 15:27:55 2016
New Revision: 1757708
URL: http://svn.apache.org/viewvc?rev=1757708&view=rev
Log:
SLING-6010 - Correctly include LICENSE and NOTICE files in both source and
binary jars
Added:
sling/trunk/bundles/extensions/xss/src/main/appended-resources/
sling/trunk/bundles/extensions/xss/src/main/appended-resources/META-INF/
sling/trunk/bundles/extensions/xss/src/main/appended-resources/META-INF/LICENSE
sling/trunk/bundles/extensions/xss/src/main/appended-resources/META-INF/NOTICE
- copied, changed from r1757681, sling/trunk/bundles/extensions/xss/NOTICE
Removed:
sling/trunk/bundles/extensions/xss/LICENSE
sling/trunk/bundles/extensions/xss/NOTICE
Modified:
sling/trunk/bundles/extensions/xss/pom.xml
Modified: sling/trunk/bundles/extensions/xss/pom.xml
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/xss/pom.xml?rev=1757708&r1=1757707&r2=1757708&view=diff
==============================================================================
--- sling/trunk/bundles/extensions/xss/pom.xml (original)
+++ sling/trunk/bundles/extensions/xss/pom.xml Thu Aug 25 15:27:55 2016
@@ -116,9 +116,6 @@
<Sling-Initial-Content>
SLING-INF/content;path:=/libs/sling/xss;overwrite:=true;ignoreImportProviders:=xml
</Sling-Initial-Content>
- <Include-Resource>
- META-INF/LICENSE=LICENSE,META-INF/NOTICE=NOTICE
- </Include-Resource>
</instructions>
</configuration>
</plugin>
Added:
sling/trunk/bundles/extensions/xss/src/main/appended-resources/META-INF/LICENSE
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/xss/src/main/appended-resources/META-INF/LICENSE?rev=1757708&view=auto
==============================================================================
---
sling/trunk/bundles/extensions/xss/src/main/appended-resources/META-INF/LICENSE
(added)
+++
sling/trunk/bundles/extensions/xss/src/main/appended-resources/META-INF/LICENSE
Thu Aug 25 15:27:55 2016
@@ -0,0 +1,115 @@
+
+
+The org.owasp.encoder:encoder dependency developed by OWASP and included in
this package is licensed under the following conditions:
+
+ Copyright (c) 2012 Jeff Ichnowski
+ All rights reserved.
+
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions
+ are met:
+
+ * Redistributions of source code must retain the above
+ copyright notice, this list of conditions and the following
+ disclaimer.
+
+ * 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.
+
+ * Neither the name of the OWASP 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 HOLDER 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.
+
+The org.owasp.esapi:esapi dependency (together with its EASPI.properties and
validation.properties configuration files) developed by OWASP
+and included in this package is licensed under the following conditions:
+
+ The BSD License
+
+ Copyright (c) 2007, The OWASP Foundation
+ All rights reserved.
+
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions
+ are met:
+
+ * Redistributions of source code must retain the above
+ copyright notice, this list of conditions and the following
+ disclaimer.
+
+ * 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.
+
+ * Neither the name of the OWASP 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 HOLDER 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.
+
+The org.owasp.antisamy:antisamy dependency developed by OWASP and included in
this package is licensed under the following conditions:
+
+ The BSD License
+
+ Copyright (c) 2007-2011, Arshan Dabirsiaghi, Jason Li
+ All rights reserved.
+
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions
+ are met:
+
+ * Redistributions of source code must retain the above
+ copyright notice, this list of conditions and the following
+ disclaimer.
+
+ * 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.
+
+ * Neither the name of the OWASP 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 HOLDER 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.
+
Copied:
sling/trunk/bundles/extensions/xss/src/main/appended-resources/META-INF/NOTICE
(from r1757681, sling/trunk/bundles/extensions/xss/NOTICE)
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/xss/src/main/appended-resources/META-INF/NOTICE?p2=sling/trunk/bundles/extensions/xss/src/main/appended-resources/META-INF/NOTICE&p1=sling/trunk/bundles/extensions/xss/NOTICE&r1=1757681&r2=1757708&rev=1757708&view=diff
==============================================================================
--- sling/trunk/bundles/extensions/xss/NOTICE (original)
+++
sling/trunk/bundles/extensions/xss/src/main/appended-resources/META-INF/NOTICE
Thu Aug 25 15:27:55 2016
@@ -1,11 +1,5 @@
-Apache Sling XSS Bundle
-Copyright 2014 The Apache Software Foundation
-
The Apache Sling XSS Bundle is based on source code originally developed
by Adobe Systems Inc. (http://www.adobe.com/).
-This product includes software developed at
-The Apache Software Foundation (http://www.apache.org/).
-
This product includes software developed by the
The Open Web Application Security Project (https://www.owasp.org/).
