You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by rm...@apache.org on 2012/11/08 15:52:02 UTC
svn commit: r1407108 - in /lucene/dev/branches/branch_4x: ./ solr/
solr/example/ solr/example/build.xml solr/example/ivy.xml solr/licenses/
solr/licenses/start.jar.sha1
Author: rmuir
Date: Thu Nov 8 14:52:01 2012
New Revision: 1407108
URL: http://svn.apache.org/viewvc?rev=1407108&view=rev
Log:
SOLR-4050: ensure we have no trash in example/lib, move jetty start.jar into ivy.xml
Modified:
lucene/dev/branches/branch_4x/ (props changed)
lucene/dev/branches/branch_4x/solr/ (props changed)
lucene/dev/branches/branch_4x/solr/example/ (props changed)
lucene/dev/branches/branch_4x/solr/example/build.xml
lucene/dev/branches/branch_4x/solr/example/ivy.xml
lucene/dev/branches/branch_4x/solr/licenses/ (props changed)
lucene/dev/branches/branch_4x/solr/licenses/start.jar.sha1
Modified: lucene/dev/branches/branch_4x/solr/example/build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/example/build.xml?rev=1407108&r1=1407107&r2=1407108&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/example/build.xml (original)
+++ lucene/dev/branches/branch_4x/solr/example/build.xml Thu Nov 8 14:52:01 2012
@@ -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"
Modified: lucene/dev/branches/branch_4x/solr/example/ivy.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/example/ivy.xml?rev=1407108&r1=1407107&r2=1407108&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/example/ivy.xml (original)
+++ lucene/dev/branches/branch_4x/solr/example/ivy.xml Thu Nov 8 14:52:01 2012
@@ -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>
Modified: lucene/dev/branches/branch_4x/solr/licenses/start.jar.sha1
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/licenses/start.jar.sha1?rev=1407108&r1=1407107&r2=1407108&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/licenses/start.jar.sha1 (original)
+++ lucene/dev/branches/branch_4x/solr/licenses/start.jar.sha1 Thu Nov 8 14:52:01 2012
@@ -1 +1 @@
-edfcab3e9f984fbfeef4f6193ec56f98b4796c68
+b90a67a4f1f6db9e9cea94663e82c320d70e8982