Permalink
Browse files

Merge commit 'ad04773a7883ddb1322181e1ccdb6ed9366a4325' into 1.2.x

Conflicts:
	TomcatGrailsPlugin.groovy
	application.properties
	src/groovy/org/grails/tomcat/TomcatServer.groovy
  • Loading branch information...
2 parents 2e13fab + ad04773 commit da9f7eaf1e1db0c7e841d4d17d36d41944add2b6 @graemerocher graemerocher committed Mar 25, 2010
Showing with 2 additions and 2 deletions.
  1. +1 −1 TomcatGrailsPlugin.groovy
  2. +1 −1 src/groovy/org/grails/tomcat/TomcatServer.groovy
@@ -16,7 +16,7 @@ class TomcatGrailsPlugin {
// the plugin version
def version = "1.2.2"
// the version or versions of Grails the plugin is designed for
- def grailsVersion = "1.2 > *"
+ def grailsVersion = "1.3 > *"
// resources that are excluded from plugin packaging
def pluginExcludes = [
"grails-app/views/error.gsp",
@@ -1,7 +1,7 @@
package org.grails.tomcat
import grails.web.container.EmbeddableServer
-
+import grails.util.*
import java.beans.PropertyChangeListener
import org.codehaus.groovy.grails.plugins.GrailsPluginUtils as GPU

0 comments on commit da9f7ea

Please sign in to comment.