Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Merge remote-tracking branch 'upstream/master'

  • Loading branch information...
commit 5ebc3d4e654e39a7b6c936d656e8f0162f32f014 2 parents fb0aaf0 + a36cb81
@sarmbruster authored
View
9 build.gradle
@@ -127,6 +127,8 @@ subprojects { project ->
}
}
+
+
install.doLast {
copy {
from(project.libsDir) {
@@ -136,6 +138,13 @@ subprojects { project ->
}
}
+ assemble.doLast {
+ copy {
+ from(sourcesJar.archivePath)
+ into "${rootProject.projectDir}/src"
+ }
+ }
+
test {
excludes = ["**/*TestCase.class", "**/*\$*.class"]
}
View
25 grails-bootstrap/src/main/groovy/org/codehaus/groovy/grails/resolve/PluginResolveEngine.groovy
@@ -84,21 +84,22 @@ final class PluginResolveEngine {
messageReporter "Resolving plugin ${pluginName}. Please wait..."
messageReporter()
def report = dependencyManager.resolvePluginDependencies(scope,args)
- if (report.hasError()) {
- messageReporter "Error resolving plugin ${resolveArgs}."
- return null
- }
- def reports = report.getArtifactsReports(null, false)
- def artifactReport = reports.find { it.artifact.attributes.organisation == resolveArgs.group && it.artifact.name == resolveArgs.name && (pluginVersion == null || it.artifact.moduleRevisionId.revision == pluginVersion) }
- if (artifactReport == null) {
- artifactReport = reports.find { it.artifact.name == pluginName && (pluginVersion == null || it.artifact.moduleRevisionId.revision == pluginVersion) }
- }
- if (artifactReport) {
- return artifactReport.localFile
+ try {
+ def reports = report.getArtifactsReports(null, false)
+ def artifactReport = reports.find { it.artifact.attributes.organisation == resolveArgs.group && it.artifact.name == resolveArgs.name && (pluginVersion == null || it.artifact.moduleRevisionId.revision == pluginVersion) }
+ if (artifactReport == null) {
+ artifactReport = reports.find { it.artifact.name == pluginName && (pluginVersion == null || it.artifact.moduleRevisionId.revision == pluginVersion) }
+ }
+ if (artifactReport) {
+ return artifactReport.localFile
+ }
+ messageReporter "Error resolving plugin ${resolveArgs}. Plugin not found."
+
+ } catch (e) {
+ messageReporter "Error resolving plugin ${resolveArgs}. ${e.message}"
}
- messageReporter "Error resolving plugin ${resolveArgs}. Plugin not found."
return null
}
View
2  grails-core/src/main/groovy/org/codehaus/groovy/grails/compiler/DirectoryWatcher.java
@@ -103,7 +103,7 @@ public void addWatchDirectory(File dir, List<String> fileExtensions) {
*/
public void addWatchDirectory(File dir, String extension) {
List<String> fileExtensions = new ArrayList<String>();
- if (extension == null) {
+ if (!StringUtils.hasText(extension)) {
fileExtensions.add("*");
}
else {
View
2  .../main/groovy/org/codehaus/groovy/grails/web/converters/marshaller/xml/InstanceMethodBasedMarshaller.java
@@ -39,7 +39,7 @@ public void marshalObject(Object object, XML converter) throws ConverterExceptio
MetaMethod method = getToXMLMethod(object);
try {
Object result = method.invoke(object, new Object[]{ converter });
- if (result != null && !(result instanceof JSON) && !(result instanceof JSONWriter)) {
+ if (result != null && !(result instanceof XML)) {
converter.convertAnother(result);
}
}
View
2  grails-resources/src/grails/grails-app/conf/BuildConfig.groovy
@@ -36,7 +36,7 @@ grails.project.dependency.resolution = {
plugins {
compile ":hibernate:$grailsVersion"
compile ":jquery:1.6.1.1"
- compile ":resources:1.0"
+ compile ":resources:1.0.1"
build ":tomcat:$grailsVersion"
}
View
10 scripts/Upgrade.groovy
@@ -27,6 +27,10 @@ import grails.util.Metadata
includeTargets << grailsScript("_GrailsPlugins")
+UNMODIFIED_CHECKSUMS = [indexgsp:['e9f4d3450ba02fe92d55f4ae4b53dee8', 'e9f4d3450ba02fe92d55f4ae4b53dee8', '77f5ed5c2fca586a9ff1dc8e7beeb85b', '5313f072b2ed10129a446d5f648d8b41'],
+ errorgsp:['473b673fb3f04a60412ace1b7bc12a8c', '473b673fb3f04a60412ace1b7bc12a8c', '473b673fb3f04a60412ace1b7bc12a8c', '473b673fb3f04a60412ace1b7bc12a8c'],
+ maincss:['612301d27b1d5d6f670cc98905376f59','612301d27b1d5d6f670cc98905376f59', '820b415fc6e53b156b68e5a01fa5677e', '820b415fc6e53b156b68e5a01fa5677e']]
+
target(upgrade: "main upgrade target") {
depends(createStructure, parseArguments)
@@ -144,6 +148,12 @@ move it to the new location of '${basedir}/test/integration'. Please move the di
}
}
+ def dsFile = new File(baseFile, "grails-app/conf/DataSource.groovy")
+ if(dsFile.exists() && argsMap.'update-data-source') {
+ replace file:dsFile, token:"jdbc:hsqldb:mem:devDB", value:"jdbc:h2:mem:devDb"
+ replace file:dsFile, token:"jdbc:hsqldb:mem:testDb",value: "jdbc:h2:mem:testDb"
+ replace file:dsFile, token:"org.hsqldb.jdbcDriver", value:"org.h2.Driver"
+ }
// if Config.groovy exists and it does not contain values for
// grails.views.default.codec or grails.views.gsp.encoding then
// add reasonable defaults for them
Please sign in to comment.
Something went wrong with that request. Please try again.