public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Sam James" <sam@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-java/gson/
Date: Thu, 28 Jul 2022 09:10:25 +0000 (UTC)	[thread overview]
Message-ID: <1658999413.95552ad8f808583da0afb128caa4be3c26e9517b.sam@gentoo> (raw)

commit:     95552ad8f808583da0afb128caa4be3c26e9517b
Author:     Volkmar W. Pogatzki <gentoo <AT> pogatzki <DOT> net>
AuthorDate: Sun Jul 17 21:15:05 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Jul 28 09:10:13 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=95552ad8

dev-java/gson: change slot for version 2.9.0 back to slot 2.6

Conditionally excluding the test class failing with java 17 allows
returning to RDEPEND=">=virtual/jre-1.8:*" which makes this version
compatible with reverse dependencies, so it can use the existing slot 2.6.

Bug: https://bugs.gentoo.org/853136
Signed-off-by: Volkmar W. Pogatzki <gentoo <AT> pogatzki.net>
Signed-off-by: Sam James <sam <AT> gentoo.org>

 dev-java/gson/gson-2.9.0-r2.ebuild | 60 ++++++++++++++++++++++++++++++++++++++
 1 file changed, 60 insertions(+)

diff --git a/dev-java/gson/gson-2.9.0-r2.ebuild b/dev-java/gson/gson-2.9.0-r2.ebuild
new file mode 100644
index 000000000000..c5ddf82b4f07
--- /dev/null
+++ b/dev-java/gson/gson-2.9.0-r2.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Skeleton command:
+# java-ebuilder --generate-ebuild --workdir . --pom pom.xml --download-uri https://github.com/google/gson/archive/gson-parent-2.9.0.tar.gz --slot 2.6 --keywords "~amd64 ~arm ~arm64 ~ppc64 ~x86" --ebuild gson-2.9.0.ebuild
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source test"
+MAVEN_ID="com.google.code.gson:gson:2.9.0"
+JAVA_TESTING_FRAMEWORKS="junit-4"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Gson JSON library"
+HOMEPAGE="https://github.com/google/gson"
+SRC_URI="https://github.com/google/${PN}/archive/${PN}-parent-${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="2.6"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+
+DEPEND=">=virtual/jdk-11:*"
+RDEPEND=">=virtual/jre-1.8:*"
+
+S="${WORKDIR}/${PN}-${PN}-parent-${PV}/${PN}"
+
+JAVA_SRC_DIR=(
+	"src/main/java"
+	"src/main/java-templates"
+)
+
+JAVA_TEST_GENTOO_CLASSPATH="junit-4"
+JAVA_TEST_SRC_DIR="src/test/java"
+JAVA_TEST_RESOURCE_DIRS="src/test/resources"
+
+JAVA_TEST_EXCLUDES=(
+	# requires the test class to be obfuscated using proguard which we do not have atm
+	"com.google.gson.functional.EnumWithObfuscatedTest"
+	# FAILURES!!!
+	# Tests run: 1090,  Failures: 3
+	# testComGoogleGsonAnnotationsPackage(com.google.gson.regression.OSGiTest)
+	# junit.framework.AssertionFailedError: Cannot find com.google.gson OSGi bundle manifest
+	"com.google.gson.regression.OSGiTest"
+	# testSerializeInternalImplementationObject(com.google.gson.functional.ReflectionAccessTest)
+	# java.lang.IllegalStateException: Expected BEGIN_ARRAY but was BEGIN_OBJECT at line 1 column 2 path $
+	"com.google.gson.functional.ReflectionAccessTest"
+)
+
+src_prepare() {
+	default
+	sed -e "s/\${project.version}/${PV}/g" \
+		-i src/main/java-templates/com/google/gson/internal/GsonBuildConfig.java \
+			|| die "Failed to set version"
+
+	local vm_version="$(java-config -g PROVIDES_VERSION)"
+	if ver_test "${vm_version}" -ge "17" ; then
+		JAVA_TEST_EXCLUDES+=( "com.google.gson.internal.bind.DefaultDateTypeAdapterTest" )
+	fi
+}


             reply	other threads:[~2022-07-28  9:10 UTC|newest]

Thread overview: 67+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-07-28  9:10 Sam James [this message]
  -- strict thread matches above, loose matches on Subject: below --
2025-10-30 21:27 [gentoo-commits] repo/gentoo:master commit in: dev-java/gson/ Arthur Zamarin
2025-10-03 14:56 Sam James
2025-10-03  5:07 Sam James
2024-08-17  8:18 Miroslav Šulc
2024-08-16 14:07 Arthur Zamarin
2024-08-14 22:03 Sam James
2024-08-14 20:21 Sam James
2024-08-14 20:21 Sam James
2024-07-16 10:08 Miroslav Šulc
2024-07-13 11:54 Miroslav Šulc
2024-07-10 10:22 Miroslav Šulc
2024-05-25  7:50 Florian Schmaus
2024-01-05 10:38 Miroslav Šulc
2024-01-05  9:48 Sam James
2024-01-05  8:13 Sam James
2024-01-05  8:13 Sam James
2024-01-05  8:13 Sam James
2023-04-28  6:28 Miroslav Šulc
2023-04-28  6:15 Sam James
2023-04-28  6:15 Sam James
2023-04-28  6:15 Sam James
2023-04-28  6:15 Sam James
2023-03-29  5:42 Miroslav Šulc
2022-10-20 16:32 Miroslav Šulc
2022-10-20 10:56 Jakov Smolić
2022-10-20 10:52 Jakov Smolić
2022-10-19  8:25 Jakov Smolić
2022-10-18 18:51 Sam James
2022-09-18 10:21 Florian Schmaus
2022-09-01  4:31 Miroslav Šulc
2022-08-01 18:08 Arthur Zamarin
2022-07-31 17:12 Arthur Zamarin
2022-07-30  2:34 Sam James
2022-07-30  2:33 Sam James
2022-07-30  2:33 Sam James
2022-06-17 10:48 Arthur Zamarin
2022-06-11 23:28 Sam James
2022-06-11  7:36 Agostino Sarubbo
2022-06-10 20:20 Jakov Smolić
2022-05-11 17:16 Florian Schmaus
2022-05-11 17:16 Florian Schmaus
2022-05-11 13:36 Florian Schmaus
2022-05-06 11:46 Florian Schmaus
2022-01-27  7:53 Miroslav Šulc
2022-01-26 19:16 Arthur Zamarin
2022-01-25 22:16 Sam James
2022-01-25  8:50 Jakov Smolić
2022-01-25  8:50 Jakov Smolić
2022-01-20 10:20 Miroslav Šulc
2022-01-07 20:42 Arthur Zamarin
2022-01-07 20:41 Arthur Zamarin
2021-11-26  9:23 Sam James
2021-11-12  8:16 Agostino Sarubbo
2021-11-11 11:35 Agostino Sarubbo
2021-10-26 10:10 Miroslav Šulc
2021-07-18  9:39 Florian Schmaus
2021-07-01 14:37 Miroslav Šulc
2021-07-01 14:37 Miroslav Šulc
2021-06-14  6:39 Sergei Trofimovich
2021-04-27 13:45 Miroslav Šulc
2021-04-27 13:45 Miroslav Šulc
2021-04-27 13:25 Miroslav Šulc
2016-10-14  2:58 Austin English
2016-05-11 21:07 James Le Cuirot
2015-09-01 19:00 Tobias Klausmann
2015-08-18 19:47 Patrice Clement

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1658999413.95552ad8f808583da0afb128caa4be3c26e9517b.sam@gentoo \
    --to=sam@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox