From 78cec310c9ebadfc96b44ac50bdc98cdc279909b Mon Sep 17 00:00:00 2001 From: Manfred Tremmel Date: Wed, 4 Dec 2024 13:33:56 +0100 Subject: [PATCH 1/5] switchted from javax.inject to jakarta.inject namespace - guice updated from 4.2.3 to 7.0.0 - gwt updated from 2.9.0 to 2.12.1 - all other dependencies updated to latest versions - java minimum requirement now is 11 --- pom.xml | 64 ++++++++++--------- src/config/gwt-checkstyle.xml | 4 +- .../binder/GinLinkedBindingBuilder.java | 2 +- .../client/multibindings/GinMapBinder.java | 4 +- .../gwt/inject/rebind/BindingsProcessor.java | 2 +- .../gwt/inject/rebind/GinjectorBindings.java | 4 +- .../gwt/inject/rebind/GinjectorGenerator.java | 2 +- .../inject/rebind/GuiceBindingVisitor.java | 6 +- .../AnnotatedBindingBuilderAdapter.java | 2 +- .../adapter/LinkedBindingBuilderAdapter.java | 2 +- .../rebind/binding/BindProviderBinding.java | 2 +- .../inject/rebind/binding/BindingFactory.java | 2 +- .../rebind/binding/BindingFactoryImpl.java | 2 +- .../inject/rebind/reflect/MemberLiteral.java | 2 +- .../resolution/ImplicitBindingCreator.java | 2 +- .../gwt/inject/rebind/util/GuiceUtil.java | 4 +- .../com/google/gwt/inject/Inject.gwt.xml | 5 +- .../guiceapi/com/google/inject/Provider.java | 2 +- .../resources/javax/inject/Inject.gwt.xml | 8 --- .../gwt/inject/client/jsr330/Jsr330Test.java | 8 +-- .../privatefactory/PrivateFactoryTest.java | 2 +- .../inject/client/privatemanylevel/Car.java | 2 +- .../PrivateManyLevelTest.java | 2 +- .../rebind/binding/FactoryBindingTest.java | 4 +- .../GinjectorBindingsOutputterTest.java | 4 +- .../rebind/reflect/MemberLiteralTest.java | 6 +- .../rebind/reflect/ReflectUtilTest.java | 10 +-- .../resolution/BindingResolverTest.java | 4 +- .../gwt/inject/rebind/util/GuiceUtilTest.java | 4 +- 29 files changed, 83 insertions(+), 84 deletions(-) delete mode 100644 src/main/resources/javax/inject/Inject.gwt.xml diff --git a/pom.xml b/pom.xml index 96c6666..64ae36c 100644 --- a/pom.xml +++ b/pom.xml @@ -101,26 +101,26 @@ UTF-8 - 1.8 - 4.2.3 - 2.9.0 + 11 + 7.0.0 + 2.12.1 - 1 + 2.0.1 3.0.2 - 1.3.2 + 3.0.0 - javax.inject - javax.inject + jakarta.inject + jakarta.inject-api ${jsr330.version} - + - javax.inject - javax.inject + jakarta.inject + jakarta.inject-api ${jsr330.version} sources @@ -139,13 +139,13 @@ - com.google.gwt + org.gwtproject gwt-user ${gwt.version} provided - com.google.gwt + org.gwtproject gwt-dev ${gwt.version} provided @@ -159,8 +159,8 @@ provided - javax.annotation - javax.annotation-api + jakarta.annotation + jakarta.annotation-api ${jsr250.version} provided @@ -169,13 +169,13 @@ junit junit - 3.8.1 + 4.13.2 test org.easymock easymock - 3.1 + 5.5.0 test @@ -211,7 +211,7 @@ maven-checkstyle-plugin - 3.1.1 + 3.6.0 validate @@ -231,13 +231,13 @@ com.puppycrawl.tools checkstyle - 8.33 + 10.20.2 maven-compiler-plugin - 3.7.0 + 3.13.0 ${java.release} ${java.release} @@ -245,7 +245,7 @@ maven-resources-plugin - 3.0.2 + 3.3.1 client-sources @@ -268,7 +268,7 @@ maven-surefire-plugin - 2.21.0 + 3.5.2 @@ -278,7 +278,7 @@ maven-failsafe-plugin - 2.21.0 + 3.5.2 com/google/gwt/inject/*TestSuite.java @@ -301,6 +301,7 @@ verify + --add-opens java.base/java.lang=ALL-UNNAMED @@ -319,6 +320,7 @@ verify + --add-opens java.base/java.lang=ALL-UNNAMED @@ -334,7 +336,7 @@ maven-jar-plugin - 3.1.0 + 3.4.2 @@ -353,7 +355,7 @@ maven-source-plugin - 3.0.1 + 3.3.1 package @@ -365,12 +367,12 @@ maven-site-plugin - 3.7 + 3.21.0 org.apache.maven.doxia doxia-module-markdown - 1.8 + 2.0.0 @@ -382,7 +384,7 @@ maven-project-info-reports-plugin - 2.9 + 3.8.0 @@ -395,7 +397,7 @@ maven-javadoc-plugin - 3.0.0 + 3.11.1 package @@ -417,7 +419,7 @@ org.apache.maven.plugins maven-release-plugin - 2.5.3 + 3.1.1 v@{project.version} HEAD-SNAPSHOT @@ -427,7 +429,7 @@ org.apache.maven.plugins maven-gpg-plugin - 1.6 + 3.2.7 sign-artifacts @@ -447,7 +449,7 @@ maven-invoker-plugin - 3.0.1 + 3.8.1 true ${project.build.directory}/it-repo diff --git a/src/config/gwt-checkstyle.xml b/src/config/gwt-checkstyle.xml index e485986..ee5ab77 100644 --- a/src/config/gwt-checkstyle.xml +++ b/src/config/gwt-checkstyle.xml @@ -85,11 +85,13 @@ Description: - + + + diff --git a/src/main/java/com/google/gwt/inject/client/binder/GinLinkedBindingBuilder.java b/src/main/java/com/google/gwt/inject/client/binder/GinLinkedBindingBuilder.java index 513ce79..5f3268c 100644 --- a/src/main/java/com/google/gwt/inject/client/binder/GinLinkedBindingBuilder.java +++ b/src/main/java/com/google/gwt/inject/client/binder/GinLinkedBindingBuilder.java @@ -18,7 +18,7 @@ import com.google.inject.Key; import com.google.inject.TypeLiteral; -import javax.inject.Provider; +import jakarta.inject.Provider; /** * See the EDSL examples at {@link GinBinder}. diff --git a/src/main/java/com/google/gwt/inject/client/multibindings/GinMapBinder.java b/src/main/java/com/google/gwt/inject/client/multibindings/GinMapBinder.java index d8b458a..a44222c 100644 --- a/src/main/java/com/google/gwt/inject/client/multibindings/GinMapBinder.java +++ b/src/main/java/com/google/gwt/inject/client/multibindings/GinMapBinder.java @@ -238,7 +238,7 @@ public GinLinkedBindingBuilder addBinding(K key) { * @see #addBinding(Object) */ public GinLinkedBindingBuilder addBinding( - Class> keyProvider) { + Class> keyProvider) { return addBinding(TypeLiteral.get(keyProvider)); } @@ -253,7 +253,7 @@ public GinLinkedBindingBuilder addBinding( * @see #addBinding(Object) */ public GinLinkedBindingBuilder addBinding( - TypeLiteral> keyProvider) { + TypeLiteral> keyProvider) { BindingRecorder recorder = createRecorder(); recorder.bind(keyType).toProvider(Key.get(keyProvider)); return recorder.bind(valueType); diff --git a/src/main/java/com/google/gwt/inject/rebind/BindingsProcessor.java b/src/main/java/com/google/gwt/inject/rebind/BindingsProcessor.java index 9751dad..a4c907c 100644 --- a/src/main/java/com/google/gwt/inject/rebind/BindingsProcessor.java +++ b/src/main/java/com/google/gwt/inject/rebind/BindingsProcessor.java @@ -43,7 +43,7 @@ import java.util.List; import java.util.Set; -import javax.inject.Provider; +import jakarta.inject.Provider; /** * Builds up the bindings and scopes for this {@code Ginjector}. This uses diff --git a/src/main/java/com/google/gwt/inject/rebind/GinjectorBindings.java b/src/main/java/com/google/gwt/inject/rebind/GinjectorBindings.java index 56149e3..992fd13 100644 --- a/src/main/java/com/google/gwt/inject/rebind/GinjectorBindings.java +++ b/src/main/java/com/google/gwt/inject/rebind/GinjectorBindings.java @@ -51,7 +51,7 @@ import java.util.Map; import java.util.Set; -import javax.inject.Provider; +import jakarta.inject.Provider; /** * Stores information that describes the bindings present in a given injector, @@ -380,7 +380,7 @@ public GinScope determineScope(Key key) { // the "real" binding every time we need the value. scope = GinScope.NO_SCOPE; } else if (raw.getAnnotation(Singleton.class) != null - || raw.getAnnotation(javax.inject.Singleton.class) != null) { + || raw.getAnnotation(jakarta.inject.Singleton.class) != null) { // Look for scope annotation as a fallback scope = GinScope.SINGLETON; } else if (RemoteServiceProxyBinding.isRemoteServiceProxy(key.getTypeLiteral())) { diff --git a/src/main/java/com/google/gwt/inject/rebind/GinjectorGenerator.java b/src/main/java/com/google/gwt/inject/rebind/GinjectorGenerator.java index 6c0d033..46d25d0 100644 --- a/src/main/java/com/google/gwt/inject/rebind/GinjectorGenerator.java +++ b/src/main/java/com/google/gwt/inject/rebind/GinjectorGenerator.java @@ -86,7 +86,7 @@ public String generate(TreeLogger logger, GeneratorContext context, String typeN private ClassLoader createGinClassLoader(TreeLogger logger, GeneratorContext context) { Set exceptions = new LinkedHashSet(); exceptions.add("com.google.inject"); // Need the non-super-source version during generation. - exceptions.add("javax.inject"); // Need the non-super-source version during generation. + exceptions.add("jakarta.inject"); // Need the non-super-source version during generation. exceptions.add("com.google.gwt.inject.client"); // Excluded to allow class-literal comparison. // Required by GWT 2.8.0+ to prevent loading of GWT script only java.lang.JsException class diff --git a/src/main/java/com/google/gwt/inject/rebind/GuiceBindingVisitor.java b/src/main/java/com/google/gwt/inject/rebind/GuiceBindingVisitor.java index c2e60e4..12e6221 100644 --- a/src/main/java/com/google/gwt/inject/rebind/GuiceBindingVisitor.java +++ b/src/main/java/com/google/gwt/inject/rebind/GuiceBindingVisitor.java @@ -38,7 +38,7 @@ import java.lang.annotation.Annotation; import java.util.List; -import javax.inject.Provider; +import jakarta.inject.Provider; /** * Gathers information about Guice Bindings and adds the information to a {@link GinjectorBindings}. @@ -136,7 +136,7 @@ public Void visitEagerSingleton() { } // TODO(schmitt): We don't support this right now in any case, but it's - // strange to be using the Guice Scope instead of javax.inject.Scope + // strange to be using the Guice Scope instead of jakarta.inject.Scope public Void visitScope(Scope scope) { messages.add(new Message(PrettyPrinter.format("Explicit scope unsupported: key=%s scope=%s", targetKey, scope))); @@ -144,7 +144,7 @@ public Void visitScope(Scope scope) { } public Void visitScopeAnnotation(Class scopeAnnotation) { - if (scopeAnnotation == Singleton.class || scopeAnnotation == javax.inject.Singleton.class) { + if (scopeAnnotation == Singleton.class || scopeAnnotation == jakarta.inject.Singleton.class) { bindingsCollection.putScope(targetKey, GinScope.SINGLETON); } else { messages.add(new Message(PrettyPrinter.format("Unsupported scope annotation: key=%s scope=%s", diff --git a/src/main/java/com/google/gwt/inject/rebind/adapter/AnnotatedBindingBuilderAdapter.java b/src/main/java/com/google/gwt/inject/rebind/adapter/AnnotatedBindingBuilderAdapter.java index d1f3c1d..5c465f8 100644 --- a/src/main/java/com/google/gwt/inject/rebind/adapter/AnnotatedBindingBuilderAdapter.java +++ b/src/main/java/com/google/gwt/inject/rebind/adapter/AnnotatedBindingBuilderAdapter.java @@ -24,7 +24,7 @@ import java.lang.annotation.Annotation; -import javax.inject.Provider; +import jakarta.inject.Provider; class AnnotatedBindingBuilderAdapter implements GinAnnotatedBindingBuilder { private final AnnotatedBindingBuilder annotatedBindingBuilder; diff --git a/src/main/java/com/google/gwt/inject/rebind/adapter/LinkedBindingBuilderAdapter.java b/src/main/java/com/google/gwt/inject/rebind/adapter/LinkedBindingBuilderAdapter.java index 7684057..af2e0a3 100644 --- a/src/main/java/com/google/gwt/inject/rebind/adapter/LinkedBindingBuilderAdapter.java +++ b/src/main/java/com/google/gwt/inject/rebind/adapter/LinkedBindingBuilderAdapter.java @@ -23,7 +23,7 @@ import java.lang.annotation.Annotation; -import javax.inject.Provider; +import jakarta.inject.Provider; class LinkedBindingBuilderAdapter implements GinLinkedBindingBuilder { private final LinkedBindingBuilder linkedBindingBuilder; diff --git a/src/main/java/com/google/gwt/inject/rebind/binding/BindProviderBinding.java b/src/main/java/com/google/gwt/inject/rebind/binding/BindProviderBinding.java index 1f8e13e..a5be0b8 100644 --- a/src/main/java/com/google/gwt/inject/rebind/binding/BindProviderBinding.java +++ b/src/main/java/com/google/gwt/inject/rebind/binding/BindProviderBinding.java @@ -29,7 +29,7 @@ import java.util.Collection; import java.util.List; -import javax.inject.Provider; +import jakarta.inject.Provider; /** * A binding to call the requested {@link com.google.inject.Provider}. diff --git a/src/main/java/com/google/gwt/inject/rebind/binding/BindingFactory.java b/src/main/java/com/google/gwt/inject/rebind/binding/BindingFactory.java index 458808a..b66486f 100644 --- a/src/main/java/com/google/gwt/inject/rebind/binding/BindingFactory.java +++ b/src/main/java/com/google/gwt/inject/rebind/binding/BindingFactory.java @@ -26,7 +26,7 @@ import java.lang.reflect.Constructor; import java.util.Map; -import javax.inject.Provider; +import jakarta.inject.Provider; /** * Factory interface for creating bindings. The parameters to each method are the not guice diff --git a/src/main/java/com/google/gwt/inject/rebind/binding/BindingFactoryImpl.java b/src/main/java/com/google/gwt/inject/rebind/binding/BindingFactoryImpl.java index a0ac1a3..bcb55be 100644 --- a/src/main/java/com/google/gwt/inject/rebind/binding/BindingFactoryImpl.java +++ b/src/main/java/com/google/gwt/inject/rebind/binding/BindingFactoryImpl.java @@ -31,7 +31,7 @@ import java.lang.reflect.Constructor; import java.util.Map; -import javax.inject.Provider; +import jakarta.inject.Provider; /** * Guice-based implementation of the binding factory. diff --git a/src/main/java/com/google/gwt/inject/rebind/reflect/MemberLiteral.java b/src/main/java/com/google/gwt/inject/rebind/reflect/MemberLiteral.java index a7edc8c..64004e0 100644 --- a/src/main/java/com/google/gwt/inject/rebind/reflect/MemberLiteral.java +++ b/src/main/java/com/google/gwt/inject/rebind/reflect/MemberLiteral.java @@ -25,7 +25,7 @@ import java.lang.reflect.Member; import java.lang.reflect.Modifier; -import javax.inject.Named; +import jakarta.inject.Named; /** * Generic member representation preserving the member's type parameters. diff --git a/src/main/java/com/google/gwt/inject/rebind/resolution/ImplicitBindingCreator.java b/src/main/java/com/google/gwt/inject/rebind/resolution/ImplicitBindingCreator.java index f7b0e23..033a0b9 100644 --- a/src/main/java/com/google/gwt/inject/rebind/resolution/ImplicitBindingCreator.java +++ b/src/main/java/com/google/gwt/inject/rebind/resolution/ImplicitBindingCreator.java @@ -40,7 +40,7 @@ import java.lang.reflect.ParameterizedType; import java.lang.reflect.Type; -import javax.inject.Provider; +import jakarta.inject.Provider; /** * Class responsible for creating implicit bindings. This returns the binding entry diff --git a/src/main/java/com/google/gwt/inject/rebind/util/GuiceUtil.java b/src/main/java/com/google/gwt/inject/rebind/util/GuiceUtil.java index 6e72b8a..7f092b0 100644 --- a/src/main/java/com/google/gwt/inject/rebind/util/GuiceUtil.java +++ b/src/main/java/com/google/gwt/inject/rebind/util/GuiceUtil.java @@ -113,7 +113,7 @@ public boolean isMemberInject(MethodLiteral method) { * annotation and the injection is marked as optional ( * {@literal @}{@code Inject(optional = true)}). * - * Note that {@link javax.inject.Inject} does not have an optional parameter + * Note that {@link jakarta.inject.Inject} does not have an optional parameter * and therefore cannot be optional. * * @param member method to be checked @@ -176,6 +176,6 @@ public Collection getDependencies(Key typeKey, MethodLiteral member) { return member.isAnnotationPresent(Inject.class) - || member.isAnnotationPresent(javax.inject.Inject.class); + || member.isAnnotationPresent(jakarta.inject.Inject.class); } } diff --git a/src/main/resources/com/google/gwt/inject/Inject.gwt.xml b/src/main/resources/com/google/gwt/inject/Inject.gwt.xml index dcc8820..aab0335 100644 --- a/src/main/resources/com/google/gwt/inject/Inject.gwt.xml +++ b/src/main/resources/com/google/gwt/inject/Inject.gwt.xml @@ -1,9 +1,10 @@ - + - + diff --git a/src/main/resources/com/google/gwt/inject/guiceapi/com/google/inject/Provider.java b/src/main/resources/com/google/gwt/inject/guiceapi/com/google/inject/Provider.java index 3625353..00f6dd6 100644 --- a/src/main/resources/com/google/gwt/inject/guiceapi/com/google/inject/Provider.java +++ b/src/main/resources/com/google/gwt/inject/guiceapi/com/google/inject/Provider.java @@ -46,7 +46,7 @@ * * @author crazybob@google.com (Bob Lee) */ -public interface Provider extends javax.inject.Provider { +public interface Provider extends jakarta.inject.Provider { /** * Provides an instance of {@code T}. Must never return {@code null}. diff --git a/src/main/resources/javax/inject/Inject.gwt.xml b/src/main/resources/javax/inject/Inject.gwt.xml deleted file mode 100644 index ccccf9a..0000000 --- a/src/main/resources/javax/inject/Inject.gwt.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - diff --git a/src/test/java/com/google/gwt/inject/client/jsr330/Jsr330Test.java b/src/test/java/com/google/gwt/inject/client/jsr330/Jsr330Test.java index c1b60f7..c7bf8bd 100644 --- a/src/test/java/com/google/gwt/inject/client/jsr330/Jsr330Test.java +++ b/src/test/java/com/google/gwt/inject/client/jsr330/Jsr330Test.java @@ -24,10 +24,10 @@ import com.google.inject.Provides; import com.google.inject.name.Names; -import javax.inject.Inject; -import javax.inject.Named; -import javax.inject.Provider; -import javax.inject.Singleton; +import jakarta.inject.Inject; +import jakarta.inject.Named; +import jakarta.inject.Provider; +import jakarta.inject.Singleton; public class Jsr330Test extends GWTTestCase { diff --git a/src/test/java/com/google/gwt/inject/client/privatefactory/PrivateFactoryTest.java b/src/test/java/com/google/gwt/inject/client/privatefactory/PrivateFactoryTest.java index 18595ae..abd5703 100644 --- a/src/test/java/com/google/gwt/inject/client/privatefactory/PrivateFactoryTest.java +++ b/src/test/java/com/google/gwt/inject/client/privatefactory/PrivateFactoryTest.java @@ -28,7 +28,7 @@ import com.google.inject.Singleton; import com.google.inject.assistedinject.Assisted; -import javax.inject.Named; +import jakarta.inject.Named; public class PrivateFactoryTest extends GWTTestCase { diff --git a/src/test/java/com/google/gwt/inject/client/privatemanylevel/Car.java b/src/test/java/com/google/gwt/inject/client/privatemanylevel/Car.java index 6383dad..c0259fd 100644 --- a/src/test/java/com/google/gwt/inject/client/privatemanylevel/Car.java +++ b/src/test/java/com/google/gwt/inject/client/privatemanylevel/Car.java @@ -20,7 +20,7 @@ import com.google.gwt.inject.client.privatemanylevel.PrivateManyLevelTest.Transmission; import com.google.inject.Inject; -import javax.inject.Provider; +import jakarta.inject.Provider; public class Car { private final Engine engine; diff --git a/src/test/java/com/google/gwt/inject/client/privatemanylevel/PrivateManyLevelTest.java b/src/test/java/com/google/gwt/inject/client/privatemanylevel/PrivateManyLevelTest.java index 08480e1..88d2b6b 100644 --- a/src/test/java/com/google/gwt/inject/client/privatemanylevel/PrivateManyLevelTest.java +++ b/src/test/java/com/google/gwt/inject/client/privatemanylevel/PrivateManyLevelTest.java @@ -26,7 +26,7 @@ import com.google.inject.Singleton; import com.google.inject.name.Named; -import javax.inject.Provider; +import jakarta.inject.Provider; public class PrivateManyLevelTest extends GWTTestCase { diff --git a/src/test/java/com/google/gwt/inject/rebind/binding/FactoryBindingTest.java b/src/test/java/com/google/gwt/inject/rebind/binding/FactoryBindingTest.java index 0c5bc56..bc895e5 100644 --- a/src/test/java/com/google/gwt/inject/rebind/binding/FactoryBindingTest.java +++ b/src/test/java/com/google/gwt/inject/rebind/binding/FactoryBindingTest.java @@ -67,7 +67,7 @@ public void testTwoUnnamedStringAnnotations() { fail("Expected ConfigurationException."); } catch (ConfigurationException e) { assertTrue(e.getMessage().contains("has more than one parameter of type " + - "java.lang.String annotated with @Assisted(\"\").")); + "String annotated with @Assisted(\"\").")); } } @@ -79,7 +79,7 @@ public void testDuplicateNamedAssistedAnnotations() { fail("Expected ConfigurationException."); } catch (ConfigurationException e) { assertTrue(e.getMessage().contains("has more than one parameter of type " + - "java.lang.String annotated with @Assisted(\"foo\").")); + "String annotated with @Assisted(\"foo\").")); } } diff --git a/src/test/java/com/google/gwt/inject/rebind/output/GinjectorBindingsOutputterTest.java b/src/test/java/com/google/gwt/inject/rebind/output/GinjectorBindingsOutputterTest.java index 375766b..1331d53 100644 --- a/src/test/java/com/google/gwt/inject/rebind/output/GinjectorBindingsOutputterTest.java +++ b/src/test/java/com/google/gwt/inject/rebind/output/GinjectorBindingsOutputterTest.java @@ -83,9 +83,9 @@ public void testOutputStaticInjections() throws Exception { expect(ctx.tryCreate((TreeLogger) anyObject(), (String) anyObject(), (String) anyObject())) .andStubReturn(printWriter); - Capture> fieldCapture = new Capture>(); + Capture> fieldCapture = Capture.newInstance(); Capture> methodCapture = - new Capture>(); + Capture.newInstance(); NameGenerator nameGenerator = createMock(NameGenerator.class, "nameGenerator"); expect(nameGenerator diff --git a/src/test/java/com/google/gwt/inject/rebind/reflect/MemberLiteralTest.java b/src/test/java/com/google/gwt/inject/rebind/reflect/MemberLiteralTest.java index 94bee17..47ff914 100644 --- a/src/test/java/com/google/gwt/inject/rebind/reflect/MemberLiteralTest.java +++ b/src/test/java/com/google/gwt/inject/rebind/reflect/MemberLiteralTest.java @@ -54,8 +54,8 @@ public void testGetBindingAnnotation() throws NoSuchMethodException { // Expected. } - Annotation[] javaxAnnotation = new Annotation[] { getAnnotation(javax.inject.Named.class) }; - assertEquals(getAnnotation(javax.inject.Named.class), + Annotation[] javaxAnnotation = new Annotation[] { getAnnotation(jakarta.inject.Named.class) }; + assertEquals(getAnnotation(jakarta.inject.Named.class), fakeLiteral.getBindingAnnotation(javaxAnnotation)); } @@ -69,7 +69,7 @@ private Annotation getAnnotation(Class annotationClass) @MyBindingAnnotation @MyOtherAnnotation @Named("foo") - @javax.inject.Named + @jakarta.inject.Named private MethodLiteral getMemberLiteral() throws NoSuchMethodException { return MethodLiteral.get(MemberLiteralTest.class.getDeclaredMethod("getMemberLiteral"), TypeLiteral.get(MemberLiteralTest.class)); diff --git a/src/test/java/com/google/gwt/inject/rebind/reflect/ReflectUtilTest.java b/src/test/java/com/google/gwt/inject/rebind/reflect/ReflectUtilTest.java index fbef41d..8c3f5b8 100644 --- a/src/test/java/com/google/gwt/inject/rebind/reflect/ReflectUtilTest.java +++ b/src/test/java/com/google/gwt/inject/rebind/reflect/ReflectUtilTest.java @@ -26,6 +26,8 @@ import java.util.List; import java.util.Map; +import javax.lang.model.element.Name; + public class ReflectUtilTest extends TestCase { @@ -250,7 +252,7 @@ public void testSignatureBuilder_typeParametrizedMethod() MethodLiteral method = getMethod(TypeLiteral.get(ReflectUtilTest.class), "parametrizedMethod", Object.class); assertEquals( - "private T parametrizedMethod(V _0)", + "private T parametrizedMethod(V _0)", ReflectUtil.signatureBuilder(method).build()); } @@ -314,7 +316,7 @@ public void testGetTypeVariableDefinition() throws NoSourceNameException, NoSuch Method combinedMethod = ReflectUtilTest.class.getDeclaredMethod("combinedTypeVariableMethod"); assertEquals( - "T extends java.lang.CharSequence & java.util.Map", + "T extends java.lang.CharSequence & javax.lang.model.element.Name", ReflectUtil.getTypeVariableDefinition(combinedMethod.getTypeParameters()[0])); } @@ -342,7 +344,7 @@ private T typeVariableMethod() { return null; } - private > T combinedTypeVariableMethod() { + private T combinedTypeVariableMethod() { return null; } @@ -352,7 +354,7 @@ private void methodWithParameters(String param1, Integer param2) {} private void throwingMethod() throws IllegalArgumentException, ExampleException {} - private T parametrizedMethod(V param) { return null; } + private T parametrizedMethod(V param) { return null; } static class ConstructorType { protected ConstructorType() {} diff --git a/src/test/java/com/google/gwt/inject/rebind/resolution/BindingResolverTest.java b/src/test/java/com/google/gwt/inject/rebind/resolution/BindingResolverTest.java index b8e62cb..3698bda 100644 --- a/src/test/java/com/google/gwt/inject/rebind/resolution/BindingResolverTest.java +++ b/src/test/java/com/google/gwt/inject/rebind/resolution/BindingResolverTest.java @@ -402,7 +402,7 @@ public void testCircularDependency() throws Exception { expectCreateBinding(bar(), required(bar(), baz())); expectCreateBinding(baz(), required(baz(), bar())); - Capture errorMessage = new Capture(); + Capture errorMessage = Capture.newInstance(); errorManager.logError(isA(String.class), isA(Object.class), isA(Object.class)); // Intentionally use a different key, so that == won't work @@ -467,7 +467,7 @@ public void testDepHiddenInChildBlocksResolvingInRoot() throws Exception { expectCreateBinding(foo(), required(foo(), bar()), required(foo(), baz())); expectCreateBinding(bar()); - Capture errorMessage = new Capture(); + Capture errorMessage = Capture.newInstance(); errorManager.logError(isA(String.class), isA(Object.class), capture(errorMessage), isA(Object.class)); // failure to create bar b/c already bound diff --git a/src/test/java/com/google/gwt/inject/rebind/util/GuiceUtilTest.java b/src/test/java/com/google/gwt/inject/rebind/util/GuiceUtilTest.java index becd35c..004cd88 100644 --- a/src/test/java/com/google/gwt/inject/rebind/util/GuiceUtilTest.java +++ b/src/test/java/com/google/gwt/inject/rebind/util/GuiceUtilTest.java @@ -266,7 +266,7 @@ public static class TestData implements Ginjector { @Inject String nonOptionalInject; @Inject(optional = true) String optionalInject; - @javax.inject.Inject String javaxInject; + @jakarta.inject.Inject String javaxInject; @Inject Baz unAnnotatedKey; @Inject @MyBindingAnnotation Baz annotatedKey; @@ -282,7 +282,7 @@ void memberInjectUnAnnotated(String string) {} @Inject void nonOptionalInject() {} @Inject(optional = true) void optionalInject() {} - @javax.inject.Inject void javaxInject() {} + @jakarta.inject.Inject void javaxInject() {} @Inject void nonOptionalKeys(String string, Foo foo) {} @Inject(optional = true) void optionalKeys(String string, Foo foo) {} From 61ed03a653640b3fdc760a05578711a3ee01f48b Mon Sep 17 00:00:00 2001 From: Manfred Tremmel Date: Wed, 4 Dec 2024 13:39:55 +0100 Subject: [PATCH 2/5] moved file to new space --- src/main/resources/jakarta/inject/Inject.gwt.xml | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 src/main/resources/jakarta/inject/Inject.gwt.xml diff --git a/src/main/resources/jakarta/inject/Inject.gwt.xml b/src/main/resources/jakarta/inject/Inject.gwt.xml new file mode 100644 index 0000000..8a5498c --- /dev/null +++ b/src/main/resources/jakarta/inject/Inject.gwt.xml @@ -0,0 +1,9 @@ + + + + + + + + From 2f5e213635efa2efe3e7a85713cd7a4816549e47 Mon Sep 17 00:00:00 2001 From: Manfred Tremmel Date: Mon, 20 Jan 2025 14:47:12 +0100 Subject: [PATCH 3/5] maven dependencies updated --- pom.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index 64ae36c..abf3da4 100644 --- a/pom.xml +++ b/pom.xml @@ -231,7 +231,7 @@ com.puppycrawl.tools checkstyle - 10.20.2 + 10.21.1 @@ -397,7 +397,7 @@ maven-javadoc-plugin - 3.11.1 + 3.11.2 package @@ -449,7 +449,7 @@ maven-invoker-plugin - 3.8.1 + 3.9.0 true ${project.build.directory}/it-repo From 79f79ee51754ac327046ee781c158897fbe88b32 Mon Sep 17 00:00:00 2001 From: Manfred Tremmel Date: Mon, 20 Jan 2025 20:42:41 +0100 Subject: [PATCH 4/5] try to fix HTTP 403 error in github build --- .github/workflows/maven-verify.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/maven-verify.yml b/.github/workflows/maven-verify.yml index be3756a..a6f6f48 100644 --- a/.github/workflows/maven-verify.yml +++ b/.github/workflows/maven-verify.yml @@ -11,7 +11,7 @@ name: Java CI with Maven on: push: branches: [ "master" ] - pull_request: + pull_request_target: branches: [ "master" ] jobs: From 8b84534b594fde26f719178196edac5e1cfb00c4 Mon Sep 17 00:00:00 2001 From: Manfred Tremmel Date: Tue, 21 Jan 2025 20:26:01 +0100 Subject: [PATCH 5/5] javadoc build fails because of xalan, set source to 8 to fix it --- pom.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/pom.xml b/pom.xml index abf3da4..3eadcdc 100644 --- a/pom.xml +++ b/pom.xml @@ -414,6 +414,7 @@ true true none + 8