Merge pull request #54 from jcputney/master

Upgrading to Handlebars 4.4.0, Spring Boot 3, Spring Framework 6, JDK17

Author: 3750

.github/workflows/gradle.yml

@@ -14,9 +14,9 @@ jobs:
       with:
         fetch-depth: '2'
     - name: Set up JDK
-      uses: actions/setup-java@v2
+      uses: actions/setup-java@v4
       with:
-        java-version: '8'
+        java-version: '17'
         distribution: 'adopt'
     - name: Build with Gradle
       run: ./gradlew build

.github/workflows/publish.yml

@@ -15,10 +15,11 @@ jobs:
 
       - uses: gradle/wrapper-validation-action@v1
 
-      - name: Set up JDK 1.8
-        uses: actions/setup-java@v1
+      - name: Set up JDK 17
+        uses: actions/setup-java@v4
         with:
-          java-version: 1.8
+          java-version: 17
+          distribution: 'adopt'
 
       - name: Publish to maven central
         run: ./gradlew publishToSonatype closeAndReleaseSonatypeStagingRepository
@@ -27,4 +28,4 @@ jobs:
           SONATYPE_PASSWORD: ${{ secrets.SONATYPE_PASSWORD }}
           GPG_KEY_ID: ${{ secrets.GPG_KEY_ID }}
           GPG_PRIVATE_KEY: ${{ secrets.GPG_PRIVATE_KEY }}
-          GPG_PRIVATE_KEY_PASSWORD: ${{ secrets.GPG_PRIVATE_KEY_PASSWORD }}
+          GPG_PRIVATE_KEY_PASSWORD: ${{ secrets.GPG_PRIVATE_KEY_PASSWORD }}

README.md

@@ -24,20 +24,19 @@ dependencies {
 
 ## Requirements
 
-Since version 0.3.0 handlebars-spring-boot-starter requires Spring Boot 2.0, Spring Framework 5 and Java 8.
+Since version 0.5.0 handlebars-spring-boot-starter requires Spring Boot 3, Spring Framework 6 and Java 17.
 
 ## Helpers
 
 Spring Boot Starter Handlebars will automatically register handlebars helpers based on project dependencies.
 Add any handlebars helper to dependencies and you can start using it.
 ```gradle
 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'
+    compile 'com.github.jknack:handlebars-helpers:4.4.0',
+            'com.github.jknack:handlebars-jackson:4.4.0'
 }
 ```
-NOTE: Jackson2Helper will register with name `json`.
+NOTE: JacksonHelper 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

@@ -7,7 +7,7 @@ buildscript {
 plugins {
     id 'pmd'
     id 'jacoco'
-    id 'com.github.spotbugs' version '4.7.1'
+    id 'com.github.spotbugs' version '6.0.23'
     id 'codenarc'
     id 'checkstyle'
     id 'maven-publish'
@@ -27,18 +27,18 @@ project.group = 'pl.allegro.tech.boot'
 project.version = scmVersion.version
 
 ext {
-    jodaVersion = '2.12.5'
+    jodaVersion = '2.13.0'
     spockVersion = '2.3-groovy-3.0'
-    handlebarsVersion = '4.3.1'
-    springBootVersion = '2.7.16'
+    handlebarsVersion = '4.4.0'
+    springBootVersion = '3.3.4'
 }
 
 allprojects {
     repositories {
         mavenCentral()
     }
     apply plugin: 'groovy'
-    sourceCompatibility = 1.8
+    sourceCompatibility = 17
 
     test {
         useJUnitPlatform()
@@ -51,8 +51,7 @@ dependencies {
 
     api 'joda-time:joda-time:' + jodaVersion, optional
     api 'com.github.jknack:handlebars-helpers:' + handlebarsVersion, optional
-    api 'com.github.jknack:handlebars-humanize:' + handlebarsVersion, optional
-    api 'com.github.jknack:handlebars-jackson2:' + handlebarsVersion, optional
+    api 'com.github.jknack:handlebars-jackson:' + handlebarsVersion, optional
     api 'org.springframework.boot:spring-boot-configuration-processor:' + springBootVersion, optional
 
     testImplementation 'org.spockframework:spock-core:' + spockVersion,
@@ -61,10 +60,10 @@ dependencies {
 }
 compileJava.dependsOn(processResources)
 
-checkstyle { toolVersion = '8.45' }
+checkstyle { toolVersion = '10.12.4' }
 
 codenarc {
-    toolVersion = '2.1.0'
+    toolVersion = '3.5.0'
     configFile = new File("${projectDir}/config/codenarc/test-rules.groovy")
 }
 
@@ -90,8 +89,8 @@ spotbugsTest {
 
 jacocoTestReport {
     reports {
-        xml.enabled = true
-        html.enabled = true
+        xml.required = true
+        html.required = true
     }
 }
 

config/codenarc/StarterRuleSet-AllRulesByCategory.groovy

@@ -359,7 +359,6 @@ ruleset {
     UnnecessarySelfAssignment
     UnnecessarySemicolon
     UnnecessaryStringInstantiation
-    UnnecessarySubstring
     UnnecessaryTernaryExpression
     UnnecessaryToString
     UnnecessaryTransientModifier
@@ -374,4 +373,4 @@ ruleset {
     UnusedVariable
 
 
-}
+}

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.4-bin.zip
 networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
+distributionSha256Sum=bed1da33cca0f557ab13691c77f38bb67388119e4794d113e051039b80af9bb1

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

@@ -1,12 +1,13 @@
 package pl.allegro.tech.boot.autoconfigure.handlebars;
 
 import com.github.jknack.handlebars.Template;
-import com.github.jknack.handlebars.cache.GuavaTemplateCache;
 import com.github.jknack.handlebars.cache.TemplateCache;
+import com.github.jknack.handlebars.guava.GuavaTemplateCache;
 import com.github.jknack.handlebars.io.TemplateLoader;
 import com.github.jknack.handlebars.io.TemplateSource;
 import com.github.jknack.handlebars.springmvc.HandlebarsViewResolver;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
@@ -15,12 +16,12 @@
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 
-import javax.annotation.PostConstruct;
+import jakarta.annotation.PostConstruct;
 
 import static com.google.common.cache.CacheBuilder.newBuilder;
 
+@AutoConfiguration
 @ConditionalOnProperty(prefix = "handlebars", value = "enabled", havingValue = "true", matchIfMissing = true)
-@Configuration
 @EnableConfigurationProperties(HandlebarsProperties.class)
 @ConditionalOnWebApplication
 public class HandlebarsAutoConfiguration {

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

@@ -1,41 +1,41 @@
 package pl.allegro.tech.boot.autoconfigure.handlebars;
 
-import com.github.jknack.handlebars.HumanizeHelper;
-import com.github.jknack.handlebars.Jackson2Helper;
-import com.github.jknack.handlebars.helper.AssignHelper;
-import com.github.jknack.handlebars.helper.IncludeHelper;
-import com.github.jknack.handlebars.helper.JodaHelper;
-import com.github.jknack.handlebars.helper.NumberHelper;
+import com.github.jknack.handlebars.helper.ext.AssignHelper;
+import com.github.jknack.handlebars.helper.ext.IncludeHelper;
+import com.github.jknack.handlebars.helper.ext.JodaHelper;
+import com.github.jknack.handlebars.helper.ext.NumberHelper;
 import com.github.jknack.handlebars.helper.StringHelpers;
+import com.github.jknack.handlebars.jackson.JacksonHelper;
 import com.github.jknack.handlebars.springmvc.HandlebarsViewResolver;
 import org.joda.time.format.DateTimeFormat;
 import org.springframework.beans.BeansException;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.config.BeanPostProcessor;
+import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 
-import javax.annotation.PostConstruct;
+import jakarta.annotation.PostConstruct;
 
 import static org.springframework.core.annotation.AnnotationUtils.findAnnotation;
 
-@Configuration
+@AutoConfiguration
 @ConditionalOnClass(HandlebarsViewResolver.class)
 @ConditionalOnWebApplication
 public class HandlebarsHelpersAutoConfiguration {
 
     @Configuration
-    @ConditionalOnClass(Jackson2Helper.class)
+    @ConditionalOnClass(JacksonHelper.class)
     static class JsonHelperAutoConfiguration {
 
         @Autowired
         private HandlebarsViewResolver handlebarsViewResolver;
 
         @PostConstruct
         public void registerHelper() {
-            handlebarsViewResolver.registerHelper("json", Jackson2Helper.INSTANCE);
+            handlebarsViewResolver.registerHelper("json", JacksonHelper.INSTANCE);
         }
     }
 
@@ -78,19 +78,6 @@ public void registerHelpers() {
         }
     }
 
-    @Configuration
-    @ConditionalOnClass(HumanizeHelper.class)
-    static class HumanizeHelpersAutoConfiguration {
-
-        @Autowired
-        private HandlebarsViewResolver handlebarsViewResolver;
-
-        @PostConstruct
-        public void registerHelpers() {
-            HumanizeHelper.register(handlebarsViewResolver.getHandlebars());
-        }
-    }
-
     @Configuration
     @ConditionalOnClass({JodaHelper.class, DateTimeFormat.class})
     static class JodaHelpersAutoConfiguration {

src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports

@@ -0,0 +1,2 @@
+pl.allegro.tech.boot.autoconfigure.handlebars.HandlebarsAutoConfiguration
+pl.allegro.tech.boot.autoconfigure.handlebars.HandlebarsHelpersAutoConfiguration

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

@@ -2,14 +2,13 @@ package pl.allegro.tech.boot.autoconfigure.handlebars
 
 import static org.springframework.web.servlet.support.RequestContext.WEB_APPLICATION_CONTEXT_ATTRIBUTE
 
-import com.github.jknack.handlebars.cache.GuavaTemplateCache
+import com.github.jknack.handlebars.guava.GuavaTemplateCache
 import com.github.jknack.handlebars.cache.HighConcurrencyTemplateCache
 import com.github.jknack.handlebars.cache.NullTemplateCache
 import com.github.jknack.handlebars.io.ClassPathTemplateLoader
 import com.github.jknack.handlebars.springmvc.HandlebarsViewResolver
 import com.github.jknack.handlebars.springmvc.SpringTemplateLoader
 import org.springframework.beans.factory.NoSuchBeanDefinitionException
-import org.springframework.boot.test.util.TestPropertyValues
 import org.springframework.context.annotation.Bean
 import org.springframework.mock.web.MockHttpServletRequest
 import org.springframework.mock.web.MockHttpServletResponse

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

@@ -31,7 +31,6 @@ class HandlebarsHelpersAutoConfigurationSpec extends Specification {
         with(resolver) {
             helper('json')
             helper('assign')
-            helper('camelize')
             helper('include')
             helper('stringFormat')
         }

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

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