Skip to content

Commit f5e8eee

Browse files
committed
fix for GRAILS-4969 "Quartz conflicts with grails-bootstrap"
1 parent 212fcd8 commit f5e8eee

File tree

1 file changed

+4
-1
lines changed

1 file changed

+4
-1
lines changed

ant/build/bundle.xml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -140,8 +140,10 @@
140140
</antcall>
141141

142142

143+
<copy file="${basedir}/build.properties" tofile="${grails.build}/grails.build.properties" />
143144
<jar destfile="${grails.dist}/grails-bootstrap-${grails.version}.jar" manifest="${grails.build}/META-INF/MANIFEST.MF">
144145
<fileset dir="${grails.build}">
146+
<include name="grails.build.properties" />
145147
<include name="META-INF/**" />
146148
<include name="grails/util/BuildSettings*"/>
147149
<include name="grails/util/GrailsNameUtils*"/>
@@ -154,8 +156,9 @@
154156
<include name="**/groovy/grails/cli/**/*" />
155157
<include name="**/groovy/grails/resolve/**/*" />
156158
</fileset>
157-
<file file="${basedir}/build.properties"/>
158159
</jar>
160+
<delete file="${grails.build}/grails.build.properties" />
161+
159162
<jar destfile="${grails.dist}/grails-scripts-${grails.version}.jar" manifest="${grails.build}/META-INF/MANIFEST.MF">
160163
<fileset dir="${grails.target}/compiled-scripts"/>
161164
<file file="${basedir}/scripts/log4j.properties"/>

0 commit comments

Comments
 (0)