Merge pull request #50 from allegro/handlebars-4.3

Upgrade Handlebars to 4.3.1

Author: 3750

README.md

@@ -34,11 +34,10 @@ Add any handlebars helper to dependencies and you can start using it.
 dependencies {
     compile 'com.github.jknack:handlebars-helpers:4.2.0',
             'com.github.jknack:handlebars-jackson2:4.2.0',
-            'com.github.jknack:handlebars-humanize:4.2.0',
-            'com.github.jknack:handlebars-markdown:4.2.0'
+            'com.github.jknack:handlebars-humanize:4.2.0'
 }
 ```
-NOTE: Jackson2Helper and MarkdownHelper will register with name `json` and `md` respectively.
+NOTE: Jackson2Helper will register with name `json`.
 Every other helper will register with its default name.
 
 More information about available helpers can be found on

build.gradle

@@ -29,7 +29,7 @@ project.version = scmVersion.version
 ext {
     jodaVersion = '2.10.10'
     spockVersion = '2.0-groovy-3.0'
-    handlebarsVersion = '4.2.0'
+    handlebarsVersion = '4.3.1'
     springBootVersion = '2.6.1'
 }
 
@@ -39,6 +39,10 @@ allprojects {
     }
     apply plugin: 'groovy'
     sourceCompatibility = 1.8
+
+    test {
+        useJUnitPlatform()
+    }
 }
 dependencies {
     compile 'org.springframework.boot:spring-boot-starter-web:' + springBootVersion,
@@ -48,7 +52,6 @@ dependencies {
     compile 'joda-time:joda-time:' + jodaVersion, optional
     compile 'com.github.jknack:handlebars-helpers:' + handlebarsVersion, optional
     compile 'com.github.jknack:handlebars-humanize:' + handlebarsVersion, optional
-    compile 'com.github.jknack:handlebars-markdown:' + handlebarsVersion, optional
     compile 'com.github.jknack:handlebars-jackson2:' + handlebarsVersion, optional
     compile 'org.springframework.boot:spring-boot-configuration-processor:' + springBootVersion, optional
 
@@ -91,10 +94,6 @@ jacocoTestReport {
     }
 }
 
-test {
-    useJUnitPlatform()
-}
-
 java {
     withSourcesJar()
     withJavadocJar()

src/main/java/pl/allegro/tech/boot/autoconfigure/handlebars/HandlebarsHelpersAutoConfiguration.java

@@ -2,7 +2,6 @@
 
 import com.github.jknack.handlebars.HumanizeHelper;
 import com.github.jknack.handlebars.Jackson2Helper;
-import com.github.jknack.handlebars.MarkdownHelper;
 import com.github.jknack.handlebars.helper.AssignHelper;
 import com.github.jknack.handlebars.helper.IncludeHelper;
 import com.github.jknack.handlebars.helper.JodaHelper;
@@ -66,19 +65,6 @@ public void registerHelper() {
         }
     }
 
-    @Configuration
-    @ConditionalOnClass(MarkdownHelper.class)
-    static class MarkdownHelperAutoConfiguration {
-
-        @Autowired
-        private HandlebarsViewResolver handlebarsViewResolver;
-
-        @PostConstruct
-        public void registerHelper() {
-            handlebarsViewResolver.registerHelper("md", MarkdownHelper.INSTANCE);
-        }
-    }
-
     @Configuration
     @ConditionalOnClass(NumberHelper.class)
     static class NumberHelpersAutoConfiguration {

src/test/groovy/pl/allegro/tech/boot/autoconfigure/handlebars/HandlebarsPropertiesSpec.groovy

@@ -18,7 +18,7 @@ class HandlebarsPropertiesSpec extends Specification {
         properties.applyToMvcViewResolver(viewResolver)
 
         then:
-        viewResolver.valueResolvers.length == 2
+        viewResolver.valueResolvers.size() == 2
         viewResolver.valueResolvers.contains(JavaBeanValueResolver.INSTANCE)
         viewResolver.valueResolvers.contains(MapValueResolver.INSTANCE)
         viewResolver.registerMessageHelper

test-dependencies/src/test/groovy/pl/allegro/tech/boot/autoconfigure/handlebars/HandlebarsHelpersDependenciesSpec.groovy

@@ -32,6 +32,5 @@ class HandlebarsHelpersDependenciesSpec extends Specification {
         resolver.helper('assign')
         resolver.helper('include')
         resolver.helper('camelize')
-        resolver.helper('md')
     }
 }