From bcc2ce9c3fad5f98c6adf157314e325d80831925 Mon Sep 17 00:00:00 2001 From: Yuta HIGUCHI Date: Wed, 7 Mar 2018 16:42:11 -0800 Subject: [PATCH] Generate copyright year in swagger template code - exclude generated source code from checkstyle by default Change-Id: I3f79183a8aae1f24d36558860555b5b0298cd8c3 --- lib/pom.xml | 3 ++- pom.xml | 1 + .../java/org/onosproject/onosjar/SwaggerGenerator.java | 5 ++++- .../build/buck-plugin/src/main/resources/registrator.javat | 7 ++++--- tools/build/conf/src/main/resources/onos/suppressions.xml | 4 ++++ tools/package/maven-plugin/pom.xml | 2 +- .../main/java/org/onosproject/maven/OnosSwaggerMojo.java | 4 +++- .../main/resources/org/onosproject/maven/registrator.javat | 7 ++++--- 8 files changed, 23 insertions(+), 10 deletions(-) diff --git a/lib/pom.xml b/lib/pom.xml index de64efb000..1ec77c7a63 100644 --- a/lib/pom.xml +++ b/lib/pom.xml @@ -39,7 +39,7 @@ 1.13.0-SNAPSHOT 4.1.8.Final 3.2.0.onos - 1.11 + ${project.version} 2.4 5.0.0 3.0.8 @@ -714,6 +714,7 @@ grpc-core ${grpccore.version} + diff --git a/pom.xml b/pom.xml index 0c2eeb2b5f..c6672d2b60 100644 --- a/pom.xml +++ b/pom.xml @@ -70,6 +70,7 @@ tools/package/archetypes tools/package/branding + tools/package/maven-plugin pipelines diff --git a/tools/build/buck-plugin/src/main/java/org/onosproject/onosjar/SwaggerGenerator.java b/tools/build/buck-plugin/src/main/java/org/onosproject/onosjar/SwaggerGenerator.java index 88850e8725..e567c81857 100644 --- a/tools/build/buck-plugin/src/main/java/org/onosproject/onosjar/SwaggerGenerator.java +++ b/tools/build/buck-plugin/src/main/java/org/onosproject/onosjar/SwaggerGenerator.java @@ -33,6 +33,7 @@ import java.io.File; import java.io.FileWriter; import java.io.IOException; import java.io.PrintWriter; +import java.time.Year; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -502,7 +503,9 @@ public class SwaggerGenerator { src = src.replace("${api.package}", apiPackage) .replace("${web.context}", webContext) .replace("${api.title}", apiTitle) - .replace("${api.description}", apiDescription); + .replace("${api.description}", apiDescription) + .replace("${year}", Year.now().toString()); + Files.write(src.getBytes(), reg); } catch (IOException e) { throw new RuntimeException("Unable to write " + reg, e); diff --git a/tools/build/buck-plugin/src/main/resources/registrator.javat b/tools/build/buck-plugin/src/main/resources/registrator.javat index 703feb2af6..6596450b17 100644 --- a/tools/build/buck-plugin/src/main/resources/registrator.javat +++ b/tools/build/buck-plugin/src/main/resources/registrator.javat @@ -1,7 +1,5 @@ /* - * Auto-generated by OnosSwaggerMojo. - * - * Copyright 2016-present Open Networking Foundation + * Copyright ${year}-present Open Networking Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,6 +12,9 @@ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. + * + * Auto-generated by OnosSwaggerMojo. + * */ package ${api.package}; diff --git a/tools/build/conf/src/main/resources/onos/suppressions.xml b/tools/build/conf/src/main/resources/onos/suppressions.xml index bfa6412910..dce87bcdfa 100644 --- a/tools/build/conf/src/main/resources/onos/suppressions.xml +++ b/tools/build/conf/src/main/resources/onos/suppressions.xml @@ -54,4 +54,8 @@ + + + + diff --git a/tools/package/maven-plugin/pom.xml b/tools/package/maven-plugin/pom.xml index 0b332628f6..608ee2347b 100644 --- a/tools/package/maven-plugin/pom.xml +++ b/tools/package/maven-plugin/pom.xml @@ -26,7 +26,7 @@ org.onosproject onos-maven-plugin - 1.11-SNAPSHOT + 1.13.0-SNAPSHOT maven-plugin Maven plugin for packaging ONOS applications or generating diff --git a/tools/package/maven-plugin/src/main/java/org/onosproject/maven/OnosSwaggerMojo.java b/tools/package/maven-plugin/src/main/java/org/onosproject/maven/OnosSwaggerMojo.java index fb0eab5bd8..0d44913840 100644 --- a/tools/package/maven-plugin/src/main/java/org/onosproject/maven/OnosSwaggerMojo.java +++ b/tools/package/maven-plugin/src/main/java/org/onosproject/maven/OnosSwaggerMojo.java @@ -41,6 +41,7 @@ import java.io.FileReader; import java.io.FileWriter; import java.io.IOException; import java.io.PrintWriter; +import java.time.Year; import java.util.HashMap; import java.util.Map; import java.util.Optional; @@ -477,7 +478,8 @@ public class OnosSwaggerMojo extends AbstractMojo { src = src.replace("${api.package}", apiPackage) .replace("${web.context}", webContext) .replace("${api.title}", apiTitle) - .replace("${api.description}", apiTitle); + .replace("${api.description}", apiTitle) + .replace("${year}", Year.now().toString()); Files.write(src.getBytes(), reg); } catch (IOException e) { getLog().warn("Unable to write " + reg); diff --git a/tools/package/maven-plugin/src/main/resources/org/onosproject/maven/registrator.javat b/tools/package/maven-plugin/src/main/resources/org/onosproject/maven/registrator.javat index 1e15d45b55..6596450b17 100644 --- a/tools/package/maven-plugin/src/main/resources/org/onosproject/maven/registrator.javat +++ b/tools/package/maven-plugin/src/main/resources/org/onosproject/maven/registrator.javat @@ -1,7 +1,5 @@ /* - * Auto-generated by OnosSwaggerMojo. - * - * Copyright 2015-present Open Networking Foundation + * Copyright ${year}-present Open Networking Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,6 +12,9 @@ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. + * + * Auto-generated by OnosSwaggerMojo. + * */ package ${api.package};