Compare commits

...

10 Commits

Author SHA1 Message Date
openeuler-ci-bot
a4f7632209
!36 [sync] PR-30: Fix compilation failure.
Merge pull request !36 from openeuler-sync-bot/sync-pr30-openEuler-20.03-LTS-SP3-to-openEuler-22.03-LTS-Next
2022-01-11 11:42:15 +00:00
weidongkl
42019bdd34 Fix compilation failure.
(cherry picked from commit 69e74f22cb30478d5981b6acad88e701b6cf924c)
2022-01-06 16:02:57 +08:00
openeuler-ci-bot
1df5976c15 !27 [sync] PR-21: update flink version to 1.12.7 to fix CVE-2021-44228
Merge pull request !27 from openeuler-sync-bot/sync-pr21-master-to-openEuler-22.03-LTS-Next
2021-12-22 07:25:27 +00:00
wei dong
5e0b219f68 Update flink version
Fix CVE-2021-44228

Signed-off-by: wei dong <weidong@uniontech.com>
(cherry picked from commit 940e1d2f1e7a85d4a0e1452cdc253916bd055d12)
2021-12-22 15:11:51 +08:00
openeuler-ci-bot
0ae081ef20 !8 Fix compilation failure
From: @jpzhang187
Reviewed-by: @lyn1001,@yangzhao_kl
Signed-off-by: @yangzhao_kl
2021-07-28 06:28:58 +00:00
jpzhang187
d040184e0d Fix compilation failure 2021-07-23 17:36:21 +08:00
openeuler-ci-bot
ec353c6878 !4 Add npm.huaweicloud repo
From: @weidongkl
Reviewed-by: 
Signed-off-by:
2021-05-28 10:24:06 +08:00
weidong
bc73fa45fd Add npm.huaweicloud repo 2020-12-23 17:29:24 +08:00
openeuler-ci-bot
dfabb421fb !2 package init
From: @weidongkl
Reviewed-by: @hubble_zhu
Signed-off-by: @hubble_zhu
2020-12-22 17:35:52 +08:00
weidongkl
ce113a41a2 update flink.spec. 2020-12-21 18:40:44 +08:00
9 changed files with 110 additions and 3 deletions

View File

@ -0,0 +1,32 @@
From a35c34c6591366ddaccc873b800b078fbd9cc9d7 Mon Sep 17 00:00:00 2001
From: weidong <weidong@uniontech.com>
Date: Thu, 17 Dec 2020 11:44:05 +0800
Subject: [PATCH] add npm.hw repo
---
flink-runtime-web/pom.xml | 2 ++
1 file changed, 2 insertions(+)
diff --git a/flink-runtime-web/pom.xml b/flink-runtime-web/pom.xml
index 0d98526b..fb29809b 100644
--- a/flink-runtime-web/pom.xml
+++ b/flink-runtime-web/pom.xml
@@ -271,6 +271,7 @@ under the License.
</goals>
<configuration>
<arguments>ci --cache-max=0 --no-save</arguments>
+ <npmRegistryURL>https://mirrors.huaweicloud.com/repository/npm</npmRegistryURL>
<environmentVariables>
<HUSKY_SKIP_INSTALL>true</HUSKY_SKIP_INSTALL>
</environmentVariables>
@@ -283,6 +284,7 @@ under the License.
</goals>
<configuration>
<arguments>run build</arguments>
+ <npmRegistryURL>https://mirrors.huaweicloud.com/repository/npm</npmRegistryURL>
</configuration>
</execution>
</executions>
--
2.23.0

View File

@ -0,0 +1,28 @@
diff --git a/flink-end-to-end-tests/flink-end-to-end-tests-common-kafka/pom.xml b/flink-end-to-end-tests/flink-end-to-end-tests-common-kafka/pom.xml
index 3843cd5..1064296 100644
--- a/flink-end-to-end-tests/flink-end-to-end-tests-common-kafka/pom.xml
+++ b/flink-end-to-end-tests/flink-end-to-end-tests-common-kafka/pom.xml
@@ -43,6 +43,11 @@ under the License.
<artifactId>flink-end-to-end-tests-common</artifactId>
<version>${project.version}</version>
</dependency>
+ <dependency>
+ <groupId>io.confluent</groupId>
+ <artifactId>kafka-schema-serializer</artifactId>
+ <version>5.5.2</version>
+ </dependency>
<dependency>
<groupId>org.apache.flink</groupId>
<artifactId>flink-test-utils-junit</artifactId>
diff --git a/flink-runtime-web/pom.xml b/flink-runtime-web/pom.xml
index d94fca1..a9896f4 100644
--- a/flink-runtime-web/pom.xml
+++ b/flink-runtime-web/pom.xml
@@ -262,6 +262,7 @@ under the License.
</goals>
<configuration>
<nodeVersion>v10.9.0</nodeVersion>
+ <downloadRoot>https://mirrors.huaweicloud.com/nodejs/</downloadRoot>
</configuration>
</execution>
<execution>

View File

@ -0,0 +1,25 @@
From 2b17debeeef8845c9d0f347d028ea8e388f4222a Mon Sep 17 00:00:00 2001
From: wei dong <weidong@uniontech.com>
Date: Wed, 5 Jan 2022 14:20:49 +0800
Subject: [PATCH] Skip flink-avro-confluent-registry test
Signed-off-by: wei dong <weidong@uniontech.com>
---
flink-formats/flink-avro-confluent-registry/pom.xml | 1 +
1 file changed, 1 insertion(+)
diff --git a/flink-formats/flink-avro-confluent-registry/pom.xml b/flink-formats/flink-avro-confluent-registry/pom.xml
index 9d412708..54710d4e 100644
--- a/flink-formats/flink-avro-confluent-registry/pom.xml
+++ b/flink-formats/flink-avro-confluent-registry/pom.xml
@@ -34,6 +34,7 @@ under the License.
<properties>
<kafka.version>2.4.1</kafka.version>
<confluent.version>5.5.2</confluent.version>
+ <maven.test.skip>true</maven.test.skip>
</properties>
<repositories>
--
2.27.0

View File

@ -3,21 +3,28 @@
%global debug_package %{nil}
# Use local caches compile
%global compile_for_local 1
%global compile_for_local 0
%global with_debug 0
%global with_tests 0
Name: flink
Version: 1.12.0
Version: 1.12.7
Release: 2
Summary: Stateful Computations over Data Streams
License: Apache License v2.0
URL: https://github.com/apache/%{name}
Source0: https://github.com/apache/%{name}/archive/release-%{version}.tar.gz
Source1: settings.xml
Source2: https://packages.confluent.io/maven/io/confluent/kafka-schema-registry-client/5.5.2/kafka-schema-registry-client-5.5.2.jar
Source3: https://packages.confluent.io/maven/io/confluent/kafka-avro-serializer/5.5.2/kafka-avro-serializer-5.5.2.jar
Source4: https://packages.confluent.io/maven/io/confluent/kafka-schema-serializer/5.5.2/kafka-schema-serializer-5.5.2.jar
Source5: https://maven.aliyun.com/repository/public/io/confluent/kafka-clients/5.5.2-ccs/kafka-clients-5.5.2-ccs.jar
Patch0: 0001-add-npm.hw-repo.patch
Patch1: 0002-fix-compilation-failure.patch
Patch2: 0003-Skip-flink-avro-confluent-registry-test.patch
BuildRequires: java-1.8.0-openjdk-devel maven
Requires: java-1.8.0-openjdk
@ -27,7 +34,10 @@ Apache Flink is a framework and distributed processing engine for stateful compu
%prep
%autosetup -p1 -n %{name}-release-%{version}
mvn install:install-file -DgroupId=io.confluent -DartifactId=kafka-schema-registry-client -Dversion=5.5.2 -Dpackaging=jar -Dfile=%{SOURCE2}
mvn install:install-file -DgroupId=io.confluent -DartifactId=kafka-avro-serializer -Dversion=5.5.2 -Dpackaging=jar -Dfile=%{SOURCE3}
mvn install:install-file -DgroupId=io.confluent -DartifactId=kafka-schema-serializer -Dversion=5.5.2 -Dpackaging=jar -Dfile=%{SOURCE4}
mvn install:install-file -DgroupId=org.apache.kafka -DartifactId=kafka-clients -Dversion=5.5.2-ccs -Dpackaging=jar -Dfile=%{SOURCE5}
%build
maven_cmd="clean package "
@ -59,6 +69,18 @@ find %{buildroot}/opt/apache-%{name}-%{version}/ -type f -name '*.py' | xargs -i
%license LICENSE
%changelog
* Wed Jan 05 2022 weidong <weidong@uniontech.com> - 1.12.7-2
- Fix compilation failure.
* Fri Dec 17 2021 weidong <weidong@uniontech.com> - 1.12.7-1
- Update version.
* Wed Jul 21 2021 zhangjiapeng <zhangjiapeng@huawei.com> - 1.12.0-4
- Fix compilation failure.
* Wed Dec 23 2020 weidong <weidong@uniontech.com> - 1.12.0-3
- Add npm.huawei repo.
* Thu Dec 17 2020 weidong <weidong@uniontech.com> - 1.12.0-2
- Fix compilation issues.

Binary file not shown.

BIN
kafka-clients-5.5.2-ccs.jar Normal file

Binary file not shown.

Binary file not shown.

Binary file not shown.