diff --git a/0001-add-npm.hw-repo.patch b/0001-add-npm.hw-repo.patch new file mode 100644 index 0000000000000000000000000000000000000000..6cf3bdcab10e8ffec3feb76070dc9096c54ac361 --- /dev/null +++ b/0001-add-npm.hw-repo.patch @@ -0,0 +1,32 @@ +From a35c34c6591366ddaccc873b800b078fbd9cc9d7 Mon Sep 17 00:00:00 2001 +From: weidong +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. + + + ci --cache-max=0 --no-save ++ https://mirrors.huaweicloud.com/repository/npm + + true + +@@ -283,6 +284,7 @@ under the License. + + + run build ++ https://mirrors.huaweicloud.com/repository/npm + + + +-- +2.23.0 + diff --git a/0002-fix-compilation-failure.patch b/0002-fix-compilation-failure.patch new file mode 100644 index 0000000000000000000000000000000000000000..55010a7401aafe727a66052d60115455e1164847 --- /dev/null +++ b/0002-fix-compilation-failure.patch @@ -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. + flink-end-to-end-tests-common + ${project.version} + ++ ++ io.confluent ++ kafka-schema-serializer ++ 5.5.2 ++ + + org.apache.flink + flink-test-utils-junit +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. + + + v10.9.0 ++ https://mirrors.huaweicloud.com/nodejs/ + + + diff --git a/flink.spec b/flink.spec index 1967ade9f4eb4ceadc315d213f957e2da6d50852..b8e95db7f8f5f01ffb2c5c38e79798941c25de03 100644 --- a/flink.spec +++ b/flink.spec @@ -3,21 +3,26 @@ %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 -Release: 2 +Version: 1.12.7 +Release: 1 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 +Patch0: 0001-add-npm.hw-repo.patch +Patch1: 0002-fix-compilation-failure.patch BuildRequires: java-1.8.0-openjdk-devel maven Requires: java-1.8.0-openjdk @@ -27,10 +32,12 @@ 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} %build -maven_cmd="clean package -Dskip.npm " +maven_cmd="clean package " %if 0%{?compile_for_local} cp %{SOURCE1} ./ @@ -59,6 +66,15 @@ find %{buildroot}/opt/apache-%{name}-%{version}/ -type f -name '*.py' | xargs -i %license LICENSE %changelog +* Fri Dec 17 2021 weidong - 1.12.7-1 +- Update version. + +* Wed Jul 21 2021 zhangjiapeng - 1.12.0-4 +- Fix compilation failure. + +* Wed Dec 23 2020 weidong - 1.12.0-3 +- Add npm.huawei repo. + * Thu Dec 17 2020 weidong - 1.12.0-2 - Fix compilation issues. diff --git a/kafka-avro-serializer-5.5.2.jar b/kafka-avro-serializer-5.5.2.jar new file mode 100644 index 0000000000000000000000000000000000000000..e8c356704d37459e4cd2b45286a6024bb0a0a3b6 Binary files /dev/null and b/kafka-avro-serializer-5.5.2.jar differ diff --git a/kafka-schema-registry-client-5.5.2.jar b/kafka-schema-registry-client-5.5.2.jar new file mode 100644 index 0000000000000000000000000000000000000000..541626227870dc53661d121322bf81a778450cc4 Binary files /dev/null and b/kafka-schema-registry-client-5.5.2.jar differ diff --git a/kafka-schema-serializer-5.5.2.jar b/kafka-schema-serializer-5.5.2.jar new file mode 100644 index 0000000000000000000000000000000000000000..fdf96a8704a4c36a72f68534bc1f8a22b54c643c Binary files /dev/null and b/kafka-schema-serializer-5.5.2.jar differ diff --git a/release-1.12.0.tar.gz b/release-1.12.7.tar.gz similarity index 71% rename from release-1.12.0.tar.gz rename to release-1.12.7.tar.gz index 34dd2cd2167919be09373445dfcce53209da563e..2bcc893e4cf167544f43723ecca839a002416fb9 100644 Binary files a/release-1.12.0.tar.gz and b/release-1.12.7.tar.gz differ