git push Merge branch 'master' of github.com:forge/roaster

forge · Jun 28, 2016 · 8ce2bf2 · 8ce2bf2
2 parents 5e3f803 + 75961d7
commit 8ce2bf2
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/api/src/main/java/org/jboss/forge/roaster/model/util/Types.java b/api/src/main/java/org/jboss/forge/roaster/model/util/Types.java
@@ -629,7 +629,7 @@ public static String getDefaultValue(String type)
     */
    public static String[] splitGenerics(String typeName)
    {
-      typeName = typeName.replaceAll(" ","");
+      typeName = typeName.replaceAll("\\s","");
       int begin = typeName.indexOf('<');
       int end = typeName.indexOf('>');
       if (begin == -1 || end == -1)

diff --git a/pom.xml b/pom.xml
@@ -3,7 +3,7 @@
    <parent>
       <groupId>org.jboss</groupId>
       <artifactId>jboss-parent</artifactId>
-      <version>20</version>
+      <version>21</version>
    </parent>
    <groupId>org.jboss.forge.roaster</groupId>
    <artifactId>roaster-parent</artifactId>

diff --git a/tests/src/test/java/org/jboss/forge/test/roaster/model/JavaDocTest.java b/tests/src/test/java/org/jboss/forge/test/roaster/model/JavaDocTest.java
@@ -197,7 +197,7 @@ public void testJavaDocFullTextShouldFormatParamWithSpace() throws Exception
                         "    }}");
       MethodSource<JavaClassSource> method = src.getMethods().get(0);
       Assert.assertEquals(
-               "Creates a new instance of CLASS\n@param actual the actual value.\n@return the modified text",
+               "Creates a new instance of CLASS" + LINE_SEPARATOR + "@param actual the actual value." + LINE_SEPARATOR + "@return the modified text",
                method.getJavaDoc().getFullText());
    }