From 1cc1c59cd20f2da7c31b53cb44a4fd13429636a3 Mon Sep 17 00:00:00 2001
From: Adam Samalik <asamalik@redhat.com>
Date: Mon, 10 Jul 2023 13:35:33 +0200
Subject: [PATCH] re-import sources as agreed with the maintainer

---
 .gitignore                             |  1 -
 .owasp-java-encoder.metadata           |  1 +
 0_bundle-packaging.patch               | 32 --------------------------
 1_update-compiler-plugin-version.patch | 15 ------------
 README.md                              |  3 ---
 5 files changed, 1 insertion(+), 51 deletions(-)
 create mode 100644 .owasp-java-encoder.metadata
 delete mode 100644 0_bundle-packaging.patch
 delete mode 100644 1_update-compiler-plugin-version.patch
 delete mode 100644 README.md

diff --git a/.gitignore b/.gitignore
index edb3d04..91a80a8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1 @@
-SOURCES/v1.2.2.tar.gz
 /v1.2.2.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/0_bundle-packaging.patch b/0_bundle-packaging.patch
deleted file mode 100644
index 54fe271..0000000
--- a/0_bundle-packaging.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-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>
diff --git a/1_update-compiler-plugin-version.patch b/1_update-compiler-plugin-version.patch
deleted file mode 100644
index fda4c5c..0000000
--- a/1_update-compiler-plugin-version.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-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>
diff --git a/README.md b/README.md
deleted file mode 100644
index cfaa5bc..0000000
--- a/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# owasp-java-encoder
-
-The owasp-java-encoder package
\ No newline at end of file