Adding back the spring framework jars needed for soap

teiid · Feb 24, 2016 · cc63d60 · cc63d60
1 parent 43d08e1
commit cc63d60
Show file tree

Hide file tree

Showing 4 changed files with 43 additions and 3 deletions.
diff --git a/connectors/connector-ws/kits/jboss-as7-dist.xml b/connectors/connector-ws/kits/jboss-as7-dist.xml
@@ -70,6 +70,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/jboss-as7/modules/org/springframework/spring/main/module.xml b/connectors/connector-ws/kits/jboss-as7/modules/org/springframework/spring/main/module.xml
@@ -7,12 +7,10 @@
     <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"/>
-     -->    
   </resources>
   <dependencies>
     <module name="javax.api"/>

diff --git a/connectors/connector-ws/pom.xml b/connectors/connector-ws/pom.xml
@@ -111,6 +111,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
@@ -81,7 +81,9 @@
 	    <version.org.apache.httpcomponents.httpcore-nio>4.2.4</version.org.apache.httpcomponents.httpcore-nio>
 	    <version.org.apache.httpcomponents.httpasyncclient>4.0-beta3</version.org.apache.httpcomponents.httpasyncclient>
 
-
+
+	    <version.org.asm.springframework>3.1.4.RELEASE</version.org.asm.springframework>
+
 	    <!-- connector specific dependencies included in kit -->
 
 
@@ -1639,6 +1641,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.asm.springframework}</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>