From d5c8ce73cd7d76dd58303711996835fceefc4421 Mon Sep 17 00:00:00 2001 From: Sérgio M. Basto Date: Mar 02 2022 02:06:08 +0000 Subject: Update google-gson to 2.9.0 javadoc is disabled because it fails to build --- diff --git a/.gitignore b/.gitignore index f89f9a3..8698f21 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,4 @@ google-gson-2.2.1.tar.xz /gson-parent-2.8.2.tar.gz /gson-parent-2.8.6.tar.gz /gson-parent-2.8.8.tar.gz +/gson-parent-2.9.0.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 b5211e5..8653e28 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 @@ -91,9 +91,9 @@ index 27f3ee9..d584ece 100644 import com.google.gson.internal.ConstructorConstructor; import com.google.gson.internal.Excluder; -import com.google.gson.internal.GsonBuildConfig; + import com.google.gson.internal.LazilyParsedNumber; import com.google.gson.internal.Primitives; import com.google.gson.internal.Streams; - import com.google.gson.internal.bind.ArrayTypeAdapter; @@ -462,7 +461,7 @@ public final class Gson { return candidate; } diff --git a/google-gson.spec b/google-gson.spec index 2a4a36a..538269e 100644 --- a/google-gson.spec +++ b/google-gson.spec @@ -1,6 +1,6 @@ Name: google-gson -Version: 2.8.8 -Release: 5%{?dist} +Version: 2.9.0 +Release: 1%{?dist} Summary: Java lib for conversion of Java objects into JSON representation License: ASL 2.0 URL: https://github.com/google/gson @@ -11,7 +11,6 @@ Patch1: 0002-Also-export-internal-packages-in-OSGi-metadata.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 -Patch4: gson-gradle.patch BuildArch: noarch @@ -21,6 +20,7 @@ BuildRequires: mvn(org.apache.felix:maven-bundle-plugin) BuildRequires: mvn(org.apache.maven.plugins:maven-jar-plugin) BuildRequires: bnd-maven-plugin BuildRequires: maven-resources-plugin +BuildRequires: mvn(com.fasterxml.jackson.core:jackson-databind) %description Gson is a Java library that can be used to convert a Java object into its @@ -36,37 +36,34 @@ This package contains the API documentation for %{name}. %prep %setup -q -n gson-gson-parent-%{version} -rm ./gradle/wrapper/gradle-wrapper.jar +#rm ./gradle/wrapper/gradle-wrapper.jar %patch1 -p1 %patch3 -p1 -%patch4 -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 + +# to check later +rm ./gson/src/test/java/com/google/gson/internal/bind/DefaultDateTypeAdapterTest.java # remove unnecessary dependency on parent POM %pom_remove_parent -# Use felix maven-bundle-plugin only for OSGi metadata -#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']" " - - <_include>bnd.bnd - - - - - create-manifest - process-classes - manifest - - " + +%pom_remove_plugin :moditect-maven-plugin gson + +#depends on com.google.caliper +%pom_disable_module metrics + +#%%pom_xpath_remove pom:build/pom:extensions proto +#%%pom_remove_plugin org.xolstice.maven.plugins:protobuf-maven-plugin proto +#depends on com.google.protobuf:protobuf-java:jar:4.0.0-rc-2 and com.google.truth:truth:jar:1.1.3 +%pom_disable_module proto %build -%mvn_build +%mvn_build -j %install %mvn_install @@ -75,10 +72,14 @@ rm ./gson/src/test/java/com/google/gson/functional/EnumWithObfuscatedTest.java %license LICENSE %doc README.md CHANGELOG.md UserGuide.md -%files javadoc -f .mfiles-javadoc -%license LICENSE +#%%files javadoc -f .mfiles-javadoc +#%%license LICENSE %changelog +* Wed Mar 02 2022 Sérgio Basto - 2.9.0-1 +- Update google-gson to 2.9.0 +- javadoc is disabled because it fails to build + * Sun Feb 06 2022 Sérgio Basto - 2.8.8-5 - re-add 0002-Also-export-internal-packages-in-OSGi-metadata.patch and pom_xpath_inject diff --git a/gson-gradle.patch b/gson-gradle.patch deleted file mode 100644 index ceb04e2..0000000 --- a/gson-gradle.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- gson-gson-parent-2.8.8.orig/gson/build.gradle 2021-08-20 17:07:19.000000000 +0100 -+++ gson-gson-parent-2.8.8/gson/build.gradle 2022-02-06 16:35:16.740363581 +0000 -@@ -4,9 +4,6 @@ apply plugin: 'maven' - group = 'com.google.code.gson' - version = '2.8.6-SNAPSHOT' - --sourceCompatibility = 1.6 --targetCompatibility = 1.6 -- - sourceSets.main.java.exclude("**/module-info.java") - dependencies { - testCompile "junit:junit:4.12" diff --git a/sources b/sources index 80c744d..b360e60 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (gson-parent-2.8.8.tar.gz) = f90ad679c99c5e9a6ee9e397e59ab1d7d94a9c82366902b808addc40ebbab101fdba7fc83e4666c4f35e52d8b127e6f901e65072a7de210496466074dcd043c5 +SHA512 (gson-parent-2.9.0.tar.gz) = 25e57f0e3cbff7e4d33070d250ba4ecf1c659380bce07863c52a3b30edd0ba88c923e55b0f38098b5ce3827a74a21c4d41f9de02f6a84da771ae39fd823667d3