Skip to content

Commit a84d130

Browse files
committed
Merge branch '1.1.x' of git@github.com:grails/grails into 1.1.x
2 parents 009b8d8 + 359b758 commit a84d130

File tree

4 files changed

+11
-11
lines changed

4 files changed

+11
-11
lines changed

samples/petclinic-mvc/ivy.xml

+3-3
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@
77
<conf name="runtime" extends="compile"/>
88
</configurations>
99
<dependencies>
10-
<dependency org="org.grails" name="grails-bootstrap" rev="1.1.1" conf="runtime"/>
11-
<dependency org="org.grails" name="grails-gorm" rev="1.1.1" conf="runtime"/>
12-
<dependency org="org.grails" name="grails-web" rev="1.1.1" conf="runtime"/>
10+
<dependency org="org.grails" name="grails-bootstrap" rev="1.1.2" conf="runtime"/>
11+
<dependency org="org.grails" name="grails-gorm" rev="1.1.2" conf="runtime"/>
12+
<dependency org="org.grails" name="grails-web" rev="1.1.2" conf="runtime"/>
1313
<dependency org="org.hibernate" name="hibernate-commons-annotations" rev="3.3.0.ga" conf="runtime"/>
1414
<dependency org="org.hibernate" name="hibernate-annotations" rev="3.3.0.ga" conf="runtime"/>
1515
<dependency org="taglibs" name="standard" rev="1.1.2" conf="runtime"/>

samples/petclinic/application.properties

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,6 @@
22
#Fri May 01 11:18:12 BST 2009
33
app.version=0.1
44
app.servlet.version=2.4
5-
app.grails.version=1.1.1
6-
plugins.hibernate=1.1.1
5+
app.grails.version=1.1.2
6+
plugins.hibernate=1.1.2
77
app.name=petclinic

samples/petclinic/ivy.xml

+5-5
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,11 @@
77
<conf name="runtime" extends="compile"/>
88
</configurations>
99
<dependencies>
10-
<dependency org="org.grails" name="grails-bootstrap" rev="1.1.1" conf="build"/>
11-
<dependency org="org.grails" name="grails-scripts" rev="1.1.1" conf="build"/>
12-
<dependency org="org.grails" name="grails-gorm" rev="1.1.1" conf="compile"/>
13-
<dependency org="org.grails" name="grails-web" rev="1.1.1" conf="compile"/>
14-
<dependency org="org.grails" name="grails-test" rev="1.1.1" conf="test"/>
10+
<dependency org="org.grails" name="grails-bootstrap" rev="1.1.2" conf="build"/>
11+
<dependency org="org.grails" name="grails-scripts" rev="1.1.2" conf="build"/>
12+
<dependency org="org.grails" name="grails-gorm" rev="1.1.2" conf="compile"/>
13+
<dependency org="org.grails" name="grails-web" rev="1.1.2" conf="compile"/>
14+
<dependency org="org.grails" name="grails-test" rev="1.1.2" conf="test"/>
1515
<dependency org="org.slf4j" name="slf4j-log4j12" rev="1.5.5" conf="runtime"/>
1616
<dependency org="opensymphony" name="oscache" rev="2.4" conf="runtime">
1717
<exclude org="javax.jms" module="jms" name="*" type="*" ext="*" conf="" matcher="exact"/>

samples/petclinic/petclinic.launch

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<booleanAttribute key="org.eclipse.debug.core.appendEnvironmentVariables" value="true"/>
1010
<listAttribute key="org.eclipse.jdt.launching.CLASSPATH">
1111
<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;"/>
12-
<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;"/>
12+
<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;"/>
1313
<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;"/>
1414
</listAttribute>
1515
<booleanAttribute key="org.eclipse.jdt.launching.DEFAULT_CLASSPATH" value="false"/>

0 commit comments

Comments
 (0)