diff --git a/0001-change-npm.patch b/0001-change-npm.patch new file mode 100644 index 0000000000000000000000000000000000000000..1b39f9dad642960ac81cbb91ebd1bc124c14d8ce --- /dev/null +++ b/0001-change-npm.patch @@ -0,0 +1,71 @@ +diff -Naur druid-druid-27.0.0/distribution/docker/Dockerfile.mariadb druid-druid-27.0.0-change/distribution/docker/Dockerfile.mariadb +--- druid-druid-27.0.0/distribution/docker/Dockerfile.mariadb 2023-08-04 20:01:06.000000000 +0800 ++++ druid-druid-27.0.0-change/distribution/docker/Dockerfile.mariadb 2023-09-25 14:45:44.072319642 +0800 +@@ -22,7 +22,7 @@ + + WORKDIR /opt/druid/extensions/mysql-metadata-storage + +-ARG MARIA_URL=https://repo1.maven.org/maven2/org/mariadb/jdbc/mariadb-java-client/2.7.3/mariadb-java-client-2.7.3.jar ++ARG MARIA_URL=https://repo.huaweicloud.com/repository/maven/org/mariadb/jdbc/mariadb-java-client/2.7.3/mariadb-java-client-2.7.3.jar + ARG MARIA_JAR=mariadb-java-client-2.7.3.jar + ARG MARIA_SHA=4a2edc05bd882ad19371d2615c2635dccf8d74f0 + +diff -Naur druid-druid-27.0.0/distribution/docker/Dockerfile.mysql druid-druid-27.0.0-change/distribution/docker/Dockerfile.mysql +--- druid-druid-27.0.0/distribution/docker/Dockerfile.mysql 2023-08-04 20:01:06.000000000 +0800 ++++ druid-druid-27.0.0-change/distribution/docker/Dockerfile.mysql 2023-09-25 14:46:08.596485026 +0800 +@@ -22,7 +22,7 @@ + + WORKDIR /opt/druid/extensions/mysql-metadata-storage + +-ARG MYSQL_URL=https://repo1.maven.org/maven2/mysql/mysql-connector-java/5.1.49/mysql-connector-java-5.1.49.jar ++ARG MYSQL_URL=https://repo.huaweicloud.com/repository/maven/mysql/mysql-connector-java/5.1.49/mysql-connector-java-5.1.49.jar + ARG MYSQL_JAR=mysql-connector-java-5.1.49.jar + # https://repo1.maven.org/maven2/mysql/mysql-connector-java/5.1.49/mysql-connector-java-5.1.49.jar.sha1 + ARG MYSQL_SHA=cf76d2e4c9c3782a85c15c87bec5772b34ffd0e5 +diff -Naur druid-druid-27.0.0/pom.xml druid-druid-27.0.0-change/pom.xml +--- druid-druid-27.0.0/pom.xml 2023-08-04 20:01:06.000000000 +0800 ++++ druid-druid-27.0.0-change/pom.xml 2023-09-25 12:21:01.101749681 +0800 +@@ -156,7 +156,7 @@ + services + integration-tests + benchmarks +- web-console ++ + + cloud/aws-common + cloud/gcp-common +diff -Naur druid-druid-27.0.0/services/src/main/java/org/apache/druid/cli/PullDependencies.java druid-druid-27.0.0-change/services/src/main/java/org/apache/druid/cli/PullDependencies.java +--- druid-druid-27.0.0/services/src/main/java/org/apache/druid/cli/PullDependencies.java 2023-08-04 20:01:06.000000000 +0800 ++++ druid-druid-27.0.0-change/services/src/main/java/org/apache/druid/cli/PullDependencies.java 2023-09-25 16:05:32.680492207 +0800 +@@ -73,7 +73,7 @@ + private static final Logger log = new Logger(PullDependencies.class); + + private static final List DEFAULT_REMOTE_REPOSITORIES = ImmutableList.of( +- "https://repo1.maven.org/maven2/" ++ "https://repo.huaweicloud.com/repository/maven/" + ); + + private static final Dependencies PROVIDED_BY_CORE_DEPENDENCIES = +diff -Naur druid-druid-27.0.0/web-console/pom.xml druid-druid-27.0.0-change/web-console/pom.xml +--- druid-druid-27.0.0/web-console/pom.xml 2023-08-04 20:01:06.000000000 +0800 ++++ druid-druid-27.0.0-change/web-console/pom.xml 2023-09-25 10:51:00.421360509 +0800 +@@ -66,7 +66,8 @@ + npm + + +- ci ++ ci ++ https://repo.huaweicloud.com/repository/npm/ + ${project.build.directory} + + +@@ -76,7 +77,8 @@ + npm + + +- run check-licenses ++ run check-licenses ++ https://repo.huaweicloud.com/repository/npm/ + ${project.build.directory} + + diff --git a/druid-0.22.1.tar.gz b/druid-27.0.0.tar.gz similarity index 67% rename from druid-0.22.1.tar.gz rename to druid-27.0.0.tar.gz index e7a469c493c665e216765e571d070d52540e519d..6057dbe3fd7af104b6577276d9ee3cef6fe9e593 100644 Binary files a/druid-0.22.1.tar.gz and b/druid-27.0.0.tar.gz differ diff --git a/druid.spec b/druid.spec index 3bafede1f73837aa795cb11a13c92e578e1e7a2d..9abb5eb6b79ba6485a7e8a3551f4aa3259591427 100644 --- a/druid.spec +++ b/druid.spec @@ -2,16 +2,22 @@ %define debug_package %{nil} Name: druid -Version: 0.22.1 +Version: 27.0.0 Release: 1 Summary: Druid is a high performance real-time analytics. License: Apache-2.0 URL: https://druid.apache.org Source0: https://github.com/apache/druid/archive/refs/tags/%{name}-%{version}.tar.gz -Source1: settings.xml +Source1: https://repo.huaweicloud.com/kunpeng/maven/org/hyperic/sigar-dist/1.6.5.132/sigar-dist-1.6.5.132.zip +Source2: https://packages.confluent.io/maven/io/confluent/kafka-schema-registry-client/5.5.12/kafka-schema-registry-client-5.5.12.jar +Source3: https://packages.confluent.io/maven/io/confluent/kafka-schema-registry-client/6.0.1/kafka-schema-registry-client-6.0.1.jar +Source4: https://packages.confluent.io/maven/io/confluent/kafka-protobuf-provider/6.0.1/kafka-protobuf-provider-6.0.1.jar +Source5: https://packages.confluent.io/maven/io/confluent/kafka-protobuf-provider/5.5.12/kafka-protobuf-provider-5.5.12.jar -BuildRequires: java-1.8.0-openjdk-devel maven zlib npm gcc-c++ gcc gcc-gfortran libgcc python3-pip git +Patch0: 0001-change-npm.patch + +BuildRequires: java-1.8.0-openjdk-devel maven zlib npm gcc-c++ gcc gcc-gfortran libgcc python3-pip git npm Requires: java-1.8.0-openjdk %description @@ -19,22 +25,30 @@ Druid is a high performance real-time analytics. %prep %autosetup -p1 -n %{name}-%{name}-%{version} -cp %{SOURCE1} ./ +mvn install:install-file -DgroupId=org.hyperic -DartifactId=sigar-dist -Dversion=1.6.5.132 -Dpackaging=zip -Dfile=%{SOURCE1} +mvn install:install-file -DgroupId=io.confluent -DartifactId=kafka-schema-registry-client -Dversion=5.5.12 -Dpackaging=jar -Dfile=%{SOURCE2} +mvn install:install-file -DgroupId=io.confluent -DartifactId=kafka-schema-registry-client -Dversion=6.0.1 -Dpackaging=jar -Dfile=%{SOURCE3} +mvn install:install-file -DgroupId=io.confluent -DartifactId=kafka-protobuf-provider -Dversion=6.0.1 -Dpackaging=jar -Dfile=%{SOURCE4} +mvn install:install-file -DgroupId=io.confluent -DartifactId=kafka-protobuf-provider -Dversion=5.5.12 -Dpackaging=jar -Dfile=%{SOURCE5} %build -pip install pyyaml==5.4.1 -i https://pypi.tuna.tsinghua.edu.cn/simple -mvn clean install -Pdist -DskipTests -Dcheckstyle.skip -Dmaven.test.skip=true -s settings.xml +pip install pip install --trusted-host https://repo.huaweicloud.com -i https://repo.huaweicloud.com/repository/pypi/simple +pip3 install pyyaml==5.4.1 -i https://repo.huaweicloud.com/repository/pypi/simple +mvn clean install -Pdist -DskipTests -Dcheckstyle.skip -Dmaven.test.skip=true %install mkdir -p $RPM_BUILD_ROOT/opt/druid -cp -r %{_builddir}/druid-druid-0.22.1/distribution/target/apache-druid-0.22.1-bin.tar.gz %{_builddir} +cp -r %{_builddir}/druid-druid-%{version}/distribution/target/apache-druid-%{version}-bin.tar.gz %{_builddir} cd %{_builddir} -tar -xf apache-druid-0.22.1-bin.tar.gz -cp -r %{_builddir}/apache-druid-0.22.1 $RPM_BUILD_ROOT/opt/druid +tar -xf apache-druid-%{version}-bin.tar.gz +cp -r %{_builddir}/apache-druid-%{version} $RPM_BUILD_ROOT/opt/druid %files /opt/druid %changelog +* Mon Sep 25 2023 xiexing -27.0.0-1 +- update version + * Mon Apr 25 2022 xiexing -0.22.1-1 -Initial package release diff --git a/kafka-protobuf-provider-5.5.12.jar b/kafka-protobuf-provider-5.5.12.jar new file mode 100644 index 0000000000000000000000000000000000000000..5e8f2648e56b22dec699609e0d470bbd34a3002e Binary files /dev/null and b/kafka-protobuf-provider-5.5.12.jar differ diff --git a/kafka-protobuf-provider-6.0.1.jar b/kafka-protobuf-provider-6.0.1.jar new file mode 100644 index 0000000000000000000000000000000000000000..7385e667329ebbf7c6cf4052658a2b7b40313d4c Binary files /dev/null and b/kafka-protobuf-provider-6.0.1.jar differ diff --git a/kafka-schema-registry-client-5.5.12.jar b/kafka-schema-registry-client-5.5.12.jar new file mode 100644 index 0000000000000000000000000000000000000000..af62f032768dfe296bf471fa5dae3d489e5ca700 Binary files /dev/null and b/kafka-schema-registry-client-5.5.12.jar differ diff --git a/kafka-schema-registry-client-6.0.1.jar b/kafka-schema-registry-client-6.0.1.jar new file mode 100644 index 0000000000000000000000000000000000000000..95f447ea5fb1248ffb453055ef4e6b6324a0b436 Binary files /dev/null and b/kafka-schema-registry-client-6.0.1.jar differ diff --git a/sigar-dist-1.6.5.132.zip b/sigar-dist-1.6.5.132.zip new file mode 100644 index 0000000000000000000000000000000000000000..2ffc6d81101a9be25e3d3fdb79cc1752111ef9b1 Binary files /dev/null and b/sigar-dist-1.6.5.132.zip differ