Bug 574900: Update to SnakeYaml 2.3
- Remove SnakeYaml bundle
Change-Id: Ic513b99bc064c2cf608c58ea9d19d237ef97fbfb
diff --git a/3rdparty/_assemblies/org.eclipse.statet.releng.3rdparty-feature/feature.xml b/3rdparty/_assemblies/org.eclipse.statet.releng.3rdparty-feature/feature.xml
index d0b29ac..49134df 100644
--- a/3rdparty/_assemblies/org.eclipse.statet.releng.3rdparty-feature/feature.xml
+++ b/3rdparty/_assemblies/org.eclipse.statet.releng.3rdparty-feature/feature.xml
@@ -41,7 +41,4 @@
<plugin id="org.apache.lucene.join"
version="7.5.0.qualifier" />
- <plugin id="org.snakeyaml.snakeyaml"
- version="1.23.0.qualifier" />
-
</feature>
diff --git a/3rdparty/bundle-recipes-pom.xml b/3rdparty/bundle-recipes-pom.xml
index 8a6fcd8..2b6291b 100644
--- a/3rdparty/bundle-recipes-pom.xml
+++ b/3rdparty/bundle-recipes-pom.xml
@@ -101,7 +101,6 @@
<module>apache-commons</module>
<!-- module>apache-db</module (orbit) -->
<module>apache-lucene</module>
- <module>snakeyaml</module>
</modules>
diff --git a/3rdparty/prereq.ids b/3rdparty/prereq.ids
index 2f14708..cd23485 100644
--- a/3rdparty/prereq.ids
+++ b/3rdparty/prereq.ids
@@ -13,7 +13,7 @@
maven/mavencentral/org.apache.lucene/lucene-highlighter/7.5.0
maven/mavencentral/org.apache.lucene/lucene-join/7.5.0
-maven/mavencentral/org.yaml/snakeyaml/1.23
+maven/mavencentral/org.snakeyaml/snakeyaml-engine/2.3
maven/mavencentral/org.yaml/snakeyaml/1.28
maven/mavencentral/com.jcraft/jsch/0.1.55
diff --git a/3rdparty/snakeyaml/org.snakeyaml.snakeyaml/.gitignore b/3rdparty/snakeyaml/org.snakeyaml.snakeyaml/.gitignore
deleted file mode 100644
index b83d222..0000000
--- a/3rdparty/snakeyaml/org.snakeyaml.snakeyaml/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/target/
diff --git a/3rdparty/snakeyaml/org.snakeyaml.snakeyaml/osgi.bnd b/3rdparty/snakeyaml/org.snakeyaml.snakeyaml/osgi.bnd
deleted file mode 100644
index c2136c5..0000000
--- a/3rdparty/snakeyaml/org.snakeyaml.snakeyaml/osgi.bnd
+++ /dev/null
@@ -1,12 +0,0 @@
-package-version=${version;===;${Bundle-Version}}
-
-Import-Package: \
- !org.yaml.snakeyaml*, \
- *;resolution:=optional
-
-Export-Package: \
- !about.html,!about_files, \
- *.internal.*;x-internal:=true;version="${package-version}", \
- *.implementation.*;x-internal:=true;version="${package-version}", \
- *.impl.*;x-internal:=true;version="${package-version}", \
- *;version="${package-version}"
diff --git a/3rdparty/snakeyaml/org.snakeyaml.snakeyaml/pom.xml b/3rdparty/snakeyaml/org.snakeyaml.snakeyaml/pom.xml
deleted file mode 100644
index 2351f83..0000000
--- a/3rdparty/snakeyaml/org.snakeyaml.snakeyaml/pom.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.eclipse.statet.3rdparty</groupId>
- <artifactId>3rdparty.snakeyaml</artifactId>
- <version>4.5.0-SNAPSHOT</version>
- </parent>
-
- <artifactId>org.snakeyaml.snakeyaml</artifactId>
- <version>1.23.0-SNAPSHOT</version>
- <packaging>eclipse-bundle-recipe</packaging>
- <name>SnakeYAML (for YAML 1.1)</name>
-
- <dependencies>
- <dependency>
- <groupId>org.yaml</groupId>
- <artifactId>snakeyaml</artifactId>
- <version>1.23</version>
- </dependency>
- </dependencies>
-
-</project>
diff --git a/3rdparty/snakeyaml/org.snakeyaml.snakeyaml/src/main/resources/OSGI-INF/l10n/bundle.properties b/3rdparty/snakeyaml/org.snakeyaml.snakeyaml/src/main/resources/OSGI-INF/l10n/bundle.properties
deleted file mode 100644
index aa06334..0000000
--- a/3rdparty/snakeyaml/org.snakeyaml.snakeyaml/src/main/resources/OSGI-INF/l10n/bundle.properties
+++ /dev/null
@@ -1,2 +0,0 @@
-bundleName= SnakeYAML (for YAML 1.1)
-bundleVendor= Eclipse StatET
diff --git a/3rdparty/snakeyaml/org.snakeyaml.snakeyaml/src/main/resources/about.html b/3rdparty/snakeyaml/org.snakeyaml.snakeyaml/src/main/resources/about.html
deleted file mode 100644
index 834e9a3..0000000
--- a/3rdparty/snakeyaml/org.snakeyaml.snakeyaml/src/main/resources/about.html
+++ /dev/null
@@ -1,47 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
- "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
-<title>About</title>
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
-
-<p>January 1, 2019</p>
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in ("Content"). Unless
- otherwise indicated below, the Content is provided to you under the terms and conditions of the
- Eclipse Public License Version 2.0 ("EPL"), or the Apache License, Version 2.0 (AL).
- A copy of the EPL is available at <a href="https://www.eclipse.org/legal/epl-2.0"
- >https://www.eclipse.org/legal/epl-2.0</a>. For purposes of the EPL, "Program" will
- mean the Content. A copy of the AL is available at <a href="https://www.apache.org/licenses/LICENSE-2.0"
- >https://www.apache.org/licenses/LICENSE-2.0</a>.</p>
-
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is being
- redistributed by another party ("Redistributor") and different terms and conditions
- may apply to your use of any object code in the Content. Check the Redistributor's license that
- was provided with the Content. If no such license exists, contact the Redistributor. Unless
- otherwise indicated below, the terms and conditions of the EPL or AL still apply to any source
- code in the Content and such source code may be obtained at <a href="https://www.eclipse.org/"
- >https://www.eclipse.org</a>.</p>
-
-<h3>Third Party Content</h3>
-
-<p>The Content includes items that have been sourced from third parties as set out below. If you did
- not receive this Content directly from the Eclipse Foundation, the following is provided for
- informational purposes only, and you should look to the Redistributor's license for terms and
- conditions of use.</p>
-
-<h4>SnakeYAML (for YAML 1.1) (1.23)</h4>
-<p>The plug-in includes software developed by a team of developers, currently led by Andrey Somov,
- as part of the SnakeYAML project (<a href="http://www.snakeyaml.org/" target="_blank">http://www.snakeyaml.org/</a>).
- It is based on the PyYAML module written by Kirill Simonov.</p>
-<p>SnakeYAML is provided to you under the terms and conditions of the
- Apache License, Version 2.0. A copy of the license is contained in the file <a
- href="about_files/APACHE-2.0.txt">APACHE-2.0</a> and is also available at <a href="https://www.apache.org/licenses/LICENSE-2.0.html"
- >https://www.apache.org/licenses/LICENSE-2.0.html</a>.</p>
-
-</body>
-</html>
diff --git a/3rdparty/snakeyaml/org.snakeyaml.snakeyaml/src/main/resources/about_files/APACHE-2.0.txt b/3rdparty/snakeyaml/org.snakeyaml.snakeyaml/src/main/resources/about_files/APACHE-2.0.txt
deleted file mode 100644
index d645695..0000000
--- a/3rdparty/snakeyaml/org.snakeyaml.snakeyaml/src/main/resources/about_files/APACHE-2.0.txt
+++ /dev/null
@@ -1,202 +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
-
- APPENDIX: How to apply the Apache License to your work.
-
- To apply the Apache License to your work, attach the following
- boilerplate notice, with the fields enclosed by brackets "[]"
- replaced with your own identifying information. (Don't include
- the brackets!) The text should be enclosed in the appropriate
- comment syntax for the file format. We also recommend that a
- file or class name and description of purpose be included on the
- same "printed page" as the copyright notice for easier
- identification within third-party archives.
-
- Copyright [yyyy] [name of copyright owner]
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
diff --git a/3rdparty/snakeyaml/pom.xml b/3rdparty/snakeyaml/pom.xml
deleted file mode 100644
index 5adb2de..0000000
--- a/3rdparty/snakeyaml/pom.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- #=============================================================================#
- # Copyright (c) 2018, 2021 Stephan Wahlbrink and others.
- #
- # This program and the accompanying materials are made available under the
- # terms of the Eclipse Public License 2.0 which is available at
- # https://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0
- # which is available at https://www.apache.org/licenses/LICENSE-2.0.
- #
- # SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
- #
- # Contributors:
- # Stephan Wahlbrink <sw@wahlbrink.eu> - initial API and implementation
- #=============================================================================#
--->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.eclipse.statet.3rdparty</groupId>
- <artifactId>bundle-recipes</artifactId>
- <version>4.5.0-SNAPSHOT</version>
- <relativePath>../bundle-recipes-pom.xml</relativePath>
- </parent>
-
- <artifactId>3rdparty.snakeyaml</artifactId>
- <version>4.5.0-SNAPSHOT</version>
- <packaging>pom</packaging>
-
- <name>Eclipse StatET 3rd Party Recipes - SnakeYAML</name>
-
- <modules>
- <module>org.snakeyaml.snakeyaml</module>
- </modules>
-
-</project>
diff --git a/NOTICE.md b/NOTICE.md
index 61533ab..143f22b 100644
--- a/NOTICE.md
+++ b/NOTICE.md
@@ -94,8 +94,8 @@
* Project: https://lucene.apache.org/core
* License: Apache-2.0
-SnakeYAML 1.23
- * Project: https://bitbucket.org/asomov/snakeyaml
+SnakeYAML 2.3
+ * Project: https://bitbucket.org/asomov/snakeyaml-engine
* License: Apache-2.0
SnakeYAML 1.28
diff --git a/releng/statet-repository/legal-resources/NOTICE.md b/releng/statet-repository/legal-resources/NOTICE.md
index 528d690..f8cf265 100644
--- a/releng/statet-repository/legal-resources/NOTICE.md
+++ b/releng/statet-repository/legal-resources/NOTICE.md
@@ -94,8 +94,8 @@
* Project: https://lucene.apache.org/core
* License: Apache-2.0
-SnakeYAML 1.23
- * Project: https://bitbucket.org/asomov/snakeyaml
+SnakeYAML 2.3
+ * Project: https://bitbucket.org/asomov/snakeyaml-engine
* License: Apache-2.0
JSch 0.1.55