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

SOLR-12265: Fix jetty-start shade issue

This commit is contained in:
Varun Thacker 2018-05-10 10:10:01 -07:00
parent 0adaeee438
commit 8a697ee09c
3 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
solr/CHANGES.txt
View File

@ -309,7 +309,7 @@ Other Changes
* SOLR-12288: Add more MDC logging information to core admin requests (Varun Thacker)
* SOLR-12290: Upgrade Jetty to 9.4.10.v20180503 (Varun Thacker)
* SOLR-12265: Upgrade Jetty to 9.4.10.v20180503 (Varun Thacker, Steve Rowe)
================== 7.3.1 ==================

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

@ -1 +1 @@
eaf77346d5b09cd74d799b1f036df4de580deec2
6d94cba2e3efab5d994cdb9ba1aaa86e022a2b26

7
solr/server/ivy.xml
View File

@ -16,7 +16,7 @@
specific language governing permissions and limitations
under the License.
-->
<ivy-module version="2.0">
<ivy-module version="2.0" xmlns:maven="http://ant.apache.org/ivy/maven">
<info organisation="org.apache.solr" module="server"/>
<configurations defaultconfmapping="metrics->master;jetty->master;start->master;servlet->master;logging->master">
<conf name="metrics" description="metrics jars" transitive="true"/>
@ -59,8 +59,9 @@
<dependency org="javax.servlet" name="javax.servlet-api" rev="${/javax.servlet/javax.servlet-api}" conf="jetty"/>
<dependency org="org.eclipse.jetty" name="jetty-start" rev="${/org.eclipse.jetty/jetty-start}" conf="start"/>
<dependency org="org.eclipse.jetty" name="jetty-start" rev="${/org.eclipse.jetty/jetty-start}" conf="start">
<artifact name="jetty-start" type="jar" maven:classifier="shaded"/>
</dependency>
<exclude org="*" ext="*" matcher="regexp" type="${ivy.exclude.types}"/>
</dependencies>