[rpms/google-gson] epel10: Update google-gson to 2.10.1

[rpms/google-gson] epel10: Update google-gson to 2.10.1

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

A new commit has been pushed.

Repo   : rpms/google-gson
Branch : epel10
Commit : 31527114e6e9227734e4972a8b75e09f0c8a89ac
Author : Sérgio M. Basto <sergio@serjux.com>
Date   : 2023-03-27T12:54:01+01:00
Stats  : +55/-57 in 4 file(s)
URL    : https://src.fedoraproject.org/rpms/google-gson/c/31527114e6e9227734e4972a8b75e09f0c8a89ac?branch=epel10

Log:
Update google-gson to 2.10.1

---
diff --git a/.gitignore b/.gitignore
index af3c3f4..789b4de 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,3 +9,4 @@ google-gson-2.2.1.tar.xz
 /gson-parent-2.8.8.tar.gz
 /gson-parent-2.9.0.tar.gz
 /gson-parent-2.9.1.tar.gz
+/gson-parent-2.10.1.tar.gz

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 1309170..e4863da 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
@@ -5,22 +5,40 @@ Subject: [PATCH 4/4] This commit added a dependency on
  templating-maven-plugin, we don't want it nor need it, so we revert it
  https://github.com/google/gson/commit/d84e26d
 
----
- gson/pom.xml                                  | 17 ----
- .../google/gson/internal/GsonBuildConfig.java | 32 -------
- gson/src/main/java/com/google/gson/Gson.java  | 15 +--
- .../GsonVersionDiagnosticsTest.java           | 96 -------------------
- .../gson/internal/GsonBuildConfigTest.java    | 33 -------
- 5 files changed, 1 insertion(+), 192 deletions(-)
- delete mode 100644 gson/src/main/java-templates/com/google/gson/internal/GsonBuildConfig.java
- delete mode 100644 gson/src/test/java/com/google/gson/functional/GsonVersionDiagnosticsTest.java
- delete mode 100644 gson/src/test/java/com/google/gson/internal/GsonBuildConfigTest.java
+delete mode 100644 gson/src/main/java-templates/com/google/gson/internal/GsonBuildConfig.java
+delete mode 100644 gson/src/test/java/com/google/gson/functional/GsonVersionDiagnosticsTest.java
+delete mode 100644 gson/src/test/java/com/google/gson/internal/GsonBuildConfigTest.java
 
-diff --git a/gson/src/main/java/com/google/gson/Gson.java b/gson/src/main/java/com/google/gson/Gson.java
-index 27f3ee9..d584ece 100644
---- a/gson/src/main/java/com/google/gson/Gson.java
-+++ b/gson/src/main/java/com/google/gson/Gson.java
-@@ -37,7 +37,6 @@ import java.util.concurrent.atomic.AtomicLongArray;
+--- ./gson/src/main/java/com/google/gson/internal/reflect/ReflectionHelper.java.orig	2023-03-27 12:12:11.824878326 +0100
++++ ./gson/src/main/java/com/google/gson/internal/reflect/ReflectionHelper.java	2023-03-27 12:14:36.157362353 +0100
+@@ -1,7 +1,6 @@
+ package com.google.gson.internal.reflect;
+ 
+ import com.google.gson.JsonIOException;
+-import com.google.gson.internal.GsonBuildConfig;
+ import java.lang.reflect.AccessibleObject;
+ import java.lang.reflect.Constructor;
+ import java.lang.reflect.Field;
+@@ -150,7 +149,7 @@ public class ReflectionHelper {
+ 
+   public static RuntimeException createExceptionForUnexpectedIllegalAccess(
+       IllegalAccessException exception) {
+-    throw new RuntimeException("Unexpected IllegalAccessException occurred (Gson " + GsonBuildConfig.VERSION + ")."
++    throw new RuntimeException("Unexpected IllegalAccessException occurred (Gson). "
+         + " Certain ReflectionAccessFilter features require Java >= 9 to work correctly. If you are not using"
+         + " ReflectionAccessFilter, report this to the Gson maintainers.",
+         exception);
+@@ -160,7 +159,6 @@ public class ReflectionHelper {
+   private static RuntimeException createExceptionForRecordReflectionException(
+           ReflectiveOperationException exception) {
+     throw new RuntimeException("Unexpected ReflectiveOperationException occurred"
+-            + " (Gson " + GsonBuildConfig.VERSION + ")."
+             + " To support Java records, reflection is utilized to read out information"
+             + " about records. All these invocations happens after it is established"
+             + " that records exist in the JVM. This exception is unexpected behavior.",
+--- ./gson/src/main/java/com/google/gson/Gson.java.orig	2023-03-27 12:09:35.155438649 +0100
++++ ./gson/src/main/java/com/google/gson/Gson.java	2023-03-27 12:11:25.244044921 +0100
+@@ -18,7 +18,6 @@ package com.google.gson;
  
  import com.google.gson.internal.ConstructorConstructor;
  import com.google.gson.internal.Excluder;
@@ -28,64 +46,39 @@ index 27f3ee9..d584ece 100644
  import com.google.gson.internal.LazilyParsedNumber;
  import com.google.gson.internal.Primitives;
  import com.google.gson.internal.Streams;
-@@ -462,7 +461,7 @@ public final class Gson {
-           return candidate;
-         }
-       }
+@@ -568,7 +567,7 @@ public final class Gson {
+     }
+ 
+     if (candidate == null) {
 -      throw new IllegalArgumentException("GSON (" + GsonBuildConfig.VERSION + ") cannot handle " + type);
 +      throw new IllegalArgumentException("GSON cannot handle " + type);
-     } finally {
-       threadCalls.remove(type);
+     }
  
-@@ -704,10 +703,6 @@ public final class Gson {
-       ((TypeAdapter<Object>) adapter).write(writer, src);
+     if (isInitialAdapterRequest) {
+@@ -842,8 +841,6 @@ public final class Gson {
+       adapter.write(writer, src);
      } catch (IOException e) {
        throw new JsonIOException(e);
 -    } catch (AssertionError e) {
--      AssertionError error = new AssertionError("AssertionError (GSON " + GsonBuildConfig.VERSION + "): " + e.getMessage());
--      error.initCause(e);
--      throw error;
+-      throw new AssertionError("AssertionError (GSON " + GsonBuildConfig.VERSION + "): " + e.getMessage(), e);
      } finally {
        writer.setLenient(oldLenient);
        writer.setHtmlSafe(oldHtmlSafe);
-@@ -784,10 +779,6 @@ public final class Gson {
+@@ -945,8 +942,6 @@ public final class Gson {
        Streams.write(jsonElement, writer);
      } catch (IOException e) {
        throw new JsonIOException(e);
 -    } catch (AssertionError e) {
--      AssertionError error = new AssertionError("AssertionError (GSON " + GsonBuildConfig.VERSION + "): " + e.getMessage());
--      error.initCause(e);
--      throw error;
+-      throw new AssertionError("AssertionError (GSON " + GsonBuildConfig.VERSION + "): " + e.getMessage(), e);
      } finally {
        writer.setLenient(oldLenient);
        writer.setHtmlSafe(oldHtmlSafe);
-@@ -945,10 +936,6 @@ public final class Gson {
+@@ -1239,8 +1234,6 @@ public final class Gson {
      } catch (IOException e) {
        // TODO(inder): Figure out whether it is indeed right to rethrow this as JsonSyntaxException
        throw new JsonSyntaxException(e);
 -    } catch (AssertionError e) {
--      AssertionError error = new AssertionError("AssertionError (GSON " + GsonBuildConfig.VERSION + "): " + e.getMessage());
--      error.initCause(e);
--      throw error;
+-      throw new AssertionError("AssertionError (GSON " + GsonBuildConfig.VERSION + "): " + e.getMessage(), e);
      } finally {
        reader.setLenient(oldLenient);
      }
---- ./gson/src/main/java/com/google/gson/internal/reflect/ReflectionHelper.java.orig	2022-08-28 15:09:57.027580397 +0100
-+++ ./gson/src/main/java/com/google/gson/internal/reflect/ReflectionHelper.java	2022-08-28 15:11:57.198151672 +0100
-@@ -1,7 +1,6 @@
- package com.google.gson.internal.reflect;
- 
- import com.google.gson.JsonIOException;
--import com.google.gson.internal.GsonBuildConfig;
- import java.lang.reflect.Constructor;
- import java.lang.reflect.Field;
- 
-@@ -66,7 +65,7 @@ public class ReflectionHelper {
-   }
- 
-   public static RuntimeException createExceptionForUnexpectedIllegalAccess(IllegalAccessException exception) {
--    throw new RuntimeException("Unexpected IllegalAccessException occurred (Gson " + GsonBuildConfig.VERSION + "). "
-+    throw new RuntimeException("Unexpected IllegalAccessException occurred (Gson). "
-         + "Certain ReflectionAccessFilter features require Java >= 9 to work correctly. If you are not using "
-         + "ReflectionAccessFilter, report this to the Gson maintainers.",
-         exception);

diff --git a/google-gson.spec b/google-gson.spec
index b4ed618..4ece35f 100644
--- a/google-gson.spec
+++ b/google-gson.spec
@@ -1,6 +1,6 @@
 Name:           google-gson
-Version:        2.9.1
-Release:        2%{?dist}
+Version:        2.10.1
+Release:        1%{?dist}
 Summary:        Java lib for conversion of Java objects into JSON representation
 License:        ASL 2.0
 URL:            https://github.com/google/gson
@@ -48,7 +48,8 @@ rm ./gson/src/test/java/com/google/gson/functional/EnumWithObfuscatedTest.java
 # to check later
 rm ./gson/src/test/java/com/google/gson/internal/bind/DefaultDateTypeAdapterTest.java
 # remove unnecessary dependency on parent POM
-%pom_remove_parent
+# POM doesn't specify parent.
+#%%pom_remove_parent
 
 %pom_remove_plugin :copy-rename-maven-plugin gson
 %pom_remove_plugin :proguard-maven-plugin gson
@@ -84,6 +85,9 @@ rm extras/src/test/java/com/google/gson/typeadapters/PostConstructAdapterFactory
 %license LICENSE
 
 %changelog
+* Mon Mar 27 2023 Sérgio Basto <sergio@serjux.com> - 2.10.1-1
+- Update google-gson to 2.10.1
+
 * Thu Jan 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 2.9.1-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
 

diff --git a/sources b/sources
index a4a56bb..8abac9b 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (gson-parent-2.9.1.tar.gz) = 928a17491efc9866271f08d4ec0fc22b96b4b6f4827d86679cd4a9085e91fbf6b1b4d6618d380ff63e7a9922d9cf0ec7ba9cd073862e7e212eb31c0140c6b6ad
+SHA512 (gson-parent-2.10.1.tar.gz) = 074f40f7f9aa48daf5b5a3ec371713db02f6f8fceb959b01e8a16732862645d2350f3276ab7ff8021d48082f890b53c6e80d992af6af4b74e4646f85494b8e70