You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@inlong.apache.org by do...@apache.org on 2022/07/13 01:42:58 UTC
[inlong] branch master updated: [INLONG-5012][Sort] Remove the duplicate declaration of elasticsearch7 (#5013)
This is an automated email from the ASF dual-hosted git repository.
dockerzhang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/inlong.git
The following commit(s) were added to refs/heads/master by this push:
new 7b4f9b212 [INLONG-5012][Sort] Remove the duplicate declaration of elasticsearch7 (#5013)
7b4f9b212 is described below
commit 7b4f9b212c37bcf3a5f3da99354ecd5d6b2b44d9
Author: healchow <he...@gmail.com>
AuthorDate: Wed Jul 13 09:42:52 2022 +0800
[INLONG-5012][Sort] Remove the duplicate declaration of elasticsearch7 (#5013)
---
.../sort-connectors/elasticsearch-6/pom.xml | 61 ++++++++++--------
.../sort-connectors/elasticsearch-7/pom.xml | 75 +++++++++++-----------
.../sort-connectors/elasticsearch-base/pom.xml | 37 +++++------
3 files changed, 87 insertions(+), 86 deletions(-)
diff --git a/inlong-sort/sort-connectors/elasticsearch-6/pom.xml b/inlong-sort/sort-connectors/elasticsearch-6/pom.xml
index 1360dca65..59c822bfc 100644
--- a/inlong-sort/sort-connectors/elasticsearch-6/pom.xml
+++ b/inlong-sort/sort-connectors/elasticsearch-6/pom.xml
@@ -1,25 +1,24 @@
<?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
+ ~ 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
+ ~ 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.
+ ~ 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.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns="http://maven.apache.org/POM/4.0.0"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<artifactId>sort-connectors</artifactId>
<groupId>org.apache.inlong</groupId>
@@ -102,9 +101,7 @@
<scope>test</scope>
</dependency>
- <!--
- Including elasticsearch transport dependency for tests. Netty3 is not here anymore in 6.x
- -->
+ <!-- Including elasticsearch transport dependency for tests. Netty3 is not here anymore in 6.x -->
<dependency>
<groupId>org.elasticsearch.client</groupId>
<artifactId>transport</artifactId>
@@ -149,10 +146,8 @@
<version>${flink.version}</version>
<scope>test</scope>
</dependency>
-
</dependencies>
-
<build>
<plugins>
<plugin>
@@ -190,8 +185,8 @@
<include>META-INF/services/org.apache.flink.table.factories.Factory</include>
</includes>
</filter>
- <!-- Unless otherwise noticed these filters only serve to reduce the size of the resulting
- jar by removing unnecessary files -->
+ <!-- Unless otherwise noticed these filters only serve to reduce the size of
+ the resulting jar by removing unnecessary files -->
<filter>
<artifact>org.elasticsearch:elasticsearch</artifact>
<excludes>
@@ -235,23 +230,33 @@
<!-- Force relocation of all Elasticsearch dependencies. -->
<relocation>
<pattern>org.apache.commons</pattern>
- <shadedPattern>org.apache.flink.elasticsearch6.shaded.org.apache.commons</shadedPattern>
+ <shadedPattern>
+ org.apache.flink.elasticsearch6.shaded.org.apache.commons
+ </shadedPattern>
</relocation>
<relocation>
<pattern>org.apache.http</pattern>
- <shadedPattern>org.apache.flink.elasticsearch6.shaded.org.apache.http</shadedPattern>
+ <shadedPattern>
+ org.apache.flink.elasticsearch6.shaded.org.apache.http
+ </shadedPattern>
</relocation>
<relocation>
<pattern>org.apache.lucene</pattern>
- <shadedPattern>org.apache.flink.elasticsearch6.shaded.org.apache.lucene</shadedPattern>
+ <shadedPattern>
+ org.apache.flink.elasticsearch6.shaded.org.apache.lucene
+ </shadedPattern>
</relocation>
<relocation>
<pattern>org.elasticsearch</pattern>
- <shadedPattern>org.apache.flink.elasticsearch6.shaded.org.elasticsearch</shadedPattern>
+ <shadedPattern>
+ org.apache.flink.elasticsearch6.shaded.org.elasticsearch
+ </shadedPattern>
</relocation>
<relocation>
<pattern>com.fasterxml.jackson</pattern>
- <shadedPattern>org.apache.flink.elasticsearch6.shaded.com.fasterxml.jackson</shadedPattern>
+ <shadedPattern>
+ org.apache.flink.elasticsearch6.shaded.com.fasterxml.jackson
+ </shadedPattern>
</relocation>
</relocations>
</configuration>
diff --git a/inlong-sort/sort-connectors/elasticsearch-7/pom.xml b/inlong-sort/sort-connectors/elasticsearch-7/pom.xml
index 84356e935..755919d66 100644
--- a/inlong-sort/sort-connectors/elasticsearch-7/pom.xml
+++ b/inlong-sort/sort-connectors/elasticsearch-7/pom.xml
@@ -1,25 +1,24 @@
<?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
+ ~ 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
+ ~ 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.
+ ~ 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.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns="http://maven.apache.org/POM/4.0.0"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<artifactId>sort-connectors</artifactId>
<groupId>org.apache.inlong</groupId>
@@ -102,9 +101,7 @@
<scope>test</scope>
</dependency>
- <!--
- Including elasticsearch transport dependency for tests. Netty3 is not here anymore in 7.x
- -->
+ <!-- Including elasticsearch transport dependency for tests. Netty3 is not here anymore in 7.x -->
<dependency>
<groupId>org.elasticsearch.client</groupId>
<artifactId>transport</artifactId>
@@ -143,16 +140,8 @@
<version>${flink.version}</version>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.elasticsearch.client</groupId>
- <artifactId>transport</artifactId>
- <version>${elasticsearch7.version}</version>
- <scope>test</scope>
- </dependency>
-
</dependencies>
-
<build>
<plugins>
<plugin>
@@ -189,8 +178,8 @@
<include>META-INF/services/org.apache.flink.table.factories.Factory</include>
</includes>
</filter>
- <!-- Unless otherwise noticed these filters only serve to reduce the size of the resulting
- jar by removing unnecessary files -->
+ <!-- Unless otherwise noticed these filters only serve to reduce the size of
+ the resulting jar by removing unnecessary files -->
<filter>
<artifact>org.elasticsearch:elasticsearch</artifact>
<excludes>
@@ -234,31 +223,45 @@
<!-- Force relocation of all Elasticsearch dependencies. -->
<relocation>
<pattern>org.apache.commons</pattern>
- <shadedPattern>org.apache.flink.elasticsearch7.shaded.org.apache.commons</shadedPattern>
+ <shadedPattern>
+ org.apache.flink.elasticsearch7.shaded.org.apache.commons
+ </shadedPattern>
</relocation>
<relocation>
<pattern>org.apache.http</pattern>
- <shadedPattern>org.apache.flink.elasticsearch7.shaded.org.apache.http</shadedPattern>
+ <shadedPattern>
+ org.apache.flink.elasticsearch7.shaded.org.apache.http
+ </shadedPattern>
</relocation>
<relocation>
<pattern>org.apache.lucene</pattern>
- <shadedPattern>org.apache.flink.elasticsearch7.shaded.org.apache.lucene</shadedPattern>
+ <shadedPattern>
+ org.apache.flink.elasticsearch7.shaded.org.apache.lucene
+ </shadedPattern>
</relocation>
<relocation>
<pattern>org.elasticsearch</pattern>
- <shadedPattern>org.apache.flink.elasticsearch7.shaded.org.elasticsearch</shadedPattern>
+ <shadedPattern>
+ org.apache.flink.elasticsearch7.shaded.org.elasticsearch
+ </shadedPattern>
</relocation>
<relocation>
<pattern>com.fasterxml.jackson</pattern>
- <shadedPattern>org.apache.flink.elasticsearch7.shaded.com.fasterxml.jackson</shadedPattern>
+ <shadedPattern>
+ org.apache.flink.elasticsearch7.shaded.com.fasterxml.jackson
+ </shadedPattern>
</relocation>
<relocation>
<pattern>com.carrotsearch.hppc</pattern>
- <shadedPattern>org.apache.flink.elasticsearch7.shaded.com.carrotsearch.hppc</shadedPattern>
+ <shadedPattern>
+ org.apache.flink.elasticsearch7.shaded.com.carrotsearch.hppc
+ </shadedPattern>
</relocation>
<relocation>
<pattern>com.github.mustachejava</pattern>
- <shadedPattern>org.apache.flink.elasticsearch7.shaded.com.github.mustachejava</shadedPattern>
+ <shadedPattern>
+ org.apache.flink.elasticsearch7.shaded.com.github.mustachejava
+ </shadedPattern>
</relocation>
</relocations>
</configuration>
diff --git a/inlong-sort/sort-connectors/elasticsearch-base/pom.xml b/inlong-sort/sort-connectors/elasticsearch-base/pom.xml
index 36b6cfeb4..eaadca70e 100644
--- a/inlong-sort/sort-connectors/elasticsearch-base/pom.xml
+++ b/inlong-sort/sort-connectors/elasticsearch-base/pom.xml
@@ -1,25 +1,24 @@
<?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
+ ~ 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
+ ~ 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.
+ ~ 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.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns="http://maven.apache.org/POM/4.0.0"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<artifactId>sort-connectors</artifactId>
<groupId>org.apache.inlong</groupId>
@@ -31,11 +30,8 @@
<name>Apache InLong - Sort-connector-elasticsearch-base</name>
<packaging>jar</packaging>
-
<dependencies>
-
<!-- core dependencies -->
-
<dependency>
<groupId>org.apache.flink</groupId>
<artifactId>flink-connector-elasticsearch-base_2.12</artifactId>
@@ -87,7 +83,6 @@
</dependency>
<!-- test dependencies -->
-
<dependency>
<groupId>org.apache.flink</groupId>
<artifactId>flink-test-utils_2.12</artifactId>
@@ -141,7 +136,6 @@
Including Log4j2 dependencies for tests is required for the
embedded Elasticsearch nodes used in tests to run correctly.
-->
-
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-api</artifactId>
@@ -153,7 +147,6 @@
<artifactId>log4j-core</artifactId>
<scope>test</scope>
</dependency>
-
</dependencies>
<build>