[#481] move spring dep to only hyperjaxb, upgrade spring

highsource · Feb 7, 2024 · d79dd4d · d79dd4d
1 parent 73571df
commit d79dd4d
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 24 deletions.
diff --git a/hyperjaxb/ejb/plugin/pom.xml b/hyperjaxb/ejb/plugin/pom.xml
@@ -27,6 +27,14 @@
 			<groupId>org.jvnet.jaxb</groupId>
 			<artifactId>jaxb-plugins-tools</artifactId>
 		</dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-context</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-beans</artifactId>
+    </dependency>
 		<dependency>
 			<groupId>org.jvnet.jaxb</groupId>
 			<artifactId>hyperjaxb3-ejb-roundtrip</artifactId>
@@ -62,18 +70,10 @@
 			<groupId>org.glassfish.jaxb</groupId>
 			<artifactId>xsom</artifactId>
 		</dependency>
-		<!--dependency>
-			<groupId>org.hibernate</groupId>
-			<artifactId>hibernate-annotations</artifactId>
-		</dependency-->
 		<dependency>
 			<groupId>jakarta.persistence</groupId>
 			<artifactId>jakarta.persistence-api</artifactId>
 		</dependency>
-		<dependency>
-			<groupId>org.springframework</groupId>
-			<artifactId>spring</artifactId>
-		</dependency>
 	</dependencies>
 	<build>
 		<defaultGoal>install</defaultGoal>

diff --git a/...ing/AbstractSpringConfigurablePlugin.java → ...ing/AbstractSpringConfigurablePlugin.java b/...ing/AbstractSpringConfigurablePlugin.java → ...ing/AbstractSpringConfigurablePlugin.java
@@ -1,5 +1,8 @@
 package org.jvnet.jaxb.plugin.spring;
 
+import com.sun.tools.xjc.BadCommandLineException;
+import com.sun.tools.xjc.Options;
+import com.sun.tools.xjc.outline.Outline;
 import org.apache.commons.lang3.ArrayUtils;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
@@ -8,10 +11,6 @@
 import org.springframework.context.support.AbstractXmlApplicationContext;
 import org.springframework.context.support.FileSystemXmlApplicationContext;
 
-import com.sun.tools.xjc.BadCommandLineException;
-import com.sun.tools.xjc.Options;
-import com.sun.tools.xjc.outline.Outline;
-
 public abstract class AbstractSpringConfigurablePlugin extends
 		AbstractParameterizablePlugin {
 

diff --git a/hyperjaxb/ejb/samples/customerservice-cxf/pom.xml b/hyperjaxb/ejb/samples/customerservice-cxf/pom.xml
@@ -16,12 +16,12 @@
 		<dependency>
 			<groupId>org.springframework</groupId>
 			<artifactId>spring-orm</artifactId>
-			<version>3.0.1.RELEASE</version>
+			<version>6.1.3</version>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework</groupId>
 			<artifactId>spring-web</artifactId>
-			<version>3.0.1.RELEASE</version>
+			<version>6.1.3</version>
 		</dependency>
 		<!-- Apache CXF -->
 		<dependency>
@@ -105,7 +105,7 @@
 		<dependency>
 			<groupId>org.springframework</groupId>
 			<artifactId>spring-test</artifactId>
-			<version>3.0.1.RELEASE</version>
+			<version>6.1.3</version>
 			<scope>test</scope>
 		</dependency>
 	</dependencies>

diff --git a/jaxb-plugins-parent/jaxb-plugins-tools/pom.xml b/jaxb-plugins-parent/jaxb-plugins-tools/pom.xml
@@ -44,10 +44,5 @@
       <artifactId>angus-activation</artifactId>
       <scope>provided</scope>
     </dependency>
-    <dependency>
-      <groupId>org.springframework</groupId>
-      <artifactId>spring</artifactId>
-      <scope>provided</scope>
-    </dependency>
   </dependencies>
 </project>
diff --git a/pom.xml b/pom.xml
@@ -77,6 +77,7 @@
     <joda-time.version>2.5</joda-time.version>
     <junit4.version>4.13.2</junit4.version>
     <slf4j.version>1.7.36</slf4j.version>
+    <spring.version>5.3.31</spring.version>
     <stax-ex.version>1.8.3</stax-ex.version>
     <plexus-build-api.version>1.2.0</plexus-build-api.version>
     <plexus-utils.version>3.5.1</plexus-utils.version>
@@ -376,13 +377,17 @@
         <version>${slf4j.version}</version>
       </dependency>
 
-      <!-- Spring -->
+      <!-- Spring in Hibernate -->
       <dependency>
         <groupId>org.springframework</groupId>
-        <artifactId>spring</artifactId>
-        <version>2.0.7</version>
+        <artifactId>spring-context</artifactId>
+        <version>${spring.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.springframework</groupId>
+        <artifactId>spring-beans</artifactId>
+        <version>${spring.version}</version>
       </dependency>
-
       <!-- Hibernate -->
       <dependency>
         <groupId>org.hibernate</groupId>