Skip to content

Commit 606c9d2

Browse files
ruanhang1993ruanhang1993
authored
[build] Update version to 3.4-SNAPSHOT and add release-3.3 docs
This closes #3870
1 parent 3e16a66 commit 606c9d2

File tree

15 files changed

+288
-14
lines changed

15 files changed

+288
-14
lines changed

‎Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717

1818
FROM flink
1919

20-
ARG FLINK_CDC_VERSION=3.3-SNAPSHOT
20+
ARG FLINK_CDC_VERSION=3.4-SNAPSHOT
2121
ARG PIPELINE_DEFINITION_FILE
2222

2323
RUN mkdir -p /opt/flink-cdc

‎docs/config.toml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,8 +58,9 @@ pygmentsUseClasses = true
5858
]
5959

6060
PreviousDocs = [
61+
["3.3", "https://nightlies.apache.org/flink/flink-cdc-docs-release-3.3"],
6162
["3.2", "https://nightlies.apache.org/flink/flink-cdc-docs-release-3.2"],
62-
["3.1", "https://nightlies.apache.org/flink/flink-cdc-docs-release-3.1"],
63+
["3.1", "https://nightlies.apache.org/flink/flink-cdc-docs-release-3.1"]
6364
]
6465

6566
[markup]

‎docs/content.zh/docs/connectors/pipeline-connectors/doris.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -169,7 +169,7 @@ pipeline:
169169
<td>String</td>
170170
<td>StreamLoad的参数。
171171
For example: <code> sink.properties.strict_mode: true</code>.
172-
查看更多关于 <a href="https://doris.apache.org/zh-CN/docs/dev/sql-manual/sql-statements/Data-Manipulation-Statements/Load/STREAM-LOAD/"> StreamLoad 的属性</a></td>
172+
查看更多关于 <a href="https://doris.apache.org/zh-CN/docs/dev/data-operate/import/import-way/stream-load-manual"> StreamLoad 的属性</a></td>
173173
</td>
174174
</tr>
175175
<tr>
@@ -179,7 +179,7 @@ pipeline:
179179
<td>String</td>
180180
<td>创建表的Properties配置。
181181
For example: <code> table.create.properties.replication_num: 1</code>.
182-
查看更多关于 <a href="https://doris.apache.org/zh-CN/docs/dev/sql-manual/sql-statements/Data-Definition-Statements/Create/CREATE-TABLE/"> Doris Table 的属性</a></td>
182+
查看更多关于 <a href="https://doris.apache.org/zh-CN/docs/dev/sql-manual/sql-statements/table-and-view/table/CREATE-TABLE"> Doris Table 的属性</a></td>
183183
</td>
184184
</tr>
185185
</tbody>

‎docs/content/docs/connectors/pipeline-connectors/doris.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -169,7 +169,7 @@ pipeline:
169169
<td>String</td>
170170
<td> Parameters of StreamLoad.
171171
For example: <code> sink.properties.strict_mode: true</code>.
172-
See more about <a href="https://doris.apache.org/docs/dev/sql-manual/sql-statements/Data-Manipulation-Statements/Load/STREAM-LOAD/"> StreamLoad Properties</a></td>
172+
See more about <a href="https://doris.apache.org/docs/dev/data-operate/import/import-way/stream-load-manual"> StreamLoad Properties</a></td>
173173
</td>
174174
</tr>
175175
<tr>
@@ -179,7 +179,7 @@ pipeline:
179179
<td>String</td>
180180
<td>Create the Properties configuration of the table.
181181
For example: <code> table.create.properties.replication_num: 1</code>.
182-
See more about <a href="https://doris.apache.org/docs/dev/sql-manual/sql-statements/Data-Definition-Statements/Create/CREATE-TABLE/"> Doris Table Properties</a></td>
182+
See more about <a href="https://doris.apache.org/docs/dev/sql-manual/sql-statements/table-and-view/table/CREATE-TABLE"> Doris Table Properties</a></td>
183183
</td>
184184
</tr>
185185
</tbody>

‎pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ limitations under the License.
5959
</scm>
6060

6161
<properties>
62-
<revision>3.3-SNAPSHOT</revision>
62+
<revision>3.4-SNAPSHOT</revision>
6363
<scala.binary.version>2.12</scala.binary.version>
6464
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
6565
<!-- Enforce single fork execution due to heavy mini cluster use in the tests -->

‎tools/mig-test/datastream/compile_jobs.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
# See the License for the specific language governing permissions and
1717
# limitations under the License.
1818

19-
JOB_VERSIONS = %w[3.2.0 3.2.1 3.3-SNAPSHOT]
19+
JOB_VERSIONS = %w[3.2.0 3.2.1 3.3.0 3.4-SNAPSHOT]
2020

2121
JOB_VERSIONS.each do |version|
2222
puts "Compiling DataStream job for CDC #{version}"

‎tools/mig-test/datastream/datastream-3.3-SNAPSHOT/.gitignore renamed to ‎tools/mig-test/datastream/datastream-3.3.0/.gitignore

File renamed without changes.

‎tools/mig-test/datastream/datastream-3.3-SNAPSHOT/pom.xml renamed to ‎tools/mig-test/datastream/datastream-3.3.0/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,13 +22,13 @@ limitations under the License.
2222

2323
<groupId>org.apache.flink</groupId>
2424
<artifactId>datastream-job</artifactId>
25-
<version>3.3-SNAPSHOT</version>
25+
<version>3.3.0</version>
2626
<packaging>jar</packaging>
2727

2828
<properties>
2929
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
3030
<flink.version>1.19.1</flink.version>
31-
<flink.cdc.version>3.3-SNAPSHOT</flink.cdc.version>
31+
<flink.cdc.version>3.3.0</flink.cdc.version>
3232
<debezium.version>1.9.7.Final</debezium.version>
3333
<scala.binary.version>2.12</scala.binary.version>
3434
<slf4j.version>2.0.13</slf4j.version>

‎tools/mig-test/datastream/datastream-3.3-SNAPSHOT/src/main/java/DataStreamJob.java renamed to ‎tools/mig-test/datastream/datastream-3.3.0/src/main/java/DataStreamJob.java

File renamed without changes.

‎tools/mig-test/datastream/datastream-3.4-SNAPSHOT/.gitignore

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
target/
2+
!.mvn/wrapper/maven-wrapper.jar
3+
!**/src/main/**/target/
4+
!**/src/test/**/target/
5+
6+
### IntelliJ IDEA ###
7+
.idea/modules.xml
8+
.idea/jarRepositories.xml
9+
.idea/compiler.xml
10+
.idea/libraries/
11+
*.iws
12+
*.iml
13+
*.ipr
14+
15+
### Eclipse ###
16+
.apt_generated
17+
.classpath
18+
.factorypath
19+
.project
20+
.settings
21+
.springBeans
22+
.sts4-cache
23+
24+
### NetBeans ###
25+
/nbproject/private/
26+
/nbbuild/
27+
/dist/
28+
/nbdist/
29+
/.nb-gradle/
30+
build/
31+
!**/src/main/**/build/
32+
!**/src/test/**/build/
33+
34+
### VS Code ###
35+
.vscode/
36+
37+
### Mac OS ###
38+
.DS_Store

‎tools/mig-test/datastream/datastream-3.4-SNAPSHOT/pom.xml

Lines changed: 180 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,180 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!--
3+
Licensed to the Apache Software Foundation (ASF) under one or more
4+
contributor license agreements. See the NOTICE file distributed with
5+
this work for additional information regarding copyright ownership.
6+
The ASF licenses this file to You under the Apache License, Version 2.0
7+
(the "License"); you may not use this file except in compliance with
8+
the License. You may obtain a copy of the License at
9+
10+
http://www.apache.org/licenses/LICENSE-2.0
11+
12+
Unless required by applicable law or agreed to in writing, software
13+
distributed under the License is distributed on an "AS IS" BASIS,
14+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
15+
See the License for the specific language governing permissions and
16+
limitations under the License.
17+
-->
18+
<project xmlns="http://maven.apache.org/POM/4.0.0"
19+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
20+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
21+
<modelVersion>4.0.0</modelVersion>
22+
23+
<groupId>org.apache.flink</groupId>
24+
<artifactId>datastream-job</artifactId>
25+
<version>3.4-SNAPSHOT</version>
26+
<packaging>jar</packaging>
27+
28+
<properties>
29+
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
30+
<flink.version>1.19.1</flink.version>
31+
<flink.cdc.version>3.4-SNAPSHOT</flink.cdc.version>
32+
<debezium.version>1.9.7.Final</debezium.version>
33+
<scala.binary.version>2.12</scala.binary.version>
34+
<slf4j.version>2.0.13</slf4j.version>
35+
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
36+
</properties>
37+
38+
<dependencies>
39+
<dependency>
40+
<groupId>org.apache.flink</groupId>
41+
<artifactId>flink-streaming-java</artifactId>
42+
<version>${flink.version}</version>
43+
</dependency>
44+
<dependency>
45+
<groupId>org.apache.flink</groupId>
46+
<artifactId>flink-runtime</artifactId>
47+
<version>${flink.version}</version>
48+
</dependency>
49+
<dependency>
50+
<groupId>org.apache.flink</groupId>
51+
<artifactId>flink-java</artifactId>
52+
<version>${flink.version}</version>
53+
</dependency>
54+
<dependency>
55+
<groupId>org.apache.flink</groupId>
56+
<artifactId>flink-connector-base</artifactId>
57+
<version>${flink.version}</version>
58+
</dependency>
59+
<dependency>
60+
<groupId>org.apache.flink</groupId>
61+
<artifactId>flink-clients</artifactId>
62+
<version>${flink.version}</version>
63+
</dependency>
64+
<dependency>
65+
<groupId>org.apache.flink</groupId>
66+
<artifactId>flink-table-planner_${scala.binary.version}</artifactId>
67+
<version>${flink.version}</version>
68+
</dependency>
69+
<dependency>
70+
<groupId>org.apache.flink</groupId>
71+
<artifactId>flink-table-runtime</artifactId>
72+
<version>${flink.version}</version>
73+
</dependency>
74+
<dependency>
75+
<groupId>org.apache.flink</groupId>
76+
<artifactId>flink-core</artifactId>
77+
<version>${flink.version}</version>
78+
</dependency>
79+
<dependency>
80+
<groupId>org.apache.flink</groupId>
81+
<artifactId>flink-table-common</artifactId>
82+
<version>${flink.version}</version>
83+
</dependency>
84+
<!-- Checked the dependencies of the Flink project and below is a feasible reference. -->
85+
<!-- Use flink shaded guava 18.0-13.0 for flink 1.13 -->
86+
<!-- Use flink shaded guava 30.1.1-jre-14.0 for flink-1.14 -->
87+
<!-- Use flink shaded guava 30.1.1-jre-15.0 for flink-1.15 -->
88+
<!-- Use flink shaded guava 30.1.1-jre-15.0 for flink-1.16 -->
89+
<!-- Use flink shaded guava 30.1.1-jre-16.1 for flink-1.17 -->
90+
<!-- Use flink shaded guava 31.1-jre-17.0 for flink-1.18 -->
91+
<dependency>
92+
<groupId>org.apache.flink</groupId>
93+
<artifactId>flink-shaded-guava</artifactId>
94+
<version>31.1-jre-17.0</version>
95+
</dependency>
96+
<dependency>
97+
<groupId>org.apache.flink</groupId>
98+
<artifactId>flink-connector-debezium</artifactId>
99+
<version>${flink.cdc.version}</version>
100+
</dependency>
101+
<dependency>
102+
<groupId>org.apache.flink</groupId>
103+
<artifactId>flink-cdc-base</artifactId>
104+
<version>${flink.cdc.version}</version>
105+
</dependency>
106+
<dependency>
107+
<groupId>org.apache.flink</groupId>
108+
<artifactId>flink-connector-mysql-cdc</artifactId>
109+
<version>${flink.cdc.version}</version>
110+
</dependency>
111+
<dependency>
112+
<groupId>io.debezium</groupId>
113+
<artifactId>debezium-connector-mysql</artifactId>
114+
<version>${debezium.version}</version>
115+
</dependency>
116+
<dependency>
117+
<groupId>org.slf4j</groupId>
118+
<artifactId>slf4j-api</artifactId>
119+
<version>${slf4j.version}</version>
120+
</dependency>
121+
<dependency>
122+
<groupId>org.slf4j</groupId>
123+
<artifactId>slf4j-simple</artifactId>
124+
<version>${slf4j.version}</version>
125+
</dependency>
126+
</dependencies>
127+
128+
<build>
129+
<plugins>
130+
<plugin>
131+
<groupId>org.apache.maven.plugins</groupId>
132+
<artifactId>maven-compiler-plugin</artifactId>
133+
<configuration>
134+
<source>${maven.compiler.source}</source>
135+
<target>${maven.compiler.target}</target>
136+
</configuration>
137+
</plugin>
138+
<plugin>
139+
<artifactId>maven-assembly-plugin</artifactId>
140+
<executions>
141+
<execution>
142+
<phase>package</phase>
143+
<goals>
144+
<goal>single</goal>
145+
</goals>
146+
</execution>
147+
</executions>
148+
<configuration>
149+
<descriptorRefs>
150+
<descriptorRef>jar-with-dependencies</descriptorRef>
151+
</descriptorRefs>
152+
</configuration>
153+
</plugin>
154+
</plugins>
155+
</build>
156+
<profiles>
157+
<profile>
158+
<id>java-8-target</id>
159+
<activation>
160+
<jdk>[1.8,11)</jdk>
161+
</activation>
162+
<properties>
163+
<java.version>1.8</java.version>
164+
<maven.compiler.source>${java.version}</maven.compiler.source>
165+
<maven.compiler.target>${java.version}</maven.compiler.target>
166+
</properties>
167+
</profile>
168+
<profile>
169+
<id>java-11-target</id>
170+
<activation>
171+
<jdk>[11,)</jdk>
172+
</activation>
173+
<properties>
174+
<java.version>11</java.version>
175+
<maven.compiler.source>${java.version}</maven.compiler.source>
176+
<maven.compiler.target>${java.version}</maven.compiler.target>
177+
</properties>
178+
</profile>
179+
</profiles>
180+
</project>

‎tools/mig-test/datastream/datastream-3.4-SNAPSHOT/src/main/java/DataStreamJob.java

Lines changed: 54 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,54 @@
1+
/*
2+
* Licensed to the Apache Software Foundation (ASF) under one or more
3+
* contributor license agreements. See the NOTICE file distributed with
4+
* this work for additional information regarding copyright ownership.
5+
* The ASF licenses this file to You under the Apache License, Version 2.0
6+
* (the "License"); you may not use this file except in compliance with
7+
* 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, software
12+
* distributed under the License is distributed on an "AS IS" BASIS,
13+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
14+
* See the License for the specific language governing permissions and
15+
* limitations under the License.
16+
*/
17+
18+
import org.apache.flink.cdc.connectors.mysql.source.MySqlSource;
19+
import org.apache.flink.cdc.connectors.mysql.table.StartupOptions;
20+
import org.apache.flink.cdc.debezium.JsonDebeziumDeserializationSchema;
21+
import org.apache.flink.api.common.eventtime.WatermarkStrategy;
22+
import org.apache.flink.streaming.api.environment.StreamExecutionEnvironment;
23+
24+
public class DataStreamJob {
25+
26+
public static void main(String[] args) {
27+
MySqlSource<String> mySqlSource = MySqlSource.<String>builder()
28+
.hostname("localhost")
29+
.port(3306)
30+
.databaseList("fallen")
31+
.tableList("fallen.angel", "fallen.gabriel", "fallen.girl")
32+
.startupOptions(StartupOptions.initial())
33+
.username("root")
34+
.password("")
35+
.deserializer(new JsonDebeziumDeserializationSchema())
36+
.serverTimeZone("UTC")
37+
.build();
38+
39+
StreamExecutionEnvironment env = StreamExecutionEnvironment.getExecutionEnvironment();
40+
env.enableCheckpointing(3000);
41+
42+
env.fromSource(mySqlSource, WatermarkStrategy.noWatermarks(), "MySQL CDC Source")
43+
.uid("sql-source-uid")
44+
.setParallelism(1)
45+
.print()
46+
.setParallelism(1);
47+
48+
try {
49+
env.execute();
50+
} catch (Exception e) {
51+
// ... unfortunately
52+
}
53+
}
54+
}

‎tools/mig-test/datastream/run_migration_test.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ def test_migration(from_version, to_version)
9393
end
9494
end
9595

96-
version_list = %w[3.2.0 3.2.1 3.3-SNAPSHOT]
96+
version_list = %w[3.2.0 3.2.1 3.3.0 3.4-SNAPSHOT]
9797
version_result = Hash.new('❓')
9898
@failures = []
9999

‎tools/mig-test/prepare_libs.rb

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,9 +38,10 @@ def gen_version(tag)
3838
RELEASED_VERSIONS = {
3939
'3.2.0': gen_version('3.2.0'),
4040
'3.2.1': gen_version('3.2.1'),
41+
'3.3.0': gen_version('3.3.0'),
4142
}.freeze
4243

43-
HEAD_VERSION = '3.3-SNAPSHOT'
44+
HEAD_VERSION = '3.4-SNAPSHOT'
4445

4546
def download_or_get(link)
4647
`mkdir -p cache`

‎tools/mig-test/run_migration_test.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -118,8 +118,8 @@ def test_migration(from_version, to_version)
118118
end
119119

120120
version_list = case ARGV[0]
121-
when '1.19.1' then %w[3.2.0 3.2.1 3.3-SNAPSHOT]
122-
when '1.20.0' then %w[3.2.1 3.3-SNAPSHOT]
121+
when '1.19.1' then %w[3.2.0 3.2.1 3.3.0 3.4-SNAPSHOT]
122+
when '1.20.0' then %w[3.2.1 3.3.0 3.4-SNAPSHOT]
123123
else []
124124
end
125125

0 commit comments

Comments
 (0)