Skip to content

Commit

Permalink
fix for GRAILS-4969 "Quartz conflicts with grails-bootstrap"
Browse files Browse the repository at this point in the history
  • Loading branch information
graemerocher committed Sep 24, 2010
1 parent cd5344e commit 9ad87d0
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 3 deletions.
1 change: 1 addition & 0 deletions gradle/assemble.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -133,6 +133,7 @@ task bootstrapJar(type: Jar, description: 'Package up the classes used to bootst
"grails/util/BuildScope*", "grails/util/GrailsMain*", "grails/ant/**/*", "**/groovy/grails/cli/**/*", "**/groovy/grails/resolve/**/*",
"grails/build/**")
from "build.properties"
rename "build.properties", "grails.build.properties"
mavenArtifact = true
}

Expand Down
2 changes: 1 addition & 1 deletion scripts/_GrailsSettings.groovy
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ if (grailsSettings.grailsHome) {
ant.property(file: "${grailsHome}/build.properties")
}
else {
ant.property(resource: "build.properties")
ant.property(resource: "grails.build.properties")
}

/**
Expand Down
2 changes: 1 addition & 1 deletion src/java/grails/util/BuildSettings.groovy
Original file line number Diff line number Diff line change
Expand Up @@ -473,7 +473,7 @@ class BuildSettings extends AbstractBuildSettings {
}

private def loadBuildPropertiesFromClasspath(Properties buildProps) {
InputStream stream = getClass().classLoader.getResourceAsStream("build.properties")
InputStream stream = getClass().classLoader.getResourceAsStream("grails.build.properties")
if (stream) {
buildProps.load(stream)
}
Expand Down
2 changes: 1 addition & 1 deletion src/java/grails/util/GrailsMain.groovy
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ if (!grailsHome) {

// Load the build properties so that we can read the Grails version.
def props = new Properties()
props.load(getClass().getClassLoader().getResourceAsStream("build.properties"))
props.load(getClass().getClassLoader().getResourceAsStream("grails.build.properties"))

// We need JAVA_HOME so that we can get hold of the "tools.jar" file.
def javaHome = new File(System.getenv("JAVA_HOME"))
Expand Down

0 comments on commit 9ad87d0

Please sign in to comment.