Merge pull request ehcache#696 from ljacomet/issue-691

Issue ehcache#691 Specify encoding for compiler and javadoc
chrisdennis · Dec 7, 2015 · 0341acd · 0341acd
2 parents ecc9dbe + a3f1be5
commit 0341acd
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/build.gradle b/build.gradle
@@ -169,3 +169,12 @@ configure(projectsToDeploy.collect {project(it)}) {
     utils.pomFiller(pom, project.subPomName, project.subPomDesc)
   }
 }
+
+allprojects {
+  tasks.withType(JavaCompile) {
+    options.encoding = 'UTF-8'
+  }
+  tasks.withType(Javadoc) {
+    options.encoding = 'UTF-8'
+  }
+}
diff --git a/management/src/main/java/org/ehcache/management/providers/ManagementProvider.java b/management/src/main/java/org/ehcache/management/providers/ManagementProvider.java
@@ -83,7 +83,7 @@ public interface ManagementProvider<T> {
    * @param context the context.
    * @param statisticNames the statistic names to collect.
    * @param since The unix time in ms from where to return the statistics for statistics based on samples.
-   * @return the statistic map, the key being the statistic namesø.
+   * @return the statistic map, the key being the statistic names.
    */
   Map<String, Statistic<?, ?>> collectStatistics(Context context, Collection<String> statisticNames, long since);