.gitignore

@@ -1 +1,4 @@
-SOURCES/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

.owasp-java-encoder.metadata

@@ -1 +1 @@
-73bd33ad45dac8f353ab3ab30093bc4a60e9c2c4 SOURCES/v1.2.2.tar.gz
+73bd33ad45dac8f353ab3ab30093bc4a60e9c2c4 v1.2.2.tar.gz

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 @@
+     </parent>
+ 
+     <artifactId>encoder</artifactId>
+-    <packaging>jar</packaging>
++    <packaging>bundle</packaging>
+ 
+     <name>Java Encoder</name>
+     <description>
+@@ -67,6 +67,18 @@
+                     </excludes>
+                 </configuration>
+             </plugin>
++            <plugin>
++                <groupId>org.apache.felix</groupId>
++                <artifactId>maven-bundle-plugin</artifactId>
++                <version>4.2.1</version>
++                <extensions>true</extensions>
++                <configuration>
++                    <instructions>
++                        <Export-Package>org.owasp.encoder</Export-Package>
++                        <Bundle-SymbolicName>org.owasp.encoder</Bundle-SymbolicName>
++                    </instructions>
++                </configuration>
++            </plugin>
+         </plugins>
+     </build>
+     <profiles>

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 @@
+                 <groupId>org.apache.maven.plugins</groupId>
+                 <artifactId>maven-compiler-plugin</artifactId>
+                 <configuration>
+-                    <source>1.5</source>
+-                    <target>1.5</target>
++                    <source>1.8</source>
++                    <target>1.8</target>
+                 </configuration>
+             </plugin>
+             <plugin>

README.md

@@ -0,0 +1,3 @@
+# owasp-java-encoder
+
+The owasp-java-encoder package

SOURCES/0_manifest.patch

@@ -1,12 +0,0 @@
-diff -Nur owasp-java-encoder-1.2.1-orig/META-INF/MANIFEST.MF owasp-java-encoder-1.2.1/META-INF/MANIFEST.MF
---- owasp-java-encoder-1.2.1-orig/META-INF/MANIFEST.MF	1969-12-31 19:00:00.000000000 -0500
-+++ owasp-java-encoder-1.2.1/META-INF/MANIFEST.MF	2018-08-07 11:59:15.923471361 -0400
-@@ -0,0 +1,8 @@
-+Manifest-Version: 1.0
-+Bnd-LastModified: 1533328833261
-+Bundle-ManifestVersion: 2
-+Bundle-Name: org.owasp.encoder
-+Bundle-SymbolicName: org.owasp.encoder
-+Created-By: 1.8.0_181 (Oracle Corporation)
-+Export-Package: org.owasp.encoder
-+Tool: Bnd-1.50.0

SPECS/owasp-java-encoder.spec

@@ -1,77 +0,0 @@
-Name:		owasp-java-encoder
-Version:	1.2.2
-Release:	3%{?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
-
-# add OSGi metadata
-Patch0:		0_manifest.patch
-
-BuildArch:	noarch
-ExclusiveArch: x86_64
-
-BuildRequires:	maven-local
-BuildRequires:	mvn(org.apache.maven.plugins:maven-source-plugin)
-BuildRequires:	mvn(org.sonatype.oss:oss-parent:pom:)
-
-%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
-
-# add version number in OSGi metadata
-sed -i '/^Bundle-SymbolicName: org.owasp.encoder$/a Bundle-Version: %{version}' %{_builddir}/%{name}-%{version}/META-INF/MANIFEST.MF
-
-%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
-
-%build
-%mvn_build
-
-# inject OSGi manifest
-jar ufm %{_builddir}/%{name}-%{version}/core/target/encoder-%{version}.jar %{_builddir}/%{name}-%{version}/META-INF/MANIFEST.MF
-
-%install
-%mvn_install
-
-%files -f .mfiles
-%doc README.md
-%license LICENSE
-
-%files javadoc -f .mfiles-javadoc
-%doc README.md
-%license LICENSE
-
-%changelog
-* Thu Mar 04 2021 Alex Macdonald <almacdon@redhat.com> - 1.2.2-3
-- Add ExclusiveArch: x86_64
-
-* Tue May 28 2019 Jie Kang <jkang@redhat.com> -1.2.2-2
-- Remove unnecessary javadoc plugin for Fedora builds
-
-* Fri Nov 16 2018 Salman Siddiqui <sasiddiq@redhat.com> - 1.2.2-1
-- Version update
-
-* Wed Aug 08 2018 Salman Siddiqui <sasiddiq@redhat.com> - 1.2.1-1
-- Initial packaging

owasp-java-encoder.spec

@@ -0,0 +1,85 @@
+Name:		owasp-java-encoder
+Version:	1.2.2
+Release:	8%{?dist}
+Summary:	Collection of high-performance low-overhead contextual encoders
+
+License:	BSD
+URL:		https://github.com/OWASP/owasp-java-encoder/
+
+Source0:	v1.2.2.tar.gz
+Source1:    	repository-1.2.2-20220203.tar.gz
+
+# 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
+%setup -q -T -D -a 1
+
+%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 -Dmaven.repo.local=repository-1.2.2-20220203 -o clean install -f pom.xml
+
+%files
+%doc README.md
+%license LICENSE
+
+%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
+- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
+  Related: rhbz#1991688
+
+* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 1.2.2-6
+- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
+
+* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.2-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+
+* Mon Sep 21 2020 Jie Kang <jkang@redhat.com> - 1.2.2-4
+- Remove deprecated dependency: sonatype-oss-parent
+
+* Tue Aug 18 2020 Alex Macdonald <almacdon@redhat.com> - 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 <jkang@redhat.com> -1.2.2-2
+- Remove unnecessary javadoc plugin for Fedora builds
+
+* Fri Nov 16 2018 Salman Siddiqui <sasiddiq@redhat.com> - 1.2.2-1
+- Version update
+
+* Wed Aug 08 2018 Salman Siddiqui <sasiddiq@redhat.com> - 1.2.1-1
+- Initial packaging

sources

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