You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by ro...@apache.org on 2017/11/07 10:26:18 UTC
[sling-org-apache-sling-xss] annotated tag
org.apache.sling.xss.compat-1.0.0 created (now c0983c2)
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a change to annotated tag org.apache.sling.xss.compat-1.0.0
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-xss.git.
at c0983c2 (tag)
tagging 8ea6e8568a34b01a95175e87d1c0f58a7869c68a (commit)
replaces org.apache.sling.xss-1.0.8
by Karl Pauls
on Mon May 1 21:27:41 2017 +0000
- Log -----------------------------------------------------------------
org.apache.sling.xss.compat-1.0.0
-----------------------------------------------------------------------
This annotated tag includes the following new commits:
new ce57411 SLING-4705 - Move the XSS Protection bundle from contrib to bundles
new a1132dc SLING-4525 - XSS protection path mangling issue
new 7a68e9d SLING-4557 - Add JSON and XML validation to the XSS Protection API
new 20f10ec Update svn:ignore
new a860112 SLING-4584 - Performance: XSSAPI.getValidHref should not be based on HTML filtering
new dc7f8be Update to Sling Parent 23
new 978acab Remove superflous sling.java.version=6 as it's the default now
new f889940 set parent version to 24 and add empty relativePath where missing
new 54e898d SLING-4403 - XSS Configuration should allow caption tags
new b9c2df5 SLING-4584 - Performance: XSSAPI.getValidHref should not be based on HTML filtering
new cb9c2a4 trivial: corrected JavaDoc for Java 1.8
new f9008d3 trivial: updated README
new b158317 [maven-release-plugin] prepare release org.apache.sling.xss-1.0.4
new 8db0e9d [maven-release-plugin] prepare for next development iteration
new ee2a195 SLING-5050 - Disable AntiSamy's default formatOutput policy directive
new d615480 Update the main reactor to parent 25
new e511cf5 [maven-release-plugin] prepare release org.apache.sling.xss-1.0.6
new 2ca29b7 [maven-release-plugin] prepare for next development iteration
new d490141 Switch to parent pom 26
new 58f95b8 SLING-5445 - XSSAPI#encodeForJSString is too restrictive
new 9ad75d5 [maven-release-plugin] prepare release org.apache.sling.xss-1.0.8
new e23ca68 [maven-release-plugin] copy for tag org.apache.sling.xss-1.0.8
new dedcf1f Add a xss.compat bundle based on the latest release of the xss bundle. This new bundle is intented to bridge the gap until all clients updated to the upcomming xss 2.0 api.
new d2c5d4d Switch to appended resources for LICENSE and NOTICE
new afaa1d9 Switch to appended resources for LICENSE and NOTICE
new a6bd132 [maven-release-plugin] prepare release org.apache.sling.xss.compat-1.0.0
new 8ea6e85 [maven-release-plugin] copy for tag org.apache.sling.xss.compat-1.0.0
The 27 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
--
To stop receiving notification emails like this one, please contact
['"commits@sling.apache.org" <co...@sling.apache.org>'].
[sling-org-apache-sling-xss] 03/05: Switch to appended resources
for LICENSE and NOTICE
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to annotated tag org.apache.sling.xss.compat-1.0.0
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-xss.git
commit afaa1d98c855f07c070f9e0f6e01822d99a692ef
Author: Karl Pauls <pa...@apache.org>
AuthorDate: Mon May 1 21:25:54 2017 +0000
Switch to appended resources for LICENSE and NOTICE
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/bundles/extensions/xss.compat@1793412 13f79535-47bb-0310-9956-ffa450edef68
---
src/main/appended-resources/META-INF/NOTICE | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/main/appended-resources/META-INF/NOTICE b/src/main/appended-resources/META-INF/NOTICE
index ae9de26..61fc74f 100644
--- a/src/main/appended-resources/META-INF/NOTICE
+++ b/src/main/appended-resources/META-INF/NOTICE
@@ -1,4 +1,4 @@
-The Apache Sling XSS Bundle is based on source code originally developed
+The Apache Sling XSS Compat Bundle is based on source code originally developed
by Adobe Systems Inc. (http://www.adobe.com/).
This product includes software developed by the
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-xss] 02/05: Switch to appended resources
for LICENSE and NOTICE
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to annotated tag org.apache.sling.xss.compat-1.0.0
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-xss.git
commit d2c5d4d8ea8f189074d57f84afb4965eb759422a
Author: Karl Pauls <pa...@apache.org>
AuthorDate: Mon May 1 21:25:19 2017 +0000
Switch to appended resources for LICENSE and NOTICE
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/bundles/extensions/xss.compat@1793411 13f79535-47bb-0310-9956-ffa450edef68
---
LICENSE | 290 ---------------------
src/main/appended-resources/META-INF/LICENSE | 115 ++++++++
.../main/appended-resources/META-INF/NOTICE | 6 -
3 files changed, 115 insertions(+), 296 deletions(-)
diff --git a/LICENSE b/LICENSE
deleted file mode 100644
index 1a2db72..0000000
--- a/LICENSE
+++ /dev/null
@@ -1,290 +0,0 @@
- Apache License
- Version 2.0, January 2004
- http://www.apache.org/licenses/
-
- TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
- 1. Definitions.
-
- "License" shall mean the terms and conditions for use, reproduction,
- and distribution as defined by Sections 1 through 9 of this document.
-
- "Licensor" shall mean the copyright owner or entity authorized by
- the copyright owner that is granting the License.
-
- "Legal Entity" shall mean the union of the acting entity and all
- other entities that control, are controlled by, or are under common
- control with that entity. For the purposes of this definition,
- "control" means (i) the power, direct or indirect, to cause the
- direction or management of such entity, whether by contract or
- otherwise, or (ii) ownership of fifty percent (50%) or more of the
- outstanding shares, or (iii) beneficial ownership of such entity.
-
- "You" (or "Your") shall mean an individual or Legal Entity
- exercising permissions granted by this License.
-
- "Source" form shall mean the preferred form for making modifications,
- including but not limited to software source code, documentation
- source, and configuration files.
-
- "Object" form shall mean any form resulting from mechanical
- transformation or translation of a Source form, including but
- not limited to compiled object code, generated documentation,
- and conversions to other media types.
-
- "Work" shall mean the work of authorship, whether in Source or
- Object form, made available under the License, as indicated by a
- copyright notice that is included in or attached to the work
- (an example is provided in the Appendix below).
-
- "Derivative Works" shall mean any work, whether in Source or Object
- form, that is based on (or derived from) the Work and for which the
- editorial revisions, annotations, elaborations, or other modifications
- represent, as a whole, an original work of authorship. For the purposes
- of this License, Derivative Works shall not include works that remain
- separable from, or merely link (or bind by name) to the interfaces of,
- the Work and Derivative Works thereof.
-
- "Contribution" shall mean any work of authorship, including
- the original version of the Work and any modifications or additions
- to that Work or Derivative Works thereof, that is intentionally
- submitted to Licensor for inclusion in the Work by the copyright owner
- or by an individual or Legal Entity authorized to submit on behalf of
- the copyright owner. For the purposes of this definition, "submitted"
- means any form of electronic, verbal, or written communication sent
- to the Licensor or its representatives, including but not limited to
- communication on electronic mailing lists, source code control systems,
- and issue tracking systems that are managed by, or on behalf of, the
- Licensor for the purpose of discussing and improving the Work, but
- excluding communication that is conspicuously marked or otherwise
- designated in writing by the copyright owner as "Not a Contribution."
-
- "Contributor" shall mean Licensor and any individual or Legal Entity
- on behalf of whom a Contribution has been received by Licensor and
- subsequently incorporated within the Work.
-
- 2. Grant of Copyright License. Subject to the terms and conditions of
- this License, each Contributor hereby grants to You a perpetual,
- worldwide, non-exclusive, no-charge, royalty-free, irrevocable
- copyright license to reproduce, prepare Derivative Works of,
- publicly display, publicly perform, sublicense, and distribute the
- Work and such Derivative Works in Source or Object form.
-
- 3. Grant of Patent License. Subject to the terms and conditions of
- this License, each Contributor hereby grants to You a perpetual,
- worldwide, non-exclusive, no-charge, royalty-free, irrevocable
- (except as stated in this section) patent license to make, have made,
- use, offer to sell, sell, import, and otherwise transfer the Work,
- where such license applies only to those patent claims licensable
- by such Contributor that are necessarily infringed by their
- Contribution(s) alone or by combination of their Contribution(s)
- with the Work to which such Contribution(s) was submitted. If You
- institute patent litigation against any entity (including a
- cross-claim or counterclaim in a lawsuit) alleging that the Work
- or a Contribution incorporated within the Work constitutes direct
- or contributory patent infringement, then any patent licenses
- granted to You under this License for that Work shall terminate
- as of the date such litigation is filed.
-
- 4. Redistribution. You may reproduce and distribute copies of the
- Work or Derivative Works thereof in any medium, with or without
- modifications, and in Source or Object form, provided that You
- meet the following conditions:
-
- (a) You must give any other recipients of the Work or
- Derivative Works a copy of this License; and
-
- (b) You must cause any modified files to carry prominent notices
- stating that You changed the files; and
-
- (c) You must retain, in the Source form of any Derivative Works
- that You distribute, all copyright, patent, trademark, and
- attribution notices from the Source form of the Work,
- excluding those notices that do not pertain to any part of
- the Derivative Works; and
-
- (d) If the Work includes a "NOTICE" text file as part of its
- distribution, then any Derivative Works that You distribute must
- include a readable copy of the attribution notices contained
- within such NOTICE file, excluding those notices that do not
- pertain to any part of the Derivative Works, in at least one
- of the following places: within a NOTICE text file distributed
- as part of the Derivative Works; within the Source form or
- documentation, if provided along with the Derivative Works; or,
- within a display generated by the Derivative Works, if and
- wherever such third-party notices normally appear. The contents
- of the NOTICE file are for informational purposes only and
- do not modify the License. You may add Your own attribution
- notices within Derivative Works that You distribute, alongside
- or as an addendum to the NOTICE text from the Work, provided
- that such additional attribution notices cannot be construed
- as modifying the License.
-
- You may add Your own copyright statement to Your modifications and
- may provide additional or different license terms and conditions
- for use, reproduction, or distribution of Your modifications, or
- for any such Derivative Works as a whole, provided Your use,
- reproduction, and distribution of the Work otherwise complies with
- the conditions stated in this License.
-
- 5. Submission of Contributions. Unless You explicitly state otherwise,
- any Contribution intentionally submitted for inclusion in the Work
- by You to the Licensor shall be under the terms and conditions of
- this License, without any additional terms or conditions.
- Notwithstanding the above, nothing herein shall supersede or modify
- the terms of any separate license agreement you may have executed
- with Licensor regarding such Contributions.
-
- 6. Trademarks. This License does not grant permission to use the trade
- names, trademarks, service marks, or product names of the Licensor,
- except as required for reasonable and customary use in describing the
- origin of the Work and reproducing the content of the NOTICE file.
-
- 7. Disclaimer of Warranty. Unless required by applicable law or
- agreed to in writing, Licensor provides the Work (and each
- Contributor provides its Contributions) on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
- implied, including, without limitation, any warranties or conditions
- of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
- PARTICULAR PURPOSE. You are solely responsible for determining the
- appropriateness of using or redistributing the Work and assume any
- risks associated with Your exercise of permissions under this License.
-
- 8. Limitation of Liability. In no event and under no legal theory,
- whether in tort (including negligence), contract, or otherwise,
- unless required by applicable law (such as deliberate and grossly
- negligent acts) or agreed to in writing, shall any Contributor be
- liable to You for damages, including any direct, indirect, special,
- incidental, or consequential damages of any character arising as a
- result of this License or out of the use or inability to use the
- Work (including but not limited to damages for loss of goodwill,
- work stoppage, computer failure or malfunction, or any and all
- other commercial damages or losses), even if such Contributor
- has been advised of the possibility of such damages.
-
- 9. Accepting Warranty or Additional Liability. While redistributing
- the Work or Derivative Works thereof, You may choose to offer,
- and charge a fee for, acceptance of support, warranty, indemnity,
- or other liability obligations and/or rights consistent with this
- License. However, in accepting such obligations, You may act only
- on Your own behalf and on Your sole responsibility, not on behalf
- of any other Contributor, and only if You agree to indemnify,
- defend, and hold each Contributor harmless for any liability
- incurred by, or claims asserted against, such Contributor by reason
- of your accepting any such warranty or additional liability.
-
- END OF TERMS AND CONDITIONS
-
-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.
-
diff --git a/src/main/appended-resources/META-INF/LICENSE b/src/main/appended-resources/META-INF/LICENSE
new file mode 100644
index 0000000..a5089af
--- /dev/null
+++ b/src/main/appended-resources/META-INF/LICENSE
@@ -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.
+
diff --git a/NOTICE b/src/main/appended-resources/META-INF/NOTICE
similarity index 57%
rename from NOTICE
rename to src/main/appended-resources/META-INF/NOTICE
index 302e05c..ae9de26 100644
--- a/NOTICE
+++ b/src/main/appended-resources/META-INF/NOTICE
@@ -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/).
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-xss] 04/05: [maven-release-plugin] prepare
release org.apache.sling.xss.compat-1.0.0
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to annotated tag org.apache.sling.xss.compat-1.0.0
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-xss.git
commit a6bd132a0924c1c861942a2dff982d7d5c03ce67
Author: Karl Pauls <pa...@apache.org>
AuthorDate: Mon May 1 21:27:27 2017 +0000
[maven-release-plugin] prepare release org.apache.sling.xss.compat-1.0.0
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/bundles/extensions/xss.compat@1793413 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/pom.xml b/pom.xml
index 83b2b5f..dbfe431 100644
--- a/pom.xml
+++ b/pom.xml
@@ -32,7 +32,7 @@
<!-- ======================================================================= -->
<artifactId>org.apache.sling.xss.compat</artifactId>
<packaging>bundle</packaging>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.0.0</version>
<name>Apache Sling XSS Protection Compat Bundle</name>
<description>
@@ -40,9 +40,9 @@
</description>
<scm>
- <connection>scm:svn:http://svn.apache.org/repos/asf/sling/trunk/bundles/extensions/xss.compat</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/sling/trunk/bundles/extensions/xss.compat</developerConnection>
- <url>http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/xss.compat</url>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/sling/tags/org.apache.sling.xss.compat-1.0.0</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/sling/tags/org.apache.sling.xss.compat-1.0.0</developerConnection>
+ <url>http://svn.apache.org/viewvc/sling/tags/org.apache.sling.xss.compat-1.0.0</url>
</scm>
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-xss] 05/05: [maven-release-plugin] copy for
tag org.apache.sling.xss.compat-1.0.0
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to annotated tag org.apache.sling.xss.compat-1.0.0
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-xss.git
commit 8ea6e8568a34b01a95175e87d1c0f58a7869c68a
Author: Karl Pauls <pa...@apache.org>
AuthorDate: Mon May 1 21:27:41 2017 +0000
[maven-release-plugin] copy for tag org.apache.sling.xss.compat-1.0.0
git-svn-id: https://svn.apache.org/repos/asf/sling/tags/org.apache.sling.xss.compat-1.0.0@1793414 13f79535-47bb-0310-9956-ffa450edef68
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-xss] 01/05: Add a xss.compat bundle based
on the latest release of the xss bundle. This new bundle is intented to
bridge the gap until all clients updated to the upcomming xss 2.0 api.
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to annotated tag org.apache.sling.xss.compat-1.0.0
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-xss.git
commit dedcf1f5ba6eb3e1c96d3e833795d8aaac25efeb
Author: Karl Pauls <pa...@apache.org>
AuthorDate: Fri Apr 28 09:11:19 2017 +0000
Add a xss.compat bundle based on the latest release of the xss bundle. This new bundle is intented to bridge the gap until all clients updated to the upcomming xss 2.0 api.
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/bundles/extensions/xss.compat@1793022 13f79535-47bb-0310-9956-ffa450edef68
---
README.md | 6 ++++--
pom.xml | 14 +++++++-------
src/main/java/org/apache/sling/xss/JSONUtil.java | 1 +
src/main/java/org/apache/sling/xss/XSSAPI.java | 2 ++
src/main/java/org/apache/sling/xss/package-info.java | 2 +-
5 files changed, 15 insertions(+), 10 deletions(-)
diff --git a/README.md b/README.md
index 1074649..e8174e7 100644
--- a/README.md
+++ b/README.md
@@ -1,8 +1,10 @@
-Apache Sling XSS Bundle
+Apache Sling XSS Compat Bundle
====
-The Apache Sling XSS Bundle provides two services for escaping and filtering XSS-prone user submitted content:
+The Apache Sling XSS Compat Bundle provides two services for escaping and filtering XSS-prone user submitted content:
1. org.apache.sling.xss.XSSAPI
2. org.apache.sling.xss.XSSFilter
+It is intended for users of the 1.x version of the org.apache.sling.xss package that can not or did not yet update to version 2.x (provided by the Apache Sling XSS Bundle).
+
Please check the JavaDoc of each service to find out what methods they provide.
diff --git a/pom.xml b/pom.xml
index 37408b9..83b2b5f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -30,19 +30,19 @@
<!-- ======================================================================= -->
<!-- P R O J E C T -->
<!-- ======================================================================= -->
- <artifactId>org.apache.sling.xss</artifactId>
+ <artifactId>org.apache.sling.xss.compat</artifactId>
<packaging>bundle</packaging>
- <version>1.0.8</version>
+ <version>1.0.0-SNAPSHOT</version>
- <name>Apache Sling XSS Protection Bundle</name>
+ <name>Apache Sling XSS Protection Compat Bundle</name>
<description>
- Apache Sling XSS Protection Bundle providing XSS protection based on the OWASP AntiSamy and OWASP Java Encoder libraries.
+ Apache Sling XSS Protection Compat Bundle providing XSS protection based on the OWASP AntiSamy and OWASP Java Encoder libraries.
</description>
<scm>
- <connection>scm:svn:http://svn.apache.org/repos/asf/sling/tags/org.apache.sling.xss-1.0.8</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/sling/tags/org.apache.sling.xss-1.0.8</developerConnection>
- <url>http://svn.apache.org/viewvc/sling/tags/org.apache.sling.xss-1.0.8</url>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/sling/trunk/bundles/extensions/xss.compat</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/sling/trunk/bundles/extensions/xss.compat</developerConnection>
+ <url>http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/xss.compat</url>
</scm>
diff --git a/src/main/java/org/apache/sling/xss/JSONUtil.java b/src/main/java/org/apache/sling/xss/JSONUtil.java
index 37552af..df0b1ef 100644
--- a/src/main/java/org/apache/sling/xss/JSONUtil.java
+++ b/src/main/java/org/apache/sling/xss/JSONUtil.java
@@ -25,6 +25,7 @@ import org.apache.sling.commons.json.io.JSONWriter;
* <p>
* Support for handling xss protected values with JSON objects and JSON writers.
*/
+@Deprecated
public final class JSONUtil {
/**
diff --git a/src/main/java/org/apache/sling/xss/XSSAPI.java b/src/main/java/org/apache/sling/xss/XSSAPI.java
index 50f2cd6..4faabee 100644
--- a/src/main/java/org/apache/sling/xss/XSSAPI.java
+++ b/src/main/java/org/apache/sling/xss/XSSAPI.java
@@ -241,6 +241,7 @@ public interface XSSAPI {
* @param request the request from which to obtain the {@link org.apache.sling.xss.XSSAPI}
* @return an XSSAPI service capable of validating hrefs.
*/
+ @Deprecated
XSSAPI getRequestSpecificAPI(SlingHttpServletRequest request);
/**
@@ -250,6 +251,7 @@ public interface XSSAPI {
* @param resourceResolver the resolver from which to obtain the {@link org.apache.sling.xss.XSSAPI}
* @return an XSSAPI service capable of validating hrefs.
*/
+ @Deprecated
XSSAPI getResourceResolverSpecificAPI(ResourceResolver resourceResolver);
}
diff --git a/src/main/java/org/apache/sling/xss/package-info.java b/src/main/java/org/apache/sling/xss/package-info.java
index de16384..4f8a523 100644
--- a/src/main/java/org/apache/sling/xss/package-info.java
+++ b/src/main/java/org/apache/sling/xss/package-info.java
@@ -19,7 +19,7 @@
*
* @version 1.1.0
*/
-@Version("1.1.0")
+@Version("1.1.1")
package org.apache.sling.xss;
import aQute.bnd.annotation.Version;
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.