!18 [sync] PR-14: Upgrade to 2.1 version

From: @openeuler-sync-bot 
Reviewed-by: @overweight 
Signed-off-by: @overweight
This commit is contained in:
openeuler-ci-bot 2022-02-17 07:39:40 +00:00 committed by Gitee
commit b750a401f0
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
3 changed files with 12 additions and 5 deletions

View File

@ -1,11 +1,11 @@
Name: ongres-scram Name: ongres-scram
Version: 1.0.0.beta.2 Version: 2.1
Release: 8 Release: 1
Summary: Java Implementation for SCRAM(Salted Challenge Response Authentication Mechanism) Summary: Java Implementation for SCRAM(Salted Challenge Response Authentication Mechanism)
License: BSD License: BSD
URL: https://github.com/ongres/scram 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 Source0: https://github.com/ongres/scram/archive/2.1/scram-2.1.tar.gz
BuildRequires: maven-local BuildRequires: maven-local ongres-stringprep
BuildArch: noarch BuildArch: noarch
%description %description
@ -35,13 +35,16 @@ Summary: Parent POM of ongres-scram
This package contains the ongres-scram parent POM. This package contains the ongres-scram parent POM.
%prep %prep
%autosetup -p1 -n "scram-1.0.0-beta.2" %autosetup -p1 -n "scram-2.1"
find \( -name '*.jar' -o -name '*.class' \) -delete find \( -name '*.jar' -o -name '*.class' \) -delete
%pom_remove_plugin :nexus-staging-maven-plugin %pom_remove_plugin :nexus-staging-maven-plugin
%pom_remove_plugin :maven-source-plugin %pom_remove_plugin :maven-source-plugin
%pom_remove_plugin :maven-dependency-plugin client %pom_remove_plugin :maven-dependency-plugin client
%pom_remove_plugin -r :maven-javadoc-plugin %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 %build
%mvn_build -s %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 %files parent -f .mfiles-parent
%changelog %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 * Mon Nov 23 Senlin <xiasenlin1@huawei.com> - 1.0.0.beta.2-8
- modify the '~' in version - modify the '~' in version

Binary file not shown.

BIN
scram-2.1.tar.gz Normal file

Binary file not shown.