Skip to content

Commit

Permalink
Updated grails version
Browse files Browse the repository at this point in the history
  • Loading branch information
continuumsecurity committed Jun 17, 2017
1 parent 4952476 commit 5c62030
Show file tree
Hide file tree
Showing 6 changed files with 14 additions and 18 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
.idea
4 changes: 2 additions & 2 deletions application.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#Grails Metadata file
#Tue Mar 17 15:23:07 CET 2015
app.grails.version=2.4.4
#Sat Jun 17 21:10:35 CEST 2017
app.grails.version=2.5.6
app.name=ropeytasks
app.version=0.2
2 changes: 1 addition & 1 deletion build.standalone.sh
Original file line number Diff line number Diff line change
@@ -1 +1 @@
grails build-standalone -Dbuild.compiler=javac1.7 ropeytasks.jar
grails prod build-standalone ropeytasks.jar
17 changes: 8 additions & 9 deletions grails-app/conf/BuildConfig.groovy
Original file line number Diff line number Diff line change
Expand Up @@ -3,22 +3,22 @@ grails.project.class.dir = "target/classes"
grails.project.test.class.dir = "target/test-classes"
grails.project.test.reports.dir = "target/test-reports"
grails.project.work.dir = "target/work"
grails.project.target.level = 1.7
grails.project.source.level = 1.7
grails.project.target.level = 1.8
grails.project.source.level = 1.8
//grails.project.war.file = "target/${appName}-${appVersion}.war"

grails.project.fork = [
// configure settings for compilation JVM, note that if you alter the Groovy version forked compilation is required
// compile: [maxMemory: 256, minMemory: 64, debug: false, maxPerm: 256, daemon:true],

// configure settings for the test-app JVM, uses the daemon by default
test: [maxMemory: 768, minMemory: 64, debug: false, maxPerm: 256, daemon:true],
test: [maxMemory: 768, minMemory: 64, debug: false, maxPerm: 512, daemon:true],
// configure settings for the run-app JVM
run: [maxMemory: 768, minMemory: 64, debug: false, maxPerm: 256, forkReserve:false],
run: [maxMemory: 768, minMemory: 64, debug: false, maxPerm: 512, forkReserve:false],
// configure settings for the run-war JVM
war: [maxMemory: 768, minMemory: 64, debug: false, maxPerm: 256, forkReserve:false],
war: [maxMemory: 768, minMemory: 64, debug: false, maxPerm: 512, forkReserve:false],
// configure settings for the Console UI JVM
console: [maxMemory: 768, minMemory: 64, debug: false, maxPerm: 256]
console: [maxMemory: 768, minMemory: 64, debug: false, maxPerm: 512]
]

grails.project.dependency.resolver = "maven" // or ivy
Expand Down Expand Up @@ -54,13 +54,12 @@ grails.project.dependency.resolution = {
}

plugins {
compile "org.grails.plugins:standalone:1.3"
compile "org.grails.plugins:standalone:9.0.0.M4"
// plugins for the build system only
build ":tomcat:7.0.55"
// plugins for the compile step
compile ":scaffolding:2.1.2"
compile ':cache:1.1.8'
compile ":asset-pipeline:1.9.9"
compile "org.grails.plugins:tomcat:9.0.0.M4.1"

// plugins needed at runtime but not for compilation
runtime ":hibernate4:4.3.6.1" // or ":hibernate:3.6.10.18"
Expand Down
8 changes: 2 additions & 6 deletions ropeytasks-grailsPlugins.iml
Original file line number Diff line number Diff line change
Expand Up @@ -50,12 +50,8 @@
<sourceFolder url="file://$MODULE_DIR$/target/work/plugins/scaffolding-2.1.2/src/java" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/target/work/plugins/scaffolding-2.1.2/src/groovy" isTestSource="false" />
</content>
<content url="file://$MODULE_DIR$/target/work/plugins/standalone-1.3">
<sourceFolder url="file://$MODULE_DIR$/target/work/plugins/standalone-1.3/src/java" isTestSource="false" />
</content>
<content url="file://$MODULE_DIR$/target/work/plugins/tomcat-7.0.55">
<sourceFolder url="file://$MODULE_DIR$/target/work/plugins/tomcat-7.0.55/src/java" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/target/work/plugins/tomcat-7.0.55/src/groovy" isTestSource="false" />
<content url="file://$MODULE_DIR$/target/work/plugins/standalone-9.0.0.M4">
<sourceFolder url="file://$MODULE_DIR$/target/work/plugins/standalone-9.0.0.M4/src/java" isTestSource="false" />
</content>
<content url="file://$MODULE_DIR$/target/work/plugins/webxml-1.4.1">
<sourceFolder url="file://$MODULE_DIR$/target/work/plugins/webxml-1.4.1/src/groovy" isTestSource="false" />
Expand Down
Binary file modified ropeytasks.jar
Binary file not shown.

0 comments on commit 5c62030

Please sign in to comment.