This is an automated email from the ASF dual-hosted git repository.
mgrigorov pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/wicket.git
The following commit(s) were added to refs/heads/master by this push:
new ec955a3cb8 WICKET-7053: Update Guice to 7.x (javax -> jakarta)
ec955a3cb8 is described below
commit ec955a3cb812f2d2720995779812d98a2b170aa3
Author: Martin Tzvetanov Grigorov <mgrigo...@apache.org>
AuthorDate: Fri May 5 10:43:01 2023 +0300
WICKET-7053: Update Guice to 7.x (javax -> jakarta)
Signed-off-by: Martin Tzvetanov Grigorov <mgrigo...@apache.org>
---
pom.xml | 2 +-
wicket-guice/pom.xml | 9 +++++++++
wicket-guice/src/main/java/module-info.java | 2 +-
.../apache/wicket/guice/GuiceFieldValueFactory.java | 8 ++++----
.../org/apache/wicket/guice/AbstractInjectorTest.java | 4 ++--
...orTest.java => JakartaInjectGuiceInjectorTest.java} | 18 +++++++++---------
...estBehavior.java => JakartaInjectTestBehavior.java} | 4 ++--
...tComponent.java => JakartaInjectTestComponent.java} | 14 +++++++-------
...omponent.java => JakartaInjectTestNoComponent.java} | 6 +++---
9 files changed, 38 insertions(+), 29 deletions(-)
diff --git a/pom.xml b/pom.xml
index 8fed1cf3ef..2348de248d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -147,7 +147,7 @@
<commons-fileupload.version>2.0-SNAPSHOT</commons-fileupload.version>
<commons-io.version>2.11.0</commons-io.version>
<commons-lang3.version>3.12.0</commons-lang3.version>
- <guice.version>5.1.0</guice.version>
+ <guice.version>7.0.0-rc1</guice.version>
<el-impl.version>2.2.1-b05</el-impl.version>
<forbiddenapis.version>3.4</forbiddenapis.version>
<jacoco.version>0.8.7</jacoco.version>
diff --git a/wicket-guice/pom.xml b/wicket-guice/pom.xml
index 5459c53f5b..921c77a50b 100644
--- a/wicket-guice/pom.xml
+++ b/wicket-guice/pom.xml
@@ -34,6 +34,15 @@
<osgi.export.package>org.apache.wicket.guice*;-noimport:=true</osgi.export.package>
<osgi.import.package>!java*,!kotlin*,!sun.nio.ch,org.slf4j*;version="[1.7,3)",*</osgi.import.package>
</properties>
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>com.google.errorprone</groupId>
+ <artifactId>error_prone_annotations</artifactId>
+ <version>2.18.0</version>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
<dependencies>
<dependency>
<groupId>com.google.inject</groupId>
diff --git a/wicket-guice/src/main/java/module-info.java
b/wicket-guice/src/main/java/module-info.java
index 1f2a6879da..0b7d1cf848 100644
--- a/wicket-guice/src/main/java/module-info.java
+++ b/wicket-guice/src/main/java/module-info.java
@@ -20,7 +20,7 @@ module org.apache.wicket.guice {
requires org.apache.wicket.util;
requires org.apache.wicket.core;
requires org.apache.wicket.ioc;
- requires javax.inject;
+ requires jakarta.inject;
requires com.google.guice;
exports org.apache.wicket.guice;
diff --git
a/wicket-guice/src/main/java/org/apache/wicket/guice/GuiceFieldValueFactory.java
b/wicket-guice/src/main/java/org/apache/wicket/guice/GuiceFieldValueFactory.java
index a385d0f23a..f12200681f 100644
---
a/wicket-guice/src/main/java/org/apache/wicket/guice/GuiceFieldValueFactory.java
+++
b/wicket-guice/src/main/java/org/apache/wicket/guice/GuiceFieldValueFactory.java
@@ -21,7 +21,7 @@ import java.lang.reflect.Field;
import java.lang.reflect.Modifier;
import java.util.concurrent.ConcurrentMap;
-import javax.inject.Qualifier;
+import jakarta.inject.Qualifier;
import org.apache.wicket.injection.IFieldValueFactory;
import org.apache.wicket.proxy.LazyInitProxyFactory;
@@ -61,8 +61,8 @@ public class GuiceFieldValueFactory implements
IFieldValueFactory
if (supportsField(field))
{
Inject injectAnnotation =
field.getAnnotation(Inject.class);
- javax.inject.Inject javaxInjectAnnotation =
field.getAnnotation(javax.inject.Inject.class);
- if (!Modifier.isStatic(field.getModifiers()) &&
(injectAnnotation != null || javaxInjectAnnotation != null))
+ jakarta.inject.Inject jakartaInjectAnnotation =
field.getAnnotation(jakarta.inject.Inject.class);
+ if (!Modifier.isStatic(field.getModifiers()) &&
(injectAnnotation != null || jakartaInjectAnnotation != null))
{
try
{
@@ -121,7 +121,7 @@ public class GuiceFieldValueFactory implements
IFieldValueFactory
@Override
public boolean supportsField(final Field field)
{
- return field.isAnnotationPresent(Inject.class) ||
field.isAnnotationPresent(javax.inject.Inject.class);
+ return field.isAnnotationPresent(Inject.class) ||
field.isAnnotationPresent(jakarta.inject.Inject.class);
}
/**
diff --git
a/wicket-guice/src/test/java/org/apache/wicket/guice/AbstractInjectorTest.java
b/wicket-guice/src/test/java/org/apache/wicket/guice/AbstractInjectorTest.java
index 164aa6ba32..8246ce33c9 100644
---
a/wicket-guice/src/test/java/org/apache/wicket/guice/AbstractInjectorTest.java
+++
b/wicket-guice/src/test/java/org/apache/wicket/guice/AbstractInjectorTest.java
@@ -23,7 +23,7 @@ import java.lang.annotation.Annotation;
import java.util.HashMap;
import java.util.Map;
-import javax.inject.Named;
+import jakarta.inject.Named;
import org.apache.wicket.Session;
import org.apache.wicket.ThreadContext;
@@ -158,7 +158,7 @@ public abstract class AbstractInjectorTest
}
/**
- * Helper class to make binding of an instance of javax.inject.Named
less verbose
+ * Helper class to make binding of an instance of jakarta.inject.Named
less verbose
*/
private static class Jsr330Named implements Named
{
diff --git
a/wicket-guice/src/test/java/org/apache/wicket/guice/JavaxInjectGuiceInjectorTest.java
b/wicket-guice/src/test/java/org/apache/wicket/guice/JakartaInjectGuiceInjectorTest.java
similarity index 77%
rename from
wicket-guice/src/test/java/org/apache/wicket/guice/JavaxInjectGuiceInjectorTest.java
rename to
wicket-guice/src/test/java/org/apache/wicket/guice/JakartaInjectGuiceInjectorTest.java
index 7350d0a35c..1348f0b304 100644
---
a/wicket-guice/src/test/java/org/apache/wicket/guice/JavaxInjectGuiceInjectorTest.java
+++
b/wicket-guice/src/test/java/org/apache/wicket/guice/JakartaInjectGuiceInjectorTest.java
@@ -19,7 +19,7 @@ package org.apache.wicket.guice;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.fail;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import org.apache.wicket.ajax.attributes.IAjaxCallListener;
import org.junit.jupiter.api.Test;
@@ -29,18 +29,18 @@ import com.google.inject.spi.Message;
/**
*/
-public class JavaxInjectGuiceInjectorTest extends AbstractInjectorTest
+public class JakartaInjectGuiceInjectorTest extends AbstractInjectorTest
{
@Override
- protected JavaxInjectTestComponent newTestComponent(String id)
+ protected JakartaInjectTestComponent newTestComponent(String id)
{
- return new JavaxInjectTestComponent(id);
+ return new JakartaInjectTestComponent(id);
}
@Override
protected TestNoComponentInterface newTestNoComponent()
{
- return new JavaxInjectTestNoComponent();
+ return new JakartaInjectTestNoComponent();
}
/**
@@ -55,9 +55,9 @@ public class JavaxInjectGuiceInjectorTest extends
AbstractInjectorTest
{
try
{
- JavaxInjectTestComponent component = new
MyJavaxInjectWithNonExistingTestComponent();
+ JakartaInjectTestComponent component = new
MyJakartaInjectWithNonExistingTestComponent();
// Throws exception because component.getNonExisting()
cannot be injected
- fail("Fields annotated with @javax.inject.Inject are
required!");
+ fail("Fields annotated with @jakarta.inject.Inject are
required!");
}
catch (ConfigurationException cx)
{
@@ -68,12 +68,12 @@ public class JavaxInjectGuiceInjectorTest extends
AbstractInjectorTest
}
}
- private static class MyJavaxInjectWithNonExistingTestComponent extends
JavaxInjectTestComponent
+ private static class MyJakartaInjectWithNonExistingTestComponent
extends JakartaInjectTestComponent
{
@Inject
private IAjaxCallListener nonExisting;
- public MyJavaxInjectWithNonExistingTestComponent()
+ public MyJakartaInjectWithNonExistingTestComponent()
{
super("id");
}
diff --git
a/wicket-guice/src/test/java/org/apache/wicket/guice/JavaxInjectTestBehavior.java
b/wicket-guice/src/test/java/org/apache/wicket/guice/JakartaInjectTestBehavior.java
similarity index 94%
rename from
wicket-guice/src/test/java/org/apache/wicket/guice/JavaxInjectTestBehavior.java
rename to
wicket-guice/src/test/java/org/apache/wicket/guice/JakartaInjectTestBehavior.java
index 96cd2ab419..ff810092ed 100644
---
a/wicket-guice/src/test/java/org/apache/wicket/guice/JavaxInjectTestBehavior.java
+++
b/wicket-guice/src/test/java/org/apache/wicket/guice/JakartaInjectTestBehavior.java
@@ -19,7 +19,7 @@ package org.apache.wicket.guice;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNotNull;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import org.apache.wicket.Component;
import org.apache.wicket.behavior.Behavior;
@@ -29,7 +29,7 @@ import org.apache.wicket.behavior.Behavior;
*
* https://issues.apache.org/jira/browse/WICKET-4149
*/
-public class JavaxInjectTestBehavior extends Behavior
+public class JakartaInjectTestBehavior extends Behavior
{
private static final long serialVersionUID = 1L;
diff --git
a/wicket-guice/src/test/java/org/apache/wicket/guice/JavaxInjectTestComponent.java
b/wicket-guice/src/test/java/org/apache/wicket/guice/JakartaInjectTestComponent.java
similarity index 88%
rename from
wicket-guice/src/test/java/org/apache/wicket/guice/JavaxInjectTestComponent.java
rename to
wicket-guice/src/test/java/org/apache/wicket/guice/JakartaInjectTestComponent.java
index ad1b1a10f3..bf87db6eb4 100644
---
a/wicket-guice/src/test/java/org/apache/wicket/guice/JavaxInjectTestComponent.java
+++
b/wicket-guice/src/test/java/org/apache/wicket/guice/JakartaInjectTestComponent.java
@@ -18,8 +18,8 @@ package org.apache.wicket.guice;
import java.util.Map;
-import javax.inject.Inject;
-import javax.inject.Named;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
import org.apache.wicket.Component;
@@ -27,7 +27,7 @@ import com.google.inject.Provider;
/**
*/
-public class JavaxInjectTestComponent extends Component implements
TestComponentInterface
+public class JakartaInjectTestComponent extends Component implements
TestComponentInterface
{
private static final long serialVersionUID = 1L;
@@ -56,7 +56,7 @@ public class JavaxInjectTestComponent extends Component
implements TestComponent
@Named("named2")
private String named2;
- private final JavaxInjectTestNoComponent noComponent;
+ private final JakartaInjectTestNoComponent noComponent;
@Inject
private EvilTestService evilTestService;
@@ -66,11 +66,11 @@ public class JavaxInjectTestComponent extends Component
implements TestComponent
*
* @param id
*/
- public JavaxInjectTestComponent(final String id)
+ public JakartaInjectTestComponent(final String id)
{
super(id);
- noComponent = new JavaxInjectTestNoComponent();
- add(new JavaxInjectTestBehavior());
+ noComponent = new JakartaInjectTestNoComponent();
+ add(new JakartaInjectTestBehavior());
}
/**
diff --git
a/wicket-guice/src/test/java/org/apache/wicket/guice/JavaxInjectTestNoComponent.java
b/wicket-guice/src/test/java/org/apache/wicket/guice/JakartaInjectTestNoComponent.java
similarity index 89%
rename from
wicket-guice/src/test/java/org/apache/wicket/guice/JavaxInjectTestNoComponent.java
rename to
wicket-guice/src/test/java/org/apache/wicket/guice/JakartaInjectTestNoComponent.java
index cce5d6033f..f63f88819f 100644
---
a/wicket-guice/src/test/java/org/apache/wicket/guice/JavaxInjectTestNoComponent.java
+++
b/wicket-guice/src/test/java/org/apache/wicket/guice/JakartaInjectTestNoComponent.java
@@ -16,7 +16,7 @@
*/
package org.apache.wicket.guice;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import org.apache.wicket.Component;
import org.apache.wicket.injection.Injector;
@@ -26,7 +26,7 @@ import org.apache.wicket.util.io.IClusterable;
* Tests injection of services in classes which do not extend {@link Component}
*/
@SuppressWarnings("serial")
-public class JavaxInjectTestNoComponent implements IClusterable,
TestNoComponentInterface
+public class JakartaInjectTestNoComponent implements IClusterable,
TestNoComponentInterface
{
@Inject
@@ -37,7 +37,7 @@ public class JavaxInjectTestNoComponent implements
IClusterable, TestNoComponent
*
* Construct.
*/
- public JavaxInjectTestNoComponent()
+ public JakartaInjectTestNoComponent()
{
Injector.get().inject(this);
}
