[rpms/google-gson] epel10: Update google-gson to 2.8.8 (#1964408)

[rpms/google-gson] epel10: Update google-gson to 2.8.8 (#1964408)

[@ 2026-08-17 12:38 UTC (permalink / raw)]

A new commit has been pushed.

Repo   : rpms/google-gson
Branch : epel10
Commit : 90fc119407b5b2906209c580c8d28a68cb8715d4
Author : Sérgio M. Basto <sergio@serjux.com>
Date   : 2022-01-02T21:54:44+00:00
Stats  : +38/-60 in 5 file(s)
URL    : https://src.fedoraproject.org/rpms/google-gson/c/90fc119407b5b2906209c580c8d28a68cb8715d4?branch=epel10

Log:
Update google-gson to 2.8.8 (#1964408)

---
diff --git a/.gitignore b/.gitignore
index bb94d61..f89f9a3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,3 +6,4 @@ google-gson-2.2.1.tar.xz
 /gson-parent-2.8.1.tar.gz
 /gson-parent-2.8.2.tar.gz
 /gson-parent-2.8.6.tar.gz
+/gson-parent-2.8.8.tar.gz

diff --git a/0001-Update-to-latest-version-of-bnd-maven-plugin.patch b/0001-Update-to-latest-version-of-bnd-maven-plugin.patch
index bfabd7a..7206b82 100644
--- a/0001-Update-to-latest-version-of-bnd-maven-plugin.patch
+++ b/0001-Update-to-latest-version-of-bnd-maven-plugin.patch
@@ -28,33 +28,6 @@ Signed-off-by: Mat Booth <mat.booth@redhat.com>
  pom.xml      | 6 ------
  3 files changed, 3 insertions(+), 7 deletions(-)
 
-diff --git a/gson/bnd.bnd b/gson/bnd.bnd
-index c98fcfd..7706d8a 100644
---- a/gson/bnd.bnd
-+++ b/gson/bnd.bnd
-@@ -3,7 +3,9 @@ Bundle-Name: ${project.name}
- Bundle-Description: ${project.description}
- Bundle-Vendor: Google Gson Project
- Bundle-ContactAddress: ${project.parent.url}
-+Bundle-DocURL: ${project.parent.url}/blob/master/UserGuide.md
- Bundle-RequiredExecutionEnvironment: J2SE-1.5, JavaSE-1.6, JavaSE-1.7, JavaSE-1.8
-+Import-Package: sun.misc;resolution:=optional,*
- 
- -removeheaders: Private-Package
- 
-diff --git a/gson/pom.xml b/gson/pom.xml
-index ffe41ac..909a91a 100644
---- a/gson/pom.xml
-+++ b/gson/pom.xml
-@@ -34,7 +34,7 @@
-       <plugin>
-         <groupId>biz.aQute.bnd</groupId>
-         <artifactId>bnd-maven-plugin</artifactId>
--        <version>4.0.0</version>
-+        <version>5.1.2</version>
-         <executions>
-           <execution>
-             <goals>
 diff --git a/pom.xml b/pom.xml
 index 4774e70..8716014 100644
 --- a/pom.xml
@@ -66,7 +39,7 @@ index 4774e70..8716014 100644
 -        <plugin>
 -          <groupId>org.apache.felix</groupId>
 -          <artifactId>maven-bundle-plugin</artifactId>
--          <version>3.3.0</version>
+-          <version>5.1.2</version>
 -          <inherited>true</inherited>
 -        </plugin>
        </plugins>

diff --git a/0004-This-commit-added-a-dependency-on-templating-maven-p.patch b/0004-This-commit-added-a-dependency-on-templating-maven-p.patch
index fc297c3..b5211e5 100644
--- a/0004-This-commit-added-a-dependency-on-templating-maven-p.patch
+++ b/0004-This-commit-added-a-dependency-on-templating-maven-p.patch
@@ -20,11 +20,10 @@ diff --git a/gson/pom.xml b/gson/pom.xml
 index 909a91a..b8984cc 100644
 --- a/gson/pom.xml
 +++ b/gson/pom.xml
-@@ -56,23 +56,6 @@
-         <groupId>org.apache.felix</groupId>
-         <artifactId>maven-bundle-plugin</artifactId>
+@@ -59,23 +59,6 @@
+         </configuration>
        </plugin>
--      <plugin>
+       <plugin>
 -        <groupId>org.codehaus.mojo</groupId>
 -        <artifactId>templating-maven-plugin</artifactId>
 -        <version>1.0.0</version>
@@ -41,9 +40,10 @@ index 909a91a..b8984cc 100644
 -          </execution>
 -        </executions>
 -      </plugin>
-     </plugins>
-   </build>
- </project>
+-      <plugin>
+         <groupId>com.coderplus.maven.plugins</groupId>
+         <artifactId>copy-rename-maven-plugin</artifactId>
+         <version>1.0.1</version>
 diff --git a/gson/src/main/java-templates/com/google/gson/internal/GsonBuildConfig.java b/gson/src/main/java-templates/com/google/gson/internal/GsonBuildConfig.java
 deleted file mode 100644
 index a94c96b..0000000
@@ -279,4 +279,3 @@ index dc39bc0..0000000
 -}
 -- 
 2.26.2
-

diff --git a/google-gson.spec b/google-gson.spec
index 509b4d6..5c5afc7 100644
--- a/google-gson.spec
+++ b/google-gson.spec
@@ -1,6 +1,6 @@
 Name:           google-gson
-Version:        2.8.6
-Release:        9%{?dist}
+Version:        2.8.8
+Release:        1%{?dist}
 Summary:        Java lib for conversion of Java objects into JSON representation
 License:        ASL 2.0
 URL:            https://github.com/google/gson
@@ -12,8 +12,6 @@ Patch0: 0001-Update-to-latest-version-of-bnd-maven-plugin.patch
 # Internal packages are naughtily used by other packages in Fedora
 Patch1: 0002-Also-export-internal-packages-in-OSGi-metadata.patch
 
-Patch2: 0003-Allow-building-on-Java-8.patch
-
 # Remove dependency on unavailable templating-maven-plugin
 # Reverts upstream commit https://github.com/google/gson/commit/d84e26d
 Patch3: 0004-This-commit-added-a-dependency-on-templating-maven-p.patch
@@ -23,6 +21,8 @@ BuildArch:      noarch
 BuildRequires:  maven-local
 BuildRequires:  mvn(junit:junit)
 BuildRequires:  mvn(org.apache.felix:maven-bundle-plugin)
+BuildRequires:  mvn(biz.aQute.bnd:bnd-baseline-maven-plugin)
+BuildRequires:  maven-resources-plugin
 
 %description
 Gson is a Java library that can be used to convert a Java object into its
@@ -38,31 +38,33 @@ This package contains the API documentation for %{name}.
 
 %prep
 %setup -q -n gson-gson-parent-%{version}
-%patch0 -p1
-%patch1 -p1
-%patch2 -p1
+#patch0 -p1
+#patch1 -p1
 %patch3 -p1
 
+# The test EnumWithObfuscatedTest requires the plugins copy-rename-maven-plugin, proguard-maven-plugin and maven-resources-plugin to work correctly because it tests Gson interaction with a class obfuscated by ProGuard.
+# https://github.com/google/gson/issues/2045
+rm ./gson/src/test/java/com/google/gson/functional/EnumWithObfuscatedTest.java
 # remove unnecessary dependency on parent POM
 %pom_remove_parent
 
-# presence of these files breaks builds with Java 8, see also Patch2: 0003-Allow-building-on-Java-8.patch
-find -name "module-info.java" -print -delete
-
 # Use felix maven-bundle-plugin only for OSGi metadata
-%pom_remove_plugin :bnd-maven-plugin gson
-%pom_xpath_inject "pom:plugin[pom:artifactId='maven-bundle-plugin']" "<configuration>
-    <instructions>
-      <_include>bnd.bnd</_include>
-    </instructions>
-  </configuration>
-  <executions>
-    <execution>
-      <id>create-manifest</id>
-      <phase>process-classes</phase>
-      <goals><goal>manifest</goal></goals>
-    </execution>
-  </executions>" gson
+#pom_remove_plugin :bnd-maven-plugin gson
+%pom_remove_plugin :copy-rename-maven-plugin gson
+%pom_remove_dep com.github.wvengen gson
+%pom_remove_plugin :proguard-maven-plugin gson
+#%%pom_xpath_inject "pom:plugin[pom:artifactId='maven-bundle-plugin']" "<configuration>
+#    <instructions>
+#      <_include>bnd.bnd</_include>
+#    </instructions>
+#  </configuration>
+#  <executions>
+#    <execution>
+#      <id>create-manifest</id>
+#      <phase>process-classes</phase>
+#      <goals><goal>manifest</goal></goals>
+#    </execution>
+#  </executions>" gson
 
 %build
 %mvn_build
@@ -78,6 +80,9 @@ find -name "module-info.java" -print -delete
 %license LICENSE
 
 %changelog
+* Fri Dec 31 2021 Sérgio Basto <sergio@serjux.com> - 2.8.8-1
+- Update google-gson to 2.8.8 (#1964408)
+
 * Thu Jul 22 2021 Fedora Release Engineering <releng@fedoraproject.org> - 2.8.6-9
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
 

diff --git a/sources b/sources
index 705273c..80c744d 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (gson-parent-2.8.6.tar.gz) = 2e9db9388017b5c08b992801d15c0e04a9402e5b729b4da78443af3003e60428f06c8ba14f8ac43d7aafca208e1ab401c56fa6079493d2bf1d4e40da48c044ab
+SHA512 (gson-parent-2.8.8.tar.gz) = f90ad679c99c5e9a6ee9e397e59ab1d7d94a9c82366902b808addc40ebbab101fdba7fc83e4666c4f35e52d8b127e6f901e65072a7de210496466074dcd043c5