.gitignore

@@ -1,2 +1,2 @@
+SOURCES/scram-1.0.0-beta.2.tar.gz
 /scram-1.0.0-beta.2.tar.gz
-/scram-1.9-beta1.tar.gz

gating.yaml

@@ -1,6 +0,0 @@
---- !Policy
-product_versions:
-  - rhel-9
-decision_context: osci_compose_gate
-rules:
-  - !PassingTestCaseRule {test_case_name: baseos-ci.brew-build.tier1.functional}

ongres-scram.spec

@@ -1,18 +1,16 @@
 %global		upstream_name    scram
-%global		upstream_version 1.9-beta1
+%global		upstream_version 1.0.0-beta.2
 
 Name:		ongres-%upstream_name
 Version:	%(echo %upstream_version | sed 's/-/~/g')
-Release:	1%{?dist}
+Release:	5%{?dist}
 Summary:	Salted Challenge Response Authentication Mechanism (SCRAM) - Java Implementation
-License:	BSD and MIT and ASL 2.0
+License:	BSD
 URL:		https://github.com/ongres/%upstream_name
 Source0:	https://github.com/ongres/%upstream_name/archive/%upstream_version/%upstream_name-%upstream_version.tar.gz
-BuildRequires:	maven-local junit
+BuildRequires:	maven-local
 BuildArch:	noarch
 
-Patch0: remove-annotations.patch
-
 %description
 This is a Java implementation of SCRAM (Salted Challenge Response
 Authentication Mechanism) which is part of the family of Simple
@@ -21,7 +19,6 @@ mechanisms. It is described as part of RFC 5802 and RFC7677.
 
 %package client
 Summary:	Client for %{name}
-License:	BSD
 
 %description client
 This package contains the client for %{name}
@@ -34,20 +31,17 @@ This package contains javadoc for %{name}
 
 %package parent
 Summary:	Parent POM of %{name}
-License:	BSD
 
 %description parent
 This package contains the %{name} parent POM.
 
 %prep
-%autosetup -p0 -n "%upstream_name-%upstream_version"
+%autosetup -p1 -n "%upstream_name-%upstream_version"
 find \( -name '*.jar' -o -name '*.class' \) -delete
 %pom_remove_plugin :nexus-staging-maven-plugin
 %pom_remove_plugin :maven-source-plugin
 %pom_remove_plugin :maven-dependency-plugin client
 %pom_remove_plugin -r :maven-javadoc-plugin
-%pom_remove_dep com.google.code.findbugs:annotations
-
 
 %build
 %mvn_build -s
@@ -56,7 +50,7 @@ find \( -name '*.jar' -o -name '*.class' \) -delete
 %mvn_install
 
 %files -f .mfiles-common
-%license LICENSE NOTICE thirdparty/bouncycastle-LICENSE thirdparty/saslprep-LICENSE
+%license LICENSE
 
 %files client -f .mfiles-client
 %license LICENSE
@@ -68,41 +62,6 @@ find \( -name '*.jar' -o -name '*.class' \) -delete
 %license LICENSE
 
 %changelog
-* Wed Dec 21 2022 Zuzana Miklankova <zmiklank@redhat.com> - 1.9.0~beta1-1
-- Rebase to 1.9-beta1
-- change of licences of ongres-scram and ongres-scram-javadoc to "BSD and MIT and ASL 2.0"
-
-* Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 1.0.0~beta.2-15
-- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
-  Related: rhbz#1991688
-
-* Mon Jul 12 2021 Ondrej Dubaj <odubaj@redhat.com> - 1.0.0~beta.2-14
-- Added junit dependency
-
-* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 1.0.0~beta.2-13
-- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
-
-* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.0~beta.2-12
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
-
-* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.0~beta.2-11
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
-
-* Sat Jul 11 2020 Jiri Vanek <jvanek@redhat.com> - 1.0.0~beta.2-10
-- Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11
-
-* Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.0~beta.2-9
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
-
-* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.0~beta.2-8
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
-
-* Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.0~beta.2-7
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
-
-* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.0~beta.2-6
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
-
 * Wed May 30 2018 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.0.0~beta.2-5
 - Remove explicit invocation of maven-javadoc-plugin
 

remove-annotations.patch

@@ -1,19 +0,0 @@
---- common/src/main/java/com/ongres/scram/common/message/ServerFinalMessage.java  2019-06-28 19:55:36.000000000 +0200
-+++ common/src/main/java/com/ongres/scram/common/message/ServerFinalMessage.java.new  2023-01-02 13:55:25.491161211 +0100
-@@ -37,8 +37,6 @@
- import com.ongres.scram.common.util.StringWritable;
- import com.ongres.scram.common.util.StringWritableCsv;
-
--import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
--
-
- /**
-  * Constructs and parses server-final-messages. Formal syntax is:
-@@ -162,7 +160,6 @@
-         return null != error;
-     }
-
--    @SuppressFBWarnings("EI_EXPOSE_REP")
-     public byte[] getVerifier() {
-         return verifier;
-     }

sources

@@ -1 +1 @@
-SHA512 (scram-1.9-beta1.tar.gz) = ff9803d7a916b15d005e81242087a254f9c494ab4a63dd2942db429386224b7058897d842227a9a231854c4ed5ca6704df4c25e78aee4641c88fcc8c21443806
+SHA512 (scram-1.0.0-beta.2.tar.gz) = 85cfad335712e187c41343aa3029074596075e28fa037f6f0965a7b9062d23b807dfc0bd71fdd835babd89699705e9bcf0e1f7dad4bcfd685f0f96debc0fab6d