You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by va...@apache.org on 2018/05/10 21:07:52 UTC
lucene-solr:master: SOLR-12265: Fix jetty-start shade issue
Repository: lucene-solr
Updated Branches:
refs/heads/master 0adaeee43 -> 8a697ee09
SOLR-12265: Fix jetty-start shade issue
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/8a697ee0
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/8a697ee0
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/8a697ee0
Branch: refs/heads/master
Commit: 8a697ee09cff3c81ea0805a5c75d1b01a0712768
Parents: 0adaeee
Author: Varun Thacker <va...@apache.org>
Authored: Thu May 10 10:10:01 2018 -0700
Committer: Varun Thacker <va...@apache.org>
Committed: Thu May 10 10:10:44 2018 -0700
----------------------------------------------------------------------
solr/CHANGES.txt | 2 +-
solr/licenses/start.jar.sha1 | 2 +-
solr/server/ivy.xml | 7 ++++---
3 files changed, 6 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/8a697ee0/solr/CHANGES.txt
----------------------------------------------------------------------
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index 474df84..798c3df 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -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 ==================
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/8a697ee0/solr/licenses/start.jar.sha1
----------------------------------------------------------------------
diff --git a/solr/licenses/start.jar.sha1 b/solr/licenses/start.jar.sha1
index 23b98ba..417f7b0 100644
--- a/solr/licenses/start.jar.sha1
+++ b/solr/licenses/start.jar.sha1
@@ -1 +1 @@
-eaf77346d5b09cd74d799b1f036df4de580deec2
+6d94cba2e3efab5d994cdb9ba1aaa86e022a2b26
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/8a697ee0/solr/server/ivy.xml
----------------------------------------------------------------------
diff --git a/solr/server/ivy.xml b/solr/server/ivy.xml
index cf7832a..626e727 100644
--- a/solr/server/ivy.xml
+++ b/solr/server/ivy.xml
@@ -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>