You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@solr.apache.org by kr...@apache.org on 2023/06/07 13:18:24 UTC
[solr] branch main updated: Update Jetty and woodstox-core in versions.props
This is an automated email from the ASF dual-hosted git repository.
krisden pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/solr.git
The following commit(s) were added to refs/heads/main by this push:
new f70696a96fa Update Jetty and woodstox-core in versions.props
f70696a96fa is described below
commit f70696a96fac878a1b699606d914a69a4516d202
Author: Kevin Risden <kr...@apache.org>
AuthorDate: Wed Jun 7 09:12:55 2023 -0400
Update Jetty and woodstox-core in versions.props
Relates to PR#1685 and PR#1695
---
solr/licenses/jetty-start-10.0.14-shaded.jar.sha1 | 1 -
solr/licenses/jetty-start-10.0.15-shaded.jar.sha1 | 1 +
versions.lock | 44 +++++++++++------------
versions.props | 4 +--
4 files changed, 25 insertions(+), 25 deletions(-)
diff --git a/solr/licenses/jetty-start-10.0.14-shaded.jar.sha1 b/solr/licenses/jetty-start-10.0.14-shaded.jar.sha1
deleted file mode 100644
index 2ba97eb6a77..00000000000
--- a/solr/licenses/jetty-start-10.0.14-shaded.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-e37c9af1fa7271e086f323a73843c3e4c0b887a9
diff --git a/solr/licenses/jetty-start-10.0.15-shaded.jar.sha1 b/solr/licenses/jetty-start-10.0.15-shaded.jar.sha1
new file mode 100644
index 00000000000..ff9a3675dbc
--- /dev/null
+++ b/solr/licenses/jetty-start-10.0.15-shaded.jar.sha1
@@ -0,0 +1 @@
+5e0ca1e20769d4189e68b8c42457de75cca24c08
diff --git a/versions.lock b/versions.lock
index 641defbfdc8..c3efc6d856c 100644
--- a/versions.lock
+++ b/versions.lock
@@ -13,7 +13,7 @@ com.fasterxml.jackson.core:jackson-databind:2.15.2 (18 constraints: 8163bbd4)
com.fasterxml.jackson.dataformat:jackson-dataformat-cbor:2.15.2 (2 constraints: 601c16f1)
com.fasterxml.jackson.dataformat:jackson-dataformat-smile:2.15.2 (1 constraints: ba0eab66)
com.fasterxml.jackson.module:jackson-module-jaxb-annotations:2.15.2 (2 constraints: a624c5e0)
-com.fasterxml.woodstox:woodstox-core:6.5.1 (3 constraints: ac288eb8)
+com.fasterxml.woodstox:woodstox-core:6.5.1 (3 constraints: ad28f4b8)
com.github.ben-manes.caffeine:caffeine:3.1.5 (1 constraints: 0b050236)
com.github.jai-imageio:jai-imageio-core:1.4.0 (1 constraints: 5c0ced01)
com.github.junrar:junrar:7.5.3 (1 constraints: 660c1102)
@@ -276,27 +276,27 @@ org.codehaus.woodstox:stax2-api:4.2.1 (2 constraints: 36152eaf)
org.codelibs:jhighlight:1.1.0 (1 constraints: 590ce401)
org.conscrypt:conscrypt-openjdk-uber:2.5.2 (1 constraints: ed0fea95)
org.eclipse.jetty:jetty-alpn-client:10.0.15 (3 constraints: f12e1a60)
-org.eclipse.jetty:jetty-alpn-java-client:10.0.15 (2 constraints: 1e1b546e)
-org.eclipse.jetty:jetty-alpn-java-server:10.0.15 (1 constraints: 68059040)
-org.eclipse.jetty:jetty-alpn-server:10.0.15 (2 constraints: f416db48)
-org.eclipse.jetty:jetty-client:10.0.15 (2 constraints: 1e1b546e)
-org.eclipse.jetty:jetty-deploy:10.0.15 (1 constraints: 68059040)
-org.eclipse.jetty:jetty-http:10.0.15 (6 constraints: 754fe58b)
-org.eclipse.jetty:jetty-io:10.0.15 (9 constraints: b47d14e2)
-org.eclipse.jetty:jetty-jmx:10.0.15 (1 constraints: 68059040)
-org.eclipse.jetty:jetty-rewrite:10.0.15 (1 constraints: 68059040)
-org.eclipse.jetty:jetty-security:10.0.15 (2 constraints: bb13f078)
-org.eclipse.jetty:jetty-server:10.0.15 (7 constraints: d16d0922)
-org.eclipse.jetty:jetty-servlet:10.0.15 (2 constraints: 35131d61)
-org.eclipse.jetty:jetty-servlets:10.0.15 (1 constraints: 68059040)
-org.eclipse.jetty:jetty-util:10.0.15 (9 constraints: a4812590)
-org.eclipse.jetty:jetty-webapp:10.0.15 (2 constraints: 4313a561)
-org.eclipse.jetty:jetty-xml:10.0.15 (3 constraints: 102163ba)
-org.eclipse.jetty.http2:http2-client:10.0.15 (2 constraints: 1e1b546e)
-org.eclipse.jetty.http2:http2-common:10.0.15 (3 constraints: de248361)
-org.eclipse.jetty.http2:http2-hpack:10.0.15 (2 constraints: 211538e0)
-org.eclipse.jetty.http2:http2-http-client-transport:10.0.15 (1 constraints: 68059040)
-org.eclipse.jetty.http2:http2-server:10.0.15 (1 constraints: 68059040)
+org.eclipse.jetty:jetty-alpn-java-client:10.0.15 (2 constraints: 1f1b936e)
+org.eclipse.jetty:jetty-alpn-java-server:10.0.15 (1 constraints: 69059140)
+org.eclipse.jetty:jetty-alpn-server:10.0.15 (2 constraints: f5160f49)
+org.eclipse.jetty:jetty-client:10.0.15 (2 constraints: 1f1b936e)
+org.eclipse.jetty:jetty-deploy:10.0.15 (1 constraints: 69059140)
+org.eclipse.jetty:jetty-http:10.0.15 (6 constraints: 764fc18c)
+org.eclipse.jetty:jetty-io:10.0.15 (9 constraints: b57d78e3)
+org.eclipse.jetty:jetty-jmx:10.0.15 (1 constraints: 69059140)
+org.eclipse.jetty:jetty-rewrite:10.0.15 (1 constraints: 69059140)
+org.eclipse.jetty:jetty-security:10.0.15 (2 constraints: bc131b79)
+org.eclipse.jetty:jetty-server:10.0.15 (7 constraints: d26d3b23)
+org.eclipse.jetty:jetty-servlet:10.0.15 (2 constraints: 36134761)
+org.eclipse.jetty:jetty-servlets:10.0.15 (1 constraints: 69059140)
+org.eclipse.jetty:jetty-util:10.0.15 (9 constraints: a5819691)
+org.eclipse.jetty:jetty-webapp:10.0.15 (2 constraints: 4413cf61)
+org.eclipse.jetty:jetty-xml:10.0.15 (3 constraints: 1121b6ba)
+org.eclipse.jetty.http2:http2-client:10.0.15 (2 constraints: 1f1b936e)
+org.eclipse.jetty.http2:http2-common:10.0.15 (3 constraints: df24e261)
+org.eclipse.jetty.http2:http2-hpack:10.0.15 (2 constraints: 221568e0)
+org.eclipse.jetty.http2:http2-http-client-transport:10.0.15 (1 constraints: 69059140)
+org.eclipse.jetty.http2:http2-server:10.0.15 (1 constraints: 69059140)
org.eclipse.jetty.toolchain:jetty-servlet-api:4.0.6 (4 constraints: 883053bf)
org.gagravarr:vorbis-java-core:0.8 (1 constraints: 010c57e9)
org.gagravarr:vorbis-java-tika:0.8 (1 constraints: 010c57e9)
diff --git a/versions.props b/versions.props
index 508390ec88b..9242b71a895 100644
--- a/versions.props
+++ b/versions.props
@@ -6,7 +6,7 @@ com.carrotsearch.randomizedtesting:*=2.8.1
com.carrotsearch:hppc=0.9.1
com.cybozu.labs:langdetect=1.1-20120112
com.fasterxml.jackson:jackson-bom=2.15.2
-com.fasterxml.woodstox:woodstox-core=6.5.0
+com.fasterxml.woodstox:woodstox-core=6.5.1
com.github.ben-manes.caffeine:caffeine=3.1.5
com.github.spotbugs:*=4.7.3
com.github.stephenc.jcip:jcip-annotations=1.0-1
@@ -57,7 +57,7 @@ org.apache.zookeeper:*=3.8.1
org.bitbucket.b_c:jose4j=0.9.3
org.carrot2:carrot2-core=4.5.0
org.codehaus.woodstox:stax2-api=4.2.1
-org.eclipse.jetty*:*=10.0.14
+org.eclipse.jetty*:*=10.0.15
org.eclipse.jetty.toolchain:jetty-servlet-api=4.0.6
org.glassfish.hk2*:*=2.6.1
org.glassfish.jersey*:*=2.35