Migrate to Spring 4.1.2, Spring Data 1.6.1 jOOQ 3.6.0

vladmihalcea · Dec 22, 2014 · 9d4277e · 9d4277e
1 parent 19fb1d1
commit 9d4277e
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 5 deletions.
diff --git a/hibernate-facts/pom.xml b/hibernate-facts/pom.xml
@@ -482,7 +482,7 @@
         <slf4j.version>1.6.1</slf4j.version>
         <cglib.version>2.2</cglib.version>
         <commons.lang.version>2.5</commons.lang.version>
-        <jooq.version>3.2.0</jooq.version>
+        <jooq.version>3.5.0</jooq.version>
         <btm.version>2.1.1</btm.version>
         <hikari.version>1.3.3</hikari.version>
         <commons-dbcp.version>1.4</commons-dbcp.version>

diff --git a/mongodb-facts/pom.xml b/mongodb-facts/pom.xml
@@ -18,9 +18,10 @@
         <jcl-over-slf4j.version>1.6.1</jcl-over-slf4j.version>
         <logback.version>1.0.13</logback.version>
 
-        <spring.version>3.2.2.RELEASE</spring.version>
-        <spring-integration.version>2.2.3.RELEASE</spring-integration.version>
-        <spring-data-mongodb.version>1.2.0.RELEASE</spring-data-mongodb.version>
+        <junit.version>4.12</junit.version>
+        <spring.version>4.1.2.RELEASE</spring.version>
+        <spring-integration.version>4.1.1.RELEASE</spring-integration.version>
+        <spring-data-mongodb.version>1.6.1.RELEASE</spring-data-mongodb.version>
         <activemq.version>5.5.0</activemq.version>
         <xbean-spring.version>3.7</xbean-spring.version>
         <javax.jms.version>1.1</javax.jms.version>
@@ -82,6 +83,12 @@
             <version>${spring.version}</version>
         </dependency>
 
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-expression</artifactId>
+            <version>${spring.version}</version>
+        </dependency>
+
         <!-- Spring Integration -->
         <dependency>
             <groupId>org.springframework.integration</groupId>
@@ -112,12 +119,26 @@
             <groupId>org.springframework.data</groupId>
             <artifactId>spring-data-mongodb</artifactId>
             <version>${spring-data-mongodb.version}</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.springframework</groupId>
+                    <artifactId>spring-expression</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
 
+        <!--
+        Could not find artifact javax.jms:jms:jar:1.1 in central (https://repo.maven.apache.org/maven2), try downloading from http://java.sun.com/products/jms/docs.html
         <dependency>
             <groupId>javax.jms</groupId>
             <artifactId>jms</artifactId>
             <version>${javax.jms.version}</version>
+        </dependency>-->
+
+        <dependency>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-jms_1.1_spec</artifactId>
+            <version>1.1.1</version>
         </dependency>
 
         <dependency>
@@ -155,7 +176,7 @@
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
-            <version>4.8.1</version>
+            <version>${junit.version}</version>
             <scope>test</scope>
         </dependency>