diff --git a/pom.xml b/pom.xml
index a5503f051..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>
@@ -352,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>
 
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 af6b354ae..6e371c2cb 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
@@ -33,7 +33,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)
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 e189e6df8..dd1737cf6 100644
--- a/src/main/java/com/hubspot/jinjava/tree/parse/TokenScanner.java
+++ b/src/main/java/com/hubspot/jinjava/tree/parse/TokenScanner.java
@@ -214,6 +214,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;