Upgrade grails to 1.3.7

(introduces test errors in grails app)
rundeck · Nov 2, 2011 · d59fde1 · d59fde1
1 parent d5d0bb9
commit d59fde1
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 18 deletions.
diff --git a/build.sh b/build.sh
@@ -30,7 +30,7 @@ BASEDIR=`pwd`
 # VERS will be determined from "version.properties" file in root
 
 #grails version for rundeckapp
-GRAILSVERS=1.2.0
+GRAILSVERS=1.3.7
 JETTYVERS=6.1.21
 
 # this is to provide a workaround for a grails bug for this version of

diff --git a/rundeckapp/application.properties b/rundeckapp/application.properties
@@ -1,10 +1,10 @@
 #Grails Metadata file
-#Thu Jan 13 11:54:14 PST 2011
-app.grails.version=1.2.0
+#Wed Nov 02 09:45:44 PDT 2011
+app.grails.version=1.3.7
 app.name=rundeck
 app.version=1.4.0.1
 build.ident=1.4.0.1-1
-plugins.hibernate=1.2.0
+plugins.hibernate=1.3.7
 plugins.jetty=1.2-SNAPSHOT
 plugins.mail=0.9
 plugins.quartz=0.4.2

diff --git a/rundeckapp/grails-app/conf/BuildConfig.groovy b/rundeckapp/grails-app/conf/BuildConfig.groovy
@@ -8,10 +8,10 @@ grails.project.dependency.resolution = {
         mavenCentral()
     }
     dependencies {
-        build 'org.apache.ant:ant:1.8.1','org.apache.ant:ant-antlr:1.8.1','org.apache.ant:ant-apache-bcel:1.8.1','org.apache.ant:ant-apache-log4j:1.8.1','org.apache.ant:ant-apache-oro:1.8.1','org.apache.ant:ant-apache-regexp:1.8.1','org.apache.ant:ant-apache-resolver:1.8.1','org.apache.ant:ant-commons-logging:1.8.1','org.apache.ant:ant-commons-net:1.8.1','org.apache.ant:ant-jai:1.8.1','org.apache.ant:ant-javamail:1.8.1','org.apache.ant:ant-jdepend:1.8.1','org.apache.ant:ant-jmf:1.8.1','org.apache.ant:ant-jsch:1.8.1','org.apache.ant:ant-junit:1.8.1','org.apache.ant:ant-launcher:1.8.1','org.apache.ant:ant-netrexx:1.8.1','org.apache.ant:ant-nodeps:1.8.1','org.apache.ant:ant-swing:1.8.1','org.apache.ant:ant-testutil:1.8.1','commons-logging:commons-logging:1.1','commons-logging:commons-logging-api:1.1'
-        compile 'org.apache.ant:ant:1.8.1','org.apache.ant:ant-antlr:1.8.1','org.apache.ant:ant-apache-bcel:1.8.1','org.apache.ant:ant-apache-log4j:1.8.1','org.apache.ant:ant-apache-oro:1.8.1','org.apache.ant:ant-apache-regexp:1.8.1','org.apache.ant:ant-apache-resolver:1.8.1','org.apache.ant:ant-commons-logging:1.8.1','org.apache.ant:ant-commons-net:1.8.1','org.apache.ant:ant-jai:1.8.1','org.apache.ant:ant-javamail:1.8.1','org.apache.ant:ant-jdepend:1.8.1','org.apache.ant:ant-jmf:1.8.1','org.apache.ant:ant-jsch:1.8.1','org.apache.ant:ant-junit:1.8.1','org.apache.ant:ant-launcher:1.8.1','org.apache.ant:ant-netrexx:1.8.1','org.apache.ant:ant-nodeps:1.8.1','org.apache.ant:ant-swing:1.8.1','org.apache.ant:ant-testutil:1.8.1','commons-logging:commons-logging:1.1','commons-logging:commons-logging-api:1.1'
-        test 'org.yaml:snakeyaml:1.9','org.apache.ant:ant:1.8.1','org.apache.ant:ant-antlr:1.8.1','org.apache.ant:ant-apache-bcel:1.8.1','org.apache.ant:ant-apache-log4j:1.8.1','org.apache.ant:ant-apache-oro:1.8.1','org.apache.ant:ant-apache-regexp:1.8.1','org.apache.ant:ant-apache-resolver:1.8.1','org.apache.ant:ant-commons-logging:1.8.1','org.apache.ant:ant-commons-net:1.8.1','org.apache.ant:ant-jai:1.8.1','org.apache.ant:ant-javamail:1.8.1','org.apache.ant:ant-jdepend:1.8.1','org.apache.ant:ant-jmf:1.8.1','org.apache.ant:ant-jsch:1.8.1','org.apache.ant:ant-junit:1.8.1','org.apache.ant:ant-launcher:1.8.1','org.apache.ant:ant-netrexx:1.8.1','org.apache.ant:ant-nodeps:1.8.1','org.apache.ant:ant-swing:1.8.1','org.apache.ant:ant-testutil:1.8.1','commons-logging:commons-logging:1.1','commons-logging:commons-logging-api:1.1'
-        runtime 'org.yaml:snakeyaml:1.9','org.apache.ant:ant:1.8.1','org.apache.ant:ant-antlr:1.8.1','org.apache.ant:ant-apache-bcel:1.8.1','org.apache.ant:ant-apache-log4j:1.8.1','org.apache.ant:ant-apache-oro:1.8.1','org.apache.ant:ant-apache-regexp:1.8.1','org.apache.ant:ant-apache-resolver:1.8.1','org.apache.ant:ant-commons-logging:1.8.1','org.apache.ant:ant-commons-net:1.8.1','org.apache.ant:ant-jai:1.8.1','org.apache.ant:ant-javamail:1.8.1','org.apache.ant:ant-jdepend:1.8.1','org.apache.ant:ant-jmf:1.8.1','org.apache.ant:ant-jsch:1.8.1','org.apache.ant:ant-junit:1.8.1','org.apache.ant:ant-launcher:1.8.1','org.apache.ant:ant-netrexx:1.8.1','org.apache.ant:ant-nodeps:1.8.1','org.apache.ant:ant-swing:1.8.1','org.apache.ant:ant-testutil:1.8.1','org.springframework:org.springframework.test:3.0.0.RELEASE','commons-logging:commons-logging:1.1','commons-logging:commons-logging-api:1.1'
+        build 'org.yaml:snakeyaml:1.9','org.apache.ant:ant:1.7.1','org.apache.ant:ant-jsch:1.7.1','com.jcraft:jsch:0.1.42'
+        test 'org.yaml:snakeyaml:1.9','org.apache.ant:ant:1.7.1','org.apache.ant:ant-jsch:1.7.1','com.jcraft:jsch:0.1.42'
+        compile 'org.yaml:snakeyaml:1.9','org.apache.ant:ant:1.7.1','org.apache.ant:ant-jsch:1.7.1','com.jcraft:jsch:0.1.42'
+        runtime 'org.yaml:snakeyaml:1.9','org.apache.ant:ant:1.7.1','org.apache.ant:ant-jsch:1.7.1','com.jcraft:jsch:0.1.42'
     }
     grails.plugin.location.'webrealms' = "webrealms"
 }
diff --git a/rundeckapp/web-app/WEB-INF/tld/grails.tld b/rundeckapp/web-app/WEB-INF/tld/grails.tld
@@ -4,12 +4,11 @@
         xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee
             http://java.sun.com/xml/ns/j2ee/web-jsptaglibrary_2_0.xsd"
         version="2.0">
-    <description>The Grails (Groovy on Rails) custom tag library</description>
+    <description>The Grails custom tag library</description>
     <tlib-version>0.2</tlib-version>
     <short-name>grails</short-name>
     <uri>http://grails.codehaus.org/tags</uri>
 
-
     <tag>
         <name>link</name>
         <tag-class>org.codehaus.groovy.grails.web.taglib.jsp.JspLinkTag</tag-class>

diff --git a/rundeckapp/webrealms/plugin.xml b/rundeckapp/webrealms/plugin.xml
@@ -1,4 +1,4 @@
-<plugin name='webrealms' version='0.3' grailsVersion='1.2.0 &gt; *'>
+<plugin name='webrealms' version='0.3' grailsVersion='1.3.7 &gt; *'>
   <author>Greg Schueler</author>
   <authorEmail>greg@dtosolutions.com</authorEmail>
   <title>Allows configuration of web.xml to support UserRealms and security constraints</title>
@@ -10,12 +10,6 @@
     <resource>DefaultWebrealmsConfig</resource>
     <resource>UrlMappings</resource>
   </resources>
-  <dependencies>
-    <resolvers>
-      <resolver type='grailsPlugins' name='grailsPlugins' />
-      <resolver type='mavenLocal' />
-      <resolver type='mavenCentral' />
-    </resolvers>
-  </dependencies>
+  <dependencies />
   <behavior />
 </plugin>