You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by us...@apache.org on 2019/04/07 12:30:44 UTC

[lucene-solr] 04/34: Remove obsolete dependency (we have no external dependency anmore that uses log4j v1)

This is an automated email from the ASF dual-hosted git repository.

uschindler pushed a commit to branch jira/lucene-2562-luke-swing-3
in repository https://gitbox.apache.org/repos/asf/lucene-solr.git

commit 890cda85fd4a8674c5b967c0d53cacee1cf09a1f
Author: Uwe Schindler <us...@apache.org>
AuthorDate: Fri Apr 5 12:16:13 2019 +0200

    Remove obsolete dependency (we have no external dependency anmore that uses log4j v1)
---
 lucene/licenses/log4j-1.2-api-2.11.2.jar.sha1 | 1 -
 lucene/luke/ivy.xml                           | 4 +---
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/lucene/licenses/log4j-1.2-api-2.11.2.jar.sha1 b/lucene/licenses/log4j-1.2-api-2.11.2.jar.sha1
deleted file mode 100644
index 4ad6f96..0000000
--- a/lucene/licenses/log4j-1.2-api-2.11.2.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-afb9ef0baba766725c3733e6a2626877dba72715
diff --git a/lucene/luke/ivy.xml b/lucene/luke/ivy.xml
index 41ec924..af5d062 100644
--- a/lucene/luke/ivy.xml
+++ b/lucene/luke/ivy.xml
@@ -20,7 +20,7 @@
   <info organisation="org.apache.lucene" module="luke"/>
 
   <configurations defaultconfmapping="compile->default;logging->default">
-    <conf name="compile" transitive="true"/>
+    <conf name="compile" transitive="false"/>
     <conf name="logging" transitive="false"/>
   </configurations>
 
@@ -30,8 +30,6 @@
     <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-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="org.slf4j" name="slf4j-api" rev="${/org.slf4j/slf4j-api}" conf="logging"/>
 
     <exclude org="*" ext="*" matcher="regexp" type="${ivy.exclude.types}"/>