From 51cb4c9897a2e0b76e450ff6c5e598b1a95fdd11 Mon Sep 17 00:00:00 2001
From: Greg Gibeling <greg.gibeling@roche.com>
Date: Thu, 2 May 2024 19:07:16 -0700
Subject: [PATCH 1/5] Compiler error (eclipse & javac differ on generics)

---
 .../java/com/hubspot/jinjava/lib/tag/eager/EagerTagFactory.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/com/hubspot/jinjava/lib/tag/eager/EagerTagFactory.java b/src/main/java/com/hubspot/jinjava/lib/tag/eager/EagerTagFactory.java
index b019e68cf..21a3feb8b 100644
--- a/src/main/java/com/hubspot/jinjava/lib/tag/eager/EagerTagFactory.java
+++ b/src/main/java/com/hubspot/jinjava/lib/tag/eager/EagerTagFactory.java
@@ -32,7 +32,7 @@ public class EagerTagFactory {
 
   public static final Map<Class<? extends Tag>, Class<? extends EagerTagDecorator<? extends Tag>>> EAGER_TAG_OVERRIDES =
     ImmutableMap
-      .<Class<? extends Tag>, Class<? extends EagerTagDecorator<?>>>builder()
+      .<Class<? extends Tag>, Class<? extends EagerTagDecorator<? extends Tag>>>builder()
       .put(SetTag.class, EagerSetTag.class)
       .put(DoTag.class, EagerDoTag.class)
       .put(PrintTag.class, EagerPrintTag.class)

From 3589a62b6e9954ae8c83839fba5ae029c1d76e93 Mon Sep 17 00:00:00 2001
From: Greg Gibeling <greg.gibeling@roche.com>
Date: Thu, 2 May 2024 19:07:32 -0700
Subject: [PATCH 2/5] Support the trim character on endraw tags

---
 .../java/com/hubspot/jinjava/tree/parse/TokenScanner.java    | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/main/java/com/hubspot/jinjava/tree/parse/TokenScanner.java b/src/main/java/com/hubspot/jinjava/tree/parse/TokenScanner.java
index 54671d644..9783f3058 100644
--- a/src/main/java/com/hubspot/jinjava/tree/parse/TokenScanner.java
+++ b/src/main/java/com/hubspot/jinjava/tree/parse/TokenScanner.java
@@ -209,6 +209,11 @@ private Token getNextToken() {
 
   private boolean isEndRaw() {
     int pos = currPost + 1;
+    if (pos < length) {
+    	if (is[pos] == symbols.getTrimChar()) {
+    		pos++;
+    	}
+    }
     while (pos < length) {
       if (!Character.isWhitespace(is[pos++])) {
         break;

From 6442a0929f4cfd07fcd516fce2a37403deeaf707 Mon Sep 17 00:00:00 2001
From: Greg Gibeling <greg.gibeling@roche.com>
Date: Tue, 22 Jul 2025 15:38:47 -0700
Subject: [PATCH 3/5] Update commons-lang3

---
 pom.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pom.xml b/pom.xml
index 57723ed5d..36267f545 100644
--- a/pom.xml
+++ b/pom.xml
@@ -142,6 +142,7 @@
     <dependency>
       <groupId>org.apache.commons</groupId>
       <artifactId>commons-lang3</artifactId>
+      <version>3.18.0</version>
     </dependency>
     <dependency>
       <groupId>commons-net</groupId>

From c75bca357c121591254d4a3184c0d4a9a7c0b247 Mon Sep 17 00:00:00 2001
From: Greg Gibeling <greg.gibeling@roche.com>
Date: Thu, 12 Mar 2026 13:15:22 -0700
Subject: [PATCH 4/5] Fix whitespace for linter

---
 .../java/com/hubspot/jinjava/tree/parse/TokenScanner.java   | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/hubspot/jinjava/tree/parse/TokenScanner.java b/src/main/java/com/hubspot/jinjava/tree/parse/TokenScanner.java
index 67efbb8e7..dd1737cf6 100644
--- a/src/main/java/com/hubspot/jinjava/tree/parse/TokenScanner.java
+++ b/src/main/java/com/hubspot/jinjava/tree/parse/TokenScanner.java
@@ -215,9 +215,9 @@ private Token getNextToken() {
   private boolean isEndRaw() {
     int pos = currPost + 1;
     if (pos < length) {
-    	if (is[pos] == symbols.getTrimChar()) {
-    		pos++;
-    	}
+      if (is[pos] == symbols.getTrimChar()) {
+        pos++;
+      }
     }
     while (pos < length) {
       if (!Character.isWhitespace(is[pos++])) {

From 5d9553ba07fee4b766ea314d3d0d9b2fd304decd Mon Sep 17 00:00:00 2001
From: Greg Gibeling <greg.gibeling@roche.com>
Date: Thu, 26 Mar 2026 21:20:49 -0700
Subject: [PATCH 5/5] Reduce build requirements

---
 pom.xml | 26 +++++++++++++++++++++++++-
 1 file changed, 25 insertions(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 4093e2a40..4ddff687e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -30,6 +30,9 @@
     </basepom.test.add.opens>
 
     <argLine />
+    
+    <project.build.jdk.version>17</project.build.jdk.version>
+    <dep.commons-lang3.version>3.18.0</dep.commons-lang3.version>
   </properties>
 
   <dependencyManagement>
@@ -144,7 +147,6 @@
     <dependency>
       <groupId>org.apache.commons</groupId>
       <artifactId>commons-lang3</artifactId>
-      <version>3.18.0</version>
     </dependency>
     <dependency>
       <groupId>commons-net</groupId>
@@ -353,6 +355,28 @@
           </annotationProcessorPaths>
         </configuration>
       </plugin>
+      
+      <plugin>
+        <groupId>com.diffplug.spotless</groupId>
+        <artifactId>spotless-maven-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>apply</id>
+            <phase>none</phase>
+          </execution>
+          <execution>
+            <id>check</id>
+            <phase>none</phase>
+          </execution>
+        </executions>
+      </plugin>
+      <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-checkstyle-plugin</artifactId>
+          <configuration>
+            <skip>true</skip>
+          </configuration>
+      </plugin>
     </plugins>
   </build>