Update com.google.code.gson to 2.8.6
Fix wrong manifest entries
(see https://github.com/google/gson/issues/1677):
Require-Capability: osgi.ee; filter:="(&(osgi.ee=JavaSE)(version=9.0))"
Bundle-RequiredExecutionEnvironment: J2SE-1.5, JavaSE-1.6, JavaSE-1.7,
JavaSE-1.8
to
Require-Capability: osgi.ee; filter:="(&(osgi.ee=JavaSE)(version=1.6))"
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
since all class files except module-info have class file version 50
corresponding to JavaSE-1.6.
Bug: 569966
Change-Id: Iae2b5598512a6d3cc9858a0be3489aebf46adb08
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
diff --git a/google/com.google.gson_2.8.2/osgi.bnd b/google/com.google.gson_2.8.2/osgi.bnd
deleted file mode 100644
index 014ce14..0000000
--- a/google/com.google.gson_2.8.2/osgi.bnd
+++ /dev/null
@@ -1,12 +0,0 @@
-package-version=${version;===;${Bundle-Version}}
-
-Import-Package: \
- com.google.gson.*;version="${range;[==,+);${package-version}}", \
- *;resolution:=optional
-
-Export-Package: \
- !about.html,!about_files, \
- *.internal*;x-internal:=true;version="${package-version}", \
- *;version="${package-version}"
-
-
diff --git a/google/com.google.gson_2.8.2/src/main/resources/about.html b/google/com.google.gson_2.8.2/src/main/resources/about.html
deleted file mode 100644
index 8084ded..0000000
--- a/google/com.google.gson_2.8.2/src/main/resources/about.html
+++ /dev/null
@@ -1,43 +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=ISO-8859-1"/>
-<title>About</title>
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
-
-<p>April 13, 2016</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 1.0 ("EPL"). A copy of the EPL is available
-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, "Program" will mean the Content.</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 still apply to any source code in the Content
-and such source code may be obtained at <a href="http://www.eclipse.org/">http://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>Guava: Google Core Libraries for Java</h4>
-
-<p>The plug-in includes software developed by Kevin Bourrillion <kevinb@google.com> (Google) as part of the Guava: Google Core Libraries for Java project.</p>
-
-<p>Guava: Google Core Libraries for Java is provided to you under the terms and conditions of the <a href="http://www.apache.org/licenses/LICENSE-2.0.txt" target="_blank">The Apache Software License, Version 2.0</a> (<a href="about_files/THE_APACHE_SOFTWARE_LICENSE__VERSION_2.0.txt" target="_blank">THE_APACHE_SOFTWARE_LICENSE__VERSION_2.0.txt</a>) license.</p>
-
-<p>Guava: Google Core Libraries for Java including its source is available from <a href="http://code.google.com/p/guava-libraries/guava" target="_blank">code.google.com/p/guava-libraries/guava</a>. Bugs or feature requests can be made in the project issue tracking system at <a href="http://code.google.com/p/guava-libraries/issues" target="_blank">code.google.com/p/guava-libraries/issues</a>.</p>
-
-
-</body>
-</html>
\ No newline at end of file
diff --git a/google/com.google.gson_2.8.2/.project b/google/com.google.gson_2.8.6/.project
similarity index 83%
rename from google/com.google.gson_2.8.2/.project
rename to google/com.google.gson_2.8.6/.project
index 4ee9408..5a42814 100644
--- a/google/com.google.gson_2.8.2/.project
+++ b/google/com.google.gson_2.8.6/.project
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
- <name>com.google.gson_2.8.2</name>
+ <name>com.google.gson_2.8.6</name>
<comment></comment>
<projects>
</projects>
diff --git a/google/com.google.gson_2.8.6/osgi.bnd b/google/com.google.gson_2.8.6/osgi.bnd
new file mode 100644
index 0000000..3ff270e
--- /dev/null
+++ b/google/com.google.gson_2.8.6/osgi.bnd
@@ -0,0 +1,15 @@
+package-version=${version;===;${Bundle-Version}}
+
+Import-Package: \
+ com.google.gson.*;version="${range;[==,+);${package-version}}", \
+ *;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}"
+
+Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version=1.6))"
+Bundle-RequiredExecutionEnvironment: JavaSE-1.6
\ No newline at end of file
diff --git a/google/com.google.gson_2.8.2/pom.xml b/google/com.google.gson_2.8.6/pom.xml
similarity index 80%
rename from google/com.google.gson_2.8.2/pom.xml
rename to google/com.google.gson_2.8.6/pom.xml
index 4fefdbc..2fba6a6 100644
--- a/google/com.google.gson_2.8.2/pom.xml
+++ b/google/com.google.gson_2.8.6/pom.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion>
<parent>
@@ -8,14 +8,14 @@
<version>1.0.0-SNAPSHOT</version>
</parent>
<artifactId>com.google.gson</artifactId>
- <version>2.8.2-SNAPSHOT</version>
+ <version>2.8.6-SNAPSHOT</version>
<packaging>eclipse-bundle-recipe</packaging>
<name>Gson: Google Json Library for Java</name>
<dependencies>
<dependency>
<groupId>com.google.code.gson</groupId>
<artifactId>gson</artifactId>
- <version>2.8.2</version>
+ <version>2.8.6</version>
</dependency>
</dependencies>
</project>
diff --git a/google/com.google.gson_2.8.2/src/eclipse/ip_log.xml b/google/com.google.gson_2.8.6/src/eclipse/ip_log.xml
similarity index 69%
rename from google/com.google.gson_2.8.2/src/eclipse/ip_log.xml
rename to google/com.google.gson_2.8.6/src/eclipse/ip_log.xml
index bf09d9c..29b2926 100644
--- a/google/com.google.gson_2.8.2/src/eclipse/ip_log.xml
+++ b/google/com.google.gson_2.8.6/src/eclipse/ip_log.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<ip_log version="1.0">
- <project id="com.google.gson" version="2.8.2" status="done">
+ <project id="com.google.gson" version="2.8.6" status="done">
<info>
<name>Gson: Google Json Library for Java</name>
<repository>scm:git:git.eclipse.org:/gitroot/orbit/recipes.git</repository>
@@ -9,15 +9,15 @@
<contact>
<name>Matthias Sohn</name>
<email>matthias.sohn@sap.com</email>
- <company>SAP</company>
+ <company>SAP SE</company>
</contact>
<legal>
- <ipzilla bug_id="15287"/>
+ <clearlydefined url="https://clearlydefined.io/definitions/maven/mavencentral/com.google.code.gson/gson/2.8.6"/>
<license>
<name>Apache License, 2.0</name>
<reference>http://www.apache.org/licenses/LICENSE-2.0.txt</reference>
</license>
- <package>gson-2.8.2.jar</package>
+ <package>gson-2.8.6.jar</package>
</legal>
</project>
-</ip_log>
+</ip_log>
\ No newline at end of file
diff --git a/google/com.google.gson_2.8.2/src/main/resources/OSGI-INF/l10n/bundle.properties b/google/com.google.gson_2.8.6/src/main/resources/OSGI-INF/l10n/bundle.properties
similarity index 100%
rename from google/com.google.gson_2.8.2/src/main/resources/OSGI-INF/l10n/bundle.properties
rename to google/com.google.gson_2.8.6/src/main/resources/OSGI-INF/l10n/bundle.properties
diff --git a/google/com.google.gson_2.8.6/src/main/resources/about.html b/google/com.google.gson_2.8.6/src/main/resources/about.html
new file mode 100644
index 0000000..1d4a596
--- /dev/null
+++ b/google/com.google.gson_2.8.6/src/main/resources/about.html
@@ -0,0 +1,43 @@
+<!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=ISO-8859-1"/>
+<title>About</title>
+</head>
+<body lang="EN-US">
+<h2>About This Content</h2>
+
+<p>December 30, 2020</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"). A copy of the EPL is available
+at <a href="http://www.eclipse.org/legal/epl-2.0">http://www.eclipse.org/legal/epl-2.0</a>.
+For purposes of the EPL, "Program" will mean the Content.</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 still apply to any source code in the Content
+and such source code may be obtained at <a href="http://www.eclipse.org/">http://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>Gson</h4>
+
+<p>The plug-in includes software developed by someone as part of the Gson project.</p>
+
+<p>Gson is provided to you under the terms and conditions of the <a href="http://www.apache.org/licenses/LICENSE-2.0.txt" target="_blank">Apache 2.0</a> (<a href="about_files/APACHE_2.0.txt" target="_blank">APACHE_2.0.txt</a>) license.</p>
+
+<p>Gson including its source is available from <a href="https://github.com/google/gson/gson" target="_blank">github.com/google/gson/gson</a>. Bugs or feature requests can be made in the project issue tracking system at <a href="https://github.com/google/gson/issues" target="_blank">github.com/google/gson/issues</a>.</p>
+
+
+</body>
+</html>
diff --git a/google/com.google.gson_2.8.2/src/main/resources/about_files/THE_APACHE_SOFTWARE_LICENSE__VERSION_2.0.txt b/google/com.google.gson_2.8.6/src/main/resources/about_files/APACHE_2.0.txt
similarity index 100%
rename from google/com.google.gson_2.8.2/src/main/resources/about_files/THE_APACHE_SOFTWARE_LICENSE__VERSION_2.0.txt
rename to google/com.google.gson_2.8.6/src/main/resources/about_files/APACHE_2.0.txt
diff --git a/google/pom.xml b/google/pom.xml
index 1634483..eb93346 100644
--- a/google/pom.xml
+++ b/google/pom.xml
@@ -18,7 +18,7 @@
<module>com.google.javascript_0.0.20160315</module>
<module>com.google.guava_27.1.0</module>
<module>com.google.gson_2.7.0</module>
- <module>com.google.gson_2.8.2</module>
+ <module>com.google.gson_2.8.6</module>
<module>com.google.gdata_1.47.1</module>
<module>com.google.flogger_0.1.0</module>
<module>com.google.flogger.systembackend_0.1.0</module>
diff --git a/releng/aggregationfeature/feature.xml b/releng/aggregationfeature/feature.xml
index cce032e..5d5b821 100644
--- a/releng/aggregationfeature/feature.xml
+++ b/releng/aggregationfeature/feature.xml
@@ -29,7 +29,7 @@
<plugin id="com.google.guava" version="27.1.0.qualifier"/>
<plugin id="com.google.gson" version="2.7.0.qualifier"/>
- <plugin id="com.google.gson" version="2.8.2.qualifier"/>
+ <plugin id="com.google.gson" version="2.8.6.qualifier"/>
<plugin id="com.google.gdata" version="1.47.1.qualifier"/>
<plugin id="com.google.javascript" version="0.0.20160315.qualifier"/>
