From 5e209ec6f2ff140784a8cef3e898317f5fed3093 Mon Sep 17 00:00:00 2001
From: DistroBaker <osci-list@redhat.com>
Date: Fri, 29 Jan 2021 07:34:35 +0000
Subject: [PATCH] Merged update from upstream sources

This is an automated DistroBaker update from upstream sources.
If you do not know what this is about or would like to opt out,
contact the OSCI team.

Source: https://src.fedoraproject.org/rpms/HdrHistogram.git#3ed57c9e056637fd343b8cb39fc39f10eb9ff7a0
---
 .gitignore        |  1 +
 HdrHistogram.spec | 13 ++++++++++---
 sources           |  2 +-
 3 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/.gitignore b/.gitignore
index 45b47d4..c67f163 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 /HdrHistogram-2.1.8.tar.gz
 /HdrHistogram-2.1.11.tar.gz
+/HdrHistogram-2.1.12.tar.gz
diff --git a/HdrHistogram.spec b/HdrHistogram.spec
index d6f092a..c8b6f57 100644
--- a/HdrHistogram.spec
+++ b/HdrHistogram.spec
@@ -1,14 +1,14 @@
 Name:          HdrHistogram
-Version:       2.1.11
-Release:       6%{?dist}
+Version:       2.1.12
+Release:       1%{?dist}
 Summary:       A High Dynamic Range (HDR) Histogram
 License:       BSD and CC0
 URL:           http://hdrhistogram.github.io/%{name}/
 Source0:       https://github.com/%{name}/%{name}/archive/%{name}-%{version}.tar.gz
 
 BuildRequires: maven-local
+BuildRequires: junit5
 BuildRequires: mvn(com.google.code.maven-replacer-plugin:replacer)
-BuildRequires: mvn(junit:junit)
 BuildRequires: mvn(org.apache.felix:maven-bundle-plugin)
 # Explicit requires for javapackages-tools since HistogramLogProcessor script
 # uses /usr/share/java-utils/java-functions
@@ -40,6 +40,7 @@ find  -name "*.jar"  -print -delete
 %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
 
@@ -62,6 +63,12 @@ find  -name "*.jar"  -print -delete
 %license COPYING.txt LICENSE.txt
 
 %changelog
+* Thu Jan 28 2021 Alex Macdonald <almacdon@redhat.com> - 2.1.12-1
+- Update to 2.1.12
+
+* Mon Jan 25 2021 Fedora Release Engineering <releng@fedoraproject.org> - 2.1.11-7
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+
 * Mon Jul 27 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2.1.11-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
 
diff --git a/sources b/sources
index dad6958..cdfcaf8 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (HdrHistogram-2.1.11.tar.gz) = 51cb4397ae5450c80f67a8488c505ea4898f54cf572c55349f74dd8a66f3140a0c0b566be8448ee6c3474d1c33c131b7c39d0a3e15b8f06d41c2896383822a00
+SHA512 (HdrHistogram-2.1.12.tar.gz) = 0f9ae646c270388e0918eb6ce87905c8e8d9e5a30f0f9a5e6798419deb64f15f4a068dfed4538206b7c021249598a2141d980157457c224e16d4c4690fac9910