From 14f51a7e33c1e29c70279fd0100c0253692c7025 Mon Sep 17 00:00:00 2001 From: "adheli.tavares" Date: Fri, 12 Apr 2024 14:55:07 +0100 Subject: [PATCH] Removing ONAP O-Parent as parent to Policy Framework. - dependency management direct in integration/pom.xml - plugins for code-coverage, vulnerabilities scan are now configured on pom.xml Issue-ID: POLICY-4960 Change-Id: Ib5092f9baa51df60a8b9765b53a4fbbb3a61d60c Signed-off-by: adheli.tavares --- checkstyle/pom.xml | 30 ++ .../onap-checkstyle/apache-license-2.regexp.txt | 15 + .../resources/onap-checkstyle/check-license.xml | 35 +++ .../resources/onap-checkstyle/onap-java-style.xml | 338 +++++++++++++++++++++ integration/pom.xml | 53 +++- pom.xml | 31 +- settings.xml | 174 +++++++++++ 7 files changed, 663 insertions(+), 13 deletions(-) create mode 100644 checkstyle/pom.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 create mode 100644 settings.xml diff --git a/checkstyle/pom.xml b/checkstyle/pom.xml new file mode 100644 index 00000000..3d8e11fd --- /dev/null +++ b/checkstyle/pom.xml @@ -0,0 +1,30 @@ + + + + 4.0.0 + + org.onap.policy.parent + policy-parent + 4.1.2-SNAPSHOT + + checkstyle + checkstyle + 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 00000000..5b69f285 --- /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 00000000..8421f520 --- /dev/null +++ b/checkstyle/src/main/resources/onap-checkstyle/check-license.xml @@ -0,0 +1,35 @@ + + + + + + + + + + + + + + + + + + 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 00000000..3de8f610 --- /dev/null +++ b/checkstyle/src/main/resources/onap-checkstyle/onap-java-style.xml @@ -0,0 +1,338 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/integration/pom.xml b/integration/pom.xml index c0e5a4ed..b50cc62c 100644 --- a/integration/pom.xml +++ b/integration/pom.xml @@ -39,7 +39,14 @@ 17 4.1.2-SNAPSHOT + 4.1.2-SNAPSHOT ${project.basedir}/../target/code-coverage/jacoco-ut.exec + 3.2 + jacoco + + ${project.reporting.outputDirectory}/jacoco-ut/jacoco.xml + + org/drools/**/*,**/gen/**,**/generated-sources/** https://nexus3.onap.org/repository/npm.public/npm/-/ nexus3.onap.org:10001 nexus3.onap.org:10003 @@ -63,6 +70,7 @@ 1.9.23 2.23.1 1.4.14 + 3.3.1 3.1.0 1.1.1 1.11.10 @@ -79,6 +87,7 @@ 6.0.18 3.1.10 6.1.8 + 3.11.0.3922 3.0.52 2.2.20 10.1.19 @@ -952,7 +961,6 @@ kotlin-stdlib-common ${version.kotlin} - @@ -985,7 +993,7 @@ org.apache.maven.plugins maven-checkstyle-plugin - 3.3.0 + ${version.maven-checkstyle-plugin} check @@ -1107,6 +1115,25 @@ + + cve + + + + org.owasp + dependency-check-maven + 9.1.0 + + + + aggregate + + + + + + + @@ -1276,6 +1303,21 @@ maven-surefire-plugin 3.1.2 + + org.sonarsource.scanner.maven + sonar-maven-plugin + ${version.sonar} + + + org.apache.maven.plugins + maven-site-plugin + 4.0.0-M13 + + + org.apache.maven.plugins + maven-deploy-plugin + 3.1.1 + @@ -1301,6 +1343,8 @@ org/drools/**/* + **/gen/** + **/generated-sources/** @@ -1356,6 +1400,7 @@ org.apache.maven.plugins maven-checkstyle-plugin + ${version.maven-checkstyle-plugin} onap-license @@ -1401,9 +1446,9 @@ - org.onap.oparent + org.onap.policy.parent checkstyle - ${oparent.version} + ${version.parent.checkstyle} compile diff --git a/pom.xml b/pom.xml index dc589fac..18c74a37 100644 --- a/pom.xml +++ b/pom.xml @@ -19,29 +19,37 @@ SPDX-License-Identifier: Apache-2.0 ============LICENSE_END========================================================= --> - + 4.0.0 - - org.onap.oparent - oparent - - 3.3.3 - - org.onap.policy.parent policy-parent 4.1.2-SNAPSHOT pom - 3.3.3 + UTF-8 + UTF-8 + /content/sites/site/${project.groupId}/${project.artifactId}/${project.version} + checkstyle resources integration + + + ecomp-releases + ${onap.nexus.url}/content/repositories/releases + + + ecomp-snapshots + ${onap.nexus.url}/content/repositories/snapshots + + + @@ -80,6 +88,11 @@ use mvn spotless:apply to rewrite source files use mvn spotless:check to validate source files --> + + org.sonarsource.scanner.maven + sonar-maven-plugin + ${sonar.scanner.version} + diff --git a/settings.xml b/settings.xml new file mode 100644 index 00000000..39ff52d9 --- /dev/null +++ b/settings.xml @@ -0,0 +1,174 @@ + + + + + + + onap-settings + + https://nexus.onap.org + https://nexus.onap.org/content/sites/raw + https://nexus.onap.org/service/local/repositories/raw/content + ecomp-raw + + + nexus3.onap.org:10003 + nexus3.onap.org:10002 + nexus3.onap.org:10001 + nexus3.onap.org:10003 + + + + onap-snapshots + + + onap-snapshots + onap-snapshots + https://nexus.onap.org/content/repositories/snapshots/ + + false + + + true + + + + + + onap-snapshots + onap-snapshots + https://nexus.onap.org/content/repositories/snapshots/ + + false + + + true + + + + + + onap-releases + + + onap-releases + onap-releases + https://nexus.onap.org/content/repositories/releases/ + + true + + + false + + + + + + onap-releases + onap-releases + https://nexus.onap.org/content/repositories/releases/ + + true + + + false + + + + + + onap-public + + + central + https://repo1.maven.org/maven2/ + + + onap-public + onap-public + https://nexus.onap.org/content/repositories/public/ + + true + + + false + + + + + + central + https://repo1.maven.org/maven2/ + + + onap-public + onap-public + https://nexus.onap.org/content/repositories/public/ + + true + + + false + + + + + + + local-public + + + local-public + local-public + http://nexus-proxy:8081/nexus/content/repositories/public/ + + true + + + false + + + + + + local-public + local-public + http://nexus-proxy:8081/nexus/content/repositories/public/ + + true + + + false + + + + + + + + onap-settings + onap-snapshots + onap-releases + onap-public + + + + -- 2.16.6