From d1a0294a21d60ef4ce26d7746e897e17fc2d276f Mon Sep 17 00:00:00 2001
From: Jeremy Long <jeremy.long@gmail.com>
Date: Fri, 2 Aug 2024 07:52:34 -0400
Subject: [PATCH 1/4] fix: build status badge (#78)

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index d6ce393..50acb66 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
 OWASP Java Encoder Project
 ==========================
 
-[![Build Status](https://travis-ci.org/OWASP/owasp-java-encoder.svg?branch=main)](https://travis-ci.org/OWASP/owasp-java-encoder) [![License](https://img.shields.io/badge/License-BSD%203--Clause-blue.svg)](https://opensource.org/licenses/BSD-3-Clause) [![javadoc](https://javadoc.io/badge2/org.owasp.encoder/encoder/javadoc.svg)](https://javadoc.io/doc/org.owasp.encoder/encoder)
+![Build Status](https://github.com/OWASP/owasp-java-encoder/actions/workflows/build.yaml/badge.svg?branch=main) [![License](https://img.shields.io/badge/License-BSD%203--Clause-blue.svg)](https://opensource.org/licenses/BSD-3-Clause) [![javadoc](https://javadoc.io/badge2/org.owasp.encoder/encoder/javadoc.svg)](https://javadoc.io/doc/org.owasp.encoder/encoder)
 
 Contextual Output Encoding is a computer programming technique necessary to stop
 Cross-Site Scripting. This project is a Java 1.8+ simple-to-use drop-in high-performance

From 72e415a87b3c40eaf8d6c4629a9f49ddb47bf35b Mon Sep 17 00:00:00 2001
From: Jeremy Long <jeremy.long@gmail.com>
Date: Mon, 19 Aug 2024 07:16:20 -0400
Subject: [PATCH 2/4] fix: java.lang.NoSuchMethodError when running on Java 8
 (#80)

* fix: java.lang.NoSuchMethodError when running on Java 8
resolves #79

* build: bump version
---
 core/pom.xml         | 2 +-
 esapi/pom.xml        | 2 +-
 jakarta-test/pom.xml | 2 +-
 jakarta/pom.xml      | 2 +-
 jsp/pom.xml          | 2 +-
 pom.xml              | 5 ++---
 6 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/core/pom.xml b/core/pom.xml
index a4e53a0..4ae9ce6 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -42,7 +42,7 @@
     <parent>
         <groupId>org.owasp.encoder</groupId>
         <artifactId>encoder-parent</artifactId>
-        <version>1.3.0</version>
+        <version>1.3.1</version>
     </parent>
 
     <artifactId>encoder</artifactId>
diff --git a/esapi/pom.xml b/esapi/pom.xml
index 083b918..b4b55a3 100644
--- a/esapi/pom.xml
+++ b/esapi/pom.xml
@@ -42,7 +42,7 @@
     <parent>
         <groupId>org.owasp.encoder</groupId>
         <artifactId>encoder-parent</artifactId>
-        <version>1.3.0</version>
+        <version>1.3.1</version>
     </parent>
 
     <artifactId>encoder-esapi</artifactId>
diff --git a/jakarta-test/pom.xml b/jakarta-test/pom.xml
index cb083ff..db39bac 100644
--- a/jakarta-test/pom.xml
+++ b/jakarta-test/pom.xml
@@ -21,7 +21,7 @@
         <dependency>
             <groupId>org.owasp.encoder</groupId>
             <artifactId>encoder-jakarta-jsp</artifactId>
-            <version>1.3.0</version>
+            <version>1.3.1</version>
         </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
diff --git a/jakarta/pom.xml b/jakarta/pom.xml
index e92c3d8..4270a04 100644
--- a/jakarta/pom.xml
+++ b/jakarta/pom.xml
@@ -42,7 +42,7 @@
     <parent>
         <groupId>org.owasp.encoder</groupId>
         <artifactId>encoder-parent</artifactId>
-        <version>1.3.0</version>
+        <version>1.3.1</version>
     </parent>
 
     <artifactId>encoder-jakarta-jsp</artifactId>
diff --git a/jsp/pom.xml b/jsp/pom.xml
index 92bb94c..6e9a08b 100644
--- a/jsp/pom.xml
+++ b/jsp/pom.xml
@@ -42,7 +42,7 @@
     <parent>
         <groupId>org.owasp.encoder</groupId>
         <artifactId>encoder-parent</artifactId>
-        <version>1.3.0</version>
+        <version>1.3.1</version>
     </parent>
 
     <artifactId>encoder-jsp</artifactId>
diff --git a/pom.xml b/pom.xml
index e61395a..758be9f 100755
--- a/pom.xml
+++ b/pom.xml
@@ -41,7 +41,7 @@
 
     <groupId>org.owasp.encoder</groupId>
     <artifactId>encoder-parent</artifactId>
-    <version>1.3.0</version>
+    <version>1.3.1</version>
     <packaging>pom</packaging>
 
     <name>OWASP Java Encoder Project</name>
@@ -273,8 +273,7 @@
                             <goal>compile</goal>
                         </goals>
                         <configuration>
-                            <source>1.8</source>
-                            <target>1.8</target>
+                            <release>8</release>
                         </configuration>
                     </execution>
                     <execution>

From 7e203bd6d47ca2c3d04a073ff215021702217289 Mon Sep 17 00:00:00 2001
From: Eric Norman <eric.d.norman@gmail.com>
Date: Tue, 20 Aug 2024 02:47:49 -0700
Subject: [PATCH 3/4] fix for issues 81 (#82)

---
 pom.xml | 28 ++++++++--------------------
 1 file changed, 8 insertions(+), 20 deletions(-)

diff --git a/pom.xml b/pom.xml
index 758be9f..deacc07 100755
--- a/pom.xml
+++ b/pom.xml
@@ -292,17 +292,6 @@
                     </execution>
                 </executions>
             </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-jar-plugin</artifactId>
-                <configuration>
-                    <archive>
-                        <manifestEntries>
-                            <Multi-Release>true</Multi-Release>
-                        </manifestEntries>
-                    </archive>
-                </configuration>
-            </plugin>
             <plugin>
                 <groupId>org.apache.felix</groupId>
                 <artifactId>maven-bundle-plugin</artifactId>
@@ -352,15 +341,14 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-jar-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>default-jar</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>jar</goal>
-                        </goals>
-                    </execution>
-                </executions>
+                <configuration>
+                    <archive>
+                        <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
+                        <manifestEntries>
+                            <Multi-Release>true</Multi-Release>
+                        </manifestEntries>
+                    </archive>
+                </configuration>
             </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>

From be0670b6880483412f8da17211a5d084ff43cd24 Mon Sep 17 00:00:00 2001
From: Jeremy Long <jeremy.long@gmail.com>
Date: Tue, 20 Aug 2024 06:00:39 -0400
Subject: [PATCH 4/4] docs: update release notes

---
 README.md | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/README.md b/README.md
index 50acb66..21e2b42 100644
--- a/README.md
+++ b/README.md
@@ -98,6 +98,11 @@ TagLib
 
 News
 ----
+### 2024-08-20 - 1.3.1 Release
+The team is happy to announce that version 1.3.1 has been released!
+* fix: add OSGi related entries in the MANIFEST.MF file (#82).
+* fix: java.lang.NoSuchMethodError when running on Java 8 (#80).
+
 ### 2024-08-02 - 1.3.0 Release
 The team is happy to announce that version 1.3.0 has been released!
 * Minimum JDK Requirement is now Java 8