You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by kr...@apache.org on 2019/02/23 14:57:38 UTC
[lucene-solr] branch jira/solr-13268 created (now 9a80088)
This is an automated email from the ASF dual-hosted git repository.
krisden pushed a change to branch jira/solr-13268
in repository https://gitbox.apache.org/repos/asf/lucene-solr.git.
at 9a80088 SOLR-13268: SOLR-12055 log4j2 async test fixes
This branch includes the following new commits:
new 9a80088 SOLR-13268: SOLR-12055 log4j2 async test fixes
The 1 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.
[lucene-solr] 01/01: SOLR-13268: SOLR-12055 log4j2 async test fixes
Posted by kr...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
krisden pushed a commit to branch jira/solr-13268
in repository https://gitbox.apache.org/repos/asf/lucene-solr.git
commit 9a80088d62f44cf326afc1f1115fbe08e3b7e623
Author: Kevin Risden <kr...@apache.org>
AuthorDate: Sat Feb 23 09:09:59 2019 -0500
SOLR-13268: SOLR-12055 log4j2 async test fixes
Signed-off-by: Kevin Risden <kr...@apache.org>
---
lucene/ivy-versions.properties | 5 +++--
solr/licenses/disruptor-3.4.0.jar.sha1 | 1 -
solr/licenses/disruptor-3.4.2.jar.sha1 | 1 +
solr/licenses/log4j-1.2-api-2.11.0.jar.sha1 | 1 -
solr/licenses/log4j-1.2-api-2.11.2.jar.sha1 | 1 +
solr/licenses/log4j-api-2.11.0.jar.sha1 | 1 -
solr/licenses/log4j-api-2.11.2.jar.sha1 | 1 +
solr/licenses/log4j-core-2.11.0.jar.sha1 | 1 -
solr/licenses/log4j-core-2.11.2.jar.sha1 | 1 +
solr/licenses/log4j-slf4j-impl-2.11.0.jar.sha1 | 1 -
solr/licenses/log4j-slf4j-impl-2.11.2.jar.sha1 | 1 +
solr/licenses/log4j-web-2.11.2.jar.sha1 | 1 +
solr/server/ivy.xml | 1 +
13 files changed, 10 insertions(+), 7 deletions(-)
diff --git a/lucene/ivy-versions.properties b/lucene/ivy-versions.properties
index ee21d99..51f05c4 100644
--- a/lucene/ivy-versions.properties
+++ b/lucene/ivy-versions.properties
@@ -33,7 +33,7 @@ com.fasterxml.jackson.core.version = 2.9.6
/com.healthmarketscience.jackcess/jackcess-encrypt = 2.1.4
/com.ibm.icu/icu4j = 62.1
/com.jayway.jsonpath/json-path = 2.4.0
-/com.lmax/disruptor = 3.4.0
+/com.lmax/disruptor = 3.4.2
/com.pff/java-libpst = 0.8.1
com.rometools.version = 1.5.1
@@ -164,11 +164,12 @@ org.apache.kerby.version = 1.0.1
/org.apache.kerby/kerby-pkix = ${org.apache.kerby.version}
/org.apache.kerby/kerby-util = ${org.apache.kerby.version}
-org.apache.logging.log4j.version = 2.11.0
+org.apache.logging.log4j.version = 2.11.2
/org.apache.logging.log4j/log4j-1.2-api = ${org.apache.logging.log4j.version}
/org.apache.logging.log4j/log4j-api = ${org.apache.logging.log4j.version}
/org.apache.logging.log4j/log4j-core = ${org.apache.logging.log4j.version}
/org.apache.logging.log4j/log4j-slf4j-impl = ${org.apache.logging.log4j.version}
+/org.apache.logging.log4j/log4j-web = ${org.apache.logging.log4j.version}
/org.apache.opennlp/opennlp-tools = 1.9.1
diff --git a/solr/licenses/disruptor-3.4.0.jar.sha1 b/solr/licenses/disruptor-3.4.0.jar.sha1
deleted file mode 100644
index ba29f9c..0000000
--- a/solr/licenses/disruptor-3.4.0.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-507e22993e3a78a3ba453e76a9756a294752648d
diff --git a/solr/licenses/disruptor-3.4.2.jar.sha1 b/solr/licenses/disruptor-3.4.2.jar.sha1
new file mode 100644
index 0000000..c211336
--- /dev/null
+++ b/solr/licenses/disruptor-3.4.2.jar.sha1
@@ -0,0 +1 @@
+e2543a63086b4189fbe418d05d56633bc1a815f7
diff --git a/solr/licenses/log4j-1.2-api-2.11.0.jar.sha1 b/solr/licenses/log4j-1.2-api-2.11.0.jar.sha1
deleted file mode 100644
index 662cac2..0000000
--- a/solr/licenses/log4j-1.2-api-2.11.0.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-5e488f2c717964162016cd5138e2b1ea4dcc379f
diff --git a/solr/licenses/log4j-1.2-api-2.11.2.jar.sha1 b/solr/licenses/log4j-1.2-api-2.11.2.jar.sha1
new file mode 100644
index 0000000..4ad6f96
--- /dev/null
+++ b/solr/licenses/log4j-1.2-api-2.11.2.jar.sha1
@@ -0,0 +1 @@
+afb9ef0baba766725c3733e6a2626877dba72715
diff --git a/solr/licenses/log4j-api-2.11.0.jar.sha1 b/solr/licenses/log4j-api-2.11.0.jar.sha1
deleted file mode 100644
index 47ba9da..0000000
--- a/solr/licenses/log4j-api-2.11.0.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-bede79a3f150711634a3047985517431bf6499f2
diff --git a/solr/licenses/log4j-api-2.11.2.jar.sha1 b/solr/licenses/log4j-api-2.11.2.jar.sha1
new file mode 100644
index 0000000..0cdea10
--- /dev/null
+++ b/solr/licenses/log4j-api-2.11.2.jar.sha1
@@ -0,0 +1 @@
+f5e9a2ffca496057d6891a3de65128efc636e26e
diff --git a/solr/licenses/log4j-core-2.11.0.jar.sha1 b/solr/licenses/log4j-core-2.11.0.jar.sha1
deleted file mode 100644
index 59e400d..0000000
--- a/solr/licenses/log4j-core-2.11.0.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-e6b751e02120c08702d98750f6a80bc25343b7f5
diff --git a/solr/licenses/log4j-core-2.11.2.jar.sha1 b/solr/licenses/log4j-core-2.11.2.jar.sha1
new file mode 100644
index 0000000..ec2acae
--- /dev/null
+++ b/solr/licenses/log4j-core-2.11.2.jar.sha1
@@ -0,0 +1 @@
+6c2fb3f5b7cd27504726aef1b674b542a0c9cf53
diff --git a/solr/licenses/log4j-slf4j-impl-2.11.0.jar.sha1 b/solr/licenses/log4j-slf4j-impl-2.11.0.jar.sha1
deleted file mode 100644
index dc5221e..0000000
--- a/solr/licenses/log4j-slf4j-impl-2.11.0.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-9ba207b78e470fe7765ebee14f1f0336c9cbcc18
diff --git a/solr/licenses/log4j-slf4j-impl-2.11.2.jar.sha1 b/solr/licenses/log4j-slf4j-impl-2.11.2.jar.sha1
new file mode 100644
index 0000000..69bca4b
--- /dev/null
+++ b/solr/licenses/log4j-slf4j-impl-2.11.2.jar.sha1
@@ -0,0 +1 @@
+4d44e4edc4a7fb39f09b95b09f560a15976fa1ba
diff --git a/solr/licenses/log4j-web-2.11.2.jar.sha1 b/solr/licenses/log4j-web-2.11.2.jar.sha1
new file mode 100644
index 0000000..cc4476e
--- /dev/null
+++ b/solr/licenses/log4j-web-2.11.2.jar.sha1
@@ -0,0 +1 @@
+d11ebc03fdf773d32143e0f7ea0fc131c21311e7
diff --git a/solr/server/ivy.xml b/solr/server/ivy.xml
index cb41a12..6d1f11e 100644
--- a/solr/server/ivy.xml
+++ b/solr/server/ivy.xml
@@ -29,6 +29,7 @@
<dependencies>
<dependency org="org.apache.logging.log4j" name="log4j-api" rev="${/org.apache.logging.log4j/log4j-api}" conf="logging"/>
<dependency org="org.apache.logging.log4j" name="log4j-core" rev="${/org.apache.logging.log4j/log4j-core}" conf="logging"/>
+ <dependency org="org.apache.logging.log4j" name="log4j-web" rev="${/org.apache.logging.log4j/log4j-web}" conf="logging"/>
<dependency org="org.apache.logging.log4j" name="log4j-slf4j-impl" rev="${/org.apache.logging.log4j/log4j-slf4j-impl}" conf="logging"/>
<dependency org="org.apache.logging.log4j" name="log4j-1.2-api" rev="${/org.apache.logging.log4j/log4j-1.2-api}" conf="logging"/>
<dependency org="com.lmax" name="disruptor" rev="${/com.lmax/disruptor}" conf="logging"/>