diff --git a/2.2.5.tar.gz b/2.5.0.tar.gz similarity index 73% rename from 2.2.5.tar.gz rename to 2.5.0.tar.gz index c4f233c6f1408e79e8100e0778352cff281015bd..5eaf2fb7339721efd00acc3e8245803ebbfa156a 100644 Binary files a/2.2.5.tar.gz and b/2.5.0.tar.gz differ diff --git a/commons-crypto-1.1.0-linux-aarch64.jar b/commons-crypto-1.1.0-linux-aarch64.jar new file mode 100644 index 0000000000000000000000000000000000000000..ce585ffc15e5105c435d8bd60218f45ffa22fa57 Binary files /dev/null and b/commons-crypto-1.1.0-linux-aarch64.jar differ diff --git a/hbase.spec b/hbase.spec index d534931cacb6d0bcda48c7052b43f54af71789d0..a53f514a1141f7b73209b21789ef3fde66551ef2 100644 --- a/hbase.spec +++ b/hbase.spec @@ -7,7 +7,7 @@ %global package_native 0 Name: hbase -Version: 2.2.5 +Version: 2.5.0 Release: 1 Summary: A database for Apache Hadoop License: Apache-2.0 and BSD and CPL-1.0 and EPL-1.0 and MIT @@ -17,6 +17,10 @@ Source1: %{name}.logrotate Source2: %{name}-site.xml Source3: %{name}.service.template Source4: xmvn-reactor +Source5: commons-crypto-1.1.0-linux-aarch64.jar +Source6: jdk.tools-1.8.0.jar +Source7: jdk.tools-1.8.0.pom +Source8: settings.xml BuildArch: noarch BuildRequires: cmake @@ -75,7 +79,7 @@ This package contains the API documentation for %{name}. %prep %setup -qn %{name}-rel-%{version} -mvn install:install-file -DgroupId=com.google.protobuf -DartifactId=protoc -Dversion=2.5.0 -Dclassifier=linux-aarch_64 -Dpackaging=exe -Dfile=/usr/bin/protoc +mvn install:install-file -s %{SOURCE8} -DgroupId=com.google.protobuf -DartifactId=protoc -Dversion=2.5.0 -Dclassifier=linux-aarch_64 -Dpackaging=exe -Dfile=/usr/bin/protoc cp %{SOURCE4} ./.xmvn-reactor echo `pwd` > absolute_prefix.log sed -i 's/\//\\\//g' absolute_prefix.log @@ -83,7 +87,14 @@ absolute_prefix=`head -n 1 absolute_prefix.log` sed -i 's/absolute-prefix/'"$absolute_prefix"'/g' .xmvn-reactor %build -mvn -Pnative clean install -DskipTests assembly:single -Prelease -Dmaven.javadoc.skip=true -Drat.skip=true +sysVer="aarch64" +if [ "$(uname -m)" = ${sysVer} ]; then + mvn install:install-file -Dfile=%{SOURCE5} -s %{SOURCE8} -DgroupId=org.apache.commons -DartifactId=commons-crypto -Dversion=1.1.0 -Dpackaging=jar +fi +mvn install:install-file -Dfile=%{SOURCE6} -s %{SOURCE8} -DgroupId=jdk.tools -DartifactId=jdk.tools -Dversion=1.8 -Dpackaging=jar +mvn install:install-file -Dfile=%{SOURCE7} -s %{SOURCE8} -DgroupId=jdk.tools -DartifactId=jdk.tools -Dversion=1.8 -Dpackaging=pom + +mvn -Pnative clean install -s %{SOURCE8} -DskipTests assembly:single -Prelease -Dmaven.javadoc.skip=true -Drat.skip=true %if %{with tests} %check @@ -154,9 +165,9 @@ pushd %{name}-assembly/target/%{name}-%{version} cp -arp %{name}-webapps/* %{buildroot}/%{_datadir}/%{name}/%{name}-webapps # Dependency jars - install -m 0755 lib/hbase-shaded-miscellaneous-2.2.1.jar %{buildroot}%{_datadir}/java/%{name}/hbase-shaded-miscellaneous-2.2.1.jar - install -m 0755 lib/hbase-shaded-netty-2.2.1.jar %{buildroot}%{_datadir}/java/%{name}/hbase-shaded-netty-2.2.1.jar - install -m 0755 lib/hbase-shaded-protobuf-2.2.1.jar %{buildroot}%{_datadir}/java/%{name}/hbase-shaded-protobuf-2.2.1.jar + install -m 0755 lib/hbase-shaded-miscellaneous-4.1.1.jar %{buildroot}%{_datadir}/java/%{name}/hbase-shaded-miscellaneous-4.1.1.jar + install -m 0755 lib/hbase-shaded-netty-4.1.1.jar %{buildroot}%{_datadir}/java/%{name}/hbase-shaded-netty-4.1.1.jar + install -m 0755 lib/hbase-shaded-protobuf-4.1.1.jar %{buildroot}%{_datadir}/java/%{name}/hbase-shaded-protobuf-4.1.1.jar install lib/*.jar %{buildroot}/%{_datadir}/%{name}/lib rm -f %{buildroot}/%{_datadir}/%{name}/lib/tools-*.jar rm -f %{buildroot}/%{_datadir}/%{name}/lib/%{name}*-tests.jar @@ -289,9 +300,9 @@ fi %attr(0755,hbase,hbase) %dir %{_var}/cache/%{name} %attr(0755,hbase,hbase) %dir %{_var}/log/%{name} %attr(0755,hbase,hbase) %dir %{_var}/run/%{name} -%attr(0755,root,root) %{_datadir}/java/%{name}/hbase-shaded-miscellaneous-2.2.1.jar -%attr(0755,root,root) %{_datadir}/java/%{name}/hbase-shaded-netty-2.2.1.jar -%attr(0755,root,root) %{_datadir}/java/%{name}/hbase-shaded-protobuf-2.2.1.jar +%attr(0755,root,root) %{_datadir}/java/%{name}/hbase-shaded-miscellaneous-4.1.1.jar +%attr(0755,root,root) %{_datadir}/java/%{name}/hbase-shaded-netty-4.1.1.jar +%attr(0755,root,root) %{_datadir}/java/%{name}/hbase-shaded-protobuf-4.1.1.jar %if %{package_native} %files native @@ -300,5 +311,8 @@ fi %endif %changelog +* Fri Aug 25 2023 huangzhaohan <307510108@qq.com> 2.5.0-1 +- Upgrade Hbase Version to 2.5.0 + * Tue Mar 16 2021 Ge Wang 2.2.5-1 - Init package diff --git a/jdk.tools-1.8.0.jar b/jdk.tools-1.8.0.jar new file mode 100644 index 0000000000000000000000000000000000000000..201bff98c9c01fb67bdce23e9fecc1a696d09356 Binary files /dev/null and b/jdk.tools-1.8.0.jar differ diff --git a/jdk.tools-1.8.0.pom b/jdk.tools-1.8.0.pom new file mode 100644 index 0000000000000000000000000000000000000000..7b691285355728b9de06dae03fbb7edadbf72d2f --- /dev/null +++ b/jdk.tools-1.8.0.pom @@ -0,0 +1,9 @@ + + + 4.0.0 + + jdk.tools + jdk.tools + 1.8.0 + diff --git a/settings.xml b/settings.xml new file mode 100644 index 0000000000000000000000000000000000000000..47cf8bd4ee208b808c3b83912be5679e079ff5b8 --- /dev/null +++ b/settings.xml @@ -0,0 +1,21 @@ + + + + + + + + + + + big + * + huaweicloud + https://repo.huaweicloud.com/repository/maven/ + + + + + diff --git a/xmvn-reactor b/xmvn-reactor index bd3a6bb6f03640dadf399fc5cd73ed60329fd8b8..9e141b539e1a028ab671e5d454f6168adab5f57a 100644 --- a/xmvn-reactor +++ b/xmvn-reactor @@ -5,253 +5,253 @@ org.apache.hbase hbase-assembly pom - 2.2.5 + 2.5.0 absolute-prefix/hbase-assembly/pom.xml jar - 1.6 + 1.8 org.apache.hbase hbase-client - 2.2.5 - absolute-prefix/hbase-client/target/hbase-client-2.2.5.jar + 2.5.0 + absolute-prefix/hbase-client/target/hbase-client-2.5.0.jar jar - 1.6 + 1.8 org.apache.hbase hbase-client pom - 2.2.5 + 2.5.0 absolute-prefix/hbase-client/pom.xml jar - 1.6 + 1.8 org.apache.hbase hbase-common - 2.2.5 - absolute-prefix/hbase-common/target/hbase-common-2.2.5.jar + 2.5.0 + absolute-prefix/hbase-common/target/hbase-common-2.5.0.jar jar - 1.6 + 1.8 org.apache.hbase hbase-common pom - 2.2.5 + 2.5.0 absolute-prefix/hbase-common/pom.xml jar - 1.6 + 1.8 org.apache.hbase hbase-examples - 2.2.5 - absolute-prefix/hbase-examples/target/hbase-examples-2.2.5.jar + 2.5.0 + absolute-prefix/hbase-examples/target/hbase-examples-2.5.0.jar jar - 1.6 + 1.8 org.apache.hbase hbase-examples pom - 2.2.5 + 2.5.0 absolute-prefix/hbase-examples/pom.xml jar - 1.6 + 1.8 org.apache.hbase hbase-hadoop-compat - 2.2.5 - absolute-prefix/hbase-hadoop-compat/target/hbase-hadoop-compat-2.2.5.jar + 2.5.0 + absolute-prefix/hbase-hadoop-compat/target/hbase-hadoop-compat-2.5.0.jar jar - 1.6 + 1.8 org.apache.hbase hbase-hadoop-compat pom - 2.2.5 + 2.5.0 absolute-prefix/hbase-hadoop-compat/pom.xml jar - 1.6 + 1.8 org.apache.hbase hbase-hadoop2-compat - 2.2.5 - absolute-prefix/hbase-hadoop2-compat/target/hbase-hadoop2-compat-2.2.5.jar + 2.5.0 + absolute-prefix/hbase-hadoop2-compat/target/hbase-hadoop2-compat-2.5.0.jar jar - 1.6 + 1.8 org.apache.hbase hbase-hadoop2-compat pom - 2.2.5 + 2.5.0 absolute-prefix/hbase-hadoop2-compat/pom.xml jar - 1.6 + 1.8 org.apache.hbase hbase-it - 2.2.5 - absolute-prefix/hbase-it/target/hbase-it-2.2.5.jar + 2.5.0 + absolute-prefix/hbase-it/target/hbase-it-2.5.0.jar jar - 1.6 + 1.8 org.apache.hbase hbase-it pom - 2.2.5 + 2.5.0 absolute-prefix/hbase-it/pom.xml jar - 1.6 + 1.8 org.apache.hbase hbase-protocol - 2.2.5 - absolute-prefix/hbase-protocol/target/hbase-protocol-2.2.5.jar + 2.5.0 + absolute-prefix/hbase-protocol/target/hbase-protocol-2.5.0.jar jar - 1.6 + 1.8 org.apache.hbase hbase-protocol pom - 2.2.5 + 2.5.0 absolute-prefix/hbase-protocol/pom.xml jar - 1.6 + 1.8 org.apache.hbase hbase-server - 2.2.5 - absolute-prefix/hbase-server/target/hbase-server-2.2.5.jar + 2.5.0 + absolute-prefix/hbase-server/target/hbase-server-2.5.0.jar jar - 1.6 + 1.8 org.apache.hbase hbase-server pom - 2.2.5 + 2.5.0 absolute-prefix/hbase-server/pom.xml jar - 1.6 + 1.8 org.apache.hbase hbase-shell - 2.2.5 - absolute-prefix/hbase-shell/target/hbase-shell-2.2.5.jar + 2.5.0 + absolute-prefix/hbase-shell/target/hbase-shell-2.5.0.jar jar - 1.6 + 1.8 org.apache.hbase hbase-shell pom - 2.2.5 + 2.5.0 absolute-prefix/hbase-shell/pom.xml jar - 1.6 + 1.8 org.apache.hbase hbase-thrift - 2.2.5 - absolute-prefix/hbase-thrift/target/hbase-thrift-2.2.5.jar + 2.5.0 + absolute-prefix/hbase-thrift/target/hbase-thrift-2.5.0.jar jar - 1.6 + 1.8 org.apache.hbase hbase-thrift pom - 2.2.5 + 2.5.0 absolute-prefix/hbase-thrift/pom.xml jar - 1.6 + 1.8 @@ -259,192 +259,192 @@ org.apache.hbase hbase pom - 2.2.5 + 2.5.0 absolute-prefix/pom.xml jar - 1.6 + 1.8 org.apache.hbase hbase-annotations - 2.2.5 - absolute-prefix/hbase-annotations/target/hbase-annotations-2.2.5.jar + 2.5.0 + absolute-prefix/hbase-annotations/target/hbase-annotations-2.5.0.jar jar - 1.6 + 1.8 org.apache.hbase hbase-endpoint - 2.2.5 - absolute-prefix/hbase-endpoint/target/hbase-endpoint-2.2.5.jar + 2.5.0 + absolute-prefix/hbase-endpoint/target/hbase-endpoint-2.5.0.jar jar - 1.6 + 1.8 org.apache.hbase hbase-external-blockcache - 2.2.5 - absolute-prefix/hbase-external-blockcache/target/hbase-external-blockcache-2.2.5.jar + 2.5.0 + absolute-prefix/hbase-external-blockcache/target/hbase-external-blockcache-2.5.0.jar jar - 1.6 + 1.8 org.apache.hbase hbase-hbtop - 2.2.5 - absolute-prefix/hbase-hbtop/target/hbase-hbtop-2.2.5.jar + 2.5.0 + absolute-prefix/hbase-hbtop/target/hbase-hbtop-2.5.0.jar jar - 1.6 + 1.8 org.apache.hbase hbase-http - 2.2.5 - absolute-prefix/hbase-http/target/hbase-http-2.2.5.jar + 2.5.0 + absolute-prefix/hbase-http/target/hbase-http-2.5.0.jar jar - 1.6 + 1.8 org.apache.hbase hbase-mapreduce - 2.2.5 - absolute-prefix/hbase-mapreduce/target/hbase-mapreduce-2.2.5.jar + 2.5.0 + absolute-prefix/hbase-mapreduce/target/hbase-mapreduce-2.5.0.jar jar - 1.6 + 1.8 org.apache.hbase hbase-metrics - 2.2.5 - absolute-prefix/hbase-metrics/target/hbase-metrics-2.2.5.jar + 2.5.0 + absolute-prefix/hbase-metrics/target/hbase-metrics-2.5.0.jar jar - 1.6 + 1.8 org.apache.hbase hbase-metrics-api - 2.2.5 - absolute-prefix/hbase-metrics-api/target/hbase-metrics-api-2.2.5.jar + 2.5.0 + absolute-prefix/hbase-metrics-api/target/hbase-metrics-api-2.5.0.jar jar - 1.6 + 1.8 org.apache.hbase hbase-procedure - 2.2.5 - absolute-prefix/hbase-procedure/target/hbase-procedure-2.2.5.jar + 2.5.0 + absolute-prefix/hbase-procedure/target/hbase-procedure-2.5.0.jar jar - 1.6 + 1.8 org.apache.hbase hbase-protocol-shaded - 2.2.5 - absolute-prefix/hbase-protocol-shaded/target/hbase-protocol-shaded-2.2.5.jar + 2.5.0 + absolute-prefix/hbase-protocol-shaded/target/hbase-protocol-shaded-2.5.0.jar jar - 1.6 + 1.8 org.apache.hbase hbase-replication - 2.2.5 - absolute-prefix/hbase-replication/target/hbase-replication-2.2.5.jar + 2.5.0 + absolute-prefix/hbase-replication/target/hbase-replication-2.5.0.jar jar - 1.6 + 1.8 org.apache.hbase hbase-resource-bundle - 2.2.5 - absolute-prefix/hbase-resource-bundle/target/hbase-resource-bundle-2.2.5.jar + 2.5.0 + absolute-prefix/hbase-resource-bundle/target/hbase-resource-bundle-2.5.0.jar jar - 1.6 + 1.8 org.apache.hbase hbase-rest - 2.2.5 - absolute-prefix/hbase-rest/target/hbase-rest-2.2.5.jar + 2.5.0 + absolute-prefix/hbase-rest/target/hbase-rest-2.5.0.jar jar - 1.6 + 1.8 org.apache.hbase hbase-rsgroup - 2.2.5 - absolute-prefix/hbase-rsgroup/target/hbase-rsgroup-2.2.5.jar + 2.5.0 + absolute-prefix/hbase-rsgroup/target/hbase-rsgroup-2.5.0.jar jar - 1.6 + 1.8 org.apache.hbase hbase-zookeeper - 2.2.5 - absolute-prefix/hbase-zookeeper/target/hbase-zookeeper-2.2.5.jar + 2.5.0 + absolute-prefix/hbase-zookeeper/target/hbase-zookeeper-2.5.0.jar jar - 1.6 + 1.8