You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@seatunnel.apache.org by fa...@apache.org on 2022/07/01 13:57:56 UTC
[incubator-seatunnel] branch dev updated: [Connector-V2]unify connector v2 modules name (#2106)
This is an automated email from the ASF dual-hosted git repository.
fanjia pushed a commit to branch dev
in repository https://gitbox.apache.org/repos/asf/incubator-seatunnel.git
The following commit(s) were added to refs/heads/dev by this push:
new cd34f1d38 [Connector-V2]unify connector v2 modules name (#2106)
cd34f1d38 is described below
commit cd34f1d388647ae917d70e7feb9c8b999a35091f
Author: Eric <ga...@gmail.com>
AuthorDate: Fri Jul 1 21:57:51 2022 +0800
[Connector-V2]unify connector v2 modules name (#2106)
* unify connector v2 modules name
* add codeql check timeout from 30min to 60min
---
.github/workflows/codeql.yaml | 2 +-
.../{new-connector => connector-v2}/sink/Assert.md | 0
.../sink/Clickhouse.md | 0
.../sink/ClickhouseFile.md | 0
.../{new-connector => connector-v2}/sink/Jdbc.md | 0
.../sink/common-options.md | 0
.../source/Clickhouse.md | 0
.../{new-connector => connector-v2}/source/Jdbc.md | 0
.../source/common-options.md | 0
seatunnel-e2e/pom.xml | 4 ++--
.../pom.xml | 2 +-
.../apache/seatunnel/e2e/flink/FlinkContainer.java | 0
.../e2e/flink/assertion/FakeSourceToAssertIT.java | 0
.../e2e/flink/fake/FakeSourceToConsoleIT.java | 0
.../resources/assertion/fakesource_to_assert.conf | 0
.../test/resources/fake/fakesource_to_console.conf | 0
.../src/test/resources/log4j.properties | 23 ----------------------
.../pom.xml | 2 +-
.../apache/seatunnel/e2e/spark/SparkContainer.java | 0
.../e2e/spark/fake/FakeSourceToConsoleIT.java | 0
.../test/resources/fake/fakesource_to_console.conf | 0
.../src/test/resources/log4j.properties | 22 ---------------------
22 files changed, 5 insertions(+), 50 deletions(-)
diff --git a/.github/workflows/codeql.yaml b/.github/workflows/codeql.yaml
index 28b656fad..9fa10da50 100644
--- a/.github/workflows/codeql.yaml
+++ b/.github/workflows/codeql.yaml
@@ -27,7 +27,7 @@ jobs:
analyze:
name: Analyze
runs-on: ubuntu-latest
- timeout-minutes: 30
+ timeout-minutes: 60
env:
JAVA_TOOL_OPTIONS: -Xmx2G -Xms2G -Dhttp.keepAlive=false -Dmaven.test.skip=true -Dcheckstyle.skip=true -Dlicense.skipAddThirdParty=true -Dhttp.keepAlive=false -Dmaven.wagon.http.pool=false -Dmaven.wagon.http.retryHandler.count=3 -Dmaven.wagon.httpconnectionManager.ttlSeconds=120
diff --git a/docs/en/new-connector/sink/Assert.md b/docs/en/connector-v2/sink/Assert.md
similarity index 100%
rename from docs/en/new-connector/sink/Assert.md
rename to docs/en/connector-v2/sink/Assert.md
diff --git a/docs/en/new-connector/sink/Clickhouse.md b/docs/en/connector-v2/sink/Clickhouse.md
similarity index 100%
rename from docs/en/new-connector/sink/Clickhouse.md
rename to docs/en/connector-v2/sink/Clickhouse.md
diff --git a/docs/en/new-connector/sink/ClickhouseFile.md b/docs/en/connector-v2/sink/ClickhouseFile.md
similarity index 100%
rename from docs/en/new-connector/sink/ClickhouseFile.md
rename to docs/en/connector-v2/sink/ClickhouseFile.md
diff --git a/docs/en/new-connector/sink/Jdbc.md b/docs/en/connector-v2/sink/Jdbc.md
similarity index 100%
rename from docs/en/new-connector/sink/Jdbc.md
rename to docs/en/connector-v2/sink/Jdbc.md
diff --git a/docs/en/new-connector/sink/common-options.md b/docs/en/connector-v2/sink/common-options.md
similarity index 100%
rename from docs/en/new-connector/sink/common-options.md
rename to docs/en/connector-v2/sink/common-options.md
diff --git a/docs/en/new-connector/source/Clickhouse.md b/docs/en/connector-v2/source/Clickhouse.md
similarity index 100%
rename from docs/en/new-connector/source/Clickhouse.md
rename to docs/en/connector-v2/source/Clickhouse.md
diff --git a/docs/en/new-connector/source/Jdbc.md b/docs/en/connector-v2/source/Jdbc.md
similarity index 100%
rename from docs/en/new-connector/source/Jdbc.md
rename to docs/en/connector-v2/source/Jdbc.md
diff --git a/docs/en/new-connector/source/common-options.md b/docs/en/connector-v2/source/common-options.md
similarity index 100%
rename from docs/en/new-connector/source/common-options.md
rename to docs/en/connector-v2/source/common-options.md
diff --git a/seatunnel-e2e/pom.xml b/seatunnel-e2e/pom.xml
index 4c0b0fd0b..c74e5c31a 100644
--- a/seatunnel-e2e/pom.xml
+++ b/seatunnel-e2e/pom.xml
@@ -29,8 +29,8 @@
<modules>
<module>seatunnel-flink-e2e</module>
<module>seatunnel-spark-e2e</module>
- <module>seatunnel-flink-new-connector-e2e</module>
- <module>seatunnel-spark-new-connector-e2e</module>
+ <module>seatunnel-flink-connector-v2-e2e</module>
+ <module>seatunnel-spark-connector-v2-e2e</module>
<module>seatunnel-flink-sql-e2e</module>
</modules>
diff --git a/seatunnel-e2e/seatunnel-flink-new-connector-e2e/pom.xml b/seatunnel-e2e/seatunnel-flink-connector-v2-e2e/pom.xml
similarity index 95%
rename from seatunnel-e2e/seatunnel-flink-new-connector-e2e/pom.xml
rename to seatunnel-e2e/seatunnel-flink-connector-v2-e2e/pom.xml
index 5c59d8491..c494f80f8 100644
--- a/seatunnel-e2e/seatunnel-flink-new-connector-e2e/pom.xml
+++ b/seatunnel-e2e/seatunnel-flink-connector-v2-e2e/pom.xml
@@ -23,7 +23,7 @@
</parent>
<modelVersion>4.0.0</modelVersion>
- <artifactId>seatunnel-flink-new-connector-e2e</artifactId>
+ <artifactId>seatunnel-flink-connector-v2-e2e</artifactId>
<dependencies>
<dependency>
diff --git a/seatunnel-e2e/seatunnel-flink-new-connector-e2e/src/test/java/org/apache/seatunnel/e2e/flink/FlinkContainer.java b/seatunnel-e2e/seatunnel-flink-connector-v2-e2e/src/test/java/org/apache/seatunnel/e2e/flink/FlinkContainer.java
similarity index 100%
rename from seatunnel-e2e/seatunnel-flink-new-connector-e2e/src/test/java/org/apache/seatunnel/e2e/flink/FlinkContainer.java
rename to seatunnel-e2e/seatunnel-flink-connector-v2-e2e/src/test/java/org/apache/seatunnel/e2e/flink/FlinkContainer.java
diff --git a/seatunnel-e2e/seatunnel-flink-new-connector-e2e/src/test/java/org/apache/seatunnel/e2e/flink/assertion/FakeSourceToAssertIT.java b/seatunnel-e2e/seatunnel-flink-connector-v2-e2e/src/test/java/org/apache/seatunnel/e2e/flink/assertion/FakeSourceToAssertIT.java
similarity index 100%
rename from seatunnel-e2e/seatunnel-flink-new-connector-e2e/src/test/java/org/apache/seatunnel/e2e/flink/assertion/FakeSourceToAssertIT.java
rename to seatunnel-e2e/seatunnel-flink-connector-v2-e2e/src/test/java/org/apache/seatunnel/e2e/flink/assertion/FakeSourceToAssertIT.java
diff --git a/seatunnel-e2e/seatunnel-flink-new-connector-e2e/src/test/java/org/apache/seatunnel/e2e/flink/fake/FakeSourceToConsoleIT.java b/seatunnel-e2e/seatunnel-flink-connector-v2-e2e/src/test/java/org/apache/seatunnel/e2e/flink/fake/FakeSourceToConsoleIT.java
similarity index 100%
rename from seatunnel-e2e/seatunnel-flink-new-connector-e2e/src/test/java/org/apache/seatunnel/e2e/flink/fake/FakeSourceToConsoleIT.java
rename to seatunnel-e2e/seatunnel-flink-connector-v2-e2e/src/test/java/org/apache/seatunnel/e2e/flink/fake/FakeSourceToConsoleIT.java
diff --git a/seatunnel-e2e/seatunnel-flink-new-connector-e2e/src/test/resources/assertion/fakesource_to_assert.conf b/seatunnel-e2e/seatunnel-flink-connector-v2-e2e/src/test/resources/assertion/fakesource_to_assert.conf
similarity index 100%
rename from seatunnel-e2e/seatunnel-flink-new-connector-e2e/src/test/resources/assertion/fakesource_to_assert.conf
rename to seatunnel-e2e/seatunnel-flink-connector-v2-e2e/src/test/resources/assertion/fakesource_to_assert.conf
diff --git a/seatunnel-e2e/seatunnel-flink-new-connector-e2e/src/test/resources/fake/fakesource_to_console.conf b/seatunnel-e2e/seatunnel-flink-connector-v2-e2e/src/test/resources/fake/fakesource_to_console.conf
similarity index 100%
rename from seatunnel-e2e/seatunnel-flink-new-connector-e2e/src/test/resources/fake/fakesource_to_console.conf
rename to seatunnel-e2e/seatunnel-flink-connector-v2-e2e/src/test/resources/fake/fakesource_to_console.conf
diff --git a/seatunnel-e2e/seatunnel-flink-new-connector-e2e/src/test/resources/log4j.properties b/seatunnel-e2e/seatunnel-flink-new-connector-e2e/src/test/resources/log4j.properties
deleted file mode 100644
index 57b61a3c1..000000000
--- a/seatunnel-e2e/seatunnel-flink-new-connector-e2e/src/test/resources/log4j.properties
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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.
-#
-
-# Set everything to be logged to the console
-log4j.rootCategory=ERROR, console
-log4j.appender.console=org.apache.log4j.ConsoleAppender
-log4j.appender.console.target=System.err
-log4j.appender.console.layout=org.apache.log4j.PatternLayout
-log4j.appender.console.layout.ConversionPattern=%d{yy/MM/dd HH:mm:ss} %p %c{1}: %m%n
diff --git a/seatunnel-e2e/seatunnel-spark-new-connector-e2e/pom.xml b/seatunnel-e2e/seatunnel-spark-connector-v2-e2e/pom.xml
similarity index 95%
rename from seatunnel-e2e/seatunnel-spark-new-connector-e2e/pom.xml
rename to seatunnel-e2e/seatunnel-spark-connector-v2-e2e/pom.xml
index 925075cbb..732d9e51b 100644
--- a/seatunnel-e2e/seatunnel-spark-new-connector-e2e/pom.xml
+++ b/seatunnel-e2e/seatunnel-spark-connector-v2-e2e/pom.xml
@@ -24,7 +24,7 @@
<modelVersion>4.0.0</modelVersion>
<packaging>jar</packaging>
- <artifactId>seatunnel-spark-new-connector-e2e</artifactId>
+ <artifactId>seatunnel-spark-connector-v2-e2e</artifactId>
<dependencies>
<dependency>
diff --git a/seatunnel-e2e/seatunnel-spark-new-connector-e2e/src/test/java/org/apache/seatunnel/e2e/spark/SparkContainer.java b/seatunnel-e2e/seatunnel-spark-connector-v2-e2e/src/test/java/org/apache/seatunnel/e2e/spark/SparkContainer.java
similarity index 100%
rename from seatunnel-e2e/seatunnel-spark-new-connector-e2e/src/test/java/org/apache/seatunnel/e2e/spark/SparkContainer.java
rename to seatunnel-e2e/seatunnel-spark-connector-v2-e2e/src/test/java/org/apache/seatunnel/e2e/spark/SparkContainer.java
diff --git a/seatunnel-e2e/seatunnel-spark-new-connector-e2e/src/test/java/org/apache/seatunnel/e2e/spark/fake/FakeSourceToConsoleIT.java b/seatunnel-e2e/seatunnel-spark-connector-v2-e2e/src/test/java/org/apache/seatunnel/e2e/spark/fake/FakeSourceToConsoleIT.java
similarity index 100%
rename from seatunnel-e2e/seatunnel-spark-new-connector-e2e/src/test/java/org/apache/seatunnel/e2e/spark/fake/FakeSourceToConsoleIT.java
rename to seatunnel-e2e/seatunnel-spark-connector-v2-e2e/src/test/java/org/apache/seatunnel/e2e/spark/fake/FakeSourceToConsoleIT.java
diff --git a/seatunnel-e2e/seatunnel-spark-new-connector-e2e/src/test/resources/fake/fakesource_to_console.conf b/seatunnel-e2e/seatunnel-spark-connector-v2-e2e/src/test/resources/fake/fakesource_to_console.conf
similarity index 100%
rename from seatunnel-e2e/seatunnel-spark-new-connector-e2e/src/test/resources/fake/fakesource_to_console.conf
rename to seatunnel-e2e/seatunnel-spark-connector-v2-e2e/src/test/resources/fake/fakesource_to_console.conf
diff --git a/seatunnel-e2e/seatunnel-spark-new-connector-e2e/src/test/resources/log4j.properties b/seatunnel-e2e/seatunnel-spark-new-connector-e2e/src/test/resources/log4j.properties
deleted file mode 100644
index 89547981c..000000000
--- a/seatunnel-e2e/seatunnel-spark-new-connector-e2e/src/test/resources/log4j.properties
+++ /dev/null
@@ -1,22 +0,0 @@
-#
-# 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.
-#
-# Set everything to be logged to the console
-log4j.rootCategory=ERROR, console
-log4j.appender.console=org.apache.log4j.ConsoleAppender
-log4j.appender.console.target=System.err
-log4j.appender.console.layout=org.apache.log4j.PatternLayout
-log4j.appender.console.layout.ConversionPattern=%d{yy/MM/dd HH:mm:ss} %p %c{1}: %m%n