changeset 125:53480fed8bd2

JMC-6473: Upgrading to OWASP encoder 1.2.2 Reviewed-by: egahlin,ghb
author hirt <marcus.hirt@oracle.com>
date Tue, 21 May 2019 13:00:45 +0200
parents b47d0ccb4559
children 56026637f9c5
files core/org.openjdk.jmc.flightrecorder.rules/pom.xml license/THIRDPARTYREADME.txt releng/platform-definitions/platform-definition-2018-09/platform-definition-2018-09.target releng/platform-definitions/platform-definition-2018-12/platform-definition-2018-12.target releng/platform-definitions/platform-definition-2019-03/platform-definition-2019-03.target releng/platform-definitions/platform-definition-photon/platform-definition-photon.target releng/third-party/pom.xml
diffstat 7 files changed, 162 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/core/org.openjdk.jmc.flightrecorder.rules/pom.xml	Mon May 20 12:35:52 2019 +0200
+++ b/core/org.openjdk.jmc.flightrecorder.rules/pom.xml	Tue May 21 13:00:45 2019 +0200
@@ -54,7 +54,7 @@
 		<dependency>
 			<groupId>org.owasp.encoder</groupId>
 			<artifactId>encoder</artifactId>
-			<version>1.2.1</version>
+			<version>1.2.2</version>
 		</dependency>
 	</dependencies>
 
--- a/license/THIRDPARTYREADME.txt	Mon May 20 12:35:52 2019 +0200
+++ b/license/THIRDPARTYREADME.txt	Tue May 21 13:00:45 2019 +0200
@@ -260,7 +260,7 @@
 
 
 %% The following notice is provided with respect to OWASP Java 
-Encoder Project 1.2.1 which may be included with this product.
+Encoder Project 1.2.2 which may be included with this product.
 
 Copyright (c) 2015 Jeff Ichnowski
 All rights reserved.
--- a/releng/platform-definitions/platform-definition-2018-09/platform-definition-2018-09.target	Mon May 20 12:35:52 2019 +0200
+++ b/releng/platform-definitions/platform-definition-2018-09/platform-definition-2018-09.target	Tue May 21 13:00:45 2019 +0200
@@ -37,7 +37,7 @@
             <unit id="com.sun.mail.jakarta.mail" version="1.6.3"/>
             <unit id="com.sun.activation.jakarta.activation" version="1.2.1"/>
             <unit id="javax.mail.dsn" version="1.4.0"/>
-            <unit id="org.owasp.encoder" version="1.2.1"/>
+            <unit id="org.owasp.encoder" version="1.2.2"/>
             <unit id="org.twitter4j.core" version="4.0.6"/>
             <unit id="org.openjfx.javafx-base.mac" version="11.0.1"/>
             <unit id="org.openjfx.javafx-base.win" version="11.0.1"/>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/releng/platform-definitions/platform-definition-2018-12/platform-definition-2018-12.target	Tue May 21 13:00:45 2019 +0200
@@ -0,0 +1,78 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!--   
+   Copyright (c) 2018, 2019 Oracle and/or its affiliates. All rights reserved.
+   
+   DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+   
+   The contents of this file are subject to the terms of either the Universal Permissive License 
+   v 1.0 as shown at http://oss.oracle.com/licenses/upl
+   
+   or the following license:
+   
+   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 holder 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.
+-->
+<?pde version="3.8"?><target name="jmc-target-2018-12" sequenceNumber="47">
+    <locations>
+        <location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
+            <unit id="com.sun.mail.jakarta.mail" version="1.6.3"/>
+            <unit id="com.sun.activation.jakarta.activation" version="1.2.1"/>
+            <unit id="javax.mail.dsn" version="1.4.0"/>
+            <unit id="org.owasp.encoder" version="1.2.2"/>
+            <unit id="org.twitter4j.core" version="4.0.6"/>
+            <unit id="org.openjfx.javafx-base.mac" version="11.0.1"/>
+            <unit id="org.openjfx.javafx-base.win" version="11.0.1"/>
+            <unit id="org.openjfx.javafx-base.linux" version="11.0.1"/>
+            <unit id="org.openjfx.javafx-fxml.mac" version="11.0.1"/>
+            <unit id="org.openjfx.javafx-fxml.win" version="11.0.1"/>
+            <unit id="org.openjfx.javafx-fxml.linux" version="11.0.1"/>
+            <unit id="org.openjfx.javafx-media.mac" version="11.0.1"/>
+            <unit id="org.openjfx.javafx-media.win" version="11.0.1"/>
+            <unit id="org.openjfx.javafx-media.linux" version="11.0.1"/>
+            <unit id="org.openjfx.javafx-controls.mac" version="11.0.1"/>
+            <unit id="org.openjfx.javafx-controls.win" version="11.0.1"/>
+            <unit id="org.openjfx.javafx-controls.linux" version="11.0.1"/>
+            <unit id="org.openjfx.javafx-graphics.mac" version="11.0.1"/>
+            <unit id="org.openjfx.javafx-graphics.win" version="11.0.1"/>
+            <unit id="org.openjfx.javafx-graphics.linux" version="11.0.1"/>
+            <unit id="org.openjfx.javafx-swing.mac" version="11.0.1"/>
+            <unit id="org.openjfx.javafx-swing.win" version="11.0.1"/>
+            <unit id="org.openjfx.javafx-swing.linux" version="11.0.1"/>
+            <unit id="org.openjfx.javafx-web.mac" version="11.0.1"/>
+            <unit id="org.openjfx.javafx-web.win" version="11.0.1"/>
+            <unit id="org.openjfx.javafx-web.linux" version="11.0.1"/>
+            <repository location="http://localhost:8080/site"/>
+        </location>
+        <location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
+            <unit id="org.eclipse.equinox.executable.feature.group"/>
+            <unit id="org.eclipse.pde.feature.group" version="3.13.300.v20181206-0815"/>
+            <unit id="org.eclipse.platform.sdk" version="4.10.0.I20181206-0815"/>
+            <repository location="http://download.eclipse.org/releases/2018-12/"/>
+        </location>
+        <location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
+            <unit id="org.eclipse.babel.nls_eclipse_ja.feature.group" version="4.10.0.v20190126060001"/>
+            <unit id="org.eclipse.babel.nls_eclipse_zh.feature.group" version="4.10.0.v20190126060001"/>
+            <repository location="http://download.eclipse.org/technology/babel/update-site/R0.16.1/2018-12/"/>
+        </location>
+    </locations>
+    <targetJRE path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
+</target>
\ No newline at end of file
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/releng/platform-definitions/platform-definition-2019-03/platform-definition-2019-03.target	Tue May 21 13:00:45 2019 +0200
@@ -0,0 +1,79 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!--   
+   Copyright (c) 2018, 2019 Oracle and/or its affiliates. All rights reserved.
+   
+   DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+   
+   The contents of this file are subject to the terms of either the Universal Permissive License 
+   v 1.0 as shown at http://oss.oracle.com/licenses/upl
+   
+   or the following license:
+   
+   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 holder 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.
+-->
+<?pde version="3.8"?>
+<target name="jmc-target-2019-03" sequenceNumber="47">
+    <locations>
+        <location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
+            <unit id="com.sun.mail.jakarta.mail" version="1.6.3"/>
+            <unit id="com.sun.activation.jakarta.activation" version="1.2.1"/>
+            <unit id="javax.mail.dsn" version="1.4.0"/>
+            <unit id="org.owasp.encoder" version="1.2.2"/>
+            <unit id="org.twitter4j.core" version="4.0.6"/>
+            <unit id="org.openjfx.javafx-base.mac" version="11.0.1"/>
+            <unit id="org.openjfx.javafx-base.win" version="11.0.1"/>
+            <unit id="org.openjfx.javafx-base.linux" version="11.0.1"/>
+            <unit id="org.openjfx.javafx-fxml.mac" version="11.0.1"/>
+            <unit id="org.openjfx.javafx-fxml.win" version="11.0.1"/>
+            <unit id="org.openjfx.javafx-fxml.linux" version="11.0.1"/>
+            <unit id="org.openjfx.javafx-media.mac" version="11.0.1"/>
+            <unit id="org.openjfx.javafx-media.win" version="11.0.1"/>
+            <unit id="org.openjfx.javafx-media.linux" version="11.0.1"/>
+            <unit id="org.openjfx.javafx-controls.mac" version="11.0.1"/>
+            <unit id="org.openjfx.javafx-controls.win" version="11.0.1"/>
+            <unit id="org.openjfx.javafx-controls.linux" version="11.0.1"/>
+            <unit id="org.openjfx.javafx-graphics.mac" version="11.0.1"/>
+            <unit id="org.openjfx.javafx-graphics.win" version="11.0.1"/>
+            <unit id="org.openjfx.javafx-graphics.linux" version="11.0.1"/>
+            <unit id="org.openjfx.javafx-swing.mac" version="11.0.1"/>
+            <unit id="org.openjfx.javafx-swing.win" version="11.0.1"/>
+            <unit id="org.openjfx.javafx-swing.linux" version="11.0.1"/>
+            <unit id="org.openjfx.javafx-web.mac" version="11.0.1"/>
+            <unit id="org.openjfx.javafx-web.win" version="11.0.1"/>
+            <unit id="org.openjfx.javafx-web.linux" version="11.0.1"/>
+            <repository location="http://localhost:8080/site"/>
+        </location>
+        <location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
+            <unit id="org.eclipse.equinox.executable.feature.group"/>
+            <unit id="org.eclipse.pde.feature.group" version="3.13.400.v20190307-0943"/>
+            <unit id="org.eclipse.platform.sdk" version="4.11.0.I20190307-0500"/>
+            <repository location="http://download.eclipse.org/releases/2019-03/"/>
+        </location>
+        <location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
+						<unit id="org.eclipse.babel.nls_eclipse_ja.feature.group" version="4.10.0.v20190126060001"/>
+						<unit id="org.eclipse.babel.nls_eclipse_zh.feature.group" version="4.10.0.v20190126060001"/>
+						<repository location="http://download.eclipse.org/technology/babel/update-site/R0.16.1/2018-12/"/>
+        </location>
+    </locations>
+    <targetJRE path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
+</target>
\ No newline at end of file
--- a/releng/platform-definitions/platform-definition-photon/platform-definition-photon.target	Mon May 20 12:35:52 2019 +0200
+++ b/releng/platform-definitions/platform-definition-photon/platform-definition-photon.target	Tue May 21 13:00:45 2019 +0200
@@ -37,7 +37,7 @@
             <unit id="com.sun.mail.jakarta.mail" version="1.6.3"/>
             <unit id="com.sun.activation.jakarta.activation" version="1.2.1"/>
             <unit id="javax.mail.dsn" version="1.4.0"/>
-            <unit id="org.owasp.encoder" version="1.2.1"/>
+            <unit id="org.owasp.encoder" version="1.2.2"/>
             <unit id="org.twitter4j.core" version="4.0.6"/>
             <unit id="org.openjfx.javafx-base.mac" version="11.0.1"/>
             <unit id="org.openjfx.javafx-base.win" version="11.0.1"/>
--- a/releng/third-party/pom.xml	Mon May 20 12:35:52 2019 +0200
+++ b/releng/third-party/pom.xml	Tue May 21 13:00:45 2019 +0200
@@ -97,7 +97,7 @@
 									<id>javax.mail:dsn:1.4</id>
 								</artifact>
 								<artifact>
-									<id>org.owasp.encoder:encoder:1.2.1</id>
+									<id>org.owasp.encoder:encoder:1.2.2</id>
 								</artifact>
 								<artifact>
 									<id>org.openjfx:javafx-base:jar:mac:11.0.1</id>