From d1433318d90adf22c2b763d109928ee3cd37d1a5 Mon Sep 17 00:00:00 2001 From: jmatsuok Date: Tue, 4 Apr 2023 14:46:52 +0000 Subject: [PATCH] Updating with bundled dependencies for move to CRB. Related: rhbz#1981016 --- .gitignore | 3 +++ .owasp-java-encoder.metadata | 1 + owasp-java-encoder.spec | 23 +++++++++-------------- sources | 1 + 4 files changed, 14 insertions(+), 14 deletions(-) create mode 100644 .owasp-java-encoder.metadata diff --git a/.gitignore b/.gitignore index 91a80a8..333c979 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,4 @@ /v1.2.2.tar.gz +/v1.2.3.tar.gz +/repository-1.2.3-20220203.tar.gz +/repository-1.2.2-20220203.tar.gz diff --git a/.owasp-java-encoder.metadata b/.owasp-java-encoder.metadata new file mode 100644 index 0000000..ba9f0ce --- /dev/null +++ b/.owasp-java-encoder.metadata @@ -0,0 +1 @@ +73bd33ad45dac8f353ab3ab30093bc4a60e9c2c4 v1.2.2.tar.gz diff --git a/owasp-java-encoder.spec b/owasp-java-encoder.spec index ff364e2..bf67f2d 100644 --- a/owasp-java-encoder.spec +++ b/owasp-java-encoder.spec @@ -1,15 +1,14 @@ Name: owasp-java-encoder Version: 1.2.2 -Release: 7%{?dist} +Release: 8%{?dist} Summary: Collection of high-performance low-overhead contextual encoders License: BSD 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 Patch1: 1_update-compiler-plugin-version.patch @@ -33,8 +32,8 @@ Summary: Javadoc for %{name} %prep %setup -q +%setup -q -T -D -a 1 -%patch0 -p1 %patch1 -p1 %pom_disable_module jsp @@ -48,20 +47,16 @@ Summary: Javadoc for %{name} %pom_remove_parent %build -%mvn_build +mvn -Dmaven.repo.local=repository-1.2.2-20220203 -o clean install -f pom.xml -%install -%mvn_install - -%files -f .mfiles -%doc README.md -%license LICENSE - -%files javadoc -f .mfiles-javadoc +%files %doc README.md %license LICENSE %changelog +* Tue Feb 28 2023 Joshua Matsuoka - 1.2.2-8 +- Updating with bundled dependencies for move to CRB. Related: rhbz#1981016 + * Mon Aug 09 2021 Mohan Boddu - 1.2.2-7 - Rebuilt for IMA sigs, glibc 2.34, aarch64 flags Related: rhbz#1991688 diff --git a/sources b/sources index 7382fc9..ba00eca 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ SHA512 (v1.2.2.tar.gz) = 97e298ec802360718d3d70451d6e227d0bb5a27dc560445e64e1521b9e5fa790820f8b9f190a572757e3c58878f4e7baf0a8e0f4cf27d2bbba26f07f949e00af +SHA512 (repository-1.2.2-20220203.tar.gz) = 571a24d8de87ef7ab2f6aabe16e7233f5cbe6adc36b9d8b5fee312954d52ed975350a21bb7020ba67635724e5018ff13dddc589ef9f575bf8fa3ea9159889661