Skip to content

Commit 099fdcb

Browse files
committed
Merge branch '2.2.x' into 2.3.x
Conflicts: build.gradle build.properties gradle/assemble.gradle grails-bootstrap/build.gradle grails-resources/src/grails/grails-app/conf/BuildConfig.groovy grails-test-suite-uber/src/test/groovy/grails/util/GrailsUtilTests.java grails-web/src/main/groovy/org/codehaus/groovy/grails/web/mapping/DefaultLinkGenerator.groovy
2 parents 45ca30e + 74e2c05 commit 099fdcb

File tree

4 files changed

+4
-2
lines changed

4 files changed

+4
-2
lines changed

build.gradle

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -338,6 +338,7 @@ subprojects { project ->
338338
}
339339
providedDeps.each { dep ->
340340
pom.dependencies.find { it.artifactId == dep.name }?.scope = 'provided'
341+
341342
}
342343

343344
configurations.runtime.allDependencies.each { dependency ->

grails-bootstrap/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,4 +82,4 @@ install.doLast {
8282
}
8383
configurations.uaa.resolvedConfiguration.resolvedArtifacts.each appendDependencies
8484
}
85-
}
85+
}

grails-core/src/main/groovy/grails/validation/ValidationException.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ public static String formatErrors(Errors errors, String msg) {
5454
b.append(msg).append(":\n");
5555
}
5656
for (ObjectError error : errors.getAllErrors()) {
57-
b.append("\n- ").append(error).append("\n");
57+
b.append("- ").append(error).append("\n");
5858
}
5959
return b.toString();
6060
}

grails-web/src/main/groovy/org/codehaus/groovy/grails/web/mapping/DefaultLinkGenerator.groovy

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -347,6 +347,7 @@ class DefaultLinkGenerator implements LinkGenerator, PluginManagerAware {
347347
}
348348
}
349349

350+
350351
/**
351352
* Get the declared URL of the server from config, or guess at localhost for non-production.
352353
*/

0 commit comments

Comments
 (0)