From 38c498588e5d1b459e5888d01ed0f28c6effef38 Mon Sep 17 00:00:00 2001 From: DistroBaker Date: Fri, 8 Jan 2021 16:35:08 +0000 Subject: [PATCH] Merged update from upstream sources This is an automated DistroBaker update from upstream sources. If you do not know what this is about or would like to opt out, contact the OSCI team. Source: https://src.fedoraproject.org/rpms/owasp-java-encoder.git#2bac160d78a01d09a1e5b8a2cbb455ae9d08dc24 --- .gitignore | 1 + 0_bundle-packaging.patch | 32 +++++++++++ 1_update-compiler-plugin-version.patch | 15 +++++ README.md | 3 + dead.package | 1 - owasp-java-encoder.spec | 80 ++++++++++++++++++++++++++ sources | 1 + 7 files changed, 132 insertions(+), 1 deletion(-) create mode 100644 .gitignore create mode 100644 0_bundle-packaging.patch create mode 100644 1_update-compiler-plugin-version.patch create mode 100644 README.md delete mode 100644 dead.package create mode 100644 owasp-java-encoder.spec create mode 100644 sources diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..91a80a8 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +/v1.2.2.tar.gz diff --git a/0_bundle-packaging.patch b/0_bundle-packaging.patch new file mode 100644 index 0000000..54fe271 --- /dev/null +++ b/0_bundle-packaging.patch @@ -0,0 +1,32 @@ +diff --git a/core/pom.xml b/core/pom.xml +index cd0293e..6d4276e 100644 +--- a/core/pom.xml ++++ b/core/pom.xml +@@ -46,7 +46,7 @@ + + + encoder +- jar ++ bundle + + Java Encoder + +@@ -67,6 +67,18 @@ + + + ++ ++ org.apache.felix ++ maven-bundle-plugin ++ 4.2.1 ++ true ++ ++ ++ org.owasp.encoder ++ org.owasp.encoder ++ ++ ++ + + + diff --git a/1_update-compiler-plugin-version.patch b/1_update-compiler-plugin-version.patch new file mode 100644 index 0000000..fda4c5c --- /dev/null +++ b/1_update-compiler-plugin-version.patch @@ -0,0 +1,15 @@ +diff --git a/pom.xml b/pom.xml +index d81ad2c..fe27928 100755 +--- a/pom.xml ++++ b/pom.xml +@@ -261,8 +261,8 @@ + org.apache.maven.plugins + maven-compiler-plugin + +- 1.5 +- 1.5 ++ 1.8 ++ 1.8 + + + diff --git a/README.md b/README.md new file mode 100644 index 0000000..cfaa5bc --- /dev/null +++ b/README.md @@ -0,0 +1,3 @@ +# owasp-java-encoder + +The owasp-java-encoder package \ No newline at end of file diff --git a/dead.package b/dead.package deleted file mode 100644 index ca95b61..0000000 --- a/dead.package +++ /dev/null @@ -1 +0,0 @@ -retiring ursine package, replaced by jmc module build diff --git a/owasp-java-encoder.spec b/owasp-java-encoder.spec new file mode 100644 index 0000000..36da477 --- /dev/null +++ b/owasp-java-encoder.spec @@ -0,0 +1,80 @@ +Name: owasp-java-encoder +Version: 1.2.2 +Release: 4%{?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 + +# 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 + +BuildArch: noarch + +BuildRequires: maven-local +BuildRequires: mvn(org.apache.maven.plugins:maven-source-plugin) +BuildRequires: mvn(org.apache.felix:maven-bundle-plugin) + +%description +The OWASP Encoders package is a collection of high-performance low-overhead +contextual encoders, that when utilized correctly, is an effective tool in +preventing Web Application security vulnerabilities such as +Cross-Site Scripting. + +%package javadoc +Summary: Javadoc for %{name} + +%description javadoc +%{summary}. + +%prep +%setup -q + +%patch0 -p1 +%patch1 -p1 + +%pom_disable_module jsp +%pom_disable_module esapi + +%pom_remove_plugin org.apache.maven.plugins:maven-javadoc-plugin + +# analysis tool for testing coverage is not required +%pom_remove_plugin :cobertura-maven-plugin + +%pom_remove_parent + +%build +%mvn_build + +%install +%mvn_install + +%files -f .mfiles +%doc README.md +%license LICENSE + +%files javadoc -f .mfiles-javadoc +%doc README.md +%license LICENSE + +%changelog +* Mon Sep 21 2020 Jie Kang - 1.2.2-4 +- Remove deprecated dependency: sonatype-oss-parent + +* Tue Aug 18 2020 Alex Macdonald - 1.2.2-3 +- Remove osgi metadata patch0 that previously added a manifest +- Include patch (courtesy of jkang) to package as a bundle instead of a jar +- Update maven-compiler-plugin source/target version for builds in f33 + +* Tue May 28 2019 Jie Kang -1.2.2-2 +- Remove unnecessary javadoc plugin for Fedora builds + +* Fri Nov 16 2018 Salman Siddiqui - 1.2.2-1 +- Version update + +* Wed Aug 08 2018 Salman Siddiqui - 1.2.1-1 +- Initial packaging diff --git a/sources b/sources new file mode 100644 index 0000000..7382fc9 --- /dev/null +++ b/sources @@ -0,0 +1 @@ +SHA512 (v1.2.2.tar.gz) = 97e298ec802360718d3d70451d6e227d0bb5a27dc560445e64e1521b9e5fa790820f8b9f190a572757e3c58878f4e7baf0a8e0f4cf27d2bbba26f07f949e00af