Java 17: upgrade to Java 17

- Add TODO notes
- Turn off pegdown for now (need replacement)

Author: jknack

.github/workflows/build-matrix.yml

@@ -8,7 +8,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        java_version: [1.8, 11, 15]
+        java_version: [1.8, 11, 15, 17]
         os: [ubuntu-latest, windows-latest, macOS-latest]
 
     steps:

TODO

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

handlebars-markdown/pom.xml

@@ -46,6 +46,25 @@
       <scope>test</scope>
     </dependency>
 
+    <dependency>
+      <groupId>org.antlr</groupId>
+      <artifactId>antlr4-runtime</artifactId>
+      <version>4.9.2</version>
+      <exclusions>
+        <exclusion>
+          <groupId>org.abego.treelayout</groupId>
+          <artifactId>org.abego.treelayout.core</artifactId>
+        </exclusion>
+      </exclusions>
+      <scope>test</scope>
+    </dependency>
+
+    <dependency>
+      <groupId>org.apache.commons</groupId>
+      <artifactId>commons-text</artifactId>
+      <scope>test</scope>
+    </dependency>
+
   </dependencies>
 
 </project>

handlebars-maven-plugin-tests/pom.xml

@@ -41,6 +41,12 @@
         </executions>
       </plugin>
 
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-war-plugin</artifactId>
+        <version>3.3.2</version>
+      </plugin>
+
       <!-- Deploy plugin -->
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>

handlebars-proto/pom.xml

@@ -124,11 +124,11 @@
       <version>${project.version}</version>
     </dependency>
 
-    <dependency>
-      <groupId>com.github.jknack</groupId>
-      <artifactId>handlebars-markdown</artifactId>
-      <version>${project.version}</version>
-    </dependency>
+<!--    <dependency>-->
+<!--      <groupId>com.github.jknack</groupId>-->
+<!--      <artifactId>handlebars-markdown</artifactId>-->
+<!--      <version>${project.version}</version>-->
+<!--    </dependency>-->
 
     <dependency>
       <groupId>com.github.jknack</groupId>

handlebars-proto/src/main/java/com/github/jknack/handlebars/server/HbsServer.java

@@ -43,11 +43,9 @@
 import org.slf4j.LoggerFactory;
 
 import com.github.jknack.handlebars.Handlebars;
-import com.github.jknack.handlebars.Helper;
 import com.github.jknack.handlebars.HelperRegistry;
 import com.github.jknack.handlebars.HumanizeHelper;
 import com.github.jknack.handlebars.Jackson2Helper;
-import com.github.jknack.handlebars.MarkdownHelper;
 import com.github.jknack.handlebars.helper.StringHelpers;
 import com.github.jknack.handlebars.io.FileTemplateLoader;
 import com.github.jknack.handlebars.io.TemplateLoader;
@@ -169,7 +167,7 @@ public static void run(final Options args) throws Exception {
       (context, options) -> new Handlebars.SafeString(options.fn.text())
     );
     handlebars.registerHelper("json", Jackson2Helper.INSTANCE);
-    handlebars.registerHelper("md", new MarkdownHelper());
+//    handlebars.registerHelper("md", new MarkdownHelper());
     // String helpers
     StringHelpers.register(handlebars);
     // Humanize helpers

pom.xml

@@ -17,7 +17,7 @@
     <module>handlebars-helpers</module>
 <!--    <module>handlebars-springmvc</module>-->
     <module>handlebars-jackson2</module>
-    <module>handlebars-markdown</module>
+<!--    <module>handlebars-markdown</module>-->
     <module>handlebars-humanize</module>
     <module>handlebars-proto</module>
     <module>handlebars-guava-cache</module>
@@ -271,7 +271,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-deploy-plugin</artifactId>
-        <version>2.8.2</version>
+        <version>3.0.0-M1</version>
       </plugin>
 
     </plugins>