This is an automated email from the ASF dual-hosted git repository.
elecharny pushed a commit to branch 2.0.X
in repository https://gitbox.apache.org/repos/asf/mina.git
The following commit(s) were added to refs/heads/2.0.X by this push:
new e1eaa6791 Bumped up the spring dependency to a more recent version
e1eaa6791 is described below
commit e1eaa679167cd099305ec49fb6f8ca095836b852
Author: emmanuel lecharny <elecha...@apache.org>
AuthorDate: Fri Oct 25 00:41:44 2024 +0200
Bumped up the spring dependency to a more recent version
---
.../org/apache/mina/example/chat/serverContext.xml | 8 +-
mina-integration-xbean/pom.xml | 7 +-
.../mina/integration/xbean/datagramAcceptor.xml | 103 ++++++++++++++++-----
pom.xml | 51 +++++-----
4 files changed, 116 insertions(+), 53 deletions(-)
diff --git
a/mina-example/src/main/resources/org/apache/mina/example/chat/serverContext.xml
b/mina-example/src/main/resources/org/apache/mina/example/chat/serverContext.xml
index 6e78e15a7..519ca5428 100644
---
a/mina-example/src/main/resources/org/apache/mina/example/chat/serverContext.xml
+++
b/mina-example/src/main/resources/org/apache/mina/example/chat/serverContext.xml
@@ -52,9 +52,9 @@
<bean id="sslContextFactory"
class="org.apache.mina.filter.ssl.SslContextFactory">
<property name="protocol" value="TLS"/>
<property name="keyManagerFactoryAlgorithm" value="SunX509"/>
- <property name="keyManagerFactoryKeyStore"><ref
local="keyStore"/></property>
+ <property name="keyManagerFactoryKeyStore"><ref
bean="keyStore"/></property>
<property name="keyManagerFactoryKeyStorePassword" value="boguspw"/>
- <property name="trustManagerFactory"><ref
local="bogusTrustManagerFactory"/></property>
+ <property name="trustManagerFactory"><ref
bean="bogusTrustManagerFactory"/></property>
</bean>
<bean id="sslContext" factory-bean="sslContextFactory"
factory-method="newInstance"/>
@@ -130,7 +130,7 @@
<property name="beans">
<map>
<entry key="chatServer:name=ioHandler">
- <ref local="chatHandler"/>
+ <ref bean="chatHandler"/>
</entry>
</map>
</property>
@@ -140,7 +140,7 @@
</bean>
</property>
<property name="server">
- <ref local="mbeanServer"/>
+ <ref bean="mbeanServer"/>
</property>
</bean>
diff --git a/mina-integration-xbean/pom.xml b/mina-integration-xbean/pom.xml
index 0c6a19b74..4fff6e8ce 100644
--- a/mina-integration-xbean/pom.xml
+++ b/mina-integration-xbean/pom.xml
@@ -63,7 +63,12 @@
<dependency>
<groupId>org.springframework</groupId>
- <artifactId>spring</artifactId>
+ <artifactId>spring-beans</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-context</artifactId>
</dependency>
<dependency>
diff --git
a/mina-integration-xbean/src/test/resources/org/apache/mina/integration/xbean/datagramAcceptor.xml
b/mina-integration-xbean/src/test/resources/org/apache/mina/integration/xbean/datagramAcceptor.xml
index 0c8b2b4da..aec450c87 100644
---
a/mina-integration-xbean/src/test/resources/org/apache/mina/integration/xbean/datagramAcceptor.xml
+++
b/mina-integration-xbean/src/test/resources/org/apache/mina/integration/xbean/datagramAcceptor.xml
@@ -20,31 +20,92 @@
-->
<spring:beans xmlns:spring="http://xbean.apache.org/schemas/spring/1.0";
- xmlns:s="http://www.springframework.org/schema/beans";
- xmlns="http://mina.apache.org/config/1.0";>
+ xmlns:s="http://www.springframework.org/schema/beans";>
+ <!-- Initialize datagramAcceptor0 -->
+ <bean class="org.apache.mina.transport.socket.nio.NioDatagramAcceptor"
id="datagramAcceptor0"/>
+
+ <!-- Initialize datagramAcceptor1 -->
+ <bean class="org.apache.mina.transport.socket.nio.NioDatagramAcceptor"
id="datagramAcceptor1">
+ <property name="defaultLocalAddress" value="192.168.0.1:110"/>
+ </bean>
+
+ <!-- Initialize datagramAcceptor2 -->
+ <bean class="org.apache.mina.transport.socket.nio.NioDatagramAcceptor"
id="datagramAcceptor2">
+ <constructor-arg ref="taskExecutor"/>
+ <property name="closeOnDeactivation" value="false"/>
+ </bean>
+
+ <!-- Initialize StandardThreadPool use for datagramAcceptor2 -->
+ <bean id="taskExecutor"
class="org.apache.mina.integration.xbean.StandardThreadPool">
+ <constructor-arg name="maxThreads" value="4"/>
+ </bean>
+
+ <!-- Initialize datagramAcceptor3 -->
+ <bean class="org.apache.mina.transport.socket.nio.NioDatagramAcceptor"
id="datagramAcceptor3">
+ <property name="defaultLocalAddresses">
+ <list>
+ <ref bean="socketAddress0"/>
+ <ref bean="socketAddress1"/>
+ <ref bean="socketAddress2"/>
+ </list>
+ </property>
+ </bean>
+
+ <!-- Initialize 1st-3rd InetSocketAddress as list in datagramAcceptor3 -->
+ <bean id="socketAddress0" class="java.net.InetSocketAddress">
+ <constructor-arg ref="byAddress0" index="0"/>
+ <constructor-arg value="10001" index="1"/>
+ </bean>
- <nioDatagramAcceptor id="datagramAcceptor0" />
+ <bean id="socketAddress1" class="java.net.InetSocketAddress">
+ <constructor-arg ref="byAddress1" index="0"/>
+ <constructor-arg value="10002" index="1"/>
+ </bean>
- <nioDatagramAcceptor id="datagramAcceptor1"
defaultLocalAddress="192.168.0.1:110" />
+ <bean id="socketAddress2" class="java.net.InetSocketAddress">
+ <constructor-arg ref="byAddress2" index="0"/>
+ <constructor-arg value="10003" index="1"/>
+ </bean>
- <nioDatagramAcceptor id="datagramAcceptor2" executor="#threadPoolExecutor"
closeOnDeactivation="false" />
+ <!-- Initialize 192.168.0.1 as byte[] for input of
InetSocketAddress->socketAddress0 -->
+ <bean id="byAddress0" class="java.net.InetAddress"
factory-method="getByAddress">
+ <constructor-arg>
+ <array>
+ <value>-64</value>
+ <value>-88</value>
+ <value>0</value>
+ <value>1</value>
+ </array>
+ </constructor-arg>
+ </bean>
- <nioDatagramAcceptor id="datagramAcceptor3">
- <defaultLocalAddresses>
- <socketAddress>192.168.0.1:10001</socketAddress>
- <socketAddress>192.168.0.2:10002</socketAddress>
- <socketAddress>192.168.0.3:10003</socketAddress>
- </defaultLocalAddresses>
- </nioDatagramAcceptor>
+ <!-- Initialize 192.168.0.2 as byte[] for input of
InetSocketAddress->socketAddress1 -->
+ <bean id="byAddress1" class="java.net.InetAddress"
factory-method="getByAddress">
+ <constructor-arg>
+ <array>
+ <value>-64</value>
+ <value>-88</value>
+ <value>0</value>
+ <value>2</value>
+ </array>
+ </constructor-arg>
+ </bean>
+
+ <!-- Initialize 192.168.0.3 as byte[] for input of
InetSocketAddress->socketAddress2 -->
+ <bean id="byAddress2" class="java.net.InetAddress"
factory-method="getByAddress">
+ <constructor-arg>
+ <array>
+ <value>-64</value>
+ <value>-88</value>
+ <value>0</value>
+ <value>3</value>
+ </array>
+ </constructor-arg>
+ </bean>
- <nioDatagramAcceptor id="datagramAcceptor4" />
-
- <standardThreadPool id="threadPoolExecutor" maxThreads="4"/>
-
<!--
- Sets up the MinaPropertyEditorRegistrar which conveniently installs all
the
- required MINA PropertyEditor implementations found in the MINA Integration
- Beans module.
+ Sets up the MinaPropertyEditorRegistrar which conveniently installs all the
+ required MINA PropertyEditor implementations found in the MINA Integration
-->
<s:bean
class="org.springframework.beans.factory.config.CustomEditorConfigurer">
<s:property name="propertyEditorRegistrars">
@@ -52,5 +113,5 @@
<s:bean
class="org.apache.mina.integration.xbean.MinaPropertyEditorRegistrar"/>
</s:list>
</s:property>
- </s:bean>
-</spring:beans>
\ No newline at end of file
+ </s:bean>
+</spring:beans>
diff --git a/pom.xml b/pom.xml
index 4b88f09c9..7a798f015 100644
--- a/pom.xml
+++ b/pom.xml
@@ -154,7 +154,8 @@
<version.slf4j.api>1.7.36</version.slf4j.api>
<version.slf4j.reload4j>1.7.36</version.slf4j.reload4j>
<version.slf4j.jcl.over.slf4j>1.7.36</version.slf4j.jcl.over.slf4j>
- <version.springframework>2.5.6.SEC03</version.springframework>
+ <version.springframework>5.3.39</version.springframework>
+ <version.springframework.old>2.5.6.SEC03</version.springframework.old>
<version.tomcat.jni>10.0.27</version.tomcat.jni>
<version.xbean.spring>4.23</version.xbean.spring>
@@ -163,6 +164,10 @@
<maven.compiler.source>8</maven.compiler.source>
<maven.compiler.target>8</maven.compiler.target>
+
+ <!-- Define the Java source and target version -->
+ <maven.compiler.source>8</maven.compiler.source>
+ <maven.compiler.target>8</maven.compiler.target>
</properties>
<modules>
@@ -260,21 +265,19 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring</artifactId>
+ <version>${version.springframework.old}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-beans</artifactId>
+ <version>${version.springframework}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-context</artifactId>
<version>${version.springframework}</version>
- <exclusions>
- <exclusion>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </exclusion>
- <exclusion>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging-api</artifactId>
- </exclusion>
- <exclusion>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<dependency>
@@ -477,9 +480,6 @@
<artifactId>maven-compiler-plugin</artifactId>
<version>${version.compiler.plugin}</version>
<configuration>
- <source>1.8</source>
- <target>1.8</target>
- <optimize>true</optimize>
<showDeprecation>true</showDeprecation>
<encoding>ISO-8859-1</encoding>
</configuration>
@@ -783,12 +783,12 @@
<pluginExecution>
<pluginExecutionFilter>
<groupId>org.apache.xbean</groupId>
- <artifactId>maven-xbean-plugin</artifactId>
- <versionRange>[4.12,)</versionRange>
- <goals>
- <goal>mapping</goal>
- </goals>
- </pluginExecutionFilter>
+ <artifactId>maven-xbean-plugin</artifactId>
+ <versionRange>[4.12,)</versionRange>
+ <goals>
+ <goal>mapping</goal>
+ </goals>
+ </pluginExecutionFilter>
<action>
<ignore />
</action>
@@ -806,10 +806,7 @@
<version>${version.compiler.plugin}</version>
<configuration>
<encoding>UTF-8</encoding>
- <source>1.7</source>
- <target>1.7</target>
<debug>true</debug>
- <optimize>true</optimize>
<showDeprecations>true</showDeprecations>
</configuration>
</plugin>
