Upgrade to 2.1 version

(cherry picked from commit 9293462846094c039951e0f3e581135953642d7e)

ongres-scram.spec

@@ -1,11 +1,11 @@
 Name:		ongres-scram
-Version:	1.0.0.beta.2
-Release:	8
+Version:	2.1
+Release:	1
 Summary:	Java Implementation for SCRAM(Salted Challenge Response Authentication Mechanism)
 License:	BSD
 URL:		https://github.com/ongres/scram
-Source0:	https://github.com/ongres/scram/archive/1.0.0-beta.2/scram-1.0.0-beta.2.tar.gz
-BuildRequires:	maven-local
+Source0:	https://github.com/ongres/scram/archive/2.1/scram-2.1.tar.gz
+BuildRequires:	maven-local ongres-stringprep
 BuildArch:	noarch
 
 %description
@@ -35,13 +35,16 @@ Summary:	Parent POM of ongres-scram
 This package contains the ongres-scram parent POM.
 
 %prep
-%autosetup -p1 -n "scram-1.0.0-beta.2"
+%autosetup -p1 -n "scram-2.1"
 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
+sed -i 's/.*SuppressFBWarnings.*//' common/src/main/java/com/ongres/scram/common/message/ServerFinalMessage.java
+
 %build
 %mvn_build -s
 
@@ -59,6 +62,10 @@ sed -i 's/[0-9a-f]\{8\}-[0-9a-f]\{4\}-[0-9a-f]\{4\}-[0-9a-f]\{4\}-[0-9a-f]\{12\}
 %files parent -f .mfiles-parent
 
 %changelog
+* Thu Feb 17 houyingchao <houyingchao@huawei.com> - 2.1-1
+- Upgrade to 2.1 version
+- Fix CVE-2022-21724
+
 * Mon Nov 23 Senlin <xiasenlin1@huawei.com> - 1.0.0.beta.2-8
 - modify the '~' in version