changed spring-aop version on the parent level and hoping for the best

fcrepo · Apr 18, 2013 · 661bb98 · 661bb98
1 parent 01dfdf0
commit 661bb98
Showing 1 changed file with 16 additions and 5 deletions.
diff --git a/pom.xml b/pom.xml
@@ -163,6 +163,17 @@
           </exclusion>
         </exclusions>
       </dependency>
+      <dependency>
+        <groupId>org.springframework</groupId>
+        <artifactId>spring-aop</artifactId>
+        <version>${spring.version}</version>
+        <exclusions>
+          <exclusion>
+            <groupId>commons-logging</groupId>
+            <artifactId>commons-logging</artifactId>
+          </exclusion>
+        </exclusions>
+      </dependency>
       <dependency>
         <groupId>javax.mail</groupId>
         <artifactId>mail</artifactId>
@@ -188,6 +199,11 @@
         <artifactId>jersey-multipart</artifactId>
         <version>${jersey.version}</version>
       </dependency>
+      <dependency>
+        <groupId>com.sun.jersey.contribs</groupId>
+        <artifactId>jersey-spring</artifactId>
+        <version>${jersey.version}</version>
+      </dependency>
 
 
       <!-- test gear -->
@@ -238,11 +254,6 @@
         <artifactId>powermock-api-mockito</artifactId>
         <version>${powermock.version}</version>
       </dependency>
-      <dependency>
-        <groupId>com.sun.jersey.contribs</groupId>
-        <artifactId>jersey-spring</artifactId>
-        <version>${jersey.version}</version>
-      </dependency>
     </dependencies>
   </dependencyManagement>