Skip to content

Commit 935f048

Browse files
committed
Merge pull request #690 from nhajratw/version-updates
updated some dependency versions
2 parents 0086dce + b5e401a commit 935f048

File tree

2 files changed

+14
-5
lines changed

2 files changed

+14
-5
lines changed

examples/spring-txn/pom.xml

+4
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,10 @@
2424
<artifactId>freemarker</artifactId>
2525
</dependency>
2626

27+
<dependency>
28+
<groupId>org.springframework</groupId>
29+
<artifactId>spring-context-support</artifactId>
30+
</dependency>
2731
<dependency>
2832
<groupId>org.springframework</groupId>
2933
<artifactId>spring-tx</artifactId>

pom.xml

+10-5
Original file line numberDiff line numberDiff line change
@@ -23,16 +23,16 @@
2323
<minimum.maven.version>3.1.1</minimum.maven.version>
2424
<outputDirectory>${project.build.directory}</outputDirectory>
2525
<gherkin.version>2.12.2</gherkin.version>
26-
<groovy.version>2.1.7</groovy.version>
26+
<groovy.version>2.2.2</groovy.version>
2727
<picocontainer.version>2.14.3</picocontainer.version>
2828
<!-- Keep in sync with scala/pom.xml and scala/scala_previous/pom.xml if minor versions are bumped. -->
2929
<scala.current.version>2.10.3</scala.current.version>
3030
<scala.previous.version>2.9.3</scala.previous.version>
3131
<!-- There is 3.1.3, but it requires at least mvn 3.0.4 which might still not be widely used. -->
3232
<scala-maven-plugin.version>3.1.6</scala-maven-plugin.version>
33-
<spring.version>3.2.4.RELEASE</spring.version>
34-
<spring.data.version>1.4.1.RELEASE</spring.data.version>
35-
<hibernate.version>4.2.5.Final</hibernate.version>
33+
<spring.version>4.0.2.RELEASE</spring.version>
34+
<spring.data.version>1.5.1.RELEASE</spring.data.version>
35+
<hibernate.version>4.3.4.Final</hibernate.version>
3636
<hsqldb.version>2.3.2</hsqldb.version>
3737
<guice.version>3.0</guice.version>
3838
<!-- Remember to bounce version in examples/clojure_cukes/project.clj as well -->
@@ -60,7 +60,7 @@
6060
<cobertura.version>1.9.4.1</cobertura.version>
6161
<dbunit.version>2.4.9</dbunit.version>
6262
<log4j.version>1.2.17</log4j.version>
63-
<slf4j.version>1.7.5</slf4j.version>
63+
<slf4j.version>1.7.6</slf4j.version>
6464
<freemarker.version>2.3.20</freemarker.version>
6565
<javax.servlet-api.version>3.1.0</javax.servlet-api.version>
6666
<android-maven-plugin.version>3.9.0-rc.1</android-maven-plugin.version>
@@ -235,6 +235,11 @@
235235
<artifactId>spring-jdbc</artifactId>
236236
<version>${spring.version}</version>
237237
</dependency>
238+
<dependency>
239+
<groupId>org.springframework</groupId>
240+
<artifactId>spring-context-support</artifactId>
241+
<version>${spring.version}</version>
242+
</dependency>
238243

239244
<dependency>
240245
<groupId>org.dbunit</groupId>

0 commit comments

Comments
 (0)