Merge branch 'master' of github.com:HubSpot/jinjava into fix-render-filter-deferred-values

Author: jasmith-hs

.build-jdk17

@@ -7,7 +7,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        java: [ 17 ]
+        java: [ 17, 21, 25 ]
     name: jdk-${{ matrix.java }}
     steps:
       - uses: actions/checkout@v3
@@ -16,9 +16,19 @@ jobs:
       - uses: actions/setup-java@v3
         with:
           distribution: "temurin"
-          java-version: ${{ matrix.java }}
+          # The JDK listed last will be the default and what Maven runs with
+          # https://github.com/marketplace/actions/setup-java-jdk#install-multiple-jdks
+          java-version: |
+            ${{ matrix.java }}
+            25
           cache: "maven"
       - name: "Build"
-        run: mvn --batch-mode -no-transfer-progress -V verify
+        run: |
+          mvn \
+            --batch-mode \
+            -no-transfer-progress \
+            -V \
+            -Dproject.build.jdk.version=${{ matrix.java }} \
+            verify
         env:
           JDK_JAVA_OPTIONS: --add-opens=java.base/java.lang=ALL-UNNAMED

.github/workflows/ci.yml

@@ -1,7 +1,23 @@
 # Jinjava Releases #
+### 2026-02-02 Version 2.8.3 ([Maven Central](https://search.maven.org/artifact/com.hubspot.jinjava/jinjava/2.8.3/jar)) ###
+* Disallow accessing properties on restricted classes while rendering through ForTag
+* Upgrade jackson to version 2.20
+* [Add performance optimization to chained filters](https://github.com/HubSpot/jinjava/pull/1274)
+
+### 2026-02-02 Version 2.7.6 ([Maven Central](https://search.maven.org/artifact/com.hubspot.jinjava/jinjava/2.7.6/jar)) ###
+* Disallow accessing properties on restricted classes while rendering through ForTag
+* Upgrade jackson to version 2.20
+
+### 2025-10-22 Version 2.8.2 ([Maven Central](https://search.maven.org/artifact/com.hubspot.jinjava/jinjava/2.8.2/jar)) ###
+* [Fix helper token escape handling and unescaping when unquoting strings](https://github.com/HubSpot/jinjava/pull/1263)
+
+### 2025-09-30 Version 2.7.5 ([Maven Central](https://search.maven.org/artifact/com.hubspot.jinjava/jinjava/2.7.5/jar)) ###
+* Disallow accessing properties on restricted classes while rendering
+
 ### 2025-09-16 Version 2.8.1 ([Maven Central](https://search.maven.org/artifact/com.hubspot.jinjava/jinjava/2.8.1/jar)) ###
 * Disallow accessing properties on restricted classes while rendering
 * [Make stack operations use AutoCloseable for safer usage with try-with-resources](https://github.com/HubSpot/jinjava/pull/1250)
+
 ### 2025-05-05 Version 2.8.0 ([Maven Central](https://search.maven.org/artifact/com.hubspot.jinjava/jinjava/2.8.0/jar)) ###
 * [Target Java 17](https://github.com/HubSpot/jinjava/pull/1238)
 * [Implement PyMap#get with optional default](https://github.com/HubSpot/jinjava/pull/1233)

CHANGES.md

@@ -5,25 +5,26 @@
   <parent>
     <groupId>com.hubspot</groupId>
     <artifactId>basepom</artifactId>
-    <version>63.4</version>
+    <version>65.1</version>
   </parent>
 
   <groupId>com.hubspot.jinjava</groupId>
   <artifactId>jinjava</artifactId>
-  <version>2.8.1-SNAPSHOT</version>
+  <version>2.8.3-SNAPSHOT</version>
 
   <name>${project.groupId}:${project.artifactId}</name>
   <description>Jinja templating engine implemented in Java</description>
 
   <properties>
     <project.build.targetJdk>17</project.build.targetJdk>
-    <project.build.releaseJdk>17</project.build.releaseJdk>
+    <hubspot.build.moved.after>1770136059427</hubspot.build.moved.after>
 
     <dep.plugin.jacoco.version>0.8.3</dep.plugin.jacoco.version>
     <dep.plugin.javadoc.version>3.0.1</dep.plugin.javadoc.version>
     <dep.hubspot-immutables.version>1.9</dep.hubspot-immutables.version>
     <dep.algebra.version>1.5</dep.algebra.version>
-
+    <dep.mockito.version>5.20.0</dep.mockito.version>
+    <dep.jackson.version>2.20.1</dep.jackson.version>
 
     <basepom.test.add.opens>
       --add-opens=java.base/java.lang=ALL-UNNAMED
@@ -72,27 +73,27 @@
       <dependency>
         <groupId>com.fasterxml.jackson.core</groupId>
         <artifactId>jackson-annotations</artifactId>
-        <version>2.14.0</version>
+        <version>2.20</version>
       </dependency>
       <dependency>
         <groupId>com.fasterxml.jackson.core</groupId>
         <artifactId>jackson-databind</artifactId>
-        <version>2.14.0</version>
+        <version>${dep.jackson.version}</version>
       </dependency>
       <dependency>
         <groupId>com.fasterxml.jackson.core</groupId>
         <artifactId>jackson-core</artifactId>
-        <version>2.14.0</version>
+        <version>${dep.jackson.version}</version>
       </dependency>
       <dependency>
         <groupId>com.fasterxml.jackson.dataformat</groupId>
         <artifactId>jackson-dataformat-yaml</artifactId>
-        <version>2.14.0</version>
+        <version>${dep.jackson.version}</version>
       </dependency>
       <dependency>
         <groupId>com.fasterxml.jackson.datatype</groupId>
         <artifactId>jackson-datatype-jdk8</artifactId>
-        <version>2.14.0</version>
+        <version>${dep.jackson.version}</version>
       </dependency>
       <dependency>
         <groupId>com.hubspot.immutables</groupId>
@@ -181,6 +182,10 @@
       <groupId>ch.obermuhlner</groupId>
       <artifactId>big-math</artifactId>
     </dependency>
+    <dependency>
+      <groupId>com.google.errorprone</groupId>
+      <artifactId>error_prone_annotations</artifactId>
+    </dependency>
 
     <dependency>
       <groupId>ch.qos.logback</groupId>
@@ -336,6 +341,18 @@
           <argLine>@{argLine} ${basepom.test.add.opens}</argLine>
         </configuration>
       </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-compiler-plugin</artifactId>
+        <configuration>
+          <annotationProcessorPaths>
+            <path>
+              <groupId>org.immutables</groupId>
+              <artifactId>value</artifactId>
+            </path>
+          </annotationProcessorPaths>
+        </configuration>
+      </plugin>
     </plugins>
   </build>
 

pom.xml

@@ -88,6 +88,7 @@ public class JinjavaConfig {
   private final ExecutionMode executionMode;
   private final LegacyOverrides legacyOverrides;
   private final boolean enablePreciseDivideFilter;
+  private final boolean enableFilterChainOptimization;
   private final ObjectMapper objectMapper;
 
   private final Features features;
@@ -151,6 +152,7 @@ private JinjavaConfig(Builder builder) {
     legacyOverrides = builder.legacyOverrides;
     dateTimeProvider = builder.dateTimeProvider;
     enablePreciseDivideFilter = builder.enablePreciseDivideFilter;
+    enableFilterChainOptimization = builder.enableFilterChainOptimization;
     objectMapper = setupObjectMapper(builder.objectMapper);
     objectUnwrapper = builder.objectUnwrapper;
     processors = builder.processors;
@@ -307,6 +309,10 @@ public boolean getEnablePreciseDivideFilter() {
     return enablePreciseDivideFilter;
   }
 
+  public boolean isEnableFilterChainOptimization() {
+    return enableFilterChainOptimization;
+  }
+
   public DateTimeProvider getDateTimeProvider() {
     return dateTimeProvider;
   }
@@ -349,6 +355,7 @@ public static class Builder {
     private ExecutionMode executionMode = DefaultExecutionMode.instance();
     private LegacyOverrides legacyOverrides = LegacyOverrides.NONE;
     private boolean enablePreciseDivideFilter = false;
+    private boolean enableFilterChainOptimization = false;
     private ObjectMapper objectMapper = null;
 
     private ObjectUnwrapper objectUnwrapper = new JinjavaObjectUnwrapper();
@@ -520,6 +527,13 @@ public Builder withEnablePreciseDivideFilter(boolean enablePreciseDivideFilter)
       return this;
     }
 
+    public Builder withEnableFilterChainOptimization(
+      boolean enableFilterChainOptimization
+    ) {
+      this.enableFilterChainOptimization = enableFilterChainOptimization;
+      return this;
+    }
+
     public Builder withObjectMapper(ObjectMapper objectMapper) {
       this.objectMapper = objectMapper;
       return this;