lucene-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From "Steve Rowe (JIRA)" <>
Subject [jira] [Commented] (SOLR-7429) Remove Solr server module sync-hack introduced in SOLR-4050.
Date Thu, 23 Apr 2015 15:30:39 GMT


Steve Rowe commented on SOLR-7429:

The dep conversion process was confused by the servlet-api dep being declared using the "test"
conf in {{solr/core/ivy.xml}}, even though it's required in compile scope.  The following
patch switches the servlet-api dep to the "compile" conf, and removes it from the {{additional.dependencies}},
which is included in the {{solr.base.classpath}}; all Solr tests pass for me under both the
Ant and Maven builds (except a couple thread leaks under Maven in the solr-map-reduce module)
with the patch:

Index: solr/common-build.xml
--- solr/common-build.xml	(revision 1675619)
+++ solr/common-build.xml	(working copy)
@@ -74,7 +74,6 @@
   	<fileset dir="${common-solr.dir}/core/lib" excludes="${common.classpath.excludes}"/>
   	<fileset dir="${common-solr.dir}/solrj/lib" excludes="${common.classpath.excludes}"/>
   	<fileset dir="${common-solr.dir}/server/lib" excludes="${common.classpath.excludes}"/>
-    <fileset dir="${common-solr.dir}/server/lib/ext" includes="javax.servlet-api-*.jar"/>
   	<fileset dir="${common-solr.dir}/example/example-DIH/solr/db/lib" excludes="${common.classpath.excludes}"/>
   	<fileset dir="lib" excludes="${common.classpath.excludes}" erroronmissingdir="false"/>
Index: solr/core/ivy.xml
--- solr/core/ivy.xml	(revision 1675619)
+++ solr/core/ivy.xml	(working copy)
@@ -47,8 +47,8 @@
     <dependency org="com.carrotsearch" name="hppc" rev="${/com.carrotsearch/hppc}" conf="compile"/>
     <dependency org="log4j" name="log4j" rev="${/log4j/log4j}" conf="compile"/>
     <dependency org="org.slf4j" name="slf4j-log4j12" rev="${/org.slf4j/slf4j-log4j12}"
+    <dependency org="javax.servlet" name="javax.servlet-api" rev="${/javax.servlet/javax.servlet-api}"
-    <dependency org="javax.servlet" name="javax.servlet-api" rev="${/javax.servlet/javax.servlet-api}"
     <dependency org="org.easymock" name="easymock" rev="${/org.easymock/easymock}" conf="test"/>
     <dependency org="cglib" name="cglib-nodep" rev="${/cglib/cglib-nodep}" conf="test"/>
     <dependency org="org.objenesis" name="objenesis" rev="${/org.objenesis/objenesis}"

Committing shortly.

> Remove Solr server module sync-hack introduced in SOLR-4050.
> ------------------------------------------------------------
>                 Key: SOLR-7429
>                 URL:
>             Project: Solr
>          Issue Type: Improvement
>            Reporter: Mark Miller
>            Assignee: Mark Miller
>             Fix For: Trunk, 5.2
>         Attachments: SOLR-7429-fix-servlet-api-deps.patch, SOLR-7429.more.servlet.api.jar.fixes.patch,
> This is annoying to the beast script I have and for other obvious reasons. We would really
like to use sync=true here like everywhere. I'll see what I can do.

This message was sent by Atlassian JIRA

To unsubscribe, e-mail:
For additional commands, e-mail:

View raw message