WW-5532 Upgrade and align various dependencies

Author: kusalk

apps/pom.xml

@@ -99,7 +99,6 @@
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-test</artifactId>
-            <version>${spring.platformVersion}</version>
             <scope>test</scope>
         </dependency>
     </dependencies>

apps/showcase/src/test/java/it/org/apache/struts2/showcase/StrutsParametersTest.java

@@ -229,7 +229,8 @@ public void private_MyDtoField_WithGetter_MethodAnnotatedDepthOne() throws Excep
     }
 
     private void assertText(Map<String, String> params, String text) throws IOException {
-        UriComponentsBuilder builder = UriComponentsBuilder.fromHttpUrl(ParameterUtils.getBaseUrl()).path("/paramsannotation/test.action");
+        UriComponentsBuilder builder = UriComponentsBuilder.fromUriString(ParameterUtils.getBaseUrl())
+                .path("/paramsannotation/test.action");
         params.forEach(builder::queryParam);
         String url = builder.toUriString();
         HtmlPage page = webClient.getPage(url);

core/pom.xml

@@ -229,6 +229,7 @@
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
+            <scope>compile</scope>
             <optional>true</optional>
         </dependency>
 

plugins/cdi/pom.xml

@@ -33,7 +33,6 @@
     <packaging>jar</packaging>
 
     <dependencies>
-
         <dependency>
             <groupId>jakarta.enterprise</groupId>
             <artifactId>jakarta.enterprise.cdi-api</artifactId>
@@ -43,29 +42,31 @@
         <dependency>
             <groupId>org.jboss.weld</groupId>
             <artifactId>weld-core-impl</artifactId>
-            <scope>provided</scope>
+            <version>${weld.version}</version>
+            <scope>test</scope>
         </dependency>
-
         <dependency>
             <groupId>org.jboss.weld.se</groupId>
             <artifactId>weld-se-core</artifactId>
+            <version>${weld.version}</version>
             <scope>test</scope>
         </dependency>
-
         <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-test</artifactId>
-            <!-- org.springframework.mock.jndi.SimpleNamingContextBuilder removed from newer version -->
-            <version>4.3.0.RELEASE</version>
+            <groupId>com.github.h-thurow</groupId>
+            <artifactId>simple-jndi</artifactId>
+            <version>0.25.0</version>
             <scope>test</scope>
         </dependency>
-
         <dependency>
             <groupId>commons-logging</groupId>
             <artifactId>commons-logging</artifactId>
             <scope>test</scope>
         </dependency>
-
+        <dependency>
+            <groupId>jakarta.inject</groupId>
+            <artifactId>jakarta.inject-api</artifactId>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
 
     <properties>

plugins/cdi/src/test/java/org/apache/struts2/cdi/CdiObjectFactoryTest.java

@@ -21,26 +21,43 @@
 import org.jboss.weld.bootstrap.api.helpers.RegistrySingletonProvider;
 import org.jboss.weld.environment.se.Weld;
 import org.jboss.weld.environment.se.WeldContainer;
+import org.junit.AfterClass;
 import org.junit.BeforeClass;
 import org.junit.Test;
-import org.springframework.mock.jndi.SimpleNamingContextBuilder;
 
 import jakarta.enterprise.inject.spi.InjectionTarget;
+import javax.naming.Context;
+import javax.naming.InitialContext;
+import javax.naming.NamingException;
 
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertSame;
 import static org.junit.Assert.assertTrue;
 
 public class CdiObjectFactoryTest {
 
+    private static final String SHARED_JNDI = "org.osjava.sj.jndi.shared";
+    private static InitialContext context;
+    private static WeldContainer container;
+
     @BeforeClass
     public static void setup() throws Exception {
-        Weld weld = new Weld().containerId(RegistrySingletonProvider.STATIC_INSTANCE);
-        WeldContainer container = weld.initialize();
+        container = new Weld().containerId(RegistrySingletonProvider.STATIC_INSTANCE).initialize();
+
+        System.setProperty(Context.INITIAL_CONTEXT_FACTORY, "org.osjava.sj.SimpleContextFactory");
+        System.setProperty(SHARED_JNDI, "true");
+        context = new InitialContext();
+        context.bind(CdiObjectFactory.CDI_JNDIKEY_BEANMANAGER_COMP, container.getBeanManager());
+    }
+
+    @AfterClass
+    public static void tearDown() throws NamingException {
+        container.shutdown();
 
-        SimpleNamingContextBuilder builder = new SimpleNamingContextBuilder();
-        builder.activate();
-        builder.bind(CdiObjectFactory.CDI_JNDIKEY_BEANMANAGER_COMP, container.getBeanManager());
+        context.unbind(CdiObjectFactory.CDI_JNDIKEY_BEANMANAGER_COMP);
+        context.close();
+        System.clearProperty(Context.INITIAL_CONTEXT_FACTORY);
+        System.clearProperty(SHARED_JNDI);
     }
 
     @Test
@@ -50,16 +67,16 @@ public void testFindBeanManager() {
 
     @Test
     public void testGetBean() throws Exception {
-        final CdiObjectFactory cdiObjectFactory = new CdiObjectFactory();
-        FooConsumer fooConsumer = (FooConsumer) cdiObjectFactory.buildBean(FooConsumer.class.getCanonicalName(), null, false);
+        var cdiObjectFactory = new CdiObjectFactory();
+        var fooConsumer = (FooConsumer) cdiObjectFactory.buildBean(FooConsumer.class.getCanonicalName(), null, false);
         assertNotNull(fooConsumer);
         assertNotNull(fooConsumer.fooService);
     }
 
     @Test
     public void testGetInjectionTarget() {
-        final CdiObjectFactory cdiObjectFactory = new CdiObjectFactory();
-        final InjectionTarget<?> injectionTarget = cdiObjectFactory.getInjectionTarget(FooConsumer.class);
+        var cdiObjectFactory = new CdiObjectFactory();
+        InjectionTarget<?> injectionTarget = cdiObjectFactory.getInjectionTarget(FooConsumer.class);
         assertNotNull(injectionTarget);
         assertTrue(cdiObjectFactory.injectionTargetCache.containsKey(FooConsumer.class));
         assertSame(cdiObjectFactory.getInjectionTarget(FooConsumer.class), injectionTarget);

plugins/jfreechart/pom.xml

@@ -62,8 +62,8 @@
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>org.easymock</groupId>
-            <artifactId>easymock</artifactId>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-web</artifactId>
             <scope>test</scope>
         </dependency>
     </dependencies>

plugins/jfreechart/src/test/java/org/apache/struts2/dispatcher/ChartResultTest.java

@@ -20,11 +20,9 @@
 
 import org.apache.struts2.ActionContext;
 import org.apache.struts2.ActionInvocation;
-import org.apache.struts2.ActionProxy;
-import org.apache.struts2.util.ValueStack;
 import org.apache.struts2.ServletActionContext;
 import org.apache.struts2.junit.StrutsTestCase;
-import org.easymock.EasyMock;
+import org.apache.struts2.util.ValueStack;
 import org.jfree.chart.ChartFactory;
 import org.jfree.chart.JFreeChart;
 import org.jfree.data.general.DefaultPieDataset;
@@ -34,96 +32,85 @@
 import jakarta.servlet.http.HttpServletResponse;
 import java.io.IOException;
 
+import static org.junit.Assert.assertThrows;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
 
-/**
- *
- */
 public class ChartResultTest extends StrutsTestCase {
 
+    private ChartResult result;
+
     private ActionInvocation actionInvocation;
     private JFreeChart mockChart;
     private MockServletOutputStream os;
-    private ValueStack stack;
-    private ActionProxy mockActionProxy;
     private HttpServletResponse responseMock;
 
+    @Override
+    protected void setUp() throws Exception {
+        super.setUp();
 
-    public void testChart() throws Exception {
-        EasyMock.expect(responseMock.getOutputStream()).andReturn(os);
-        EasyMock.replay(responseMock, mockActionProxy, actionInvocation);
+        result = new ChartResult();
+
+        var data = new DefaultPieDataset<String>();
+        data.setValue("Java", Double.valueOf(43.2));
+        data.setValue("Visual Basic", Double.valueOf(0.0));
+        data.setValue("C/C++", Double.valueOf(17.5));
+        mockChart = ChartFactory.createPieChart("Pie Chart", data, true, true, false);
+
+        actionInvocation = mock(ActionInvocation.class);
+        when(actionInvocation.getStack()).thenReturn(ActionContext.getContext().getValueStack());
 
-        ChartResult result = new ChartResult();
+        os = new MockServletOutputStream();
+        responseMock = mock(HttpServletResponse.class);
+        when(responseMock.getOutputStream()).thenReturn(os);
+
+        ServletActionContext.setResponse(responseMock);
+    }
 
+    public void testChart() throws Exception {
         result.setChart(mockChart);
 
         result.setHeight("10");
         result.setWidth("10");
         result.execute(actionInvocation);
 
-        EasyMock.verify(responseMock);
         assertTrue(os.isWritten());
     }
 
     public void testContentTypePng() throws Exception {
-        EasyMock.expect(responseMock.getOutputStream()).andReturn(os);
-        responseMock.setContentType("image/png");
-        EasyMock.replay(responseMock, mockActionProxy, actionInvocation);
-        ChartResult result = new ChartResult();
-
         result.setChart(mockChart);
 
         result.setHeight("10");
         result.setWidth("10");
         result.setType("png");
         result.execute(actionInvocation);
 
-        EasyMock.verify(responseMock);
+        verify(responseMock).setContentType("image/png");
         assertTrue(os.isWritten());
     }
 
     public void testContentTypeJpg() throws Exception {
-        EasyMock.expect(responseMock.getOutputStream()).andReturn(os);
-        responseMock.setContentType("image/jpg");
-        EasyMock.replay(responseMock, mockActionProxy, actionInvocation);
-        ChartResult result = new ChartResult();
-
         result.setChart(mockChart);
 
         result.setHeight("10");
         result.setWidth("10");
         result.setType("jpg");
         result.execute(actionInvocation);
 
-        EasyMock.verify(responseMock);
+        verify(responseMock).setContentType("image/jpg");
         assertTrue(os.isWritten());
     }
 
-
     public void testChartNotSet() {
-        ChartResult result = new ChartResult();
-        EasyMock.replay(responseMock, mockActionProxy, actionInvocation);
-
-        // expect exception if chart not set.
         result.setChart(null);
 
-        try {
-            result.execute(actionInvocation);
-            fail();
-        } catch (Exception e) {
-        }
+        assertThrows(NullPointerException.class, () -> result.execute(actionInvocation));
 
-        EasyMock.verify(responseMock);
         assertFalse(os.isWritten());
     }
 
-
     public void testChartWithOGNLProperties() throws Exception {
-        EasyMock.expect(responseMock.getOutputStream()).andReturn(os);
-        EasyMock.replay(responseMock, mockActionProxy, actionInvocation);
-
-
-        ChartResult result = new ChartResult();
-
         result.setChart(mockChart);
 
         result.setHeight("${myHeight}");
@@ -135,50 +122,14 @@ public void testChartWithOGNLProperties() throws Exception {
 
         result.execute(actionInvocation);
 
-        EasyMock.verify(responseMock);
         assertEquals(result.getHeight(), stack.findValue("myHeight").toString());
         assertEquals(result.getWidth(), stack.findValue("myWidth").toString());
-        assertEquals("250", result.getHeight().toString());
-        assertEquals("150", result.getWidth().toString());
+        assertEquals("250", result.getHeight());
+        assertEquals("150", result.getWidth());
         assertTrue(os.isWritten());
     }
 
-    protected void setUp() throws Exception {
-        super.setUp();
-
-        DefaultPieDataset data = new DefaultPieDataset();
-        data.setValue("Java", new Double(43.2));
-        data.setValue("Visual Basic", new Double(0.0));
-        data.setValue("C/C++", new Double(17.5));
-        mockChart = ChartFactory.createPieChart("Pie Chart", data, true, true, false);
-
-
-        stack = ActionContext.getContext().getValueStack();
-
-        mockActionProxy = EasyMock.createNiceMock(ActionProxy.class);
-        EasyMock.expect(mockActionProxy.getNamespace()).andReturn("/html");
-
-        actionInvocation = EasyMock.createMock(ActionInvocation.class);
-
-        EasyMock.expect(actionInvocation.getStack()).andReturn(stack).anyTimes();
-
-
-        os = new MockServletOutputStream();
-        responseMock = EasyMock.createNiceMock(HttpServletResponse.class);
-
-        ServletActionContext.setResponse((HttpServletResponse) responseMock);
-    }
-
-    protected void tearDown() throws Exception {
-        actionInvocation = null;
-        os = null;
-        responseMock = null;
-        stack = null;
-        mockActionProxy = null;
-    }
-
-
-    private class MockServletOutputStream extends ServletOutputStream {
+    private static class MockServletOutputStream extends ServletOutputStream {
         // very simple check that outputStream was written to.
         private boolean written = false;
 
@@ -189,6 +140,7 @@ public boolean isWritten() {
             return written;
         }
 
+        @Override
         public void write(int arg0) throws IOException {
             written = true;
         }

plugins/junit/pom.xml

@@ -52,6 +52,7 @@
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
+            <scope>compile</scope>
         </dependency>
     </dependencies>
 

plugins/rest/pom.xml

@@ -58,6 +58,7 @@
         <dependency>
             <groupId>org.apache.juneau</groupId>
             <artifactId>juneau-marshall</artifactId>
+            <version>8.1.3</version>
             <optional>true</optional>
         </dependency>
 

plugins/testng/pom.xml

@@ -35,6 +35,7 @@
         <dependency>
             <groupId>org.testng</groupId>
             <artifactId>testng</artifactId>
+            <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>org.springframework</groupId>