From 2a78a3757795bbbfb6ac875dc51ec3b4eb7a5364 Mon Sep 17 00:00:00 2001 From: Gary Wu Date: Mon, 21 Aug 2017 14:03:14 -0700 Subject: Refactor oparent for independent versioning Change-Id: I543f394b360b6926986f33b48bef4b3355363beb Issue-id: INT-103 Signed-off-by: Gary Wu --- checkstyle/pom.xml | 2 +- .../src/main/resources/apache-license-2.regexp.txt | 15 -- checkstyle/src/main/resources/check-license.xml | 19 -- .../onap-checkstyle/apache-license-2.regexp.txt | 15 ++ .../resources/onap-checkstyle/check-license.xml | 19 ++ .../resources/onap-checkstyle/onap-java-style.xml | 220 +++++++++++++++++++++ checkstyle/src/main/resources/onap-java-style.xml | 220 --------------------- 7 files changed, 255 insertions(+), 255 deletions(-) delete mode 100644 checkstyle/src/main/resources/apache-license-2.regexp.txt delete mode 100644 checkstyle/src/main/resources/check-license.xml create mode 100644 checkstyle/src/main/resources/onap-checkstyle/apache-license-2.regexp.txt create mode 100644 checkstyle/src/main/resources/onap-checkstyle/check-license.xml create mode 100644 checkstyle/src/main/resources/onap-checkstyle/onap-java-style.xml delete mode 100644 checkstyle/src/main/resources/onap-java-style.xml (limited to 'checkstyle') diff --git a/checkstyle/pom.xml b/checkstyle/pom.xml index 00f76d6..8dd9c61 100644 --- a/checkstyle/pom.xml +++ b/checkstyle/pom.xml @@ -20,7 +20,7 @@ org.onap.oparent version 1.0.0-SNAPSHOT - ../version + .. checkstyle oparent/checkstyle diff --git a/checkstyle/src/main/resources/apache-license-2.regexp.txt b/checkstyle/src/main/resources/apache-license-2.regexp.txt deleted file mode 100644 index 5b69f28..0000000 --- a/checkstyle/src/main/resources/apache-license-2.regexp.txt +++ /dev/null @@ -1,15 +0,0 @@ -^/[*]+$ -^ \* Copyright .*$ -^ \*( )?$ -^ \* Licensed under the Apache License, Version 2.0 \(the "License"\);$ -^ \* you may not use this file except in compliance with the License.$ -^ \* You may obtain a copy of the License at$ -^ \*( )?$ -^ \*( )*http://www.apache.org/licenses/LICENSE-2.0$ -^ \*( )?$ -^ \* Unless required by applicable law or agreed to in writing, software -^ \* distributed under the License is distributed on an "AS IS" BASIS, -^ \* 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. -^ [*]+/$ diff --git a/checkstyle/src/main/resources/check-license.xml b/checkstyle/src/main/resources/check-license.xml deleted file mode 100644 index 2a0acd0..0000000 --- a/checkstyle/src/main/resources/check-license.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - - - - - - - - - diff --git a/checkstyle/src/main/resources/onap-checkstyle/apache-license-2.regexp.txt b/checkstyle/src/main/resources/onap-checkstyle/apache-license-2.regexp.txt new file mode 100644 index 0000000..5b69f28 --- /dev/null +++ b/checkstyle/src/main/resources/onap-checkstyle/apache-license-2.regexp.txt @@ -0,0 +1,15 @@ +^/[*]+$ +^ \* Copyright .*$ +^ \*( )?$ +^ \* Licensed under the Apache License, Version 2.0 \(the "License"\);$ +^ \* you may not use this file except in compliance with the License.$ +^ \* You may obtain a copy of the License at$ +^ \*( )?$ +^ \*( )*http://www.apache.org/licenses/LICENSE-2.0$ +^ \*( )?$ +^ \* Unless required by applicable law or agreed to in writing, software +^ \* distributed under the License is distributed on an "AS IS" BASIS, +^ \* 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. +^ [*]+/$ diff --git a/checkstyle/src/main/resources/onap-checkstyle/check-license.xml b/checkstyle/src/main/resources/onap-checkstyle/check-license.xml new file mode 100644 index 0000000..2a0acd0 --- /dev/null +++ b/checkstyle/src/main/resources/onap-checkstyle/check-license.xml @@ -0,0 +1,19 @@ + + + + + + + + + + + + + + diff --git a/checkstyle/src/main/resources/onap-checkstyle/onap-java-style.xml b/checkstyle/src/main/resources/onap-checkstyle/onap-java-style.xml new file mode 100644 index 0000000..32439e2 --- /dev/null +++ b/checkstyle/src/main/resources/onap-checkstyle/onap-java-style.xml @@ -0,0 +1,220 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/checkstyle/src/main/resources/onap-java-style.xml b/checkstyle/src/main/resources/onap-java-style.xml deleted file mode 100644 index 32439e2..0000000 --- a/checkstyle/src/main/resources/onap-java-style.xml +++ /dev/null @@ -1,220 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -- cgit 1.2.3-korg