diff --git a/0001-add-npm.hw-repo.patch b/0001-add-npm.hw-repo.patch index 6cf3bdc..406ebfe 100644 --- a/0001-add-npm.hw-repo.patch +++ b/0001-add-npm.hw-repo.patch @@ -1,32 +1,27 @@ -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. +diff -Naur flink-release-1.17.1/flink-runtime-web/pom.xml flink-release-1.17.1-change/flink-runtime-web/pom.xml +--- flink-release-1.17.1/flink-runtime-web/pom.xml 2023-05-19 16:45:46.000000000 +0800 ++++ flink-release-1.17.1-change/flink-runtime-web/pom.xml 2023-09-27 14:16:02.741215322 +0800 +@@ -259,6 +259,7 @@ - ci --cache-max=0 --no-save -+ https://mirrors.huaweicloud.com/repository/npm + v16.13.2 ++ https://repo.huaweicloud.com/nodejs/ + 8.1.2 + + +@@ -269,6 +270,7 @@ + + + ci --cache-max=0 --no-save ${npm.proxy} ++ https://repo.huaweicloud.com/repository/npm true -@@ -283,6 +284,7 @@ under the License. +@@ -281,6 +283,7 @@ - run build -+ https://mirrors.huaweicloud.com/repository/npm + run ci-check ++ https://repo.huaweicloud.com/repository/npm --- -2.23.0 - diff --git a/0002-fix-compilation-failure.patch b/0002-fix-compilation-failure.patch index 55010a7..f6d3fb7 100644 --- a/0002-fix-compilation-failure.patch +++ b/0002-fix-compilation-failure.patch @@ -1,28 +1,14 @@ -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-release-1.17.1/flink-end-to-end-tests/flink-end-to-end-tests-common-kafka/pom.xml 2023-05-19 16:45:46.000000000 +0800 ++++ flink-release-1.17.1-change/flink-end-to-end-tests/flink-end-to-end-tests-common-kafka/pom.xml 2023-09-26 17:25:33.739542538 +0800 +@@ -43,6 +43,11 @@ flink-end-to-end-tests-common ${project.version} -+ -+ io.confluent -+ kafka-schema-serializer -+ 5.5.2 -+ ++ ++ io.confluent ++ kafka-schema-serializer ++ 7.2.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/ - - - + flink-connector-kafka diff --git a/0003-Skip-flink-avro-confluent-registry-test.patch b/0003-Skip-flink-avro-confluent-registry-test.patch new file mode 100644 index 0000000..8a8f303 --- /dev/null +++ b/0003-Skip-flink-avro-confluent-registry-test.patch @@ -0,0 +1,11 @@ +diff -Naur flink-release-1.17.1/flink-formats/flink-avro-confluent-registry/pom.xml flink-release-1.17.1-change/flink-formats/flink-avro-confluent-registry/pom.xml +--- flink-release-1.17.1/flink-formats/flink-avro-confluent-registry/pom.xml 2023-05-19 16:45:46.000000000 +0800 ++++ flink-release-1.17.1-change/flink-formats/flink-avro-confluent-registry/pom.xml 2023-09-25 17:26:23.465127239 +0800 +@@ -34,6 +34,7 @@ + + 3.2.3 + 7.2.2 ++ true + + + diff --git a/0003-update-os-maven-plugin-to-support-loongarch64.patch b/0003-update-os-maven-plugin-to-support-loongarch64.patch deleted file mode 100644 index 244aed1..0000000 --- a/0003-update-os-maven-plugin-to-support-loongarch64.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 2a34491f2b3763d7cc7835ebfe0bfa2668066872 Mon Sep 17 00:00:00 2001 -From: Wenlong Zhang -Date: Sat, 20 May 2023 11:09:45 +0800 -Subject: [PATCH] update os-maven-plugin to support loongarch64 - ---- - flink-formats/flink-parquet/pom.xml | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/flink-formats/flink-parquet/pom.xml b/flink-formats/flink-parquet/pom.xml -index df4076d7..bac6b680 100644 ---- a/flink-formats/flink-parquet/pom.xml -+++ b/flink-formats/flink-parquet/pom.xml -@@ -209,7 +209,7 @@ under the License. - - kr.motd.maven - os-maven-plugin -- 1.7.0 -+ 1.7.1 - - - --- -2.27.0 - diff --git a/flink.spec b/flink.spec index 7f38bb9..0cffb34 100644 --- a/flink.spec +++ b/flink.spec @@ -10,50 +10,39 @@ %global with_tests 0 Name: flink -Version: 1.13.0 -Release: 2 +Version: 1.17.1 +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/flink-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 +Source0: https://github.com/apache/%{name}/archive/release-%{version}.tar.gz +Source2: https://packages.confluent.io/maven/io/confluent/kafka-schema-registry-client/7.2.2/kafka-schema-registry-client-7.2.2.jar +Source3: https://packages.confluent.io/maven/io/confluent/kafka-avro-serializer/7.2.2/kafka-avro-serializer-7.2.2.jar +Source4: https://packages.confluent.io/maven/io/confluent/kafka-schema-serializer/7.2.2/kafka-schema-serializer-7.2.2.jar +Source5: https://packages.confluent.io/maven/org/apache/kafka/kafka-clients/7.2.2-ccs/kafka-clients-7.2.2-ccs.jar +Source6: npm-8.1.2.tar.gz Patch0: 0001-add-npm.hw-repo.patch Patch1: 0002-fix-compilation-failure.patch -Patch2: 0003-update-os-maven-plugin-to-support-loongarch64.patch -BuildRequires: java-1.8.0-openjdk-devel maven +Patch2: 0003-Skip-flink-avro-confluent-registry-test.patch +BuildRequires: java-1.8.0-openjdk-devel maven npm Requires: java-1.8.0-openjdk %description Apache Flink is a framework and distributed processing engine for stateful computations over unbounded and bounded data streams. Flink has been designed to run in all common cluster environments, perform computations at in-memory speed and at any scale. - %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=io.confluent -DartifactId=kafka-schema-registry-client -Dversion=7.2.2 -Dpackaging=jar -Dfile=%{SOURCE2} +mvn install:install-file -DgroupId=io.confluent -DartifactId=kafka-avro-serializer -Dversion=7.2.2 -Dpackaging=jar -Dfile=%{SOURCE3} +mvn install:install-file -DgroupId=io.confluent -DartifactId=kafka-schema-serializer -Dversion=7.2.2 -Dpackaging=jar -Dfile=%{SOURCE4} +mvn install:install-file -DgroupId=org.apache.kafka -DartifactId=kafka-clients -Dversion=7.2.2-ccs -Dpackaging=jar -Dfile=%{SOURCE5} +mkdir -p ${HOME}/.m2/repository/com/github/eirslett/npm/8.1.2/ +cp %{SOURCE6} ${HOME}/.m2/repository/com/github/eirslett/npm/8.1.2/ + %build - -maven_cmd="clean package " - -%if 0%{?compile_for_local} - cp %{SOURCE1} ./ - maven_cmd="${maven_cmd} -s settings.xml" -%endif - -%if 0%{?with_debug} - maven_cmd="${maven_cmd} -X " -%endif - -%if 0%{?with_tests:1} - maven_cmd="${maven_cmd} -DskipTests" -%endif - -mvn ${maven_cmd} +npm config set registry https://repo.huaweicloud.com/repository/npm/ +mvn clean install -DskipTests -Dfast -T 2 %install mkdir -p %{buildroot}/opt/ @@ -66,7 +55,10 @@ find %{buildroot}/opt/apache-%{name}-%{version}/ -type f -name '*.py' | xargs -i %doc README.md %license LICENSE -%changelog +%changelog +* Wed Sep 27 2023 xiexing - 1.17.1-1 +- update version to 1.17.1 + * Mon May 8 2023 Wenlong Zhang - 1.13.0-2 - add loongarch64 support diff --git a/kafka-avro-serializer-5.5.2.jar b/kafka-avro-serializer-5.5.2.jar deleted file mode 100644 index e8c3567..0000000 Binary files a/kafka-avro-serializer-5.5.2.jar and /dev/null differ diff --git a/kafka-avro-serializer-7.2.2.jar b/kafka-avro-serializer-7.2.2.jar new file mode 100644 index 0000000..6ea0e9a Binary files /dev/null and b/kafka-avro-serializer-7.2.2.jar differ diff --git a/kafka-clients-7.2.2-ccs.jar b/kafka-clients-7.2.2-ccs.jar new file mode 100644 index 0000000..177a528 Binary files /dev/null and b/kafka-clients-7.2.2-ccs.jar differ diff --git a/kafka-schema-registry-client-5.5.2.jar b/kafka-schema-registry-client-5.5.2.jar deleted file mode 100644 index 5416262..0000000 Binary files a/kafka-schema-registry-client-5.5.2.jar and /dev/null differ diff --git a/kafka-schema-registry-client-7.2.2.jar b/kafka-schema-registry-client-7.2.2.jar new file mode 100644 index 0000000..b5806dd Binary files /dev/null and b/kafka-schema-registry-client-7.2.2.jar differ diff --git a/kafka-schema-serializer-5.5.2.jar b/kafka-schema-serializer-5.5.2.jar deleted file mode 100644 index fdf96a8..0000000 Binary files a/kafka-schema-serializer-5.5.2.jar and /dev/null differ diff --git a/kafka-schema-serializer-7.2.2.jar b/kafka-schema-serializer-7.2.2.jar new file mode 100644 index 0000000..d6bb8c7 Binary files /dev/null and b/kafka-schema-serializer-7.2.2.jar differ diff --git a/flink-release-1.13.0.tar.gz b/node-16.13.2-linux-arm64.tar.gz similarity index 69% rename from flink-release-1.13.0.tar.gz rename to node-16.13.2-linux-arm64.tar.gz index b64fdbc..2f18dde 100644 Binary files a/flink-release-1.13.0.tar.gz and b/node-16.13.2-linux-arm64.tar.gz differ diff --git a/npm-8.1.2.tar.gz b/npm-8.1.2.tar.gz new file mode 100644 index 0000000..893bd9f Binary files /dev/null and b/npm-8.1.2.tar.gz differ diff --git a/release-1.12.7.tar.gz b/release-1.17.1.tar.gz similarity index 65% rename from release-1.12.7.tar.gz rename to release-1.17.1.tar.gz index 2bcc893..44a75f3 100644 Binary files a/release-1.12.7.tar.gz and b/release-1.17.1.tar.gz differ diff --git a/settings.xml b/settings.xml deleted file mode 100644 index 6ab9c83..0000000 --- a/settings.xml +++ /dev/null @@ -1,59 +0,0 @@ - - - - - - - - - - confluent - confluent - confluent - http://packages.confluent.io/maven - - - mapr-public - mapr-releases - mapr-releases - https://maven.aliyun.com/repository/mapr-public - - - nexus-aliyun - *,!jeecg,!jeecg-snapshots,!mapr-releases,!icm - Nexus aliyun - http://maven.aliyun.com/nexus/content/groups/public - - - - - - - - - aliyunmaven - aliyunmaven - https://maven.aliyun.com/repository/public - default - - true - - - true - - - - MavenCentral - http://repo1.maven.org/maven2/ - - - aliyunmavenApache - https://maven.aliyun.com/repository/apache-snapshots - - - - -