Skip to content

Commit e54ad21

Browse files
committed
Merge branch '2.4.x' of github.com:grails/grails-core into 2.4.x
2 parents ac5d693 + 2903d84 commit e54ad21

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

gradle/assemble.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ task pluginsFromRepo {
124124
ext.plugins = [
125125
cache: "1.1.8",
126126
'database-migration': "1.4.0",
127-
hibernate4: "4.3.5.5",
127+
hibernate4: "4.3.6.1",
128128
jquery: "1.11.1",
129129
'asset-pipeline': "1.9.9",
130130
scaffolding: "2.1.2",

grails-resources/src/grails/grails-app/conf/BuildConfig.groovy

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ grails.project.dependency.resolution = {
5050
// specify dependencies here under either 'build', 'compile', 'runtime', 'test' or 'provided' scopes e.g.
5151
// runtime 'mysql:mysql-connector-java:5.1.29'
5252
// runtime 'org.postgresql:postgresql:9.3-1101-jdbc41'
53-
test "org.grails:grails-datastore-test-support:1.0.1-grails-2.4"
53+
test "org.grails:grails-datastore-test-support:1.0.2-grails-2.4"
5454
}
5555

5656
plugins {
@@ -63,7 +63,7 @@ grails.project.dependency.resolution = {
6363
compile ":asset-pipeline:1.9.9"
6464

6565
// plugins needed at runtime but not for compilation
66-
runtime ":hibernate4:4.3.5.5" // or ":hibernate:3.6.10.17"
66+
runtime ":hibernate4:4.3.6.1" // or ":hibernate:3.6.10.18"
6767
runtime ":database-migration:1.4.0"
6868
runtime ":jquery:1.11.1"
6969

0 commit comments

Comments
 (0)