!46 更新版本1.17.1

From: @xiexing01 
Reviewed-by: @macchen1 
Signed-off-by: @macchen1
This commit is contained in:
openeuler-ci-bot 2023-10-09 06:32:34 +00:00 committed by Gitee
commit c80ce77947
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
16 changed files with 60 additions and 160 deletions

View File

@ -1,32 +1,27 @@
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.
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 @@
</goals>
<configuration>
<arguments>ci --cache-max=0 --no-save</arguments>
+ <npmRegistryURL>https://mirrors.huaweicloud.com/repository/npm</npmRegistryURL>
<nodeVersion>v16.13.2</nodeVersion>
+ <downloadRoot>https://repo.huaweicloud.com/nodejs/</downloadRoot>
<npmVersion>8.1.2</npmVersion>
</configuration>
</execution>
@@ -269,6 +270,7 @@
</goals>
<configuration>
<arguments>ci --cache-max=0 --no-save ${npm.proxy}</arguments>
+ <npmRegistryURL>https://repo.huaweicloud.com/repository/npm</npmRegistryURL>
<environmentVariables>
<HUSKY_SKIP_INSTALL>true</HUSKY_SKIP_INSTALL>
</environmentVariables>
@@ -283,6 +284,7 @@ under the License.
@@ -281,6 +283,7 @@
</goals>
<configuration>
<arguments>run build</arguments>
+ <npmRegistryURL>https://mirrors.huaweicloud.com/repository/npm</npmRegistryURL>
<arguments>run ci-check</arguments>
+ <npmRegistryURL>https://repo.huaweicloud.com/repository/npm</npmRegistryURL>
</configuration>
</execution>
</executions>
--
2.23.0

View File

@ -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 @@
<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>io.confluent</groupId>
+ <artifactId>kafka-schema-serializer</artifactId>
+ <version>7.2.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>
<artifactId>flink-connector-kafka</artifactId>

View File

@ -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 @@
<properties>
<kafka.version>3.2.3</kafka.version>
<confluent.version>7.2.2</confluent.version>
+ <maven.test.skip>true</maven.test.skip>
</properties>
<repositories>

View File

@ -1,25 +0,0 @@
From 2a34491f2b3763d7cc7835ebfe0bfa2668066872 Mon Sep 17 00:00:00 2001
From: Wenlong Zhang <zhangwenlong@loongson.cn>
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.
<extension>
<groupId>kr.motd.maven</groupId>
<artifactId>os-maven-plugin</artifactId>
- <version>1.7.0</version>
+ <version>1.7.1</version>
</extension>
</extensions>
--
2.27.0

View File

@ -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 <xiexing4@hisilicon.com> - 1.17.1-1
- update version to 1.17.1
* Mon May 8 2023 Wenlong Zhang <zhangwenlong@loongson.cn> - 1.13.0-2
- add loongarch64 support

Binary file not shown.

Binary file not shown.

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

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

BIN
npm-8.1.2.tar.gz Normal file

Binary file not shown.

View File

@ -1,59 +0,0 @@
<settings xmlns="http://maven.apache.org/SETTINGS/1.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/SETTINGS/1.0.0
http://maven.apache.org/xsd/settings-1.0.0.xsd">
<localRepository/>
<interactiveMode/>
<usePluginRegistry/>
<offline/>
<pluginGroups/>
<servers/>
<mirrors>
<mirror>
<id>confluent</id>
<mirrorOf>confluent</mirrorOf>
<name>confluent</name>
<url>http://packages.confluent.io/maven</url>
</mirror>
<mirror>
<id>mapr-public</id>
<mirrorOf>mapr-releases</mirrorOf>
<name>mapr-releases</name>
<url>https://maven.aliyun.com/repository/mapr-public</url>
</mirror>
<mirror>
<id>nexus-aliyun</id>
<mirrorOf>*,!jeecg,!jeecg-snapshots,!mapr-releases,!icm</mirrorOf>
<name>Nexus aliyun</name>
<url>http://maven.aliyun.com/nexus/content/groups/public</url>
</mirror>
</mirrors>
<proxies/>
<activeProfiles/>
<profiles>
<profile>
<repositories>
<repository>
<id>aliyunmaven</id>
<name>aliyunmaven</name>
<url>https://maven.aliyun.com/repository/public</url>
<layout>default</layout>
<releases>
<enabled>true</enabled>
</releases>
<snapshots>
<enabled>true</enabled>
</snapshots>
</repository>
<repository>
<id>MavenCentral</id>
<url>http://repo1.maven.org/maven2/</url>
</repository>
<repository>
<id>aliyunmavenApache</id>
<url>https://maven.aliyun.com/repository/apache-snapshots</url>
</repository>
</repositories>
</profile>
</profiles>
</settings>