Skip to content

Commit 5a516ed

Browse files
authored
[Feature] Upgrade flink version to 1.16.1 (#1430)
1 parent ecd926a commit 5a516ed

File tree

1,787 files changed

+24022
-149708
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,787 files changed

+24022
-149708
lines changed

.github/workflows/build.yml

-38
This file was deleted.

.github/workflows/code-check.yml

+108
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,108 @@
1+
# Licensed to the Apache Software Foundation (ASF) under one
2+
# or more contributor license agreements. See the NOTICE file
3+
# distributed with this work for additional information
4+
# regarding copyright ownership. The ASF licenses this file
5+
# to you under the Apache License, Version 2.0 (the
6+
# "License"); you may not use this file except in compliance
7+
# with the License. You may obtain a copy of the License at
8+
#
9+
# http://www.apache.org/licenses/LICENSE-2.0
10+
#
11+
# Unless required by applicable law or agreed to in writing,
12+
# software distributed under the License is distributed on an
13+
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
14+
# KIND, either express or implied. See the License for the
15+
# specific language governing permissions and limitations
16+
# under the License.
17+
18+
name: Check Code.
19+
20+
on:
21+
push:
22+
pull_request:
23+
paths-ignore:
24+
- 'chunjun-docker/*'
25+
- '**/*.md'
26+
- 'docs/*'
27+
- 'docs_zh/*'
28+
- 'website/*'
29+
30+
concurrency:
31+
group: backend-${{ github.event.pull_request.number || github.ref }}
32+
cancel-in-progress: true
33+
34+
jobs:
35+
license-header:
36+
if: github.repository == 'DTStack/chunjun'
37+
name: Check License header
38+
runs-on: ubuntu-latest
39+
timeout-minutes: 10
40+
steps:
41+
- uses: actions/checkout@v3
42+
with:
43+
submodules: true
44+
- name: Check license header
45+
uses: apache/skywalking-eyes@main
46+
47+
spotless-check:
48+
if: github.repository =='DTStack/chunjun'
49+
name: Check code style with spotless.
50+
runs-on: ubuntu-latest
51+
timeout-minutes: 10
52+
steps:
53+
- name: Checkout code
54+
uses: actions/checkout@v3
55+
with:
56+
submodules: true
57+
- name: Set up JDK 1.8
58+
uses: actions/setup-java@v1
59+
with:
60+
java-version: 1.8
61+
- name: Spotless Check
62+
run: |
63+
./mvnw spotless:check
64+
65+
unit-test:
66+
needs: [ spotless-check ]
67+
runs-on: ${{ matrix.os }}
68+
strategy:
69+
matrix:
70+
java: [ '8', '11' ]
71+
os: [ 'ubuntu-latest', 'windows-latest' ]
72+
timeout-minutes: 90
73+
steps:
74+
- uses: actions/checkout@v2
75+
- name: Set up JDK ${{ matrix.java }}
76+
uses: actions/setup-java@v3
77+
with:
78+
java-version: ${{ matrix.java }}
79+
distribution: 'temurin'
80+
cache: 'maven'
81+
- name: run modules unit test
82+
if: needs.changes.outputs.api == 'true'
83+
run: |
84+
./mvnw -B -T 1C clean verify -DskipUT=false -DskipITCase=false --no-snapshot-updates
85+
env:
86+
MAVEN_OPTS: -Xmx2048m
87+
88+
integration-test:
89+
needs: [ spotless-check, unit-test ]
90+
runs-on: ${{ matrix.os }}
91+
strategy:
92+
matrix:
93+
java: [ '8', '11' ]
94+
os: [ 'ubuntu-latest' ]
95+
timeout-minutes: 90
96+
steps:
97+
- uses: actions/checkout@v2
98+
- name: Set up JDK ${{ matrix.java }}
99+
uses: actions/setup-java@v3
100+
with:
101+
java-version: ${{ matrix.java }}
102+
distribution: 'temurin'
103+
cache: 'maven'
104+
- name: run modules integration test
105+
run: |
106+
./mvnw -T 1C -B verify -DskipUT=true -DskipIT=false --no-snapshot-updates -pl chunjun-e2e -am
107+
env:
108+
MAVEN_OPTS: -Xmx2048m

.gitignore

+2
Original file line numberDiff line numberDiff line change
@@ -51,3 +51,5 @@ chunjun-dist/
5151

5252
chunjun-dev/data/**
5353
output/*
54+
55+
venv/

README.md

+5-1
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@ Standalone mode depend on the Flink Standalone environment and does not depend o
120120
##### 1. add jars of chunjun
121121
1) Find directory of jars:
122122
if you build this project using maven, the directory name is 'chunjun-dist' ;
123-
if you download tar.gz file from release page, after decompression, the directory name would be like 'chunjun-assembly-1.12-SNAPSHOT-chunjun-dist'.
123+
if you download tar.gz file from release page, after decompression, the directory name would be like 'chunjun-assembly-${revision}-chunjun-dist'.
124124
125125
2) Copy jars to directory of Flink lib, command example:
126126
```shell
@@ -203,6 +203,10 @@ Thanks to all contributors! We are very happy that you can contribute Chunjun.
203203
<img src="https://contrib.rocks/image?repo=DTStack/chunjun" alt="contributors"/>
204204
</a>
205205
206+
## Contributor Over Time
207+
208+
[![Stargazers Over Time](https://contributor-overtime-api.git-contributor.com/contributors-svg?chart=contributorOverTime&repo=DTStack/chunjun)](https://git-contributor.com?chart=contributorOverTime&repo=DTStack/chunjun)
209+
206210
## License
207211
208212
ChunJun is under the Apache 2.0 license. Please visit [LICENSE](http://www.apache.org/licenses/LICENSE-2.0) for details.

README_CH.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@ Standalone模式依赖Flink Standalone环境,不依赖Hadoop环境。
143143
##### 1. 添加chunjun依赖包
144144
1) 根据实际情况找到依赖文件:
145145
通过maven编译的方式构建项目时,依赖文件目录为'chunjun-dist';
146-
通过官网下载压缩包解压使用时,依赖文件目录为解压后的目录,例如'chunjun-assembly-1.12-SNAPSHOT-chunjun-dist'
146+
通过官网下载压缩包解压使用时,依赖文件目录为解压后的目录,例如'chunjun-assembly-${revision}-chunjun-dist'
147147
148148
2) 将依赖文件复制到Flink lib目录下,例如
149149
```shell

chunjun-assembly/pom.xml

+2-13
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,7 @@
2424
<parent>
2525
<artifactId>chunjun</artifactId>
2626
<groupId>com.dtstack.chunjun</groupId>
27-
<version>1.12-SNAPSHOT</version>
28-
<relativePath>../pom.xml</relativePath>
27+
<version>${revision}</version>
2928
</parent>
3029
<modelVersion>4.0.0</modelVersion>
3130

@@ -36,7 +35,7 @@
3635
<properties>
3736
<skipTests>true</skipTests>
3837
<!--version same as flink-1.12.7-bin-scala_2.12.tgz/lib/log4j-* -->
39-
<log4j2.version>2.16.0</log4j2.version>
38+
<log4j2.version>2.19.0</log4j2.version>
4039
<main.basedir>${project.parent.basedir}</main.basedir>
4140
<sbt.project.name>assembly</sbt.project.name>
4241
<build.testJarPhase>none</build.testJarPhase>
@@ -82,16 +81,6 @@
8281
<plugin>
8382
<groupId>org.apache.maven.plugins</groupId>
8483
<artifactId>maven-antrun-plugin</artifactId>
85-
<executions>
86-
<execution>
87-
<phase>package</phase>
88-
<goals>
89-
<goal>run</goal>
90-
</goals>
91-
</execution>
92-
</executions>
93-
<configuration>
94-
</configuration>
9584
</plugin>
9685
<plugin>
9786
<groupId>org.apache.maven.plugins</groupId>

chunjun-clients/.gitignore

-19
This file was deleted.

0 commit comments

Comments
 (0)