Apache
/
lucene
mirror of https://github.com/apache/lucene.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

SOLR-4050: ensure we have no trash in example/lib, move jetty start.jar into ivy.xml 

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1407107 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Robert Muir 2012-11-08 14:50:41 +00:00
parent 959bccf7c1
commit 3c14a51d14
3 changed files with 30 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
solr/example/build.xml
View File

@ -36,15 +36,24 @@
<!-- nothing to cover -->
<target name="pitest"/>
<target name="resolve" depends="ivy-availability-check,ivy-fail,ivy-configure">
<!-- a hack because we don't use sync-true since we have 3 different profiles.
we have these different profiles because each has a different artifact pattern.
this way we can rename servlet-api-xxxxxxxxxxxxxxxxxxx.jar -> lib/servlet-api-3.0.jar,
and rename jetty-start-xxxxxxxxxxxxx.jar -> start.jar (not in lib/) !
there is probably a cleaner way: but this ensure we have no garbage if jetty is upgraded -->
<target name="sync-hack">
<delete>
<fileset dir="lib" includes="*.jar"/>
</delete>
</target>
<target name="resolve" depends="ivy-availability-check,ivy-fail,ivy-configure,sync-hack">
<sequential>
<!-- jetty libs in lib/ -->
<ivy:retrieve conf="default" type="jar" log="download-only"/>
<ivy:retrieve conf="jetty" type="jar" log="download-only"/>
<!-- start.jar -->
<!-- TODO: put this in ivy.xml -->
<ivy:retrieve inline="true" organisation="org.eclipse.jetty"
module="jetty-start" revision="8.1.7.v20120910"
transitive="false" type="jar" log="download-only"
<ivy:retrieve conf="start" type="jar" log="download-only"
pattern="start.jar"/>
<!-- servlet-api.jar -->
<ivy:retrieve conf="servlet" log="download-only" type="orbit"

26
solr/example/ivy.xml
View File

@ -19,22 +19,24 @@
<ivy-module version="2.0">
<info organisation="org.apache.solr" module="example"/>
<configurations>
<conf name="default" description="jetty jars"/>
<conf name="jetty" description="jetty jars"/>
<conf name="start" description="jetty start jar"/>
<conf name="servlet" description="servlet-api jar"/>
</configurations>
<dependencies>
<dependency org="org.eclipse.jetty" name="jetty-continuation" rev="8.1.7.v20120910" transitive="false"/>
<dependency org="org.eclipse.jetty" name="jetty-deploy" rev="8.1.7.v20120910" transitive="false"/>
<dependency org="org.eclipse.jetty" name="jetty-http" rev="8.1.7.v20120910" transitive="false"/>
<dependency org="org.eclipse.jetty" name="jetty-io" rev="8.1.7.v20120910" transitive="false"/>
<dependency org="org.eclipse.jetty" name="jetty-jmx" rev="8.1.7.v20120910" transitive="false"/>
<dependency org="org.eclipse.jetty" name="jetty-security" rev="8.1.7.v20120910" transitive="false"/>
<dependency org="org.eclipse.jetty" name="jetty-server" rev="8.1.7.v20120910" transitive="false"/>
<dependency org="org.eclipse.jetty" name="jetty-servlet" rev="8.1.7.v20120910" transitive="false"/>
<dependency org="org.eclipse.jetty" name="jetty-util" rev="8.1.7.v20120910" transitive="false"/>
<dependency org="org.eclipse.jetty" name="jetty-webapp" rev="8.1.7.v20120910" transitive="false"/>
<dependency org="org.eclipse.jetty" name="jetty-xml" rev="8.1.7.v20120910" transitive="false"/>
<dependency org="org.eclipse.jetty" name="jetty-continuation" rev="8.1.7.v20120910" transitive="false" conf="jetty->default"/>
<dependency org="org.eclipse.jetty" name="jetty-deploy" rev="8.1.7.v20120910" transitive="false" conf="jetty->default"/>
<dependency org="org.eclipse.jetty" name="jetty-http" rev="8.1.7.v20120910" transitive="false" conf="jetty->default"/>
<dependency org="org.eclipse.jetty" name="jetty-io" rev="8.1.7.v20120910" transitive="false" conf="jetty->default"/>
<dependency org="org.eclipse.jetty" name="jetty-jmx" rev="8.1.7.v20120910" transitive="false" conf="jetty->default"/>
<dependency org="org.eclipse.jetty" name="jetty-security" rev="8.1.7.v20120910" transitive="false" conf="jetty->default"/>
<dependency org="org.eclipse.jetty" name="jetty-server" rev="8.1.7.v20120910" transitive="false" conf="jetty->default"/>
<dependency org="org.eclipse.jetty" name="jetty-servlet" rev="8.1.7.v20120910" transitive="false" conf="jetty->default"/>
<dependency org="org.eclipse.jetty" name="jetty-util" rev="8.1.7.v20120910" transitive="false" conf="jetty->default"/>
<dependency org="org.eclipse.jetty" name="jetty-webapp" rev="8.1.7.v20120910" transitive="false" conf="jetty->default"/>
<dependency org="org.eclipse.jetty" name="jetty-xml" rev="8.1.7.v20120910" transitive="false" conf="jetty->default"/>
<dependency org="org.eclipse.jetty" name="jetty-start" rev="8.1.7.v20120910" transitive="false" conf="start->default"/>
<dependency org="org.eclipse.jetty.orbit" name="javax.servlet" rev="3.0.0.v201112011016" transitive="false" conf="servlet->default">
<artifact name="javax.servlet" type="orbit" ext="jar"/>
</dependency>

2
solr/licenses/start.jar.sha1
View File

@ -1 +1 @@
edfcab3e9f984fbfeef4f6193ec56f98b4796c68
b90a67a4f1f6db9e9cea94663e82c320d70e8982