Commit 2bc29997 authored by wenmo's avatar wenmo

升级flink1.13.5到1.13.6,修复pom的bug

parent f195f7d7
...@@ -265,7 +265,7 @@ mvn clean install -Dmaven.test.skip=true ...@@ -265,7 +265,7 @@ mvn clean install -Dmaven.test.skip=true
#### 扩展其他版本的Flink #### 扩展其他版本的Flink
Flink 的版本取决于 lib 下的 dlink-client-1.13.jar。当前版本默认为 Flink 1.13.5 API。向其他版本的集群提交任务可能存在问题,已实现 1.11、1.12、1.13, 1.14,切换版本时只需要将对应依赖在lib下进行替换,然后重启即可。 Flink 的版本取决于 lib 下的 dlink-client-1.13.jar。当前版本默认为 Flink 1.13.6 API。向其他版本的集群提交任务可能存在问题,已实现 1.11、1.12、1.13, 1.14,切换版本时只需要将对应依赖在lib下进行替换,然后重启即可。
切换版本时需要同时更新 plugins 下的 Flink 依赖。 切换版本时需要同时更新 plugins 下的 Flink 依赖。
......
...@@ -149,7 +149,7 @@ ...@@ -149,7 +149,7 @@
<!--<dependency> <!--<dependency>
<groupId>org.apache.flink</groupId> <groupId>org.apache.flink</groupId>
<artifactId>flink-yarn_2.11</artifactId> <artifactId>flink-yarn_2.11</artifactId>
<version>1.13.5</version> <version>1.13.6</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.flink</groupId> <groupId>org.apache.flink</groupId>
......
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
<properties> <properties>
<java.version>1.8</java.version> <java.version>1.8</java.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<flink.version>1.13.5</flink.version> <flink.version>1.13.6</flink.version>
<flinkcdc.version>2.1.1</flinkcdc.version> <flinkcdc.version>2.1.1</flinkcdc.version>
<scala.binary.version>2.11</scala.binary.version> <scala.binary.version>2.11</scala.binary.version>
<maven.compiler.source>1.8</maven.compiler.source> <maven.compiler.source>1.8</maven.compiler.source>
...@@ -23,6 +23,10 @@ ...@@ -23,6 +23,10 @@
</properties> </properties>
<dependencies> <dependencies>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
</dependency>
<dependency> <dependency>
<groupId>com.dlink</groupId> <groupId>com.dlink</groupId>
<artifactId>dlink-client-base</artifactId> <artifactId>dlink-client-base</artifactId>
......
...@@ -16,7 +16,6 @@ ...@@ -16,7 +16,6 @@
<flink.version>1.14.3</flink.version> <flink.version>1.14.3</flink.version>
<flinkcdc.version>2.1.1</flinkcdc.version> <flinkcdc.version>2.1.1</flinkcdc.version>
<commons.version>1.3.1</commons.version> <commons.version>1.3.1</commons.version>
<commons-lang3.version>3.1</commons-lang3.version>
<scala.binary.version>2.11</scala.binary.version> <scala.binary.version>2.11</scala.binary.version>
<maven.compiler.source>1.8</maven.compiler.source> <maven.compiler.source>1.8</maven.compiler.source>
<maven.compiler.target>1.8</maven.compiler.target> <maven.compiler.target>1.8</maven.compiler.target>
...@@ -48,10 +47,6 @@ ...@@ -48,10 +47,6 @@
<groupId>org.slf4j</groupId> <groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId> <artifactId>slf4j-api</artifactId>
</exclusion> </exclusion>
<exclusion>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
</exclusion>
</exclusions> </exclusions>
<version>${flink.version}</version> <version>${flink.version}</version>
</dependency> </dependency>
...@@ -85,12 +80,6 @@ ...@@ -85,12 +80,6 @@
<dependency> <dependency>
<groupId>com.dlink</groupId> <groupId>com.dlink</groupId>
<artifactId>dlink-client-hadoop</artifactId> <artifactId>dlink-client-hadoop</artifactId>
<exclusions>
<exclusion>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
</exclusion>
</exclusions>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.flink</groupId> <groupId>org.apache.flink</groupId>
...@@ -106,12 +95,6 @@ ...@@ -106,12 +95,6 @@
<groupId>com.ververica</groupId> <groupId>com.ververica</groupId>
<artifactId>flink-connector-mysql-cdc</artifactId> <artifactId>flink-connector-mysql-cdc</artifactId>
<version>${flinkcdc.version}</version> <version>${flinkcdc.version}</version>
<exclusions>
<exclusion>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
</exclusion>
</exclusions>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.slf4j</groupId> <groupId>org.slf4j</groupId>
...@@ -126,10 +109,5 @@ ...@@ -126,10 +109,5 @@
<artifactId>commons-cli</artifactId> <artifactId>commons-cli</artifactId>
<version>${commons.version}</version> <version>${commons.version}</version>
</dependency> </dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
<version>${commons-lang3.version}</version>
</dependency>
</dependencies> </dependencies>
</project> </project>
\ No newline at end of file
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
<source.level>1.8</source.level> <source.level>1.8</source.level>
<target.level>1.8</target.level> <target.level>1.8</target.level>
<dubbo.version>3.0.2.1</dubbo.version> <dubbo.version>3.0.2.1</dubbo.version>
<flink.version>1.13.5</flink.version> <flink.version>1.13.6</flink.version>
<scala.binary.version>2.11</scala.binary.version> <scala.binary.version>2.11</scala.binary.version>
<junit.version>4.12</junit.version> <junit.version>4.12</junit.version>
<spring.version>4.3.16.RELEASE</spring.version> <spring.version>4.3.16.RELEASE</spring.version>
......
...@@ -14,7 +14,6 @@ ...@@ -14,7 +14,6 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<!--<scope.type>provided</scope.type>--> <!--<scope.type>provided</scope.type>-->
<hadoop.version>3.1.0</hadoop.version> <hadoop.version>3.1.0</hadoop.version>
<commons-lang3.version>3.1</commons-lang3.version>
<scope.type>compile</scope.type> <scope.type>compile</scope.type>
</properties> </properties>
...@@ -31,10 +30,6 @@ ...@@ -31,10 +30,6 @@
<groupId>javax.servlet</groupId> <groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId> <artifactId>servlet-api</artifactId>
</exclusion> </exclusion>
<exclusion>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
</exclusion>
</exclusions> </exclusions>
<version>${hadoop.version}</version> <version>${hadoop.version}</version>
</dependency> </dependency>
...@@ -108,12 +103,6 @@ ...@@ -108,12 +103,6 @@
</exclusion> </exclusion>
</exclusions> </exclusions>
</dependency> </dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
<version>${commons-lang3.version}</version>
</dependency>
</dependencies> </dependencies>
<build> <build>
......
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
<properties> <properties>
<java.version>1.8</java.version> <java.version>1.8</java.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<flink.version>1.13.5</flink.version> <flink.version>1.13.6</flink.version>
<scala.binary.version>2.11</scala.binary.version> <scala.binary.version>2.11</scala.binary.version>
<maven.compiler.source>1.8</maven.compiler.source> <maven.compiler.source>1.8</maven.compiler.source>
<maven.compiler.target>1.8</maven.compiler.target> <maven.compiler.target>1.8</maven.compiler.target>
...@@ -53,14 +53,6 @@ ...@@ -53,14 +53,6 @@
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
<!-- test dependencies -->
<dependency>
<groupId>org.apache.flink</groupId>
<artifactId>flink-test-utils_${scala.binary.version}</artifactId>
<version>${flink.version}</version>
<scope>test</scope>
</dependency>
<dependency> <dependency>
<groupId>org.apache.flink</groupId> <groupId>org.apache.flink</groupId>
<artifactId>flink-table-common</artifactId> <artifactId>flink-table-common</artifactId>
......
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
<properties> <properties>
<java.version>1.8</java.version> <java.version>1.8</java.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<flink.version>1.13.5</flink.version> <flink.version>1.13.6</flink.version>
<scala.binary.version>2.11</scala.binary.version> <scala.binary.version>2.11</scala.binary.version>
<mysql-connector-java.version>8.0.22</mysql-connector-java.version> <mysql-connector-java.version>8.0.22</mysql-connector-java.version>
<ojdbc8.version>12.2.0.1</ojdbc8.version> <ojdbc8.version>12.2.0.1</ojdbc8.version>
......
...@@ -47,7 +47,7 @@ ...@@ -47,7 +47,7 @@
<hibernate-validator.version>6.2.0.Final</hibernate-validator.version> <hibernate-validator.version>6.2.0.Final</hibernate-validator.version>
<!--<flyway.version>6.4.4</flyway.version>--> <!--<flyway.version>6.4.4</flyway.version>-->
<sa-token.version>1.28.0</sa-token.version> <sa-token.version>1.28.0</sa-token.version>
<commons.version>3.12.0</commons.version> <commons-lang3.version>3.3.2</commons-lang3.version>
<maven-jar-plugin.version>3.2.0</maven-jar-plugin.version> <maven-jar-plugin.version>3.2.0</maven-jar-plugin.version>
<maven-assembly-plugin.version>3.2.0</maven-assembly-plugin.version> <maven-assembly-plugin.version>3.2.0</maven-assembly-plugin.version>
<maven.resource.version>3.2.0</maven.resource.version> <maven.resource.version>3.2.0</maven.resource.version>
...@@ -106,7 +106,7 @@ ...@@ -106,7 +106,7 @@
<dependency> <dependency>
<groupId>org.apache.commons</groupId> <groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId> <artifactId>commons-lang3</artifactId>
<version>${commons.version}</version> <version>${commons-lang3.version}</version>
</dependency> </dependency>
<!--<dependency> <!--<dependency>
<groupId>org.apache.logging.log4j</groupId> <groupId>org.apache.logging.log4j</groupId>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment