!2 【软件升级】openEuler 22.03 LTS版本HdrHistogram软件升级至2.1.12

Merge pull request !2 from 王歌/openEuler-22.03-LTS-Next

HdrHistogram.spec

@@ -1,14 +1,15 @@
 Name:                HdrHistogram
-Version:             2.1.11
+Version:             2.1.12
 Release:             1
 Summary:             A High Dynamic Range (HDR) Histogram
-License:             BSD and CC0
+License:             Public Domain and BSD and CC0
 URL:                 http://hdrhistogram.github.io/%{name}/
 Source0:             https://github.com/%{name}/%{name}/archive/%{name}-%{version}.tar.gz
-BuildRequires:       maven-local mvn(com.google.code.maven-replacer-plugin:replacer)
-BuildRequires:       mvn(junit:junit) mvn(org.sonatype.oss:oss-parent:pom:)
-BuildRequires:       mvn(org.apache.felix:maven-bundle-plugin)
+Source1:             xmvn-reactor
+BuildRequires:       maven-local 
+BuildRequires:       java-1.8.0-openjdk-devel maven
 Requires:            javapackages-tools
+Requires:            java-1.8.0-openjdk
 BuildArch:           noarch
 %description
 HdrHistogram supports the recording and analyzing sampled data value
@@ -27,19 +28,28 @@ This package contains javadoc for %{name}.
 %setup -q -n %{name}-%{name}-%{version}
 find  -name "*.class"  -print -delete
 find  -name "*.jar"  -print -delete
+sed -i 's/1.4.0/1.5.0/g' pom.xml
+cp %{SOURCE1} ./.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
 %pom_remove_plugin :maven-dependency-plugin
-%pom_remove_plugin :maven-javadoc-plugin
 %pom_remove_plugin :maven-release-plugin
 %pom_remove_plugin :maven-source-plugin
 %pom_remove_plugin :nexus-staging-maven-plugin
+%pom_remove_plugin :maven-gpg-plugin
+
 %pom_xpath_set "pom:plugin[pom:groupId = 'com.google.code.maven-replacer-plugin' ]/pom:artifactId" replacer
 %mvn_file :%{name} %{name}
 
 %build
-%mvn_build
+mvn -DskipTests -DskipIT package
 
 %install
 %mvn_install
+install -d -m 0755 %{buildroot}/%{_javadocdir}/HdrHistogram
+install -m 0755 target/HdrHistogram-2.1.12-javadoc.jar %{buildroot}/%{_javadocdir}/HdrHistogram
 %jpackage_script org.%{name}.HistogramLogProcessor "" "" %{name} HistogramLogProcessor true
 
 %files -f .mfiles
@@ -47,9 +57,13 @@ find  -name "*.jar"  -print -delete
 %doc README.md
 %license COPYING.txt LICENSE.txt
 
-%files javadoc -f .mfiles-javadoc
+%files javadoc 
+%{_javadocdir}/HdrHistogram
 %license COPYING.txt LICENSE.txt
 
 %changelog
+* Wed Dec 29 2021 Ge Wang <wangge20@huawei.com> - 2.1.12-1
+- update to version 2.1.12
+
 * Thu Jul 30 2020 wangyue <wangyue92@huawei.com> - 2.1.11-1
 - package init

xmvn-reactor

@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<metadata xmlns="http://fedorahosted.org/xmvn/METADATA/3.0.0">
+  <artifacts>
+    <artifact>
+      <groupId>org.hdrhistogram</groupId>
+      <artifactId>HdrHistogram</artifactId>
+      <version>2.1.12</version>
+      <path>absolute-prefix/target/HdrHistogram-2.1.12.jar</path>
+      <properties>
+        <type>bundle</type>
+        <requiresJava>1.6</requiresJava>
+      </properties>
+    </artifact>
+    <artifact>
+      <groupId>org.hdrhistogram</groupId>
+      <artifactId>HdrHistogram</artifactId>
+      <extension>pom</extension>
+      <version>2.1.12</version>
+      <path>absolute-prefix/pom.xml</path>
+      <properties>
+        <type>bundle</type>
+        <requiresJava>1.6</requiresJava>
+      </properties>
+    </artifact>
+  </artifacts>
+</metadata>