Adding back in the spring jars to support SOAP services

teiid · Feb 25, 2016 · cd6555a · cd6555a
1 parent f18395b
commit cd6555a
Show file tree

Hide file tree

Showing 4 changed files with 47 additions and 7 deletions.
diff --git a/connectors/connector-ws/kits/wildfly-dist.xml b/connectors/connector-ws/kits/wildfly-dist.xml
@@ -48,6 +48,10 @@
                 <include>org.springframework:spring-beans</include>
                 <include>org.springframework:spring-context</include>
                 <include>org.springframework:spring-core</include>
+                <include>org.springframework:spring-asm</include>
+                <include>org.springframework:spring-expression</include>
+                <include>org.springframework:spring-aop</include>
+                <include>org.springframework:spring-tx</include>
             </includes>
         </dependencySet>
         <dependencySet>

diff --git a/connectors/connector-ws/kits/wildfly/modules/org/springframework/spring/main/module.xml b/connectors/connector-ws/kits/wildfly/modules/org/springframework/spring/main/module.xml
@@ -7,12 +7,11 @@
     <resource-root path="spring-beans-${version.org.springframework}.jar"/>
     <resource-root path="spring-context-${version.org.springframework}.jar"/>    
     <resource-root path="spring-core-${version.org.springframework}.jar"/>
-    <!-- 
-    <resource-root path="spring-asm.jar"/>
-    <resource-root path="spring-aop.jar"/>    
-    <resource-root path="spring-expression.jar"/>
-    <resource-root path="spring-tx.jar"/>
-     -->    
+    <resource-root path="spring-asm-${version.org.springframework.asm}.jar"/>
+    <resource-root path="spring-expression-${version.org.springframework}.jar"/>
+
+    <resource-root path="spring-aop-${version.org.springframework}.jar"/>   
+    <resource-root path="spring-tx-${version.org.springframework}.jar"/> 
   </resources>
   <dependencies>
     <module name="javax.api"/>

diff --git a/connectors/connector-ws/pom.xml b/connectors/connector-ws/pom.xml
@@ -120,6 +120,22 @@
             <groupId>org.springframework</groupId>
             <artifactId>spring-core</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-aop</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-asm</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-expression</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-tx</artifactId>
+        </dependency>           
     </dependencies>
     <build>
         <plugins>

diff --git a/pom.xml b/pom.xml
@@ -97,7 +97,8 @@
         <version.org.dbunit>2.2</version.org.dbunit>
         <version.org.apache.poi>3.10.1</version.org.apache.poi>
         <version.org.apache.xmlbeans>2.6.0</version.org.apache.xmlbeans>
-        <version.org.springframework>3.2.6.RELEASE</version.org.springframework>
+        <version.org.springframework>3.2.12.RELEASE</version.org.springframework>
+        <version.org.springframework.asm>3.1.4.RELEASE</version.org.springframework.asm>
         <version.commons-logging>1.1</version.commons-logging>
         <version.commons-configuration>1.6</version.commons-configuration>
         <version.org.apache.ant>1.8.2</version.org.apache.ant>	    	    
@@ -1591,6 +1592,26 @@
                 <artifactId>spring-core</artifactId>
                 <version>${version.org.springframework}</version>
             </dependency>
+			<dependency>
+				<groupId>org.springframework</groupId>
+				<artifactId>spring-aop</artifactId>
+				<version>${version.org.springframework}</version>
+			</dependency>
+			<dependency>
+				<groupId>org.springframework</groupId>
+				<artifactId>spring-asm</artifactId>
+				<version>${version.org.springframework.asm}</version>
+			</dependency>
+			<dependency>
+				<groupId>org.springframework</groupId>
+				<artifactId>spring-expression</artifactId>
+				<version>${version.org.springframework}</version>
+			</dependency>
+			<dependency>
+				<groupId>org.springframework</groupId>
+				<artifactId>spring-tx</artifactId>
+				<version>${version.org.springframework}</version>
+			</dependency>             
             <dependency>
                 <groupId>com.facebook.presto</groupId>
                 <artifactId>presto-jdbc</artifactId>