Merge pull request #844 from maciejpuzianowski/NUTCH-3097

NUTCH-3097 fixed dependencies for indexer-elastic
apache · Jan 8, 2025 · 5068b76 · 5068b76
2 parents 86b893a + bb17570
commit 5068b76
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 8 deletions.
diff --git a/src/plugin/indexer-elastic/ivy.xml b/src/plugin/indexer-elastic/ivy.xml
@@ -36,14 +36,7 @@
   </publications>
 
   <dependencies>
-    <dependency org="org.elasticsearch.client" name="elasticsearch-rest-high-level-client" rev="7.10.2">
-      <!-- exclusions of dependencies provided in Nutch core (ivy/ivy.xml) -->
-      <exclude org="commons-codec" name="commons-codec" />
-      <exclude org="commons-logging" name="commons-logging" />
-      <exclude org="com.tdunning" name="t-digest" />
-      <exclude org="org.apache.logging.log4j" name="log4j-api" />
-      <exclude org="org.apache.lucene" name="*"/>
-    </dependency>
+    <dependency org="org.elasticsearch.client" name="elasticsearch-rest-high-level-client" rev="7.10.2"/>
     <dependency org="org.apache.lucene" name="lucene-analyzers-common" rev="8.11.2"/>
     <dependency org="org.apache.lucene" name="lucene-backward-codecs" rev="8.11.2"/>
     <dependency org="org.apache.lucene" name="lucene-core" rev="8.11.2"/>

diff --git a/src/plugin/indexer-elastic/plugin.xml b/src/plugin/indexer-elastic/plugin.xml
@@ -23,6 +23,8 @@
     <!-- Elastic Rest Client Dependencies -->
     <!-- end of Elastic Rest Client dependencies -->
     <library name="aggs-matrix-stats-client-7.10.2.jar"/>
+    <library name="commons-codec-1.11.jar"/>
+    <library name="commons-logging-1.1.3.jar"/>
     <library name="compiler-0.9.6.jar"/>
     <library name="elasticsearch-7.10.2.jar"/>
     <library name="elasticsearch-cli-7.10.2.jar"/>
@@ -46,6 +48,7 @@
     <library name="joda-time-2.10.4.jar"/>
     <library name="jopt-simple-5.0.2.jar"/>
     <library name="lang-mustache-client-7.10.2.jar"/>
+    <library name="log4j-api-2.11.1.jar"/>
     <library name="lucene-analyzers-common-8.11.2.jar"/>
     <library name="lucene-backward-codecs-8.11.2.jar"/>
     <library name="lucene-core-8.11.2.jar"/>
@@ -66,6 +69,7 @@
     <library name="s2-geometry-library-java-1.0.0.jar"/>
     <library name="snakeyaml-1.26.jar"/>
     <library name="spatial4j-0.7.jar"/>
+    <library name="t-digest-3.2.jar"/>
   </runtime>
   <requires>
     <import plugin="nutch-extensionpoints" />