Updating with bundled dependencies for move to CRB. Related: rhbz#1981016

This commit is contained in:
jmatsuok 2023-04-04 14:46:52 +00:00 committed by Stepan Oksanichenko
parent 5c45d9bbf6
commit d1433318d9
4 changed files with 14 additions and 14 deletions

3
.gitignore vendored
View File

@ -1 +1,4 @@
/v1.2.2.tar.gz /v1.2.2.tar.gz
/v1.2.3.tar.gz
/repository-1.2.3-20220203.tar.gz
/repository-1.2.2-20220203.tar.gz

View File

@ -0,0 +1 @@
73bd33ad45dac8f353ab3ab30093bc4a60e9c2c4 v1.2.2.tar.gz

View File

@ -1,15 +1,14 @@
Name: owasp-java-encoder Name: owasp-java-encoder
Version: 1.2.2 Version: 1.2.2
Release: 7%{?dist} Release: 8%{?dist}
Summary: Collection of high-performance low-overhead contextual encoders Summary: Collection of high-performance low-overhead contextual encoders
License: BSD License: BSD
URL: https://github.com/OWASP/owasp-java-encoder/ URL: https://github.com/OWASP/owasp-java-encoder/
Source0: https://github.com/OWASP/owasp-java-encoder/archive/v%{version}.tar.gz Source0: v1.2.2.tar.gz
Source1: repository-1.2.2-20220203.tar.gz
# package as a bundle instead of a jar
Patch0: 0_bundle-packaging.patch
# source/target option of 1.5 not compatible with maven-compiler-plugin 3.8.1 >= in f33 # source/target option of 1.5 not compatible with maven-compiler-plugin 3.8.1 >= in f33
Patch1: 1_update-compiler-plugin-version.patch Patch1: 1_update-compiler-plugin-version.patch
@ -33,8 +32,8 @@ Summary: Javadoc for %{name}
%prep %prep
%setup -q %setup -q
%setup -q -T -D -a 1
%patch0 -p1
%patch1 -p1 %patch1 -p1
%pom_disable_module jsp %pom_disable_module jsp
@ -48,20 +47,16 @@ Summary: Javadoc for %{name}
%pom_remove_parent %pom_remove_parent
%build %build
%mvn_build mvn -Dmaven.repo.local=repository-1.2.2-20220203 -o clean install -f pom.xml
%install %files
%mvn_install
%files -f .mfiles
%doc README.md
%license LICENSE
%files javadoc -f .mfiles-javadoc
%doc README.md %doc README.md
%license LICENSE %license LICENSE
%changelog %changelog
* Tue Feb 28 2023 Joshua Matsuoka <jmatsuok@redhat.com> - 1.2.2-8
- Updating with bundled dependencies for move to CRB. Related: rhbz#1981016
* Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 1.2.2-7 * Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 1.2.2-7
- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags - Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
Related: rhbz#1991688 Related: rhbz#1991688

View File

@ -1 +1,2 @@
SHA512 (v1.2.2.tar.gz) = 97e298ec802360718d3d70451d6e227d0bb5a27dc560445e64e1521b9e5fa790820f8b9f190a572757e3c58878f4e7baf0a8e0f4cf27d2bbba26f07f949e00af SHA512 (v1.2.2.tar.gz) = 97e298ec802360718d3d70451d6e227d0bb5a27dc560445e64e1521b9e5fa790820f8b9f190a572757e3c58878f4e7baf0a8e0f4cf27d2bbba26f07f949e00af
SHA512 (repository-1.2.2-20220203.tar.gz) = 571a24d8de87ef7ab2f6aabe16e7233f5cbe6adc36b9d8b5fee312954d52ed975350a21bb7020ba67635724e5018ff13dddc589ef9f575bf8fa3ea9159889661