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/03/02 13:50:36 UTC
[solr] branch branch_9x updated (5eadc39946a -> 7c4a10deac2)
This is an automated email from the ASF dual-hosted git repository.
krisden pushed a change to branch branch_9x
in repository https://gitbox.apache.org/repos/asf/solr.git
from 5eadc39946a Update io.dropwizard.metrics:* to v4.2.17 (#1391)
new 0f1e0390941 Update org.apache.logging.log4j:* to v2.20.0 (#1421)
new 7c4a10deac2 Update dependency org.openjdk.jmh:jmh-core to v1.36 (#1417)
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
solr/licenses/jmh-core-1.32.jar.sha1 | 1 -
solr/licenses/jmh-core-1.36.jar.sha1 | 1 +
solr/licenses/jopt-simple-4.6.jar.sha1 | 1 -
solr/licenses/jopt-simple-5.0.4.jar.sha1 | 1 +
solr/licenses/log4j-1.2-api-2.19.0.jar.sha1 | 1 -
solr/licenses/log4j-1.2-api-2.20.0.jar.sha1 | 1 +
solr/licenses/log4j-api-2.19.0.jar.sha1 | 1 -
solr/licenses/log4j-api-2.20.0.jar.sha1 | 1 +
solr/licenses/log4j-core-2.19.0.jar.sha1 | 1 -
solr/licenses/log4j-core-2.20.0.jar.sha1 | 1 +
.../log4j-layout-template-json-2.19.0.jar.sha1 | 1 -
.../log4j-layout-template-json-2.20.0.jar.sha1 | 1 +
solr/licenses/log4j-slf4j2-impl-2.19.0.jar.sha1 | 1 -
solr/licenses/log4j-slf4j2-impl-2.20.0.jar.sha1 | 1 +
solr/licenses/log4j-web-2.19.0.jar.sha1 | 1 -
solr/licenses/log4j-web-2.20.0.jar.sha1 | 1 +
versions.lock | 18 +++++++++---------
versions.props | 4 ++--
18 files changed, 19 insertions(+), 19 deletions(-)
delete mode 100644 solr/licenses/jmh-core-1.32.jar.sha1
create mode 100644 solr/licenses/jmh-core-1.36.jar.sha1
delete mode 100644 solr/licenses/jopt-simple-4.6.jar.sha1
create mode 100644 solr/licenses/jopt-simple-5.0.4.jar.sha1
delete mode 100644 solr/licenses/log4j-1.2-api-2.19.0.jar.sha1
create mode 100644 solr/licenses/log4j-1.2-api-2.20.0.jar.sha1
delete mode 100644 solr/licenses/log4j-api-2.19.0.jar.sha1
create mode 100644 solr/licenses/log4j-api-2.20.0.jar.sha1
delete mode 100644 solr/licenses/log4j-core-2.19.0.jar.sha1
create mode 100644 solr/licenses/log4j-core-2.20.0.jar.sha1
delete mode 100644 solr/licenses/log4j-layout-template-json-2.19.0.jar.sha1
create mode 100644 solr/licenses/log4j-layout-template-json-2.20.0.jar.sha1
delete mode 100644 solr/licenses/log4j-slf4j2-impl-2.19.0.jar.sha1
create mode 100644 solr/licenses/log4j-slf4j2-impl-2.20.0.jar.sha1
delete mode 100644 solr/licenses/log4j-web-2.19.0.jar.sha1
create mode 100644 solr/licenses/log4j-web-2.20.0.jar.sha1
[solr] 01/02: Update org.apache.logging.log4j:* to v2.20.0 (#1421)
Posted by kr...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
krisden pushed a commit to branch branch_9x
in repository https://gitbox.apache.org/repos/asf/solr.git
commit 0f1e0390941da7edf2ae94523bfdae5260a99bbe
Author: Solr Bot <12...@users.noreply.github.com>
AuthorDate: Thu Mar 2 14:38:51 2023 +0100
Update org.apache.logging.log4j:* to v2.20.0 (#1421)
---
solr/licenses/log4j-1.2-api-2.19.0.jar.sha1 | 1 -
solr/licenses/log4j-1.2-api-2.20.0.jar.sha1 | 1 +
solr/licenses/log4j-api-2.19.0.jar.sha1 | 1 -
solr/licenses/log4j-api-2.20.0.jar.sha1 | 1 +
solr/licenses/log4j-core-2.19.0.jar.sha1 | 1 -
solr/licenses/log4j-core-2.20.0.jar.sha1 | 1 +
solr/licenses/log4j-layout-template-json-2.19.0.jar.sha1 | 1 -
solr/licenses/log4j-layout-template-json-2.20.0.jar.sha1 | 1 +
solr/licenses/log4j-slf4j2-impl-2.19.0.jar.sha1 | 1 -
solr/licenses/log4j-slf4j2-impl-2.20.0.jar.sha1 | 1 +
solr/licenses/log4j-web-2.19.0.jar.sha1 | 1 -
solr/licenses/log4j-web-2.20.0.jar.sha1 | 1 +
versions.lock | 14 +++++++-------
versions.props | 2 +-
14 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/solr/licenses/log4j-1.2-api-2.19.0.jar.sha1 b/solr/licenses/log4j-1.2-api-2.19.0.jar.sha1
deleted file mode 100644
index 0568b12a5a3..00000000000
--- a/solr/licenses/log4j-1.2-api-2.19.0.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-0e8d839e89e44f06ed901bb8b681161ad3131fd5
diff --git a/solr/licenses/log4j-1.2-api-2.20.0.jar.sha1 b/solr/licenses/log4j-1.2-api-2.20.0.jar.sha1
new file mode 100644
index 00000000000..ac95ee746ec
--- /dev/null
+++ b/solr/licenses/log4j-1.2-api-2.20.0.jar.sha1
@@ -0,0 +1 @@
+689151374756cb809cb029f2501015bdc7733179
diff --git a/solr/licenses/log4j-api-2.19.0.jar.sha1 b/solr/licenses/log4j-api-2.19.0.jar.sha1
deleted file mode 100644
index dea51ab21ff..00000000000
--- a/solr/licenses/log4j-api-2.19.0.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-ea1b37f38c327596b216542bc636cfdc0b8036fa
diff --git a/solr/licenses/log4j-api-2.20.0.jar.sha1 b/solr/licenses/log4j-api-2.20.0.jar.sha1
new file mode 100644
index 00000000000..390ef64b01e
--- /dev/null
+++ b/solr/licenses/log4j-api-2.20.0.jar.sha1
@@ -0,0 +1 @@
+1fe6082e660daf07c689a89c94dc0f49c26b44bb
diff --git a/solr/licenses/log4j-core-2.19.0.jar.sha1 b/solr/licenses/log4j-core-2.19.0.jar.sha1
deleted file mode 100644
index c2931b29890..00000000000
--- a/solr/licenses/log4j-core-2.19.0.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-3b6eeb4de4c49c0fe38a4ee27188ff5fee44d0bb
diff --git a/solr/licenses/log4j-core-2.20.0.jar.sha1 b/solr/licenses/log4j-core-2.20.0.jar.sha1
new file mode 100644
index 00000000000..6272a4a0858
--- /dev/null
+++ b/solr/licenses/log4j-core-2.20.0.jar.sha1
@@ -0,0 +1 @@
+eb2a9a47b1396e00b5eee1264296729a70565cc0
diff --git a/solr/licenses/log4j-layout-template-json-2.19.0.jar.sha1 b/solr/licenses/log4j-layout-template-json-2.19.0.jar.sha1
deleted file mode 100644
index 98bbe28cc1b..00000000000
--- a/solr/licenses/log4j-layout-template-json-2.19.0.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-e86db7ff1fab823b44439f55655006e95548f774
diff --git a/solr/licenses/log4j-layout-template-json-2.20.0.jar.sha1 b/solr/licenses/log4j-layout-template-json-2.20.0.jar.sha1
new file mode 100644
index 00000000000..ba0ad6db32b
--- /dev/null
+++ b/solr/licenses/log4j-layout-template-json-2.20.0.jar.sha1
@@ -0,0 +1 @@
+16f2e5669f4e4173fc446007e8b85aa2313df33b
diff --git a/solr/licenses/log4j-slf4j2-impl-2.19.0.jar.sha1 b/solr/licenses/log4j-slf4j2-impl-2.19.0.jar.sha1
deleted file mode 100644
index 46e408e6b37..00000000000
--- a/solr/licenses/log4j-slf4j2-impl-2.19.0.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-5c04bfdd63ce9dceb2e284b81e96b6a70010ee10
diff --git a/solr/licenses/log4j-slf4j2-impl-2.20.0.jar.sha1 b/solr/licenses/log4j-slf4j2-impl-2.20.0.jar.sha1
new file mode 100644
index 00000000000..5c2144b9c61
--- /dev/null
+++ b/solr/licenses/log4j-slf4j2-impl-2.20.0.jar.sha1
@@ -0,0 +1 @@
+155c8b9bbdac91d8461d9a403a646e6bd0d365d8
diff --git a/solr/licenses/log4j-web-2.19.0.jar.sha1 b/solr/licenses/log4j-web-2.19.0.jar.sha1
deleted file mode 100644
index 1f23fe59135..00000000000
--- a/solr/licenses/log4j-web-2.19.0.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-6933767a88b585bee0693e891795dba1256bfcbf
diff --git a/solr/licenses/log4j-web-2.20.0.jar.sha1 b/solr/licenses/log4j-web-2.20.0.jar.sha1
new file mode 100644
index 00000000000..586ef6986b9
--- /dev/null
+++ b/solr/licenses/log4j-web-2.20.0.jar.sha1
@@ -0,0 +1 @@
+3877f128ebc8655c4a48944ebf3e2c94de1bfbed
diff --git a/versions.lock b/versions.lock
index 7203c7f19fc..a76705444db 100644
--- a/versions.lock
+++ b/versions.lock
@@ -202,12 +202,12 @@ org.apache.kerby:kerby-asn1:1.0.1 (1 constraints: fd0be9f4)
org.apache.kerby:kerby-config:1.0.1 (4 constraints: 4d3182b9)
org.apache.kerby:kerby-pkix:1.0.1 (1 constraints: 710bfce4)
org.apache.kerby:kerby-util:1.0.1 (2 constraints: 6518bdb6)
-org.apache.logging.log4j:log4j-1.2-api:2.19.0 (1 constraints: 3e054a3b)
-org.apache.logging.log4j:log4j-api:2.19.0 (9 constraints: ba6f36df)
-org.apache.logging.log4j:log4j-core:2.19.0 (4 constraints: 9944df17)
-org.apache.logging.log4j:log4j-layout-template-json:2.19.0 (1 constraints: 3e054a3b)
-org.apache.logging.log4j:log4j-slf4j2-impl:2.19.0 (1 constraints: 3e054a3b)
-org.apache.logging.log4j:log4j-web:2.19.0 (1 constraints: 3e054a3b)
+org.apache.logging.log4j:log4j-1.2-api:2.20.0 (1 constraints: 3605333b)
+org.apache.logging.log4j:log4j-api:2.20.0 (9 constraints: 926f5bba)
+org.apache.logging.log4j:log4j-core:2.20.0 (5 constraints: 82556aef)
+org.apache.logging.log4j:log4j-layout-template-json:2.20.0 (1 constraints: 3605333b)
+org.apache.logging.log4j:log4j-slf4j2-impl:2.20.0 (1 constraints: 3605333b)
+org.apache.logging.log4j:log4j-web:2.20.0 (1 constraints: 3605333b)
org.apache.lucene:lucene-analysis-common:9.4.2 (10 constraints: e89eec62)
org.apache.lucene:lucene-analysis-icu:9.4.2 (1 constraints: 11052636)
org.apache.lucene:lucene-analysis-kuromoji:9.4.2 (1 constraints: 11052636)
@@ -348,7 +348,7 @@ org.reactivestreams:reactive-streams:1.0.3 (3 constraints: 3c2b02fd)
org.semver4j:semver4j:2.2.0 (1 constraints: 0605fb35)
org.slf4j:jcl-over-slf4j:2.0.6 (3 constraints: cc171ba6)
org.slf4j:jul-to-slf4j:2.0.6 (3 constraints: 26283448)
-org.slf4j:slf4j-api:2.0.6 (62 constraints: c0378e3f)
+org.slf4j:slf4j-api:2.0.6 (62 constraints: c637445f)
org.tallison:isoparser:1.9.41.7 (1 constraints: fb0c5528)
org.tallison:jmatio:1.5 (1 constraints: ff0b57e9)
org.tallison:metadata-extractor:2.17.1.0 (1 constraints: f00c3b28)
diff --git a/versions.props b/versions.props
index 5470464b189..169a980a9dc 100644
--- a/versions.props
+++ b/versions.props
@@ -50,7 +50,7 @@ org.apache.httpcomponents:httpclient=4.5.14
org.apache.httpcomponents:httpcore=4.4.16
org.apache.httpcomponents:httpmime=4.5.14
org.apache.kerby:*=1.0.1
-org.apache.logging.log4j:*=2.19.0
+org.apache.logging.log4j:*=2.20.0
org.apache.lucene:*=9.4.2
org.apache.opennlp:opennlp-tools=1.9.4
org.apache.tika:*=1.28.5
[solr] 02/02: Update dependency org.openjdk.jmh:jmh-core to v1.36 (#1417)
Posted by kr...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
krisden pushed a commit to branch branch_9x
in repository https://gitbox.apache.org/repos/asf/solr.git
commit 7c4a10deac29fabd48895dff8aad832dbefa9bae
Author: Solr Bot <12...@users.noreply.github.com>
AuthorDate: Thu Mar 2 14:39:13 2023 +0100
Update dependency org.openjdk.jmh:jmh-core to v1.36 (#1417)
---
solr/licenses/jmh-core-1.32.jar.sha1 | 1 -
solr/licenses/jmh-core-1.36.jar.sha1 | 1 +
solr/licenses/jopt-simple-4.6.jar.sha1 | 1 -
solr/licenses/jopt-simple-5.0.4.jar.sha1 | 1 +
versions.lock | 4 ++--
versions.props | 2 +-
6 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/solr/licenses/jmh-core-1.32.jar.sha1 b/solr/licenses/jmh-core-1.32.jar.sha1
deleted file mode 100644
index 23e527818c7..00000000000
--- a/solr/licenses/jmh-core-1.32.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-9a8b69ea08118fd4e5d30a152d37b7087ee4a720
diff --git a/solr/licenses/jmh-core-1.36.jar.sha1 b/solr/licenses/jmh-core-1.36.jar.sha1
new file mode 100644
index 00000000000..14878efb422
--- /dev/null
+++ b/solr/licenses/jmh-core-1.36.jar.sha1
@@ -0,0 +1 @@
+5a69117788322630fc5f228bc804771335d41b1b
diff --git a/solr/licenses/jopt-simple-4.6.jar.sha1 b/solr/licenses/jopt-simple-4.6.jar.sha1
deleted file mode 100644
index 03f870758c7..00000000000
--- a/solr/licenses/jopt-simple-4.6.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-306816fb57cf94f108a43c95731b08934dcae15c
diff --git a/solr/licenses/jopt-simple-5.0.4.jar.sha1 b/solr/licenses/jopt-simple-5.0.4.jar.sha1
new file mode 100644
index 00000000000..f67100d20e2
--- /dev/null
+++ b/solr/licenses/jopt-simple-5.0.4.jar.sha1
@@ -0,0 +1 @@
+4fdac2fbe92dfad86aa6e9301736f6b4342a3f5c
diff --git a/versions.lock b/versions.lock
index a76705444db..d355734a8f5 100644
--- a/versions.lock
+++ b/versions.lock
@@ -162,7 +162,7 @@ junit:junit:4.13.2 (9 constraints: d4aa559e)
net.arnx:jsonic:1.2.7 (1 constraints: d00b47eb)
net.java.dev.jna:jna:5.12.1 (1 constraints: 900c8e0e)
net.sf.ehcache:ehcache-core:2.6.2 (1 constraints: 2706f94d)
-net.sf.jopt-simple:jopt-simple:4.6 (1 constraints: 610a91b7)
+net.sf.jopt-simple:jopt-simple:5.0.4 (1 constraints: be0ad6cc)
net.sourceforge.argparse4j:argparse4j:0.9.0 (1 constraints: 0b050636)
net.thisptr:jackson-jq:0.0.13 (1 constraints: 3605223b)
org.antlr:antlr4-runtime:4.5.1-1 (1 constraints: 2810eea6)
@@ -335,7 +335,7 @@ org.locationtech.jts.io:jts-io-common:1.19.0 (1 constraints: 930d513a)
org.locationtech.proj4j:proj4j:1.1.5 (1 constraints: 5f0daf2c)
org.locationtech.spatial4j:spatial4j:0.8 (1 constraints: 59105498)
org.opengis:geoapi:3.0.1 (7 constraints: 1361d046)
-org.openjdk.jmh:jmh-core:1.32 (1 constraints: da04f730)
+org.openjdk.jmh:jmh-core:1.36 (1 constraints: de04fb30)
org.osgi:org.osgi.resource:1.0.0 (1 constraints: e60f2999)
org.osgi:org.osgi.service.serviceloader:1.0.0 (1 constraints: e60f2999)
org.osgi:osgi.annotation:8.1.0 (1 constraints: 0b051636)
diff --git a/versions.props b/versions.props
index 169a980a9dc..4c0a66ab4c0 100644
--- a/versions.props
+++ b/versions.props
@@ -68,7 +68,7 @@ org.hsqldb:hsqldb=2.4.0
org.immutables:value-annotations=2.9.3
org.jctools:jctools-core=3.3.0
org.mockito:mockito-core=3.8.0
-org.openjdk.jmh:*=1.32
+org.openjdk.jmh:*=1.36
org.osgi:osgi.annotation=8.1.0
org.quicktheories:quicktheories=0.26
org.semver4j:semver4j=2.2.0