You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by mg...@apache.org on 2021/06/04 12:40:36 UTC
[wicket] branch master updated: Update javax.inject:inject:1 to
jakarta.inject:inject:2.0.0
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 67165d1 Update javax.inject:inject:1 to jakarta.inject:inject:2.0.0
67165d1 is described below
commit 67165d1820d247286f5c12c1755fe11424a74046
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
AuthorDate: Fri Jun 4 14:27:38 2021 +0300
Update javax.inject:inject:1 to jakarta.inject:inject:2.0.0
---
pom.xml | 7 ++++---
wicket-ioc/pom.xml | 4 ++--
.../spring/injection/annot/AnnotProxyFieldValueFactory.java | 8 ++++----
...est.java => JakartaInjectAnnotProxyFieldValueFactoryTest.java} | 8 ++++----
.../{JavaxInjectInjectable.java => JakartaInjectInjectable.java} | 6 +++---
5 files changed, 17 insertions(+), 16 deletions(-)
diff --git a/pom.xml b/pom.xml
index 4dc4ebe..fe68d0c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -150,6 +150,7 @@
<jakarta.el.version>4.0.1</jakarta.el.version>
<jakarta.el-api.version>4.0.0</jakarta.el-api.version>
<jakarta.enterprise.cdi-api.version>3.0.0</jakarta.enterprise.cdi-api.version>
+ <jakarta.inject-api.version>2.0.0</jakarta.inject-api.version>
<jakarta.servlet.jsp-api.version>3.0.0</jakarta.servlet.jsp-api.version>
<jakarta.validation-api.version>3.0.0</jakarta.validation-api.version>
<jakarta.websocket-api.version>2.0.0</jakarta.websocket-api.version>
@@ -308,9 +309,9 @@
<version>${metrics.version}</version>
</dependency>
<dependency>
- <groupId>javax.inject</groupId>
- <artifactId>javax.inject</artifactId>
- <version>1</version>
+ <groupId>jakarta.inject</groupId>
+ <artifactId>jakarta.inject-api</artifactId>
+ <version>${jakarta.inject-api.version}</version>
</dependency>
<dependency>
<groupId>log4j</groupId>
diff --git a/wicket-ioc/pom.xml b/wicket-ioc/pom.xml
index a6fa4c5..e099980 100644
--- a/wicket-ioc/pom.xml
+++ b/wicket-ioc/pom.xml
@@ -41,8 +41,8 @@
<artifactId>cglib</artifactId>
</dependency>
<dependency>
- <groupId>javax.inject</groupId>
- <artifactId>javax.inject</artifactId>
+ <groupId>jakarta.inject</groupId>
+ <artifactId>jakarta.inject-api</artifactId>
</dependency>
<dependency>
<groupId>org.apache.wicket</groupId>
diff --git a/wicket-spring/src/main/java/org/apache/wicket/spring/injection/annot/AnnotProxyFieldValueFactory.java b/wicket-spring/src/main/java/org/apache/wicket/spring/injection/annot/AnnotProxyFieldValueFactory.java
index aec594b..57caa9b 100644
--- a/wicket-spring/src/main/java/org/apache/wicket/spring/injection/annot/AnnotProxyFieldValueFactory.java
+++ b/wicket-spring/src/main/java/org/apache/wicket/spring/injection/annot/AnnotProxyFieldValueFactory.java
@@ -24,8 +24,8 @@ import java.util.Iterator;
import java.util.List;
import java.util.concurrent.ConcurrentMap;
-import javax.inject.Inject;
-import javax.inject.Named;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
import org.apache.wicket.injection.IFieldValueFactory;
import org.apache.wicket.proxy.LazyInitProxyFactory;
@@ -64,13 +64,13 @@ import org.springframework.core.ResolvableType;
* IDependency bean from spring context upon first access to one of the methods.
* <p>
* This class will also cache any produced proxies so that the same proxy is always returned for the
- * same spring dependency. This helps cut down on session size beacause proxies for the same
+ * same spring dependency. This helps cut down on session size because proxies for the same
* dependency will not be serialized twice.
*
* @see LazyInitProxyFactory
* @see SpringBean
* @see SpringBeanLocator
- * @see javax.inject.Inject
+ * @see jakarta.inject.Inject
*
* @author Igor Vaynberg (ivaynberg)
* @author Istvan Devai
diff --git a/wicket-spring/src/test/java/org/apache/wicket/spring/injection/annot/JavaxInjectAnnotProxyFieldValueFactoryTest.java b/wicket-spring/src/test/java/org/apache/wicket/spring/injection/annot/JakartaInjectAnnotProxyFieldValueFactoryTest.java
similarity index 85%
rename from wicket-spring/src/test/java/org/apache/wicket/spring/injection/annot/JavaxInjectAnnotProxyFieldValueFactoryTest.java
rename to wicket-spring/src/test/java/org/apache/wicket/spring/injection/annot/JakartaInjectAnnotProxyFieldValueFactoryTest.java
index f128366..eb4dbdc 100644
--- a/wicket-spring/src/test/java/org/apache/wicket/spring/injection/annot/JavaxInjectAnnotProxyFieldValueFactoryTest.java
+++ b/wicket-spring/src/test/java/org/apache/wicket/spring/injection/annot/JakartaInjectAnnotProxyFieldValueFactoryTest.java
@@ -16,7 +16,7 @@
*/
package org.apache.wicket.spring.injection.annot;
-import org.apache.wicket.spring.injection.util.JavaxInjectInjectable;
+import org.apache.wicket.spring.injection.util.JakartaInjectInjectable;
import org.junit.jupiter.api.Test;
import java.lang.reflect.Field;
@@ -27,14 +27,14 @@ import static org.junit.jupiter.api.Assertions.fail;
/**
* Tests for Spring injection with {@literal @javax.inject.Inject} annotation
*/
-public class JavaxInjectAnnotProxyFieldValueFactoryTest extends AnnotProxyFieldValueFactoryTest
+public class JakartaInjectAnnotProxyFieldValueFactoryTest extends AnnotProxyFieldValueFactoryTest
{
/**
* Construct.
*/
- public JavaxInjectAnnotProxyFieldValueFactoryTest()
+ public JakartaInjectAnnotProxyFieldValueFactoryTest()
{
- super(new JavaxInjectInjectable());
+ super(new JakartaInjectInjectable());
}
/**
diff --git a/wicket-spring/src/test/java/org/apache/wicket/spring/injection/util/JavaxInjectInjectable.java b/wicket-spring/src/test/java/org/apache/wicket/spring/injection/util/JakartaInjectInjectable.java
similarity index 91%
rename from wicket-spring/src/test/java/org/apache/wicket/spring/injection/util/JavaxInjectInjectable.java
rename to wicket-spring/src/test/java/org/apache/wicket/spring/injection/util/JakartaInjectInjectable.java
index 0f378fc..d02b6a4 100644
--- a/wicket-spring/src/test/java/org/apache/wicket/spring/injection/util/JavaxInjectInjectable.java
+++ b/wicket-spring/src/test/java/org/apache/wicket/spring/injection/util/JakartaInjectInjectable.java
@@ -16,8 +16,8 @@
*/
package org.apache.wicket.spring.injection.util;
-import javax.inject.Inject;
-import javax.inject.Named;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
/**
* Mock for an object with some SpringBean annotations
@@ -25,7 +25,7 @@ import javax.inject.Named;
* @author Igor Vaynberg (ivaynberg)
*
*/
-public class JavaxInjectInjectable implements InjectableInterface
+public class JakartaInjectInjectable implements InjectableInterface
{
private Bean nobean;