!44 修改22.03-LTS-Next分支编译失败问题

From: @macchen1 
Reviewed-by: @wuzeyi1 
Signed-off-by: @wuzeyi1

xmvn-reactor

@@ -0,0 +1,71 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<metadata xmlns="http://fedorahosted.org/xmvn/METADATA/3.0.0">
+  <artifacts>
+    <artifact>
+      <groupId>org.apache.zookeeper</groupId>
+      <artifactId>zookeeper</artifactId>
+      <version>3.6.2</version>
+      <path>absolute-prefix/zookeeper-server/target/zookeeper-3.6.2.jar</path>
+      <properties>
+        <type>jar</type>
+        <requiresJava>1.6</requiresJava>
+      </properties>
+    </artifact>
+    <artifact>
+      <groupId>org.apache.zookeeper</groupId>
+      <artifactId>zookeeper</artifactId>
+      <extension>pom</extension>
+      <version>3.6.2</version>
+      <path>absolute-prefix/zookeeper-server/pom.xml</path>
+      <properties>
+        <type>jar</type>
+        <requiresJava>1.6</requiresJava>
+      </properties>
+    </artifact>
+
+    <artifact>
+      <groupId>org.apache.zookeeper</groupId>
+      <artifactId>zookeeper-jute</artifactId>
+      <version>3.6.2</version>
+      <path>absolute-prefix/zookeeper-jute/target/zookeeper-jute-3.6.2.jar</path>
+      <properties>
+        <type>jar</type>
+        <requiresJava>1.6</requiresJava>
+      </properties>
+    </artifact>
+    <artifact>
+      <groupId>org.apache.zookeeper</groupId>
+      <artifactId>zookeeper-jute</artifactId>
+      <extension>pom</extension>
+      <version>3.6.2</version>
+      <path>absolute-prefix/zookeeper-jute/pom.xml</path>
+      <properties>
+        <type>jar</type>
+        <requiresJava>1.6</requiresJava>
+      </properties>
+    </artifact>
+
+    <artifact>
+      <groupId>org.apache.zookeeper</groupId>
+      <artifactId>zookeeper-prometheus-metrics</artifactId>
+      <version>3.6.2</version>
+      <path>absolute-prefix/zookeeper-metrics-providers/zookeeper-prometheus-metrics/target/zookeeper-prometheus-metrics-3.6.2.jar</path>
+      <properties>
+        <type>jar</type> 
+        <requiresJava>1.6</requiresJava>
+      </properties> 
+    </artifact>
+    <artifact>
+      <groupId>org.apache.zookeeper</groupId>
+      <artifactId>zookeeper-prometheus-metrics</artifactId>
+      <extension>pom</extension>
+      <version>3.6.2</version>
+      <path>absolute-prefix/zookeeper-metrics-providers/zookeeper-prometheus-metrics/pom.xml</path> 
+      <properties> 
+        <type>jar</type>
+        <requiresJava>1.6</requiresJava>
+      </properties>
+    </artifact>
+
+  </artifacts>
+</metadata>

zookeeper.service

@@ -12,7 +12,8 @@ Group=zookeeper
 ExecStart=/opt/zookeeper/bin/zkServer.sh start /opt/zookeeper/conf/zoo.cfg
 ExecStop=/opt/zookeeper/bin/zkServer.sh stop /opt/zookeeper/conf/zoo.cfg
 ExecReload=/opt/zookeeper/bin/zkServer.sh restart /opt/zookeeper/conf/zoo.cfg
-Restart=on-failure
+Restart=always
+SuccessExitStatus=143
 
 [Install]
-WantedBy=default.target
+WantedBy=default.target

zookeeper.spec

@@ -1,11 +1,11 @@
 %define rel_ver 3.6.2
-%define pkg_ver 2.0
+%define pkg_ver 2.4
 %define _prefix /opt/zookeeper
 
 Summary: High-performance coordination service for distributed applications.
 Name: zookeeper
 Version: %{rel_ver}
-Release: %{pkg_ver}%{?dist}
+Release: %{pkg_ver}
 License: Apache-2.0 and OpenSSL and SSLeay and MIT and BSD
 Group: Applications/Databases
 URL: https://www.apache.org/dist/zookeeper/
@@ -15,15 +15,23 @@ Source1: zoo.cfg
 Source2: zookeeper.service
 Source3: zookeeper.sysconfig
 Source4: log4j.properties 
+Source5: xmvn-reactor
 BuildRoot: %{_tmppath}/%{name}-%{rel_ver}-%{release}-root
-BuildRequires: java-1.8.0-openjdk-devel,maven,hostname
+BuildRequires: java-1.8.0-openjdk-devel,maven,hostname,maven-local,systemd
 Requires: java-1.8.0-openjdk,systemd
+Provides: apache-zookeeper
+Provides: mvn(org.apche.zookeeper:zookeeper)
 
 %description
 ZooKeeper is a centralized service for maintaining configuration information, naming, providing distributed synchronization, and providing group services.
 
 %prep
 %setup -q -n zookeeper-release-%{version}
+cp %{SOURCE5} ./.xmvn-reactor
+echo `pwd` > absolute_prefix.log
+sed -i 's/\//\\\//g' absolute_prefix.log
+absolute_prefix=`head -n 1 absolute_prefix.log`
+sed -i 's/absolute-prefix/'"$absolute_prefix"'/g' .xmvn-reactor
 
 %build
 mvn -DskipTests package
@@ -31,6 +39,8 @@ tar xvf zookeeper-assembly/target/apache-%{name}-%{rel_ver}-bin.tar.gz -C .
 cp -r apache-%{name}-%{rel_ver}-bin/lib .
 
 %install
+%mvn_install
+
 mkdir -p %{buildroot}%{_prefix}/bin
 mkdir -p %{buildroot}%{_prefix}/lib
 mkdir -p %{buildroot}%{_prefix}/conf
@@ -48,7 +58,7 @@ install -p -D -m 644 %{S:4} %{buildroot}%{_prefix}/conf/log4j.properties
 %clean
 rm -rf %{buildroot}
 
-%files
+%files -f .mfiles
 %defattr(-,root,root)
 %attr(-,zookeeper,zookeeper) %{_prefix}
 %dir %attr(744, zookeeper, zookeeper) %{_localstatedir}/log/zookeeper
@@ -72,5 +82,20 @@ exit 0
 %systemd_postun_with_restart zookeeper.service
 
 %changelog
+* Mon Nov 7 2022 MacChen1 <mac.chenqiang@huawei.com> - 3.6.2-2.4
+- Fix the build problem
+
+* Thu Jun 24 2021 Ge Wang <wangge20@huawei.com> - 2.3
+- Add provides item apache-zookeeper and add packages to system default java package directory
+
+* Fri Jun 18 2021 lingsheng <lingsheng@huawei.com> - 2.2
+- Fix reload service failure
+
+* Thu Apr 1 2021 zhangshaoning <zhangshaoning@uniontech.com> - 2.1
+- Repair status failure after stopping service
+
+* Thu Mar 25 2021 baizhonggui <baizhonggui@huawei.com> - 2.0
+- Delete %{dist} in Release
+
 * Sun Jun 28 2020 hao zhang <unioah@isrc.iscas.ac.cn> - 1.0
 - Add zookeeper.service