Apache/struts
1
0
Fork 0
mirror of https://github.com/apache/struts.git synced 2026-08-31 19:35:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

WW-5141

Browse Source 
- initial attempt to update references javax>jakarta and get things to compile
This commit is contained in:
jdyer1
2023-10-18 13:06:44 -05:00
committed by Lukasz Lenart
parent f4501846c6
commit 2202e5fbbb
646 changed files with 1604 additions and 1575 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/cdi/pom.xml
+4 -2
View File
@@ -35,8 +35,8 @@
<dependencies>
<dependency>
<groupId>javax.enterprise</groupId>
<artifactId>cdi-api</artifactId>
<groupId>jakarta.enterprise</groupId>
<artifactId>jakarta.enterprise.cdi-api</artifactId>
<scope>provided</scope>
</dependency>
@@ -55,6 +55,8 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-test</artifactId>
<!-- org.springframework.mock.jndi.SimpleNamingContextBuilder removed from newer version -->
<version>4.3.0.RELEASE</version>
<scope>test</scope>
</dependency>
plugins/cdi/src/main/java/org/apache/struts2/cdi/CdiObjectFactory.java
+4 -4
View File
@@ -23,10 +23,10 @@ import com.opensymphony.xwork2.inject.Inject;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import javax.enterprise.context.spi.CreationalContext;
import javax.enterprise.inject.spi.BeanManager;
import javax.enterprise.inject.spi.InjectionTarget;
import javax.enterprise.inject.spi.InjectionTargetFactory;
import jakarta.enterprise.context.spi.CreationalContext;
import jakarta.enterprise.inject.spi.BeanManager;
import jakarta.enterprise.inject.spi.InjectionTarget;
import jakarta.enterprise.inject.spi.InjectionTargetFactory;
import javax.naming.Context;
import javax.naming.InitialContext;
import javax.naming.NamingException;
plugins/cdi/src/test/java/org/apache/struts2/cdi/CdiObjectFactoryTest.java
+1 -1
View File
@@ -25,7 +25,7 @@ import org.junit.BeforeClass;
import org.junit.Test;
import org.springframework.mock.jndi.SimpleNamingContextBuilder;
import javax.enterprise.inject.spi.InjectionTarget;
import jakarta.enterprise.inject.spi.InjectionTarget;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertSame;
plugins/cdi/src/test/java/org/apache/struts2/cdi/FooConsumer.java
+1 -1
View File
@@ -18,7 +18,7 @@
*/
package org.apache.struts2.cdi;
import javax.inject.Inject;
import jakarta.inject.Inject;
/**
* FooConsumer.