Compare commits
No commits in common. "a4f7632209e1301c0e52be0ec7153551125ba7ac" and "845f2822ba1ef5f4d1caa09dfe66455a06e72ec7" have entirely different histories.
a4f7632209
...
845f2822ba
@ -1,32 +0,0 @@
|
|||||||
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
|
|
||||||
|
|
||||||
@ -1,28 +0,0 @@
|
|||||||
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>
|
|
||||||
@ -1,25 +0,0 @@
|
|||||||
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
|
|
||||||
|
|
||||||
28
flink.spec
28
flink.spec
@ -3,28 +3,21 @@
|
|||||||
%global debug_package %{nil}
|
%global debug_package %{nil}
|
||||||
|
|
||||||
# Use local caches compile
|
# Use local caches compile
|
||||||
%global compile_for_local 0
|
%global compile_for_local 1
|
||||||
|
|
||||||
%global with_debug 0
|
%global with_debug 0
|
||||||
|
|
||||||
%global with_tests 0
|
%global with_tests 0
|
||||||
|
|
||||||
Name: flink
|
Name: flink
|
||||||
Version: 1.12.7
|
Version: 1.12.0
|
||||||
Release: 2
|
Release: 2
|
||||||
Summary: Stateful Computations over Data Streams
|
Summary: Stateful Computations over Data Streams
|
||||||
License: Apache License v2.0
|
License: Apache License v2.0
|
||||||
URL: https://github.com/apache/%{name}
|
URL: https://github.com/apache/%{name}
|
||||||
Source0: https://github.com/apache/%{name}/archive/release-%{version}.tar.gz
|
Source0: https://github.com/apache/%{name}/archive/release-%{version}.tar.gz
|
||||||
Source1: settings.xml
|
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
|
BuildRequires: java-1.8.0-openjdk-devel maven
|
||||||
Requires: java-1.8.0-openjdk
|
Requires: java-1.8.0-openjdk
|
||||||
|
|
||||||
@ -34,10 +27,7 @@ Apache Flink is a framework and distributed processing engine for stateful compu
|
|||||||
|
|
||||||
%prep
|
%prep
|
||||||
%autosetup -p1 -n %{name}-release-%{version}
|
%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
|
%build
|
||||||
|
|
||||||
maven_cmd="clean package "
|
maven_cmd="clean package "
|
||||||
@ -69,18 +59,6 @@ find %{buildroot}/opt/apache-%{name}-%{version}/ -type f -name '*.py' | xargs -i
|
|||||||
%license LICENSE
|
%license LICENSE
|
||||||
|
|
||||||
%changelog
|
%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
|
* Thu Dec 17 2020 weidong <weidong@uniontech.com> - 1.12.0-2
|
||||||
- Fix compilation issues.
|
- Fix compilation issues.
|
||||||
|
|
||||||
|
|||||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Loading…
x
Reference in New Issue
Block a user