Merge latest upstream from May 5 2026 [WIP]

.github/dependabot.yml

@@ -3,36 +3,9 @@ updates:
 - package-ecosystem: maven
   directory: "/"
   schedule:
-    interval: daily
-    time: "09:00"
-  open-pull-requests-limit: 10
-  ignore:
-  - dependency-name: org.springframework:spring-test
-    versions:
-    - ">= 5.a, < 6"
-  - dependency-name: com.google.javascript:closure-compiler
-    versions:
-    - v20210106
-    - v20210202
-    - v20210302
-  - dependency-name: org.eclipse.jetty:jetty-servlet
-    versions:
-    - 11.0.0
-    - 11.0.1
-  - dependency-name: org.eclipse.jetty:jetty-webapp
-    versions:
-    - 11.0.0
-    - 11.0.1
-  - dependency-name: org.eclipse.jetty:jetty-server
-    versions:
-    - 11.0.0
-    - 11.0.1
-  - dependency-name: org.yaml:snakeyaml
-    versions:
-    - "1.27"
-  - dependency-name: org.apache.commons:commons-lang3
-    versions:
-    - "3.11"
-  - dependency-name: org.apache.felix:maven-bundle-plugin
-    versions:
-    - 5.1.1
+    interval: weekly
+  open-pull-requests-limit: 1
+  groups:
+    dependencies:
+      patterns:
+      - "*"

.github/workflows/build-matrix.yml

@@ -8,26 +8,24 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        java_version: [1.8, 11, 15, 17]
-        os: [ubuntu-latest, windows-latest, macOS-latest]
+        jre: [17]
+        os: [ ubuntu-latest, windows-latest, macOS-latest ]
+        include:
+          - jre: 21
+            os: ubuntu-latest
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v1
+        uses: actions/checkout@v4
       - name: Mustache Specs
         run: |
           git submodule update --init --recursive
       - name: Set up JDK ${{ matrix.java_version }}
-        uses: actions/setup-java@v1
+        uses: actions/setup-java@v4
         with:
-          java-version: ${{ matrix.java_version }}
+          java-version: ${{ matrix.jre }}
+          distribution: 'temurin'
       - name: Install
         run: mvn clean install -DskipTests --batch-mode --no-transfer-progress
-        env:
-          BUILD_PORT: 0
-          BUILD_SECURE_PORT: 0
       - name: Build
         run: mvn clean package --batch-mode --no-transfer-progress
-        env:
-          BUILD_PORT: 0
-          BUILD_SECURE_PORT: 0

.github/workflows/maven-central.yml

@@ -0,0 +1,38 @@
+name: Maven Central
+
+on:
+  release:
+    types: [created]
+
+jobs:
+  release:
+    name: Maven Central
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v4
+      - name: Set up JDK 17
+        uses: actions/setup-java@v4
+        with:
+          java-version: 17
+          distribution: 'temurin'
+          cache: maven
+      - name: Build
+        run: mvn clean install -DskipTests -q
+      - name: Set up Maven Central
+        uses: actions/setup-java@v3
+        with: # running setup-java again overwrites the settings.xml
+          java-version: 17
+          distribution: 'temurin'
+          server-id: central
+          server-username: CENTRAL_USERNAME
+          server-password: CENTRAL_TOKEN
+          gpg-private-key: ${{ secrets.MAVEN_GPG_PRIVATE_KEY }}
+          gpg-passphrase: MAVEN_GPG_PASSPHRASE
+
+      - name: Publish to Maven Central
+        run: mvn -pl '!tests' clean deploy -P central
+        env:
+          CENTRAL_USERNAME: ${{ secrets.CENTRAL_USERNAME }}
+          CENTRAL_TOKEN: ${{ secrets.CENTRAL_TOKEN }}
+          MAVEN_GPG_PASSPHRASE: ${{ secrets.MAVEN_GPG_PASSPHRASE }}

.gitignore

@@ -24,3 +24,5 @@ pom.xml.versionsBackup
 jacoco.exec
 
 out
+tmp
+tmp/spotless

README.md

@@ -27,7 +27,8 @@ Handlebars provides the power necessary to let you build semantic templates effe
 
 # Requirements
 
-- Handlebars 4.3+ requires Java 8 or higher.
+- Handlebars 4.4+ requires Java 17 or higher.
+- Handlebars 4.3+ requires Java 8 or higher (NOT MAINTAINED).
 
 
 # Getting Started
@@ -61,9 +62,9 @@ Hello {{this}}!
 ```
 
 ```java
-Handlebars handlebars = new Handlebars();
+var handlebars = new Handlebars();
 
-Template template = handlebars.compile("mytemplate");
+var template = handlebars.compile("mytemplate");
 
 System.out.println(template.apply("Handlebars.java"));
 ```
@@ -544,8 +545,8 @@ Template template = handlebars.compileInline("{{#blog-list blogs}}{{/blog-list}}
 ```java
 handlebars.registerHelper("blog-list", new Helper<Blog>() {
   public CharSequence apply(List<Blog> list, Options options) {
-    String class = options.hash("class");
-    assertEquals("blog-css", class);
+    String classParam = options.hash("class");
+    assertEquals("blog-css", classParam);
     ...
   }
 });
@@ -885,58 +886,17 @@ escapeHTML: True, if the JSON content contains HTML chars and you need to escape
 
 pretty: True, if the JSON content must be formatted. Default is: false.
 
-## Jackson 2.x
+## Jackson
 
 Maven:
 ```xml
  <dependency>
    <groupId>com.github.jknack</groupId>
-   <artifactId>handlebars-jackson2</artifactId>
+   <artifactId>handlebars-jackson</artifactId>
    <version>${handlebars-version}</version>
  </dependency>
 ```
 
-Same as Jackson1.x, except for the name of the helper: ```Jackson2Helper```
-
-## Markdown
-
-Maven:
-```xml
- <dependency>
-   <groupId>com.github.jknack</groupId>
-   <artifactId>handlebars-markdown</artifactId>
-   <version>${handlebars-version}</version>
- </dependency>
-```
-Usage:
-
-```java
- handlebars.registerHelper("md", new MarkdownHelper());
-```
-```
- {{md context}}
-```
-context: An object or null. Required.
-
-## Humanize
-
-Maven:
-```xml
- <dependency>
-   <groupId>com.github.jknack</groupId>
-   <artifactId>handlebars-humanize</artifactId>
-   <version>${handlebars-version}</version>
- </dependency>
-```
-Usage:
-
-```java
- // Register all the humanize helpers.
- HumanizeHelper.register(handlebars);
-```
-
-See the JavaDoc of the [HumanizeHelper] (https://github.com/jknack/handlebars.java/blob/master/handlebars-humanize/src/main/java/com/github/jknack/handlebars/HumanizeHelper.java) for more information.
-
 ## SpringMVC
 
 Maven:
@@ -1063,7 +1023,6 @@ Hello {{#child}}{{this.value}}{{/child}}
  * [Handlebars.js](http://handlebarsjs.com/)
  * [Try Handlebars.js](http://tryhandlebarsjs.com/)
  * [Mustache](http://mustache.github.io/)
- * [Humanize](https://github.com/mfornos/humanize)
  * [ANTLRv4](http://www.antlr.org/)
 
 ## Author

TODO

@@ -1,4 +1,3 @@
 Java 15/17 Migration
 
-- Replace pegdown with something else
 - Upgrade spring

handlebars-caffeine/pom.xml

@@ -5,11 +5,10 @@
   <parent>
     <groupId>com.github.jknack</groupId>
     <artifactId>handlebars.java</artifactId>
-    <version>5.0.0-SNAPSHOT</version>
+    <version>4.5.1</version>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>
-  <groupId>com.github.jknack</groupId>
   <artifactId>handlebars-caffeine</artifactId>
 
   <name>Handlebars Caffeine Cache</name>
@@ -24,14 +23,7 @@
     <dependency>
       <groupId>com.github.ben-manes.caffeine</groupId>
       <artifactId>caffeine</artifactId>
-      <version>2.9.2</version>
-    </dependency>
-
-    <!-- Servlet API -->
-    <dependency>
-      <groupId>javax.servlet</groupId>
-      <artifactId>servlet-api</artifactId>
-      <scope>provided</scope>
+      <version>3.1.8</version>
     </dependency>
 
     <!-- Test dependencies -->
@@ -50,14 +42,8 @@
     </dependency>
 
     <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <scope>test</scope>
-    </dependency>
-
-    <dependency>
-      <groupId>org.mockito</groupId>
-      <artifactId>mockito-core</artifactId>
+      <groupId>org.junit.jupiter</groupId>
+      <artifactId>junit-jupiter-engine</artifactId>
       <scope>test</scope>
     </dependency>
 
@@ -70,7 +56,7 @@
     <dependency>
       <groupId>org.antlr</groupId>
       <artifactId>antlr4-runtime</artifactId>
-      <version>4.9.3</version>
+      <version>${antlr-version}</version>
       <exclusions>
         <exclusion>
           <groupId>org.abego.treelayout</groupId>
@@ -85,6 +71,12 @@
       <artifactId>commons-text</artifactId>
       <scope>test</scope>
     </dependency>
+
+    <dependency>
+      <groupId>org.mockito</groupId>
+      <artifactId>mockito-core</artifactId>
+      <scope>test</scope>
+    </dependency>
   </dependencies>
 
 </project>

handlebars-caffeine/src/main/java/com/github/jknack/handlebars/cache/CaffeineTemplateCache.java → handlebars-caffeine/src/main/java/com/github/jknack/handlebars/caffeine/CaffeineTemplateCache.java

@@ -1,21 +1,9 @@
-/**
- * Copyright (c) 2012-2015 Edgar Espina
- *
- * This file is part of Handlebars.java.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+/*
+ * Handlebars.java: https://github.com/jknack/handlebars.java
+ * Apache License Version 2.0 http://www.apache.org/licenses/LICENSE-2.0
+ * Copyright (c) 2012 Edgar Espina
  */
-package com.github.jknack.handlebars.cache;
+package com.github.jknack.handlebars.caffeine;
 
 import static java.util.Objects.requireNonNull;
 
@@ -26,6 +14,7 @@
 import com.github.jknack.handlebars.Handlebars;
 import com.github.jknack.handlebars.Parser;
 import com.github.jknack.handlebars.Template;
+import com.github.jknack.handlebars.cache.TemplateCache;
 import com.github.jknack.handlebars.io.TemplateSource;
 
 /**
@@ -36,9 +25,7 @@
  */
 public class CaffeineTemplateCache implements TemplateCache {
 
-  /**
-   * Internal cache.
-   */
+  /** Internal cache. */
   private final Cache<TemplateSource, Template> cache;
 
   /**
@@ -50,28 +37,32 @@ public CaffeineTemplateCache(final Cache<TemplateSource, Template> cache) {
     this.cache = requireNonNull(cache, "The cache is required.");
   }
 
-  @Override public void clear() {
+  @Override
+  public void clear() {
     cache.invalidateAll();
   }
 
-  @Override public void evict(final TemplateSource source) {
+  @Override
+  public void evict(final TemplateSource source) {
     cache.invalidate(source);
   }
 
-  @Override public Template get(final TemplateSource source, final Parser parser) {
+  @Override
+  public Template get(final TemplateSource source, final Parser parser) {
     return cache.get(source, parseTemplate(parser));
   }
 
   /**
-   * This method does nothing on Caffeine. Better option is to use a loading cache with a
-   * eviction policy of your choice.
+   * This method does nothing on Caffeine. Better option is to use a loading cache with a eviction
+   * policy of your choice.
    *
-   * Don't use this method.
+   * <p>Don't use this method.
    *
    * @param reload Ignored.
    * @return This template cache.
    */
-  @Override public TemplateCache setReload(final boolean reload) {
+  @Override
+  public TemplateCache setReload(final boolean reload) {
     // NOOP
     return this;
   }