Merge branch 'release/2.0' into 'master'

feat: release 2.0-rc2

See merge request galaxy/tsg_olap/sip-rtp-correlation!28

.gitlab-ci.yml

@@ -8,14 +8,7 @@ stages:
   - test
   - build
 
-snapshot-version:
-  stage: check
-  script:
-    - mvn $MAVEN_CLI_OPTS enforcer:enforce@snapshot-version-check
-  rules:
-    - if: $CI_MERGE_REQUEST_TARGET_BRANCH_NAME == "develop" && $CI_PIPELINE_SOURCE == "merge_request_event"
-
-non-snapshot-version:
+release-version-check:
   stage: check
   script:
     - mvn $MAVEN_CLI_OPTS enforcer:enforce@release-version-check
@@ -27,7 +20,7 @@ non-snapshot-version:
         echo "The current version has not been deployed."
       fi
   rules:
-    - if: $CI_MERGE_REQUEST_TARGET_BRANCH_NAME =~ /(^master$|^release\/)/ && $CI_PIPELINE_SOURCE == "merge_request_event"
+    - if: $CI_MERGE_REQUEST_TARGET_BRANCH_NAME == "master" && $CI_PIPELINE_SOURCE == "merge_request_event"
 
 test:
   stage: test
@@ -36,12 +29,10 @@ test:
   only:
     - merge_requests
 
-# Used for building snapshot versions on the develop branch.
 build:
   stage: build
   script:
     - echo "$MAVEN_SETTINGS_XML" > /usr/share/maven/conf/settings.xml
     - mvn clean site deploy -DskipTests
   only:
-    - master
-    - /^release\//
+    - master

pom.xml

@@ -7,7 +7,7 @@
 
     <groupId>com.geedgenetworks.application</groupId>
     <artifactId>sip-rtp-correlation</artifactId>
-    <version>2.0-SNAPSHOT</version>
+    <version>2.0-rc2</version>
 
     <name>Flink : SIP-RTP : Correlation</name>
 
@@ -19,7 +19,7 @@
         <scala.version>2.12.10</scala.version>
         <scala.binary.version>2.12</scala.binary.version>
         <flink.version>1.13.6</flink.version>
-        <easy.stream.version>1.3-SNAPSHOT</easy.stream.version>
+        <easy.stream.version>1.3-rc1</easy.stream.version>
         <slf4j.version>1.7.32</slf4j.version>
         <log4j.version>2.17.1</log4j.version>
         <junit.version>5.8.0</junit.version>
@@ -337,13 +337,13 @@
                 <groupId>org.apache.flink</groupId>
                 <artifactId>flink-runtime_${scala.binary.version}</artifactId>
                 <version>${flink.version}</version>
-                <scope>runtime</scope>
+                <scope>provided</scope>
             </dependency>
             <dependency>
                 <groupId>org.apache.flink</groupId>
                 <artifactId>flink-runtime-web_${scala.binary.version}</artifactId>
                 <version>${flink.version}</version>
-                <scope>runtime</scope>
+                <scope>provided</scope>
             </dependency>
 
             <dependency>
@@ -587,6 +587,26 @@
 
         <pluginManagement>
             <plugins>
+                <!-- CI plugins -->
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-dependency-plugin</artifactId>
+                    <version>3.1.2</version>
+                    <executions>
+                        <execution>
+                            <id>release-deploy-check</id>
+                            <goals>
+                                <goal>get</goal>
+                            </goals>
+                            <configuration>
+                                <groupId>${project.groupId}</groupId>
+                                <artifactId>easy-stream-common</artifactId>
+                                <version>${project.version}</version>
+                                <remoteRepositories>${project.distributionManagement.repository.url}</remoteRepositories>
+                            </configuration>
+                        </execution>
+                    </executions>
+                </plugin>
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-enforcer-plugin</artifactId>

src/main/resources/jobs/job.yml

@@ -12,11 +12,11 @@ source:
     option:
       topic: VOIP-RECORD
       properties:
-        bootstrap.servers: 192.168.44.12:9094
+        bootstrap.servers: localhost:9092
         group.id: sip-rtp-correlation
         security.protocol: SASL_PLAINTEXT
         sasl.mechanism: PLAIN
-        sasl.jaas.config: org.apache.kafka.common.security.plain.PlainLoginModule required username="admin" password="galaxy2019";
+        sasl.jaas.config: org.apache.kafka.common.security.plain.PlainLoginModule required username="example" password="example";
     format: json
     schema:
       ## General
@@ -296,10 +296,10 @@ sink:
     option:
       topic: VOIP-CONVERSATTON-RECORD
       properties:
-        bootstrap.servers: 192.168.44.12:9094
+        bootstrap.servers: localhost:9092
         security.protocol: SASL_PLAINTEXT
         sasl.mechanism: PLAIN
-        sasl.jaas.config: org.apache.kafka.common.security.plain.PlainLoginModule required username="admin" password="galaxy2019";
+        sasl.jaas.config: org.apache.kafka.common.security.plain.PlainLoginModule required username="example" password="example";
     format: json
   # 关联成功的 VOIP
   - name: only-voip-records
@@ -308,10 +308,10 @@ sink:
     option:
       topic: VOIP-CONVERSATTON-RECORD
       properties:
-        bootstrap.servers: 192.168.44.12:9094
+        bootstrap.servers: localhost:9092
         security.protocol: SASL_PLAINTEXT
         sasl.mechanism: PLAIN
-        sasl.jaas.config: org.apache.kafka.common.security.plain.PlainLoginModule required username="admin" password="galaxy2019";
+        sasl.jaas.config: org.apache.kafka.common.security.plain.PlainLoginModule required username="example" password="example";
     format: json
   # 没有关联成功的 SIP 和 RTP
   - name: fusion-fail-records
@@ -320,10 +320,10 @@ sink:
     option:
       topic: VOIP-CONVERSATTON-RECORD
       properties:
-        bootstrap.servers: 192.168.44.12:9094
+        bootstrap.servers: localhost:9092
         security.protocol: SASL_PLAINTEXT
         sasl.mechanism: PLAIN
-        sasl.jaas.config: org.apache.kafka.common.security.plain.PlainLoginModule required username="admin" password="galaxy2019";
+        sasl.jaas.config: org.apache.kafka.common.security.plain.PlainLoginModule required username="example" password="example";
     format: json
 
 pipeline:

src/site/markdown/deploy.md

@@ -1,13 +1,11 @@
 ## Deploy
 
 - 准备 JDK ${java.version} 的环境
-
 - 准备 Flink ${flink.version} 的环境
-
 - [下载](./download.html) 对应版本 UDF 依赖 Jar
-
 - [下载](./download.html) 对应版本 Job 配置 (一个 yml 文件)
-
 - 执行命令 `flink run -Dflink.rest.bind-port=8081 -c com.geedgenetworks.flink.easy.core.Runner path/to/sip-rtp-correlation-<version>.jar job.yml`
+- 您将在控制台看到启动日志，同时您可以在 `http://<you-host>:8081` 看到任务 UI。
 
-- 您将在控制台看到启动日志，同时您可以在 `http://<you-host>:8081` 看到任务 UI。
+> 注意：
+> SIP 和 RTP 融合作业强烈建议开启 Checkpoint 机制，否则将会由于丢失数据或重复数据导致业务数据关联错误。 

src/site/markdown/download.md

@@ -1,8 +1,8 @@
 ## Download
 
-### Easy Stream ${project.version}
+### ${project.version}
 
-| UDF Jar                                                                                                                                                                                          | Job             |
-|--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------| --------------- |
-| [JAR](${project.distributionManagement.repository.url}/com/geedgenetworks/application/sip-rtp-correlation/${project.version}/${project.artifactId}-${project.version}.jar) ( [MD5](${project.distributionManagement.repository.url}/com/geedgenetworks/application/sip-rtp-correlation/${project.version}/${project.artifactId}-${project.version}.jar.md5) [SHA1](${project.distributionManagement.repository.url}/com/geedgenetworks/application/sip-rtp-correlation/${project.version}/${project.artifactId}-${project.version}.jar.sha1) ) | [YML](${project.distributionManagement.repository.url}/com/geedgenetworks/application/sip-rtp-correlation/${project.version}/${project.artifactId}-${project.version}.tar.gz) ( [MD5](${project.distributionManagement.repository.url}/com/geedgenetworks/application/sip-rtp-correlation/${project.version}/${project.artifactId}-${project.version}.tar.gz.md5) [SHA1](${project.distributionManagement.repository.url}/com/geedgenetworks/application/sip-rtp-correlation/${project.version}/${project.artifactId}-${project.version}.tar.gz.sha1) ) |
+| Easy Stream | UDF Jar                                                      | Job                                                          |
+|-------------| ------------------------------------------------------------ | ------------------------------------------------------------ |
+| ${easy.stream.version}         | [JAR](${project.distributionManagement.repository.url}/com/geedgenetworks/application/sip-rtp-correlation/${project.version}/${project.artifactId}-${project.version}.jar) ( [MD5](${project.distributionManagement.repository.url}/com/geedgenetworks/application/sip-rtp-correlation/${project.version}/${project.artifactId}-${project.version}.jar.md5) [SHA1](${project.distributionManagement.repository.url}/com/geedgenetworks/application/sip-rtp-correlation/${project.version}/${project.artifactId}-${project.version}.jar.sha1) ) | [YML](${project.distributionManagement.repository.url}/com/geedgenetworks/application/sip-rtp-correlation/${project.version}/${project.artifactId}-${project.version}.tar.gz) ( [MD5](${project.distributionManagement.repository.url}/com/geedgenetworks/application/sip-rtp-correlation/${project.version}/${project.artifactId}-${project.version}.tar.gz.md5) [SHA1](${project.distributionManagement.repository.url}/com/geedgenetworks/application/sip-rtp-correlation/${project.version}/${project.artifactId}-${project.version}.tar.gz.sha1) ) |
 

src/site/markdown/index.md

@@ -7,4 +7,4 @@ SIP RTP Correlation 项目可以用于实时监控和分析 VoIP 通话数据，
 <br/>
 
 
-You can download the latest release from [Job Yml](./jobs/job.yml). And you can changelog from [CHANGELOG.md](./changelogs.html).
+You can download the latest release from [Downloads](./download.html). And you can changelog from [Changelogs](./changelogs.html).