From 76dc892491948adae5e5e62cf94448967e8d865b Mon Sep 17 00:00:00 2001 From: Ashlee Young Date: Sun, 6 Dec 2015 07:15:03 -0800 Subject: Fixes bad POM file with ONOS commit 8c68536972f63069c263635c9d9f4f31d7f3e9a2 Change-Id: I7adb5a2d3738d53dbc41db7577768b0e7ced5450 Signed-off-by: Ashlee Young --- .../src/main/java/org/onosproject/maven/OnosSwaggerMojo.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'framework/src/onos/tools/package/maven-plugin/src/main/java/org/onosproject/maven/OnosSwaggerMojo.java') diff --git a/framework/src/onos/tools/package/maven-plugin/src/main/java/org/onosproject/maven/OnosSwaggerMojo.java b/framework/src/onos/tools/package/maven-plugin/src/main/java/org/onosproject/maven/OnosSwaggerMojo.java index 0ee5382e..a98557dc 100644 --- a/framework/src/onos/tools/package/maven-plugin/src/main/java/org/onosproject/maven/OnosSwaggerMojo.java +++ b/framework/src/onos/tools/package/maven-plugin/src/main/java/org/onosproject/maven/OnosSwaggerMojo.java @@ -243,7 +243,7 @@ public class OnosSwaggerMojo extends AbstractMojo { String resourcePath, ArrayNode tagArray, ObjectNode definitions) { String fullPath = resourcePath, consumes = "", produces = "", comment = javaMethod.getComment(); - DocletTag tag = javaMethod.getTagByName("rsModel"); + DocletTag tag = javaMethod.getTagByName("onos.rsModel"); for (JavaAnnotation annotation : javaMethod.getAnnotations()) { String name = annotation.getType().getName(); if (name.equals(PATH)) { @@ -293,6 +293,7 @@ public class OnosSwaggerMojo extends AbstractMojo { + param + ".json"); String lines = Files.readLines(config, Charsets.UTF_8).stream().reduce((t, u) -> t + u). get(); + lines = lines.replaceAll("\\s+",""); definitions.putPOJO(param, lines); } catch (IOException e) { e.printStackTrace(); -- cgit 1.2.3-korg