Author: dkatayev
Date: 2010-07-29 10:46:27 -0400 (Thu, 29 Jul 2010)
New Revision: 2840
Modified:
jcr/trunk/applications/exo.jcr.applications.jetty/pom.xml
Log:
EXOJCR-771 org.apache.taglibs.standard.glassfish which conflicts with jcr dependencies is
now removed on build phase
Modified: jcr/trunk/applications/exo.jcr.applications.jetty/pom.xml
===================================================================
--- jcr/trunk/applications/exo.jcr.applications.jetty/pom.xml 2010-07-29 13:57:14 UTC (rev
2839)
+++ jcr/trunk/applications/exo.jcr.applications.jetty/pom.xml 2010-07-29 14:46:27 UTC (rev
2840)
@@ -95,7 +95,8 @@
</copy>
<delete
dir="${exo.projects.directory.working}/exo-jetty/etc"
includeEmptyDirs="true" quiet="yes" />
<delete
dir="${exo.projects.directory.working}/exo-jetty/contexts"
includeEmptyDirs="true" quiet="yes" />
- <delete
dir="${exo.projects.directory.working}/exo-jetty/webapps"
includeEmptyDirs="true" quiet="yes" />
+ <delete
dir="${exo.projects.directory.working}/exo-jetty/webapps"
includeEmptyDirs="true" quiet="yes" />
+ <delete
file="${exo.projects.directory.working}/exo-jetty/lib/jsp/org.apache.taglibs.standard.glassfish_1.2.0.v201004190952.jar"
/>
<copy
todir="${exo.projects.directory.working}/exo-jetty/lib/ext/"
verbose="true" overwrite="true">
<fileset dir="${basedir}/target/lib-binary.dir/"
excludes="**/*.war" />
</copy>