From cb08a08a8e13867f7eebd302e584159c44884fe3 Mon Sep 17 00:00:00 2001 From: "adheli.tavares" Date: Wed, 10 Dec 2025 09:43:30 +0000 Subject: [PATCH] Decoupling clamp from policy-parent Issue-ID: POLICY-5521 Change-Id: I99baee12d7f48dd0bc74598b00c908cb341e8580 Signed-off-by: adheli.tavares --- clamp-parent/checkstyle/pom.xml | 34 + .../onap-checkstyle/apache-license-2.regexp.txt | 15 + .../resources/onap-checkstyle/check-license.xml | 35 + .../resources/onap-checkstyle/onap-java-style.xml | 338 +++++ clamp-parent/dependencies/pom.xml | 1385 ++++++++++++++++++++ clamp-parent/pom.xml | 120 ++ common/pom.xml | 3 +- examples/pom.xml | 3 +- models/pom.xml | 3 +- .../JpaAutomationCompositionDefinition.java | 2 +- .../acm/persistence/concepts/JpaParticipant.java | 2 +- .../policy/clamp/models/acm/utils/AcmUtils.java | 2 +- packages/pom.xml | 28 +- participant/pom.xml | 3 +- policy-common/pom.xml | 3 +- policy-models/pom.xml | 3 +- pom.xml | 33 +- runtime-acm/pom.xml | 6 +- 18 files changed, 1949 insertions(+), 69 deletions(-) create mode 100644 clamp-parent/checkstyle/pom.xml create mode 100644 clamp-parent/checkstyle/src/main/resources/onap-checkstyle/apache-license-2.regexp.txt create mode 100644 clamp-parent/checkstyle/src/main/resources/onap-checkstyle/check-license.xml create mode 100644 clamp-parent/checkstyle/src/main/resources/onap-checkstyle/onap-java-style.xml create mode 100644 clamp-parent/dependencies/pom.xml create mode 100644 clamp-parent/pom.xml diff --git a/clamp-parent/checkstyle/pom.xml b/clamp-parent/checkstyle/pom.xml new file mode 100644 index 000000000..121d98b32 --- /dev/null +++ b/clamp-parent/checkstyle/pom.xml @@ -0,0 +1,34 @@ + + + + + 4.0.0 + + org.onap.policy.clamp + clamp-parent + 9.0.0-SNAPSHOT + + + checkstyle + checkstyle + + \ No newline at end of file diff --git a/clamp-parent/checkstyle/src/main/resources/onap-checkstyle/apache-license-2.regexp.txt b/clamp-parent/checkstyle/src/main/resources/onap-checkstyle/apache-license-2.regexp.txt new file mode 100644 index 000000000..5b69f2853 --- /dev/null +++ b/clamp-parent/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/clamp-parent/checkstyle/src/main/resources/onap-checkstyle/check-license.xml b/clamp-parent/checkstyle/src/main/resources/onap-checkstyle/check-license.xml new file mode 100644 index 000000000..8421f5205 --- /dev/null +++ b/clamp-parent/checkstyle/src/main/resources/onap-checkstyle/check-license.xml @@ -0,0 +1,35 @@ + + + + + + + + + + + + + + + + + + diff --git a/clamp-parent/checkstyle/src/main/resources/onap-checkstyle/onap-java-style.xml b/clamp-parent/checkstyle/src/main/resources/onap-checkstyle/onap-java-style.xml new file mode 100644 index 000000000..3de8f610e --- /dev/null +++ b/clamp-parent/checkstyle/src/main/resources/onap-checkstyle/onap-java-style.xml @@ -0,0 +1,338 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/clamp-parent/dependencies/pom.xml b/clamp-parent/dependencies/pom.xml new file mode 100644 index 000000000..4269f1fbd --- /dev/null +++ b/clamp-parent/dependencies/pom.xml @@ -0,0 +1,1385 @@ + + + + + 4.0.0 + + org.onap.policy.clamp + clamp-parent + 9.0.0-SNAPSHOT + + dependencies + pom + + + 4.0.0-SNAPSHOT + 5.0.0-SNAPSHOT + ${project.version} + ${project.build.directory}/code-coverage/jacoco-ut.exec + + 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 + + 1.11.0 + 1.17.8 + 1.7.1 + 7.15.0 + 3.3.2 + 8.40.1.Final + 1.13.4 + 33.4.6-jre + 3.0 + 5.4.3 + 5.3.4 + 1.3.6 + 2.18.3 + 0.8.13 + 4.0.5 + 3.1.10 + 12.0.22 + 3.2.1 + 2.9.0 + 0.12.4 + 1.5.6 + 6.0.0 + 4.1.0 + 2.1.20 + 2.24.3 + 1.5.18 + 1.18.42 + 3.3.1 + 3.1.0 + 1.14.5 + 5.20.0 + 5.15.0 + 1.2.1-oss + 1.3.0-oss + 1.43.0 + 3.6.0 + 2.1.1 + 1.9.0 + 2.0.17 + 6.2.12 + 3.5.3 + 3.5.1 + 6.5.5 + 5.0.0.4389 + 3.0.68 + 2.2.29 + + --add-opens java.base/java.time=ALL-UNNAMED + --add-opens java.base/java.util=ALL-UNNAMED + --add-opens java.base/java.lang=ALL-UNNAMED + --add-opens java.sql/java.sql=ALL-UNNAMED + -XX:+EnableDynamicAgentLoading + + + + + + ecomp-site + dav:${onap.nexus.url}${sitePath} + + + + + + + com.github.blagerweij + liquibase-sessionlock + 1.6.9 + + + ch.qos.logback + logback-classic + ${version.logback} + + + ch.qos.logback + logback-core + ${version.logback} + + + com.fasterxml.jackson + jackson-bom + ${version.jackson} + pom + import + + + com.fasterxml.jackson.core + jackson-core + ${version.jackson} + + + com.google.code.gson + gson + 2.12.1 + + + com.google.guava + guava + ${version.guava} + + + com.google.re2j + re2j + 1.8 + + + com.jayway.jsonpath + json-path + ${version.json-path} + + + com.networknt + json-schema-validator + ${version.json-schema-validator} + + + com.sun.xml.bind + jaxb-core + ${version.jaxb} + + + com.sun.xml.bind + jaxb-impl + ${version.jaxb} + + + com.sun.xml.bind + jaxb-xjc + ${version.jaxb} + + + commons-beanutils + commons-beanutils + ${version.beanutils} + + + commons-cli + commons-cli + 1.9.0 + + + commons-codec + commons-codec + 1.18.0 + + + commons-fileupload + commons-fileupload + 1.5 + + + commons-io + commons-io + 2.18.0 + + + commons-logging + commons-logging + 1.3.5 + + + commons-net + commons-net + 3.11.1 + + + info.picocli + picocli + 4.7.7 + + + io.micrometer + micrometer-core + ${version.micrometer} + + + io.micrometer + micrometer-observation + ${version.micrometer} + + + javax.servlet + javax.servlet-api + + + + + io.micrometer + micrometer-registry-prometheus + ${version.micrometer} + + + io.micrometer + micrometer-tracing-bridge-otel + 1.4.7 + + + io.netty + netty-bom + 4.2.7.Final + pom + import + + + io.opentelemetry + opentelemetry-api + ${version.opentel} + + + io.opentelemetry + opentelemetry-context + ${version.opentel} + + + io.opentelemetry + opentelemetry-exporter-otlp + ${version.opentel} + + + io.opentelemetry + opentelemetry-sdk-extension-autoconfigure + ${version.opentel} + + + io.opentelemetry + opentelemetry-sdk-extension-jaeger-remote-sampler + ${version.opentel} + + + io.opentelemetry + opentelemetry-sdk-trace + ${version.opentel} + + + io.opentelemetry.instrumentation + opentelemetry-kafka-clients-2.6 + 2.7.0-alpha + + + io.prometheus + prometheus-metrics-core + ${version.io.prometheus} + + + io.prometheus + prometheus-metrics-instrumentation-jvm + ${version.io.prometheus} + + + io.prometheus + prometheus-metrics-exporter-httpserver + ${version.io.prometheus} + + + io.prometheus + prometheus-metrics-exporter-servlet-jakarta + ${version.io.prometheus} + + + io.swagger.core.v3 + swagger-annotations + ${version.swagger.core.v3} + + + io.swagger.core.v3 + swagger-annotations-jakarta + ${version.swagger.core.v3} + + + io.swagger.core.v3 + swagger-core + ${version.swagger.core.v3} + + + io.swagger.core.v3 + swagger-jaxrs2-jakarta + ${version.swagger.core.v3} + + + io.swagger.core.v3 + swagger-jaxrs2-servlet-initializer-v2-jakarta + ${version.swagger.core.v3} + + + io.swagger.core.v3 + swagger-models-jakarta + ${version.swagger.core.v3} + + + io.swagger.parser.v3 + swagger-parser + 2.1.24 + + + jakarta.activation + jakarta.activation-api + 2.1.3 + + + jakarta.annotation + jakarta.annotation-api + 3.0.0 + + + jakarta.inject + jakarta.inject-api + 2.0.1 + + + jakarta.persistence + jakarta.persistence-api + 3.1.0 + + + jakarta.servlet + jakarta.servlet-api + 6.1.0 + + + jakarta.transaction + jakarta.transaction-api + 2.0.1 + + + jakarta.validation + jakarta.validation-api + 3.1.1 + + + jakarta.ws.rs + jakarta.ws.rs-api + 4.0.0 + + + jakarta.xml.bind + jakarta.xml.bind-api + 4.0.2 + + + net.jimblackler.jsonschemafriend + core + ${version.json-schema-friend} + + + org.apache.commons + commons-collections4 + 4.5.0-M3 + + + org.apache.commons + commons-jexl3 + ${version.jexl3} + + + org.apache.commons + commons-lang3 + 3.18.0 + + + org.apache.commons + commons-math3 + 3.6.1 + + + org.apache.commons + commons-text + 1.13.0 + + + org.apache.httpcomponents.client5 + httpclient5 + ${version.httpclient} + + + org.apache.httpcomponents.core5 + httpcore5 + ${version.httpcore} + + + org.apache.kafka + kafka-clients + ${version.kafka} + + + org.apache.logging.log4j + log4j-api + ${version.log4j} + + + org.apache.logging.log4j + log4j-to-slf4j + ${version.log4j} + + + org.apache.tomcat.embed + tomcat-embed-core + 11.0.13 + + + org.aspectj + aspectjweaver + 1.9.23 + + + org.bouncycastle + bcpkix-fips + 2.1.9 + + + org.codehaus.plexus + plexus-utils + ${version.plexus} + + + org.eclipse.jetty + jetty-http + ${version.jetty} + + + org.eclipse.jetty + jetty-security + ${version.jetty} + + + org.eclipse.jetty + jetty-server + ${version.jetty} + + + org.eclipse.jetty + jetty-util + ${version.jetty} + + + org.eclipse.jetty.ee10 + jetty-ee10-servlet + ${version.jetty} + + + org.glassfish.jaxb + jaxb-core + ${version.jaxb} + + + org.glassfish.jaxb + jaxb-runtime + ${version.jaxb} + + + org.glassfish.jersey.containers + jersey-container-servlet + ${version.jersey} + + + org.glassfish.jersey.core + jersey-client + ${version.jersey} + + + org.glassfish.jersey.inject + jersey-hk2 + ${version.jersey} + + + org.hamcrest + hamcrest + ${version.hamcrest} + + + org.hibernate.orm + hibernate-core + 6.6.16.Final + + + org.hibernate.validator + hibernate-validator + 8.0.2.Final + + + org.jetbrains.kotlin + kotlin-reflect + ${version.kotlin} + + + org.jetbrains.kotlin + kotlin-stdlib + ${version.kotlin} + + + org.jetbrains.kotlin + kotlin-stdlib-jdk7 + ${version.kotlin} + + + org.jetbrains.kotlin + kotlin-stdlib-jdk8 + ${version.kotlin} + + + org.json + json + 20250107 + + + org.liquibase + liquibase-core + 4.32.0 + + + org.openapitools + jackson-databind-nullable + 0.2.6 + + + org.postgresql + postgresql + 42.7.7 + + + org.projectlombok + lombok + ${version.lombok} + + + org.slf4j + jcl-over-slf4j + ${version.slf4j} + + + org.slf4j + slf4j-api + ${version.slf4j} + + + org.slf4j + slf4j-ext + ${version.slf4j} + + + org.springdoc + springdoc-openapi-starter-webmvc-ui + 2.8.6 + + + org.springframework + spring-aop + ${version.spring} + + + org.springframework + spring-aspects + ${version.spring} + + + org.springframework + spring-beans + ${version.spring} + + + org.springframework + spring-context + ${version.spring} + + + org.springframework + spring-core + ${version.spring} + + + org.springframework + spring-expression + ${version.spring} + + + org.springframework + spring-jcl + ${version.spring} + + + org.springframework + spring-jdbc + ${version.spring} + + + org.springframework + spring-orm + ${version.spring} + + + org.springframework + spring-tx + ${version.spring} + + + org.springframework + spring-web + ${version.spring} + + + org.springframework + spring-webflux + ${version.spring} + + + org.springframework + spring-webmvc + ${version.spring} + + + org.springframework.boot + spring-boot + ${version.springboot} + + + org.springframework.boot + spring-boot-autoconfigure + ${version.springboot} + + + org.springframework.boot + spring-boot-starter-actuator + ${version.springboot} + + + org.springframework.boot + spring-boot-starter-aop + ${version.springboot} + + + org.springframework.boot + spring-boot-starter-data-jpa + ${version.springboot} + + + org.springframework.boot + spring-boot-starter-security + ${version.springboot} + + + org.springframework.boot + spring-boot-starter-tomcat + ${version.springboot} + + + org.springframework.boot + spring-boot-starter-validation + ${version.springboot} + + + org.springframework.boot + spring-boot-starter-web + ${version.springboot} + + + + org.springframework.boot + spring-boot-starter-json + + + + + org.springframework.boot + spring-boot-starter-webflux + ${version.springboot} + + + org.springframework.data + spring-data-commons + ${version.spring-data} + + + org.springframework.data + spring-data-jpa + ${version.spring-data} + + + org.springframework.security + spring-security-core + ${version.spring-security} + + + org.springframework.security + spring-security-config + ${version.spring-security} + + + org.springframework.security + spring-security-test + ${version.spring-security} + + + org.springframework.security + spring-security-web + ${version.spring-security} + + + org.testcontainers + testcontainers-bom + 1.21.3 + pom + import + + + org.yaml + snakeyaml + 2.4 + + + com.github.docker-java + docker-java + ${version.docker-java} + test + + + com.github.docker-java + docker-java-core + ${version.docker-java} + test + + + com.h2database + h2 + 2.2.224 + test + + + com.openpojo + openpojo + 0.9.1 + test + + + io.cucumber + cucumber-java + ${version.cucumber} + test + + + io.cucumber + cucumber-junit + ${version.cucumber} + test + + + org.assertj + assertj-core + 3.25.3 + test + + + org.awaitility + awaitility + 4.2.0 + test + + + org.junit.jupiter + junit-jupiter + ${version.jupiter} + test + + + org.junit.jupiter + junit-jupiter-api + ${version.jupiter} + test + + + org.junit.jupiter + junit-jupiter-engine + ${version.jupiter} + test + + + org.junit.jupiter + junit-jupiter-params + ${version.jupiter} + test + + + org.mock-server + mockserver-client-java + ${version.mockserver} + test + + + org.mock-server + mockserver-netty + ${version.mockserver} + test + + + org.mockito + mockito-core + ${version.mockito} + test + + + org.mockito + mockito-junit-jupiter + ${version.mockito} + test + + + org.springframework + spring-test + ${version.spring} + test + + + org.springframework.boot + spring-boot-starter-test + ${version.springboot} + test + + + com.vaadin.external.google + android-json + + + + + org.springframework.boot + spring-boot-test + ${version.springboot} + test + + + org.springframework.boot + spring-boot-test-autoconfigure + ${version.springboot} + test + + + io.projectreactor + reactor-bom + 2024.0.8 + pom + import + + + + + + scm:git:ssh://git.onap.org:29418/${project.groupId} + scm:git:ssh://git.onap.org:29418/${project.groupId} + HEAD + https://lf-onap.atlassian.net/wiki/spaces/DW/pages/16230649/Integration+Project + + + + + m2e + + + + m2e.version + + + + + + + org.eclipse.m2e + lifecycle-mapping + 1.0.0 + + + + + + org.apache.maven.plugins + maven-checkstyle-plugin + ${version.maven-checkstyle-plugin} + + check + + + + + + + + + org.apache.maven.plugins + maven-remote-resources-plugin + ${version.maven-remote-resources-plugin},) + + bundle + process + + + + + + + + + org.jacoco + jacoco-maven-plugin + ${version.jacoco} + + prepare-agent + + + + + + + + + de.jpdigital + hibernate56-ddl-maven-plugin + [2.5.0,) + + gen-ddl + + + + + + + + + org.codehaus.groovy.maven + gmaven-plugin + [1.5,) + + execute + + + + + + + + + org.codehaus.mojo + exec-maven-plugin + [3.0.0,) + + exec + + + + + + + + + org.codehaus.mojo + keytool-maven-plugin + [1.7.0,) + + generateKeyPair + + + + + + + + + com.github.eirslett + frontend-maven-plugin + ${version.frontend.maven} + + npm + + + + + + + + + io.swagger.codegen.v3 + swagger-codegen-maven-plugin + [${version.swagger.codegen.v3},) + + generate + + + + + + + + + + + + + + + + cve + + + + org.owasp + dependency-check-maven + + + + aggregate + + + + + + + + + + + + org.apache.maven.archetype + archetype-packaging + 3.4.0 + + + + + + com.coderplus.maven.plugins + copy-rename-maven-plugin + 1.0.1 + + + com.github.eirslett + frontend-maven-plugin + ${version.frontend.maven} + + + io.fabric8 + docker-maven-plugin + 0.43.4 + + + io.github.git-commit-id + git-commit-id-maven-plugin + 9.0.2 + + + + revision + + + + + false + false + + ^git.build.(time|version)$ + ^git.commit.id.(abbrev|full)$ + + full + yyyy-MM-dd'T'HH:mm:ss.SSS'Z' + UTC + + + + io.swagger.codegen.v3 + swagger-codegen-maven-plugin + ${version.swagger.codegen.v3} + + + org.apache.maven.plugins + maven-archetype-plugin + 3.4.0 + + + org.apache.maven.plugins + maven-assembly-plugin + 3.6.0 + + + org.apache.maven.plugins + maven-clean-plugin + 3.3.1 + + + org.apache.maven.plugins + maven-dependency-plugin + 3.8.1 + + + org.apache.maven.plugins + maven-eclipse-plugin + 2.10 + + + org.apache.maven.plugins + maven-install-plugin + 3.1.1 + + + org.apache.maven.plugins + maven-jar-plugin + 3.3.0 + + + org.apache.maven.plugins + maven-javadoc-plugin + 3.6.3 + + + org.apache.maven.plugins + maven-pmd-plugin + 3.21.0 + + + org.apache.maven.plugins + maven-release-plugin + 3.0.1 + + + org.apache.maven.plugins + maven-remote-resources-plugin + ${version.maven-remote-resources-plugin} + + + org.apache.maven.plugins + maven-resources-plugin + 3.3.1 + + + org.apache.maven.plugins + maven-source-plugin + 3.3.0 + + + org.apache.maven.plugins + maven-shade-plugin + 3.5.0 + + + org.apache.maven.plugins + maven-war-plugin + 3.4.0 + + + org.codehaus.gmaven + groovy-maven-plugin + 2.1.1 + + + org.codehaus.mojo + versions-maven-plugin + 2.16.0 + + + org.codehaus.mojo + exec-maven-plugin + 3.1.0 + + + org.springframework.boot + spring-boot-maven-plugin + ${version.springboot} + + + org.apache.maven.plugins + maven-surefire-plugin + 3.5.3 + + + org.sonarsource.scanner.maven + sonar-maven-plugin + ${version.sonar} + + + org.apache.maven + maven-core + 3.9.11 + + + org.apache.maven + maven-compat + 3.9.11 + + + + + org.apache.maven.plugins + maven-deploy-plugin + 3.1.1 + + + org.apache.maven.plugins + maven-failsafe-plugin + 3.2.5 + + + + + + org.apache.maven.plugins + maven-surefire-plugin + + @{surefireArgLine} + + + + org.jacoco + jacoco-maven-plugin + ${version.jacoco} + + + org/drools/**/* + **/gen/** + **/generated-sources/** + + file + + + + pre-unit-test + + prepare-agent + + + ${jacoco.destFile} + true + surefireArgLine + + + + post-unit-test + test + + report + + + ${jacoco.destFile} + ${project.reporting.outputDirectory}/jacoco-ut + + + + report-aggregate + verify + + report-aggregate + + + true + + + + + + org.apache.maven.plugins + maven-checkstyle-plugin + ${version.maven-checkstyle-plugin} + + + onap-license + + check + + process-sources + + onap-checkstyle/check-license.xml + false + true + false + + ${project.build.sourceDirectory} + + true + true + warning + + + + onap-java-style + + check + + process-sources + + + onap-checkstyle/onap-java-style.xml + + ${project.build.sourceDirectory} + true + true + true + true + true + warning + + + + + + org.onap.policy.clamp + checkstyle + ${project.version} + compile + + + + + org.apache.maven.plugins + maven-failsafe-plugin + + + integration-tests + + integration-test + verify + + + + + + org.apache.maven.plugins + maven-compiler-plugin + + + + org.projectlombok + lombok + ${version.lombok} + + + + + + + \ No newline at end of file diff --git a/clamp-parent/pom.xml b/clamp-parent/pom.xml new file mode 100644 index 000000000..7b1e7c7d7 --- /dev/null +++ b/clamp-parent/pom.xml @@ -0,0 +1,120 @@ + + + + + 4.0.0 + + org.onap.policy.clamp + policy-clamp + 9.0.0-SNAPSHOT + + + clamp-parent + pom + + + 21 + UTF-8 + UTF-8 + /content/sites/site/${project.groupId}/${project.artifactId}/${project.version} + + + + checkstyle + dependencies + + + + + ecomp-releases + ${onap.nexus.url}/content/repositories/releases + + + ecomp-snapshots + ${onap.nexus.url}/content/repositories/snapshots + + + + + + + + + net.revelc.code.formatter + formatter-maven-plugin + 2.24.1 + + ${project.basedir}/onap-java-formatter.xml + + + + + com.diffplug.spotless + spotless-maven-plugin + 2.43.0 + + + + com,java,javax,org + + + + + + + + + + org.apache.maven.plugins + maven-compiler-plugin + 3.14.0 + + ${project.build.sourceEncoding} + ${maven.compiler.release} + + + + org.apache.maven.plugins + maven-site-plugin + 3.21.0 + + + org.owasp + dependency-check-maven + 12.1.9 + + + + + \ No newline at end of file diff --git a/common/pom.xml b/common/pom.xml index 86f698c6f..0a6d678f4 100644 --- a/common/pom.xml +++ b/common/pom.xml @@ -26,8 +26,9 @@ org.onap.policy.clamp - policy-clamp + dependencies 9.0.0-SNAPSHOT + ../clamp-parent/dependencies/pom.xml policy-clamp-common diff --git a/examples/pom.xml b/examples/pom.xml index 128e89fa9..53d51d528 100644 --- a/examples/pom.xml +++ b/examples/pom.xml @@ -25,8 +25,9 @@ org.onap.policy.clamp - policy-clamp + dependencies 9.0.0-SNAPSHOT + ../clamp-parent/dependencies/pom.xml 4.0.0 diff --git a/models/pom.xml b/models/pom.xml index 54d33169b..7a8f6915b 100644 --- a/models/pom.xml +++ b/models/pom.xml @@ -26,8 +26,9 @@ org.onap.policy.clamp - policy-clamp + dependencies 9.0.0-SNAPSHOT + ../clamp-parent/dependencies/pom.xml policy-clamp-models diff --git a/models/src/main/java/org/onap/policy/clamp/models/acm/persistence/concepts/JpaAutomationCompositionDefinition.java b/models/src/main/java/org/onap/policy/clamp/models/acm/persistence/concepts/JpaAutomationCompositionDefinition.java index fce5782a7..9837dd23d 100644 --- a/models/src/main/java/org/onap/policy/clamp/models/acm/persistence/concepts/JpaAutomationCompositionDefinition.java +++ b/models/src/main/java/org/onap/policy/clamp/models/acm/persistence/concepts/JpaAutomationCompositionDefinition.java @@ -126,7 +126,7 @@ public class JpaAutomationCompositionDefinition extends Validated this.serviceTemplate = new DocToscaServiceTemplate(copyConcept.getServiceTemplate()); setName(this.serviceTemplate.getName()); setVersion(this.serviceTemplate.getVersion()); - this.elements = new HashSet<>(copyConcept.getElementStateMap().size()); + this.elements = HashSet.newHashSet(copyConcept.getElementStateMap().size()); for (var element : copyConcept.getElementStateMap().values()) { var nodeTemplateStateId = element.getNodeTemplateStateId().toString(); var jpaNodeTemplateState = new JpaNodeTemplateState(nodeTemplateStateId, this.compositionId); diff --git a/models/src/main/java/org/onap/policy/clamp/models/acm/persistence/concepts/JpaParticipant.java b/models/src/main/java/org/onap/policy/clamp/models/acm/persistence/concepts/JpaParticipant.java index 5952bfa1c..6bbe6adbd 100644 --- a/models/src/main/java/org/onap/policy/clamp/models/acm/persistence/concepts/JpaParticipant.java +++ b/models/src/main/java/org/onap/policy/clamp/models/acm/persistence/concepts/JpaParticipant.java @@ -132,7 +132,7 @@ public class JpaParticipant extends Validated var participant = new Participant(); participant.setParticipantId(UUID.fromString(participantId)); - participant.setParticipantSupportedElementTypes(new LinkedHashMap<>(this.supportedElements.size())); + participant.setParticipantSupportedElementTypes(LinkedHashMap.newLinkedHashMap(this.supportedElements.size())); for (var element : this.supportedElements) { participant.getParticipantSupportedElementTypes() .put(UUID.fromString(element.getId()), element.toAuthorative()); diff --git a/models/src/main/java/org/onap/policy/clamp/models/acm/utils/AcmUtils.java b/models/src/main/java/org/onap/policy/clamp/models/acm/utils/AcmUtils.java index e92c9b507..8e370ab36 100644 --- a/models/src/main/java/org/onap/policy/clamp/models/acm/utils/AcmUtils.java +++ b/models/src/main/java/org/onap/policy/clamp/models/acm/utils/AcmUtils.java @@ -178,7 +178,7 @@ public final class AcmUtils { */ public static Map createElementStateMap( List> acElements, AcTypeState state) { - Map result = new HashMap<>(acElements.size()); + Map result = HashMap.newHashMap(acElements.size()); for (var entry : acElements) { var nodeTemplateState = new NodeTemplateState(); nodeTemplateState.setNodeTemplateStateId(UUID.randomUUID()); diff --git a/packages/pom.xml b/packages/pom.xml index 765331030..da184dfd0 100644 --- a/packages/pom.xml +++ b/packages/pom.xml @@ -22,8 +22,9 @@ 4.0.0 org.onap.policy.clamp - policy-clamp + dependencies 9.0.0-SNAPSHOT + ../clamp-parent/dependencies/pom.xml clamp-packages @@ -69,31 +70,6 @@ SimParticipant.Dockerfile - - dockersuse - - policy-clamp-tarball - policy-clamp-docker - - - false - AcmRuntime-Suse.Dockerfile - PolicyParticipant-Suse.Dockerfile - - KubernetesParticipant-Suse.Dockerfile - - HttpParticipant-Suse.Dockerfile - - A1pmsParticipant-Suse.Dockerfile - - KserveParticipant-Suse.Dockerfile - - ElementParticipant-Suse.Dockerfile - - SimParticipant-Suse.Dockerfile - - - diff --git a/participant/pom.xml b/participant/pom.xml index 1d3b4671c..d939a38be 100644 --- a/participant/pom.xml +++ b/participant/pom.xml @@ -25,8 +25,9 @@ org.onap.policy.clamp - policy-clamp + dependencies 9.0.0-SNAPSHOT + ../clamp-parent/dependencies/pom.xml org.onap.policy.clamp.participant diff --git a/policy-common/pom.xml b/policy-common/pom.xml index ebfd23512..dd64bdb2d 100644 --- a/policy-common/pom.xml +++ b/policy-common/pom.xml @@ -26,8 +26,9 @@ org.onap.policy.clamp - policy-clamp + dependencies 9.0.0-SNAPSHOT + ../clamp-parent/dependencies/pom.xml policy-common diff --git a/policy-models/pom.xml b/policy-models/pom.xml index f525714b1..00bfec002 100644 --- a/policy-models/pom.xml +++ b/policy-models/pom.xml @@ -26,8 +26,9 @@ org.onap.policy.clamp - policy-clamp + dependencies 9.0.0-SNAPSHOT + ../clamp-parent/dependencies/pom.xml policy-models diff --git a/pom.xml b/pom.xml index 91a073a7b..e6667a391 100644 --- a/pom.xml +++ b/pom.xml @@ -22,17 +22,12 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> 4.0.0 - - org.onap.policy.parent - integration - 6.0.0-SNAPSHOT - - org.onap.policy.clamp policy-clamp 9.0.0-SNAPSHOT ${project.artifactId} pom + This is the root Maven module for the policy-clamp project. @@ -53,11 +48,9 @@ o policy-clamp-participant-impl-a1pms: A standard participant for accessing A1-Policy Management Service o policy-clamp-participant-impl-kserve: A standard participant for Kserve - - 4.0.0-SNAPSHOT - 5.0.0-SNAPSHOT - + + clamp-parent policy-common policy-models common @@ -68,24 +61,4 @@ participant - - - - - io.netty - netty-bom - 4.2.7.Final - pom - import - - - - org.testcontainers - testcontainers-bom - 1.21.3 - pom - import - - - diff --git a/runtime-acm/pom.xml b/runtime-acm/pom.xml index f981202af..238dee4c4 100644 --- a/runtime-acm/pom.xml +++ b/runtime-acm/pom.xml @@ -25,8 +25,9 @@ org.onap.policy.clamp - policy-clamp + dependencies 9.0.0-SNAPSHOT + ../clamp-parent/dependencies/pom.xml policy-clamp-runtime-acm @@ -237,12 +238,10 @@ com.github.blagerweij liquibase-sessionlock - 1.6.9 info.picocli picocli - 4.7.7 com.h2database @@ -294,7 +293,6 @@ postgresql test - -- 2.16.6