From 2d3f5ca1fce21dea00c99d2414801b7f471c0477 Mon Sep 17 00:00:00 2001
From: jasmith-hs <jasmith@hubspot.com>
Date: Tue, 17 Mar 2026 17:33:29 -0400
Subject: [PATCH 1/2] Remove version override so that we can internally publish
 snapshots from this branch to 2.8.4-SNAPSHOT

---
 .blazar.yaml | 3 +++
 pom.xml      | 2 ++
 2 files changed, 5 insertions(+)

diff --git a/.blazar.yaml b/.blazar.yaml
index 5727ecbff..95708e9b9 100644
--- a/.blazar.yaml
+++ b/.blazar.yaml
@@ -1,2 +1,5 @@
 buildResources:
   memoryMb: 10240
+
+env:
+  SKIP_VERSION_OVERRIDE: true
diff --git a/pom.xml b/pom.xml
index 666d46fe9..a0b84d0d8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -29,6 +29,8 @@
     </basepom.test.add.opens>
 
     <argLine />
+
+    <hubspot.build.moved.after>1773782489663</hubspot.build.moved.after>
   </properties>
 
   <dependencyManagement>

From 2bd2214f71b4ddf26f9ccf281b3f2322e8df6811 Mon Sep 17 00:00:00 2001
From: chathurangaj <chathuranga.jayanath.1999@gmail.com>
Date: Mon, 14 Sep 2026 21:08:05 +0530
Subject: [PATCH 2/2] Bump jsoup to 1.23.2

Disable jsoup pretty-printing in CloseHtmlFilter to keep its output
unchanged, since 1.23.2 pretty-prints block elements (e.g. inserts
newlines around a <p> inside an <h1>) differently than 1.15.3 did.

Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
---
 pom.xml                                                      | 2 +-
 .../java/com/hubspot/jinjava/lib/filter/CloseHtmlFilter.java | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index a0b84d0d8..a1d39829f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -38,7 +38,7 @@
       <dependency>
         <groupId>org.jsoup</groupId>
         <artifactId>jsoup</artifactId>
-        <version>1.15.3</version>
+        <version>1.23.2</version>
       </dependency>
       <dependency>
         <groupId>de.odysseus.juel</groupId>
diff --git a/src/main/java/com/hubspot/jinjava/lib/filter/CloseHtmlFilter.java b/src/main/java/com/hubspot/jinjava/lib/filter/CloseHtmlFilter.java
index f15315bd8..8120ad2d4 100644
--- a/src/main/java/com/hubspot/jinjava/lib/filter/CloseHtmlFilter.java
+++ b/src/main/java/com/hubspot/jinjava/lib/filter/CloseHtmlFilter.java
@@ -6,6 +6,7 @@
 import com.hubspot.jinjava.interpret.JinjavaInterpreter;
 import java.util.Objects;
 import org.jsoup.Jsoup;
+import org.jsoup.nodes.Document;
 
 @JinjavaDoc(
   value = "Closes open HTML tags in a string",
@@ -21,6 +22,8 @@ public String getName() {
 
   @Override
   public Object filter(Object var, JinjavaInterpreter interpreter, String... args) {
-    return Jsoup.parseBodyFragment(Objects.toString(var)).body().html();
+    Document doc = Jsoup.parseBodyFragment(Objects.toString(var));
+    doc.outputSettings().prettyPrint(false);
+    return doc.body().html();
   }
 }