v2.0.0

jknack · jknack · commit dfb64ef89e8a · 2014-11-27T15:19:05.000-03:00
diff --git a/.gitignore b/.gitignore
@@ -16,4 +16,7 @@ dependency-reduced-pom.xml
 
 # IntelliJ IDE Project Files #
 *.iml
-*.idea
+*.idea
+
+*.versionsBackup
+pom.xml.versionsBackup
diff --git a/README.md b/README.md
@@ -1,5 +1,6 @@
 [![Build Status](https://secure.travis-ci.org/jknack/handlebars.java.png?branch=master)](https://travis-ci.org/jknack/handlebars.java)
 [![Coverage Status](https://coveralls.io/repos/jknack/handlebars.java/badge.png)](https://coveralls.io/r/jknack/handlebars.java)
+[![Maven Central](https://maven-badges.herokuapp.com/maven-central/com.github.jknack/handlebars/badge.svg)](https://maven-badges.herokuapp.com/maven-central/com.github.jknack/handlebars)
 
 Handlebars.java
 ===============
@@ -17,7 +18,7 @@ Handlebars provides the power necessary to let you build semantic templates effe
  The [Handlebars.java blog](http://jknack.github.io/handlebars.java) is a good place for getting started too.
 
 ## Maven
-#### Stable version: **1.3.2**
+#### Stable version: **2.0.0**
 
 
 ```xml
@@ -28,7 +29,7 @@ Handlebars provides the power necessary to let you build semantic templates effe
   </dependency>
 ```
  
-#### Development version: **1.3.3-SNAPSHOT**
+#### Development version: **2.1.0-SNAPSHOT**
 
 SNAPSHOT versions are NOT synchronized to Central. If you want to use a snapshot version you need to add the https://oss.sonatype.org/content/repositories/snapshots/ repository to your pom.xml.
 
diff --git a/handlebars-guava-cache/pom.xml b/handlebars-guava-cache/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>com.github.jknack</groupId>
     <artifactId>handlebars.java</artifactId>
-    <version>1.3.3-SNAPSHOT</version>
+    <version>2.0.0</version>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>
diff --git a/handlebars-helpers/pom.xml b/handlebars-helpers/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>com.github.jknack</groupId>
     <artifactId>handlebars.java</artifactId>
-    <version>1.3.3-SNAPSHOT</version>
+    <version>2.0.0</version>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>
diff --git a/handlebars-humanize/pom.xml b/handlebars-humanize/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>com.github.jknack</groupId>
     <artifactId>handlebars.java</artifactId>
-    <version>1.3.3-SNAPSHOT</version>
+    <version>2.0.0</version>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>
diff --git a/handlebars-jackson2/pom.xml b/handlebars-jackson2/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>com.github.jknack</groupId>
     <artifactId>handlebars.java</artifactId>
-    <version>1.3.3-SNAPSHOT</version>
+    <version>2.0.0</version>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>
diff --git a/handlebars-json/pom.xml b/handlebars-json/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>com.github.jknack</groupId>
     <artifactId>handlebars.java</artifactId>
-    <version>1.3.3-SNAPSHOT</version>
+    <version>2.0.0</version>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>
diff --git a/handlebars-markdown/pom.xml b/handlebars-markdown/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>com.github.jknack</groupId>
     <artifactId>handlebars.java</artifactId>
-    <version>1.3.3-SNAPSHOT</version>
+    <version>2.0.0</version>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>
diff --git a/handlebars-maven-plugin-tests/pom.xml b/handlebars-maven-plugin-tests/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>com.github.jknack</groupId>
     <artifactId>handlebars.java</artifactId>
-    <version>1.3.3-SNAPSHOT</version>
+    <version>2.0.0</version>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>
diff --git a/handlebars-maven-plugin/pom.xml b/handlebars-maven-plugin/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>com.github.jknack</groupId>
     <artifactId>handlebars.java</artifactId>
-    <version>1.3.3-SNAPSHOT</version>
+    <version>2.0.0</version>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>
diff --git a/handlebars-proto/pom.xml b/handlebars-proto/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>com.github.jknack</groupId>
     <artifactId>handlebars.java</artifactId>
-    <version>1.3.3-SNAPSHOT</version>
+    <version>2.0.0</version>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>
diff --git a/handlebars-springmvc/pom.xml b/handlebars-springmvc/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>com.github.jknack</groupId>
     <artifactId>handlebars.java</artifactId>
-    <version>1.3.3-SNAPSHOT</version>
+    <version>2.0.0</version>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>
diff --git a/handlebars/pom.xml b/handlebars/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>com.github.jknack</groupId>
     <artifactId>handlebars.java</artifactId>
-    <version>1.3.3-SNAPSHOT</version>
+    <version>2.0.0</version>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>
diff --git a/handlebars/src/main/java/com/github/jknack/handlebars/Handlebars.java b/handlebars/src/main/java/com/github/jknack/handlebars/Handlebars.java
@@ -207,7 +207,7 @@ public static boolean isEmpty(final Object value) {
      * For example:
      * </p>
      * <p>
-     * <code>"bread" & "butter"</code>
+     * <code>"bread" {@literal &} "butter"</code>
      * </p>
      * becomes:
      *
diff --git a/handlebars/src/main/java/com/github/jknack/handlebars/Lambda.java b/handlebars/src/main/java/com/github/jknack/handlebars/Lambda.java
@@ -41,7 +41,7 @@
  * <pre>
  * Map hash = ...
  * hash.put("name", "Willy");
- * hash.put("wrapped", new Lambda<String>() {
+ * hash.put("wrapped", new Lambda&lt;String&gt;() {
  *   public String apply(Scope scope, Template template) {
  *    return "<b>" + template.apply(scope) + "</b>";
  *   }
diff --git a/handlebars/src/main/java/com/github/jknack/handlebars/TagType.java b/handlebars/src/main/java/com/github/jknack/handlebars/TagType.java
@@ -33,7 +33,7 @@ public enum TagType {
 
   /**
    * All variables are HTML escaped by default. If you want to return unescaped HTML, use the
-   * triple mustache: <code>{{&name}}</code>.
+   * triple mustache: <code>{{{@literal &}name}}</code>.
    */
   AMP_VAR,
 
diff --git a/handlebars/src/main/java/com/github/jknack/handlebars/Template.java b/handlebars/src/main/java/com/github/jknack/handlebars/Template.java
@@ -229,7 +229,6 @@ public List<String> collectReferenceParameters() {
 
   /**
    * @return The line and column where the template was found.
-   * @return
    */
   int[] position();
 }
diff --git a/handlebars/src/main/java/com/github/jknack/handlebars/TypeSafeTemplate.java b/handlebars/src/main/java/com/github/jknack/handlebars/TypeSafeTemplate.java
@@ -28,7 +28,7 @@
  * </p>
  *
  * <pre>
- *  public interface UserTemplate extends TypeSafeTemplate<User> {
+ *  public interface UserTemplate extends TypeSafeTemplate&lt;User&gt; {
  *    UserTemplate setAge(int age);
  *
  *    UserTemplate setRole(String role);
diff --git a/handlebars/src/main/java/com/github/jknack/handlebars/helper/I18nHelper.java b/handlebars/src/main/java/com/github/jknack/handlebars/helper/I18nHelper.java
@@ -59,9 +59,8 @@ public enum I18nHelper implements Helper<String> {
    * A helper built on top of {@link ResourceBundle}. A {@link ResourceBundle} is the most well
    * known mechanism for internationalization (i18n).
    * </p>
-   * <p>
+   *
    * <h3>messages.properties:</h3>
-   * </p>
    *
    * <pre>
    *  hello=Hola
@@ -297,8 +296,9 @@ private String message(final String message) {
   /**
    * Set the message source.
    *
+   * NotThreadSafe Make sure to call this method ONCE at start time.
+   *
    * @param source The message source. Required.
-   * @NotThreadSafe Make sure to call this method ONCE at start time.
    */
   public void setSource(final I18nSource source) {
     this.source = notNull(source, "The i18n source is required.");
@@ -308,8 +308,9 @@ public void setSource(final I18nSource source) {
    * Set the default bundle's name. Default is: messages and this method let you override the
    * default bundle's name to something else.
    *
+   * NotThreadSafe Make sure to call this method ONCE at start time.
+   *
    * @param bundle The default's bundle name. Required.
-   * @NotThreadSafe Make sure to call this method ONCE at start time.
    */
   public void setDefaultBundle(final String bundle) {
     this.defaultBundle = notEmpty(bundle, "A bundle's name is required.");
@@ -319,8 +320,9 @@ public void setDefaultBundle(final String bundle) {
    * Set the default locale. Default is system dependent and this method let you override the
    * default bundle's name to something else.
    *
+   * NotThreadSafe Make sure to call this method ONCE at start time.
+   *
    * @param locale The default locale name. Required.
-   * @NotThreadSafe Make sure to call this method ONCE at start time.
    */
   public void setDefaultLocale(final Locale locale) {
     this.defaultLocale = notNull(locale, "A locale is required.");
diff --git a/handlebars/src/main/java/com/github/jknack/handlebars/helper/PartialHelper.java b/handlebars/src/main/java/com/github/jknack/handlebars/helper/PartialHelper.java
@@ -27,7 +27,7 @@
 
 /**
  * The partial registry helper. It stores templates in the current execution
- * context. Later the {@link #BLOCK} helper read the registry and apply the
+ * context. Later the {@link BlockHelper} helper read the registry and apply the
  * template.
  *
  * @author edgar.espina
diff --git a/handlebars/src/main/java/com/github/jknack/handlebars/helper/StringHelpers.java b/handlebars/src/main/java/com/github/jknack/handlebars/helper/StringHelpers.java
@@ -151,7 +151,7 @@ protected CharSequence safeApply(final Object context, final Options options) {
    *
    * <pre>
    * {{join "a" "b" "c" " // " [prefix=""] [suffix=""]}}
-   * <p>Join the "a", "b", "c", the output will be the string "a // b // c".</p>
+   * Join the "a", "b", "c", the output will be the string "a // b // c".
    * </pre>
    */
   join {
diff --git a/integration-tests/handlebars-without-rhino/pom.xml b/integration-tests/handlebars-without-rhino/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>com.github.jknack</groupId>
     <artifactId>integration-tests</artifactId>
-    <version>1.3.3-SNAPSHOT</version>
+    <version>2.0.0</version>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>
diff --git a/integration-tests/pom.xml b/integration-tests/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>com.github.jknack</groupId>
     <artifactId>handlebars.java</artifactId>
-    <version>1.3.3-SNAPSHOT</version>
+    <version>2.0.0</version>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>
diff --git a/pom.xml b/pom.xml
@@ -4,7 +4,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.github.jknack</groupId>
   <artifactId>handlebars.java</artifactId>
-  <version>1.3.3-SNAPSHOT</version>
+  <version>2.0.0</version>
   <packaging>pom</packaging>
 
   <name>Handlebars.java</name>
