You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@inlong.apache.org by he...@apache.org on 2022/06/07 15:03:48 UTC
[incubator-inlong] branch master updated (0785e342f -> 395e9669a)
This is an automated email from the ASF dual-hosted git repository.
healchow pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-inlong.git
omit 0785e342f [INLONG-4527][Sort] Update Elasticsearch version & add LICENSE and NOTICE #4537
new 395e9669a [INLONG-4527][Sort] Update Elasticsearch version & add LICENSE and NOTICE (#4537)
This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version. This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:
* -- * -- B -- O -- O -- O (0785e342f)
\
N -- N -- N refs/heads/master (395e9669a)
You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.
Any revisions marked "omit" are not gone; other references still
refer to them. Any revisions marked "discard" are gone forever.
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.
Summary of changes:
[incubator-inlong] 01/01: [INLONG-4527][Sort] Update Elasticsearch version & add LICENSE and NOTICE (#4537)
Posted by he...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
healchow pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-inlong.git
commit 395e9669a96d5768bf14def5bd3d9cf09376b4bf
Author: Oneal65 <li...@foxmail.com>
AuthorDate: Tue Jun 7 22:43:05 2022 +0800
[INLONG-4527][Sort] Update Elasticsearch version & add LICENSE and NOTICE (#4537)
Co-authored-by: onealliu <on...@tencent.com>
---
.../sort-connectors/elasticsearch-6/pom.xml | 2 +-
.../sort-connectors/elasticsearch-7/pom.xml | 2 +-
licenses/inlong-sort/LICENSE | 26 ++++++++++++++++++++++
licenses/inlong-sort/NOTICE | 12 ++++++++++
4 files changed, 40 insertions(+), 2 deletions(-)
diff --git a/inlong-sort/sort-connectors/elasticsearch-6/pom.xml b/inlong-sort/sort-connectors/elasticsearch-6/pom.xml
index 84204f4ce..e8de0d42c 100644
--- a/inlong-sort/sort-connectors/elasticsearch-6/pom.xml
+++ b/inlong-sort/sort-connectors/elasticsearch-6/pom.xml
@@ -33,7 +33,7 @@
<properties>
- <elasticsearch.version>6.3.1</elasticsearch.version>
+ <elasticsearch.version>6.8.17</elasticsearch.version>
</properties>
<dependencies>
diff --git a/inlong-sort/sort-connectors/elasticsearch-7/pom.xml b/inlong-sort/sort-connectors/elasticsearch-7/pom.xml
index f79a314bc..58ae3bfde 100644
--- a/inlong-sort/sort-connectors/elasticsearch-7/pom.xml
+++ b/inlong-sort/sort-connectors/elasticsearch-7/pom.xml
@@ -32,7 +32,7 @@
<packaging>jar</packaging>
<properties>
- <elasticsearch.version>7.5.1</elasticsearch.version>
+ <elasticsearch.version>7.9.2</elasticsearch.version>
</properties>
<dependencies>
diff --git a/licenses/inlong-sort/LICENSE b/licenses/inlong-sort/LICENSE
index 45a1eeda7..1a771951d 100644
--- a/licenses/inlong-sort/LICENSE
+++ b/licenses/inlong-sort/LICENSE
@@ -514,6 +514,32 @@ The text of each license is the standard Apache 2.0 license.
org.apache.avro:avro:1.10.1 - Apache Avro (https://avro.apache.org), (The Apache Software License, Version 2.0)
org.apache.avro:avro-ipc:1.10.1 - Apache Avro IPC (https://avro.apache.org), (The Apache Software License, Version 2.0)
org.apache.pulsar:bouncy-castle-bc:2.8.1 - Apache Pulsar :: Bouncy Castle :: BC (https://github.com/apache/pulsar/tree/master/bouncy-castle/bc), (Apache License, Version 2.0)
+ org.elasticsearch:elasticsearch:jar:6.8.17 - server (https://github.com/elastic/elasticsearch), (The Apache Software License, Version 2.0)
+ org.elasticsearch:elasticsearch-cli:jar:6.8.17 - cli (https://github.com/elastic/elasticsearch), (The Apache Software License, Version 2.0)
+ org.elasticsearch:elasticsearch-core:jar:6.8.17 - core (https://github.com/elastic/elasticsearch), (The Apache Software License, Version 2.0)
+ org.elasticsearch:elasticsearch-secure-sm:jar:6.8.17 - secure-sm (https://github.com/elastic/elasticsearch), (The Apache Software License, Version 2.0)
+ org.elasticsearch:elasticsearch-x-content:jar:6.8.17 - x-content (https://github.com/elastic/elasticsearch), (The Apache Software License, Version 2.0)
+ org.elasticsearch:jna:jar:5.5.0 - Elastic JNA Distribution (https://github.com/java-native-access/jna), (Apache License, Version 2.0)
+ org.elasticsearch.client:elasticsearch-rest-client:jar:6.8.17 - rest (https://github.com/elastic/elasticsearch), (The Apache Software License, Version 2.0)
+ org.elasticsearch.client:elasticsearch-rest-high-level-client:jar:6.8.17 - rest-high-level (https://github.com/elastic/elasticsearch), (The Apache Software License, Version 2.0)
+ org.elasticsearch.plugin:aggs-matrix-stats-client:jar:6.8.17 - aggs-matrix-stats (https://github.com/elastic/elasticsearch), (The Apache Software License, Version 2.0)
+ org.elasticsearch.plugin:lang-mustache-client:jar:6.8.17 - lang-mustache (https://github.com/elastic/elasticsearch), (The Apache Software License, Version 2.0)
+ org.elasticsearch.plugin:parent-join-client:jar:6.8.17 - parent-join (https://github.com/elastic/elasticsearch), (The Apache Software License, Version 2.0)
+ org.elasticsearch.plugin:rank-eval-client:jar:6.8.17 - rank-eval (https://github.com/elastic/elasticsearch), (The Apache Software License, Version 2.0)
+ org.elasticsearch:elasticsearch:jar:7.9.2 - server (https://github.com/elastic/elasticsearch), (The Apache Software License, Version 2.0)
+ org.elasticsearch:elasticsearch-cli:jar:7.9.2 - elasticsearch-cli (https://github.com/elastic/elasticsearch), (The Apache Software License, Version 2.0)
+ org.elasticsearch:elasticsearch-core:jar:7.9.2 - elasticsearch-core (https://github.com/elastic/elasticsearch), (The Apache Software License, Version 2.0)
+ org.elasticsearch:elasticsearch-geo:jar:7.9.2 - elasticsearch-geo (https://github.com/elastic/elasticsearch), (The Apache Software License, Version 2.0)
+ org.elasticsearch:elasticsearch-secure-sm:jar:7.9.2 - elasticsearch-secure-sm (https://github.com/elastic/elasticsearch), (The Apache Software License, Version 2.0)
+ org.elasticsearch:elasticsearch-x-content:jar:7.9.2 - elasticsearch-x-content (https://github.com/elastic/elasticsearch), (The Apache Software License, Version 2.0)
+ org.elasticsearch:jna:jar:5.5.0 - Elastic JNA Distribution (https://github.com/java-native-access/jna) , (Apache License, Version 2.0)
+ org.elasticsearch.client:elasticsearch-rest-client:jar:7.9.2 - rest (https://github.com/elastic/elasticsearch), (The Apache Software License, Version 2.0)
+ org.elasticsearch.client:elasticsearch-rest-high-level-client:jar:7.9.2 - rest-high-level (https://github.com/elastic/elasticsearch), (The Apache Software License, Version 2.0)
+ org.elasticsearch.plugin:aggs-matrix-stats-client:jar:7.9.2 - aggs-matrix-stats (https://github.com/elastic/elasticsearch), (The Apache Software License, Version 2.0)
+ org.elasticsearch.plugin:lang-mustache-client:jar:7.9.2 - lang-mustache (https://github.com/elastic/elasticsearch), (The Apache Software License, Version 2.0)
+ org.elasticsearch.plugin:mapper-extras-client:jar:7.9.2 - mapper-extras (https://github.com/elastic/elasticsearch), (The Apache Software License, Version 2.0)
+ org.elasticsearch.plugin:parent-join-client:jar:7.9.2 - parent-join (https://github.com/elastic/elasticsearch), (The Apache Software License, Version 2.0)
+ org.elasticsearch.plugin:rank-eval-client:jar:7.9.2 - rank-eval (https://github.com/elastic/elasticsearch), (The Apache Software License, Version 2.0)
org.mongodb:bson:4.3.1 - BSON (https://bsonspec.org), (The Apache License, Version 2.0)
com.github.ben-manes.caffeine:caffeine:2.8.4 - Caffeine cache (https://github.com/ben-manes/caffeine), (Apache License, Version 2.0)
ru.yandex.clickhouse:clickhouse-jdbc:0.3.1 - clickhouse-jdbc (https://github.com/ClickHouse/clickhouse-jdbc/tree/master/clickhouse-jdbc), (The Apache Software License, Version 2.0)
diff --git a/licenses/inlong-sort/NOTICE b/licenses/inlong-sort/NOTICE
index cfe8aa606..985526873 100644
--- a/licenses/inlong-sort/NOTICE
+++ b/licenses/inlong-sort/NOTICE
@@ -2390,6 +2390,18 @@ Apache Parquet Format Structures NOTICE
Apache Parquet Hadoop NOTICE
========================================================================
+
+========================================================================
+Elasticsearch
+Copyright 2009-2018 Elasticsearch
+
+This product includes software developed by The Apache Software
+Foundation (http://www.apache.org/).
+
+This product includes software developed by
+Joda.org (http://www.joda.org/).
+========================================================================
+
The NOTICE content is too long and is included at notices/NOTICE-[project].txt