version bump: dependencies upgrade fix #659

Author: jknack

handlebars-guava-cache/src/test/java/com/github/jknack/handlebars/io/GuavaCachedTemplateLoaderTest.java

@@ -24,7 +24,7 @@ public void testCacheWithExpiration() throws Exception {
 
     final int TOTAL = 1000;
 
-    Stopwatch sw = new Stopwatch().start();
+    Stopwatch sw = Stopwatch.createStarted();
     for (int i = 0; i < TOTAL; i++) {
       loader.sourceAt("template");
     }

handlebars-humanize/src/main/java/com/github/jknack/handlebars/HumanizeHelper.java

@@ -24,6 +24,7 @@
 import java.util.Locale;
 
 import com.github.jknack.handlebars.internal.Locales;
+
 import static java.util.Objects.requireNonNull;
 
 /**
@@ -380,25 +381,6 @@ public Object apply(final Object value, final Options options)
     }
   },
 
-  /**
-   * <p>
-   * Strips diacritic marks.
-   * </p>
-   *
-   * <pre>
-   * {{transliterate string}}
-   * </pre>
-   *
-   * @see Humanize#transliterate(String)
-   */
-  transliterate {
-    @Override
-    public Object apply(final Object value, final Options options)
-        throws IOException {
-      return Humanize.transliterate((String) value);
-    }
-  },
-
   /**
    * <p>
    * Makes a phrase underscored instead of spaced.

handlebars-humanize/src/test/java/com/github/jknack/handlebars/HumanizeHelperTest.java

@@ -20,7 +20,7 @@ public void binaryPrefix() throws IOException {
     assertEquals("2 bytes",
         handlebars.compileInline("{{binaryPrefix this}}").apply(2));
 
-    assertEquals("1.5 kB",
+    assertEquals("1.5 KB",
         handlebars.compileInline("{{binaryPrefix this}}").apply(1536));
 
     assertEquals("5 MB",
@@ -211,13 +211,6 @@ public void titleize() throws IOException {
             .apply("Handlebars.java rocks!"));
   }
 
-  @Test
-  public void transliterate() throws IOException {
-    assertEquals("Hablo espanol",
-        handlebars.compileInline("{{transliterate this}}")
-            .apply("Hablo español"));
-  }
-
   @Test
   public void underscore() throws IOException {
     assertEquals("Handlebars_Java_rock",

handlebars-markdown/output.md

@@ -0,0 +1,7 @@
+<h1>Header 1</h1>
+<ul>
+  <li>Item 1</li>
+  <li>Item 2</li>
+  <li>Item 3</li>
+</ul>
+<h2>Header 2</h2>

handlebars-markdown/pom.xml

@@ -46,6 +46,12 @@
       <scope>test</scope>
     </dependency>
 
+    <dependency>
+      <groupId>org.apache.commons</groupId>
+      <artifactId>commons-lang3</artifactId>
+      <optional>true</optional>
+    </dependency>
+
   </dependencies>
 
 </project>

handlebars-markdown/src/test/java/com/github/jknack/handlebars/MarkdownHelperTest.java

@@ -20,6 +20,9 @@
 import static org.junit.Assert.assertEquals;
 
 import java.io.IOException;
+import java.nio.charset.StandardCharsets;
+import java.nio.file.Files;
+import java.nio.file.Paths;
 
 import org.junit.Test;
 
@@ -53,13 +56,13 @@ public void markdown() throws IOException {
     handlebars.registerHelper("markdown", new MarkdownHelper());
     Template template = handlebars.compileInline("{{markdown .}}");
 
-    String expected = "<h1>Header 1</h1>\n";
-    expected += "<ul>\n";
-    expected += "  <li>Item 1</li>\n";
-    expected += "  <li>Item 2</li>\n";
-    expected += "  <li>Item 3</li>\n";
-    expected += "</ul><h2>Header 2</h2>";
-    System.out.println(template.apply(text));
+    String expected = "<h1>Header 1</h1>\n"
+        + "<ul>\n"
+        + "  <li>Item 1</li>\n"
+        + "  <li>Item 2</li>\n"
+        + "  <li>Item 3</li>\n"
+        + "</ul>\n"
+        + "<h2>Header 2</h2>";
     assertEquals(expected, template.apply(text));
   }
 

handlebars-proto/pom.xml

@@ -14,7 +14,7 @@
   <name>A standalone Handlebars Server</name>
 
   <properties>
-    <jetty-version>8.1.7.v20120910</jetty-version>
+    <jetty-version>9.3.24.v20180605</jetty-version>
   </properties>
 
   <build>

handlebars/src/main/java/com/github/jknack/handlebars/internal/Partial.java

@@ -219,8 +219,6 @@ protected void merge(final Context context, final Writer writer)
             throw fnf;
           }
         }
-      } else {
-        partials.removeLast();
       }
       context.data(Context.CALLEE, this);
       Map<String, Object> hash = hash(context);

pom.xml

@@ -65,20 +65,20 @@
       <dependency>
         <groupId>org.apache.commons</groupId>
         <artifactId>commons-lang3</artifactId>
-        <version>3.7</version>
+        <version>3.8.1</version>
       </dependency>
 
       <dependency>
         <groupId>org.apache.commons</groupId>
         <artifactId>commons-text</artifactId>
-        <version>1.3</version>
+        <version>1.6</version>
       </dependency>
 
       <!-- Guava -->
       <dependency>
         <groupId>com.google.guava</groupId>
         <artifactId>guava</artifactId>
-        <version>14.0.1</version>
+        <version>18.0</version>
       </dependency>
 
       <dependency>
@@ -98,7 +98,7 @@
       <dependency>
         <groupId>org.slf4j</groupId>
         <artifactId>slf4j-api</artifactId>
-        <version>1.6.4</version>
+        <version>1.7.25</version>
       </dependency>
 
       <!-- Servlet API -->
@@ -109,13 +109,6 @@
         <scope>provided</scope>
       </dependency>
 
-      <!-- Jackson 1.x -->
-      <dependency>
-        <groupId>org.codehaus.jackson</groupId>
-        <artifactId>jackson-mapper-asl</artifactId>
-        <version>${jackson-version}</version>
-      </dependency>
-
       <!-- Jackson 2.x -->
       <dependency>
         <groupId>com.fasterxml.jackson.core</groupId>
@@ -127,21 +120,27 @@
       <dependency>
         <groupId>org.pegdown</groupId>
         <artifactId>pegdown</artifactId>
-        <version>1.2.1</version>
+        <version>1.6.0</version>
       </dependency>
 
       <!-- Humanize -->
       <dependency>
         <groupId>com.github.mfornos</groupId>
         <artifactId>humanize-slim</artifactId>
-        <version>1.1.1</version>
+        <version>${humanize.version}</version>
+      </dependency>
+
+      <dependency>
+        <groupId>com.github.mfornos</groupId>
+        <artifactId>humanize-icu</artifactId>
+        <version>${humanize.version}</version>
       </dependency>
 
       <!-- Test dependencies -->
       <dependency>
         <groupId>ch.qos.logback</groupId>
         <artifactId>logback-classic</artifactId>
-        <version>1.0.3</version>
+        <version>1.2.3</version>
         <scope>test</scope>
       </dependency>
 
@@ -422,8 +421,8 @@
   <properties>
     <!-- Encoding UTF-8 -->
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <jackson2-version>2.1.4</jackson2-version>
-    <jackson-version>1.9.12</jackson-version>
+    <jackson2-version>2.9.7</jackson2-version>
+    <humanize.version>1.2.2</humanize.version>
     <jacoco.version>0.8.1</jacoco.version>
     <maven.build.timestamp.format>yyyy-MM-dd HH:mm:ssa</maven.build.timestamp.format>
     <timestamp>${maven.build.timestamp}</timestamp>