From 09bec035b4ebc5573c2198fbcfd9401f98da17aa8767a60a12882699954f027a Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Mon, 10 Jun 2024 15:41:32 +0000 Subject: [PATCH] Accepting request 1179726 from Java:packages:test guice 6.0.0 + dependent changes OBS-URL: https://build.opensuse.org/request/show/1179726 OBS-URL: https://build.opensuse.org/package/show/Java:packages/google-guice?expand=0&rev=32 --- _service | 2 +- google-guice-5.1.0.tar.xz | 3 -- google-guice-6.0.0.tar.xz | 3 ++ google-guice-build.tar.xz | 2 +- google-guice.changes | 68 ++++++++++++++++++++++++++++++++++++++- google-guice.spec | 4 ++- 6 files changed, 75 insertions(+), 7 deletions(-) delete mode 100644 google-guice-5.1.0.tar.xz create mode 100644 google-guice-6.0.0.tar.xz diff --git a/_service b/_service index 9e68bc5..adac757 100644 --- a/_service +++ b/_service @@ -2,7 +2,7 @@ git https://github.com/google/guice.git - 5.1.0 + 6.0.0 @PARENT_TAG@ google-guice diff --git a/google-guice-5.1.0.tar.xz b/google-guice-5.1.0.tar.xz deleted file mode 100644 index c6fbdcb..0000000 --- a/google-guice-5.1.0.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:0fa10549f7cf3cb83e05f06cfad470cb21a60f98f0a8ed4b302c79835ba1d3e3 -size 446716 diff --git a/google-guice-6.0.0.tar.xz b/google-guice-6.0.0.tar.xz new file mode 100644 index 0000000..5d58f55 --- /dev/null +++ b/google-guice-6.0.0.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:74a9af9741738cfa1eed67547fd775ec97d93c10e17df8f5f21a7ad58df77517 +size 456772 diff --git a/google-guice-build.tar.xz b/google-guice-build.tar.xz index b972ffd..3574c01 100644 --- a/google-guice-build.tar.xz +++ b/google-guice-build.tar.xz @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a38d9acb0f9712287e792507b68b5b75d4697f15039f10a5484f5e2c2c0fe354 +oid sha256:3b942a942711b579da55bf9bf4e669e224b083cba688ae5fc4032f79f6cb8738 size 3812 diff --git a/google-guice.changes b/google-guice.changes index d9b1e6f..260c4be 100644 --- a/google-guice.changes +++ b/google-guice.changes @@ -1,3 +1,69 @@ +------------------------------------------------------------------- +Mon Jun 10 13:45:04 UTC 2024 - Fridrich Strba + +- Upgrade to upstream version 6.0.0 + * JEE Jakarta Transition + + Guice 6.0 adds support for jakarta.inject, the new namespace + for the JSR330 spec (after the javax -> jakarta JEE + transition). + Guice 6.0 is intended to help users migrate their code to the + jakarta namespace. It continues to fully support the + javax.inject namespace while also mostly supporting the + jakarta.inject namespace. The only part of Guice 6.0 that + doesn't support jakarta.inject are the bind(..).toProvider + methods. Those methods still require javax.inject or + com.google.inject Providers. + + The Guice 6.0 servlet & persist extensions only support the + javax.servlet and javax.persistence namespaces respectively. + + Guice 6.0 can help with incremental migrations to the + jakarta.inject namespace, by incrementally replacing + javax.inject references to jakarta.inject. This works + everywhere, except for code where a jakarta Provider is passed + to bind(..).toProvider. + * Guice Core + + Adds jakarta.inject support. + + Support Java 21 (via updating ASM to 9.5 and other changes). + + Improve AOP support on JVMs such as Azul. + + Fix a deadlock or crash associated with recursively loading + just-in-time bindings. + + Make PrivateModule.binder() non-private, to allow subclass + customization, such as calling skipSources. + + Fix an endloop loop (that can OOM) in singleton lock cycle + detection. + + Fix tests to pass on Windows, despite the different line + separator. + + Improvements to OSGi metadata. + + Mark the JSR305 dependency as optional (since it's not + required at runtime). + + Fix Binder.requestInjection(TypeLiteral, T) to use the + TypeLiteral. + + Honor scoping annotations on concrete types when provisioned + by their @ProvidedBy annotation + + Add a way to tell if a class is "enhanced" by Guice, and + retrieve the original class. + + Ensure the order of bind(...) statements does not matter when + referring to JIT bindings. + + Implement Matcher.and and Matcher.or as default methods + directly in Matcher, so that the AbstractMatcher subclass + isn't required. + + Mark the error_prone_annotations dependency as optional. + * Servlet + + Fix an NPE if contextPath is null + * Persist + + Persist had a number of changes, some of which are backwards + incompatible. Notably: injection of EntityManager no longer + implicitly starts a unit of work (because this led to leaks). + Users can opt-in to the legacy behavior by constructing the + JpaPersistModule with a JpaPersistOptions that sets + setAutoBeginWorkOnEntityManagerCreation to true. + + EntityManager provisioning no longer automatically starts a + unit of work. + + Ignore multiple start/stop calls, rather than throwing an + exception. + + Support manually initiated rollbacks. + + Don't wrap Object-defined methods (e.g: toString, finalize, + equals, hashCode) in transactions. + ------------------------------------------------------------------- Wed Feb 21 22:04:06 UTC 2024 - Fridrich Strba @@ -94,7 +160,7 @@ Thu Jun 10 10:16:03 UTC 2021 - Fridrich Strba - Modified patches: * google-guice-throwingproviderbinder.patch + do not add the override of virtual function - + build with source/target 8 so that the default override + + build with source/target 8 so that the default override from the interface can be used * guice-4.1-javadoc.patch + build javadoc with source level 8 diff --git a/google-guice.spec b/google-guice.spec index 8723980..428c7d7 100644 --- a/google-guice.spec +++ b/google-guice.spec @@ -18,7 +18,7 @@ %global short_name guice Name: google-%{short_name} -Version: 5.1.0 +Version: 6.0.0 Release: 0 Summary: Dependency injection framework for Java 5 and above License: Apache-2.0 @@ -34,6 +34,7 @@ BuildRequires: fdupes BuildRequires: glassfish-servlet-api BuildRequires: google-errorprone-annotations BuildRequires: guava +BuildRequires: jakarta-inject BuildRequires: java-devel >= 1.8 BuildRequires: javapackages-local >= 6 BuildRequires: jsr-305 @@ -176,6 +177,7 @@ build-jar-repository -s lib \ glassfish-servlet-api \ google-errorprone/annotations \ guava/guava \ + jakarta-inject \ jsr-305 \ objectweb-asm/asm \