Skip to content
Browse files

Merge branch '1.1.x' of git@github.com:grails/grails into 1.1.x

  • Loading branch information...
2 parents 009b8d8 + 359b758 commit a84d13007e00f929790bf98df9a041b7fee35216 @graemerocher graemerocher committed
View
6 samples/petclinic-mvc/ivy.xml
@@ -7,9 +7,9 @@
<conf name="runtime" extends="compile"/>
</configurations>
<dependencies>
- <dependency org="org.grails" name="grails-bootstrap" rev="1.1.1" conf="runtime"/>
- <dependency org="org.grails" name="grails-gorm" rev="1.1.1" conf="runtime"/>
- <dependency org="org.grails" name="grails-web" rev="1.1.1" conf="runtime"/>
+ <dependency org="org.grails" name="grails-bootstrap" rev="1.1.2" conf="runtime"/>
+ <dependency org="org.grails" name="grails-gorm" rev="1.1.2" conf="runtime"/>
+ <dependency org="org.grails" name="grails-web" rev="1.1.2" conf="runtime"/>
<dependency org="org.hibernate" name="hibernate-commons-annotations" rev="3.3.0.ga" conf="runtime"/>
<dependency org="org.hibernate" name="hibernate-annotations" rev="3.3.0.ga" conf="runtime"/>
<dependency org="taglibs" name="standard" rev="1.1.2" conf="runtime"/>
View
4 samples/petclinic/application.properties
@@ -2,6 +2,6 @@
#Fri May 01 11:18:12 BST 2009
app.version=0.1
app.servlet.version=2.4
-app.grails.version=1.1.1
-plugins.hibernate=1.1.1
+app.grails.version=1.1.2
+plugins.hibernate=1.1.2
app.name=petclinic
View
10 samples/petclinic/ivy.xml
@@ -7,11 +7,11 @@
<conf name="runtime" extends="compile"/>
</configurations>
<dependencies>
- <dependency org="org.grails" name="grails-bootstrap" rev="1.1.1" conf="build"/>
- <dependency org="org.grails" name="grails-scripts" rev="1.1.1" conf="build"/>
- <dependency org="org.grails" name="grails-gorm" rev="1.1.1" conf="compile"/>
- <dependency org="org.grails" name="grails-web" rev="1.1.1" conf="compile"/>
- <dependency org="org.grails" name="grails-test" rev="1.1.1" conf="test"/>
+ <dependency org="org.grails" name="grails-bootstrap" rev="1.1.2" conf="build"/>
+ <dependency org="org.grails" name="grails-scripts" rev="1.1.2" conf="build"/>
+ <dependency org="org.grails" name="grails-gorm" rev="1.1.2" conf="compile"/>
+ <dependency org="org.grails" name="grails-web" rev="1.1.2" conf="compile"/>
+ <dependency org="org.grails" name="grails-test" rev="1.1.2" conf="test"/>
<dependency org="org.slf4j" name="slf4j-log4j12" rev="1.5.5" conf="runtime"/>
<dependency org="opensymphony" name="oscache" rev="2.4" conf="runtime">
<exclude org="javax.jms" module="jms" name="*" type="*" ext="*" conf="" matcher="exact"/>
View
2 samples/petclinic/petclinic.launch
@@ -9,7 +9,7 @@
<booleanAttribute key="org.eclipse.debug.core.appendEnvironmentVariables" value="true"/>
<listAttribute key="org.eclipse.jdt.launching.CLASSPATH">
<listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;&#10;&lt;runtimeClasspathEntry containerPath=&quot;org.eclipse.jdt.launching.JRE_CONTAINER&quot; javaProject=&quot;petclinic&quot; path=&quot;1&quot; type=&quot;4&quot;/&gt;&#10;"/>
-<listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;&#10;&lt;runtimeClasspathEntry containerPath=&quot;GRAILS_HOME/dist/grails-bootstrap-1.1.1-SNAPSHOT.jar&quot; path=&quot;3&quot; type=&quot;3&quot;/&gt;&#10;"/>
+<listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;&#10;&lt;runtimeClasspathEntry containerPath=&quot;GRAILS_HOME/dist/grails-bootstrap-1.1.2.jar&quot; path=&quot;3&quot; type=&quot;3&quot;/&gt;&#10;"/>
<listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;&#10;&lt;runtimeClasspathEntry containerPath=&quot;GRAILS_HOME/lib/groovy-all-1.6.2.jar&quot; path=&quot;3&quot; type=&quot;3&quot;/&gt;&#10;"/>
</listAttribute>
<booleanAttribute key="org.eclipse.jdt.launching.DEFAULT_CLASSPATH" value="false"/>

0 comments on commit a84d130

Please sign in to comment.
Something went wrong with that request. Please try again.