This is an automated email from the ASF dual-hosted git repository. lewismc pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/nutch.git
The following commit(s) were added to refs/heads/master by this push: new 004b62d fireant upgrade dependency elasticsearch-rest-high-level-client in src/plugin/indexer-elastic/ivy.xml from 7.11.1 to 7.13.2 (#688) 004b62d is described below commit 004b62dedb8fd25fc3ae278b1647d7d2826f509e Author: Lewis John McGibbney <lewis.mcgibb...@gmail.com> AuthorDate: Fri Sep 17 19:42:25 2021 -0700 fireant upgrade dependency elasticsearch-rest-high-level-client in src/plugin/indexer-elastic/ivy.xml from 7.11.1 to 7.13.2 (#688) * fireant upgrade dependency elasticsearch-rest-high-level-client in src/plugin/indexer-elastic/ivy.xml from 7.11.1 to 7.13.2 * fireant upgrade dependency elasticsearch-rest-high-level-client in src/plugin/indexer-elastic/ivy.xml from 7.11.1 to 7.13.2 --- src/plugin/indexer-elastic/ivy.xml | 18 ++--- src/plugin/indexer-elastic/plugin.xml | 136 ++++++++++++++++------------------ 2 files changed, 72 insertions(+), 82 deletions(-) diff --git a/src/plugin/indexer-elastic/ivy.xml b/src/plugin/indexer-elastic/ivy.xml index 3da98e3..9ee8e1c 100644 --- a/src/plugin/indexer-elastic/ivy.xml +++ b/src/plugin/indexer-elastic/ivy.xml @@ -1,6 +1,5 @@ -<?xml version="1.0" ?> - -<!-- +<?xml version='1.0' encoding='utf-8'?> +<!-- Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with this work for additional information regarding copyright ownership. @@ -16,27 +15,26 @@ See the License for the specific language governing permissions and limitations under the License. --> - <ivy-module version="1.0"> <info organisation="org.apache.nutch" module="${ant.project.name}"> - <license name="Apache 2.0"/> - <ivyauthor name="Apache Nutch Team" url="https://nutch.apache.org/"/> + <license name="Apache 2.0" /> + <ivyauthor name="Apache Nutch Team" url="https://nutch.apache.org/" /> <description> Apache Nutch </description> </info> <configurations> - <include file="../../../ivy/ivy-configurations.xml"/> + <include file="../../../ivy/ivy-configurations.xml" /> </configurations> <publications> <!--get the artifact from our module name--> - <artifact conf="master"/> + <artifact conf="master" /> </publications> <dependencies> - <dependency org="org.elasticsearch.client" name="elasticsearch-rest-high-level-client" rev="7.11.1"> + <dependency org="org.elasticsearch.client" name="elasticsearch-rest-high-level-client" rev="7.13.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" /> @@ -44,4 +42,4 @@ </dependency> </dependencies> -</ivy-module> +</ivy-module> \ No newline at end of file diff --git a/src/plugin/indexer-elastic/plugin.xml b/src/plugin/indexer-elastic/plugin.xml index 1e41b7e..387a3ac 100644 --- a/src/plugin/indexer-elastic/plugin.xml +++ b/src/plugin/indexer-elastic/plugin.xml @@ -1,84 +1,76 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - Licensed to the Apache Software Foundation (ASF) under one or more - contributor license agreements. See the NOTICE file distributed with - this work for additional information regarding copyright ownership. - The ASF licenses this file to You under the Apache License, Version 2.0 - (the "License"); you may not use this file except in compliance with - the License. You may obtain a copy of the License at - http://www.apache.org/licenses/LICENSE-2.0 - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. ---> -<plugin id="indexer-elastic" name="ElasticIndexWriter" version="1.0.0" - provider-name="nutch.apache.org"> +<?xml version='1.0' encoding='utf-8'?> +<!-- + Licensed to the Apache Software Foundation (ASF) under one or more + contributor license agreements. See the NOTICE file distributed with + this work for additional information regarding copyright ownership. + The ASF licenses this file to You under the Apache License, Version 2.0 + (the "License"); you may not use this file except in compliance with + the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +--> +<plugin id="indexer-elastic" name="ElasticIndexWriter" version="1.0.0" provider-name="nutch.apache.org"> <runtime> <library name="indexer-elastic.jar"> <export name="*" /> </library> - <!-- Elastic Rest Client Dependencies --> - <library name="aggs-matrix-stats-client-7.11.1.jar"/> - <library name="compiler-0.9.6.jar"/> - <library name="elasticsearch-7.11.1.jar"/> - <library name="elasticsearch-cli-7.11.1.jar"/> - <library name="elasticsearch-core-7.11.1.jar"/> - <library name="elasticsearch-geo-7.11.1.jar"/> - <library name="elasticsearch-plugin-classloader-7.11.1.jar"/> - <library name="elasticsearch-rest-client-7.11.1.jar"/> - <library name="elasticsearch-rest-high-level-client-7.11.1.jar"/> - <library name="elasticsearch-secure-sm-7.11.1.jar"/> - <library name="elasticsearch-x-content-7.11.1.jar"/> - <library name="HdrHistogram-2.1.9.jar"/> - <library name="hppc-0.8.1.jar"/> - <library name="httpasyncclient-4.1.4.jar"/> - <library name="httpclient-4.5.10.jar"/> - <library name="httpcore-4.4.12.jar"/> - <library name="httpcore-nio-4.4.12.jar"/> - <library name="jackson-core-2.10.4.jar"/> - <library name="jackson-dataformat-cbor-2.10.4.jar"/> - <library name="jackson-dataformat-smile-2.10.4.jar"/> - <library name="jackson-dataformat-yaml-2.10.4.jar"/> - <library name="jna-5.5.0.jar"/> - <library name="joda-time-2.10.4.jar"/> - <library name="jopt-simple-5.0.2.jar"/> - <library name="lang-mustache-client-7.11.1.jar"/> - <library name="log4j-api-2.11.1.jar"/> - <library name="lucene-analyzers-common-8.7.0.jar"/> - <library name="lucene-backward-codecs-8.7.0.jar"/> - <library name="lucene-core-8.7.0.jar"/> - <library name="lucene-grouping-8.7.0.jar"/> - <library name="lucene-highlighter-8.7.0.jar"/> - <library name="lucene-join-8.7.0.jar"/> - <library name="lucene-memory-8.7.0.jar"/> - <library name="lucene-misc-8.7.0.jar"/> - <library name="lucene-queries-8.7.0.jar"/> - <library name="lucene-queryparser-8.7.0.jar"/> - <library name="lucene-sandbox-8.7.0.jar"/> - <library name="lucene-spatial3d-8.7.0.jar"/> - <library name="lucene-spatial-extras-8.7.0.jar"/> - <library name="lucene-suggest-8.7.0.jar"/> - <library name="mapper-extras-client-7.11.1.jar"/> - <library name="parent-join-client-7.11.1.jar"/> - <library name="rank-eval-client-7.11.1.jar"/> - <library name="snakeyaml-1.26.jar"/> <!-- end of Elastic Rest Client dependencies --> - + <library name="HdrHistogram-2.1.9.jar" /> + <library name="aggs-matrix-stats-client-7.13.2.jar" /> + <library name="compiler-0.9.6.jar" /> + <library name="elasticsearch-7.13.2.jar" /> + <library name="elasticsearch-cli-7.13.2.jar" /> + <library name="elasticsearch-core-7.13.2.jar" /> + <library name="elasticsearch-geo-7.13.2.jar" /> + <library name="elasticsearch-plugin-classloader-7.13.2.jar" /> + <library name="elasticsearch-rest-client-7.13.2.jar" /> + <library name="elasticsearch-rest-high-level-client-7.13.2.jar" /> + <library name="elasticsearch-secure-sm-7.13.2.jar" /> + <library name="elasticsearch-x-content-7.13.2.jar" /> + <library name="hppc-0.8.1.jar" /> + <library name="httpasyncclient-4.1.4.jar" /> + <library name="httpclient-4.5.10.jar" /> + <library name="httpcore-4.4.12.jar" /> + <library name="httpcore-nio-4.4.12.jar" /> + <library name="jackson-core-2.10.4.jar" /> + <library name="jackson-dataformat-cbor-2.10.4.jar" /> + <library name="jackson-dataformat-smile-2.10.4.jar" /> + <library name="jackson-dataformat-yaml-2.10.4.jar" /> + <library name="jna-5.7.0-1.jar" /> + <library name="joda-time-2.10.10.jar" /> + <library name="jopt-simple-5.0.2.jar" /> + <library name="lang-mustache-client-7.13.2.jar" /> + <library name="log4j-api-2.11.1.jar" /> + <library name="lucene-analyzers-common-8.8.2.jar" /> + <library name="lucene-backward-codecs-8.8.2.jar" /> + <library name="lucene-core-8.8.2.jar" /> + <library name="lucene-grouping-8.8.2.jar" /> + <library name="lucene-highlighter-8.8.2.jar" /> + <library name="lucene-join-8.8.2.jar" /> + <library name="lucene-memory-8.8.2.jar" /> + <library name="lucene-misc-8.8.2.jar" /> + <library name="lucene-queries-8.8.2.jar" /> + <library name="lucene-queryparser-8.8.2.jar" /> + <library name="lucene-sandbox-8.8.2.jar" /> + <library name="lucene-spatial-extras-8.8.2.jar" /> + <library name="lucene-spatial3d-8.8.2.jar" /> + <library name="lucene-suggest-8.8.2.jar" /> + <library name="mapper-extras-client-7.13.2.jar" /> + <library name="parent-join-client-7.13.2.jar" /> + <library name="rank-eval-client-7.13.2.jar" /> + <library name="snakeyaml-1.26.jar" /> </runtime> - <requires> <import plugin="nutch-extensionpoints" /> </requires> - - <extension id="org.apache.nutch.indexer.elastic" - name="Elasticsearch Index Writer" - point="org.apache.nutch.indexer.IndexWriter"> - <implementation id="ElasticIndexWriter" - class="org.apache.nutch.indexwriter.elastic.ElasticIndexWriter" /> + <extension id="org.apache.nutch.indexer.elastic" name="Elasticsearch Index Writer" point="org.apache.nutch.indexer.IndexWriter"> + <implementation id="ElasticIndexWriter" class="org.apache.nutch.indexwriter.elastic.ElasticIndexWriter" /> </extension> - -</plugin> +</plugin> \ No newline at end of file