From e4446b67085ea4ee6ebb0ba9b7d5fa2cc5b202c9 Mon Sep 17 00:00:00 2001 From: "adheli.tavares" Date: Wed, 10 Apr 2024 13:45:31 +0100 Subject: [PATCH 1/7] Dependency management update - including dependencies to pom.xml files only where they are used, avoiding extra dependencies being added in all packages. Issue-ID: POLICY-4945 Change-Id: I181d03f45ccedff8658903150b160feaf692ee10 Signed-off-by: adheli.tavares --- main/pom.xml | 26 +++++++++++++++++++++++++- pom.xml | 35 +---------------------------------- 2 files changed, 26 insertions(+), 35 deletions(-) diff --git a/main/pom.xml b/main/pom.xml index b37a1c5a..3faa05c0 100644 --- a/main/pom.xml +++ b/main/pom.xml @@ -4,7 +4,7 @@ Modified Copyright (C) 2018 Samsung Electronics Co., Ltd. Copyright (C) 2019,2021 AT&T Intellectual Property. All rights reserved. Modifications Copyright (C) 2020-2023 Bell Canada. - Modifications Copyright (C) 2022-2023 Nordix Foundation. + Modifications Copyright (C) 2022-2024 Nordix Foundation. ================================================================================ Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -42,6 +42,16 @@ policy-models-pdp ${policy.models.version} + + org.onap.policy.models + policy-models-examples + ${policy.models.version} + + + org.onap.policy.common + policy-endpoints + ${policy.common.version} + org.onap.policy.common spring-utils @@ -54,6 +64,18 @@ test + + com.google.guava + guava + + + org.hibernate + hibernate-core-jakarta + + + org.bouncycastle + bcpkix-fips + org.springframework.boot spring-boot-starter-test @@ -95,6 +117,7 @@ com.h2database h2 + test org.junit.jupiter @@ -104,6 +127,7 @@ org.mockito mockito-junit-jupiter + test diff --git a/pom.xml b/pom.xml index 47198b77..180104a2 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ ================================================================================ Copyright (C) 2018 Samsung Electronics Co., Ltd. All rights reserved. Copyright (C) 2017-2021 AT&T Intellectual Property. All rights reserved. - Modifications Copyright (C) 2019-2020, 2023 Nordix Foundation. + Modifications Copyright (C) 2019-2020, 2023-2024 Nordix Foundation. Modifications Copyright (C) 2020 Bell Canada. All rights reserved. ================================================================================ Licensed under the Apache License, Version 2.0 (the "License"); @@ -52,39 +52,6 @@ testsuites - - - org.slf4j - slf4j-api - - - org.onap.policy.common - policy-endpoints - ${policy.common.version} - - - org.assertj - assertj-core - test - - - org.glassfish.jersey.containers - jersey-container-servlet - - - org.eclipse.jetty - jetty-server - - - org.eclipse.jetty - jetty-servlet - - - org.eclipse.jetty - jetty-security - - - ecomp-site -- 2.16.6 From 45e1f7c33aadf61c4edd2525211f6ac13081afde Mon Sep 17 00:00:00 2001 From: "saul.gill" Date: Thu, 25 Apr 2024 13:10:34 +0100 Subject: [PATCH 2/7] update references in policy/api pom updated references in the policy/api pom *** This commit is generated by a PF release script *** Issue-ID: POLICY-4970 Change-Id: I7f58f3ebcdb505f981e5a3c9f9ca426698360270 Signed-off-by: saul.gill --- packages/policy-api-docker/src/main/docker/Dockerfile | 2 +- pom.xml | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/policy-api-docker/src/main/docker/Dockerfile b/packages/policy-api-docker/src/main/docker/Dockerfile index 660dd112..7d6da44a 100644 --- a/packages/policy-api-docker/src/main/docker/Dockerfile +++ b/packages/policy-api-docker/src/main/docker/Dockerfile @@ -26,7 +26,7 @@ RUN mkdir /packages /extracted COPY /maven/lib/policy-api.tar.gz /packages/ RUN tar xvzf /packages/policy-api.tar.gz --directory /extracted/ -FROM onap/policy-jre-alpine:3.1.2-SNAPSHOT +FROM onap/policy-jre-alpine:3.1.2 LABEL maintainer="Policy Team" LABEL org.opencontainers.image.title="Policy API" diff --git a/pom.xml b/pom.xml index 180104a2..9abfa444 100644 --- a/pom.xml +++ b/pom.xml @@ -28,7 +28,7 @@ org.onap.policy.parent integration - 4.1.2-SNAPSHOT + 4.1.2 @@ -42,8 +42,8 @@ Code that define our external API. - 2.1.2-SNAPSHOT - 3.1.2-SNAPSHOT + 2.1.2 + 3.1.2 -- 2.16.6 From 429047e4093e09649424b6cb3e41bc46d0658122 Mon Sep 17 00:00:00 2001 From: "saul.gill" Date: Thu, 25 Apr 2024 14:25:09 +0100 Subject: [PATCH 3/7] Release policy/api: 3.1.2 This commit releases repo policy/api. *** This commit is generated by a PF release script *** Issue-ID: POLICY-4970 Change-Id: Iecf87cb6c527d5bd4f5498b00b48bd89dcf2979a Signed-off-by: saul.gill --- releases/3.1.2.yaml | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 releases/3.1.2.yaml diff --git a/releases/3.1.2.yaml b/releases/3.1.2.yaml new file mode 100644 index 00000000..5923e2b9 --- /dev/null +++ b/releases/3.1.2.yaml @@ -0,0 +1,5 @@ +distribution_type: 'maven' +version: '3.1.2' +project: 'policy-api' +tag_release: false +log_dir: 'policy-api-maven-stage-master/1417/' -- 2.16.6 From 990effedc1ac132f596a36c0668ecd541c3c0d2d Mon Sep 17 00:00:00 2001 From: "saul.gill" Date: Thu, 25 Apr 2024 15:24:02 +0100 Subject: [PATCH 4/7] Release docker images for policy/api: 3.1.2 This commit releases docker images for repo policy/api. *** This commit is generated by a PF release script *** Issue-ID: POLICY-4970 Change-Id: I321b1d6e49ef0cc8a3df43c91d0ad6030f33f554 Signed-off-by: saul.gill --- releases/3.1.2-container.yaml | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 releases/3.1.2-container.yaml diff --git a/releases/3.1.2-container.yaml b/releases/3.1.2-container.yaml new file mode 100644 index 00000000..85d89e6f --- /dev/null +++ b/releases/3.1.2-container.yaml @@ -0,0 +1,8 @@ +distribution_type: 'container' +container_release_tag: '3.1.2' +project: 'policy-api' +log_dir: 'policy-api-maven-docker-stage-master/1300' +ref: 429047e4093e09649424b6cb3e41bc46d0658122 +containers: + - name: 'policy-api' + version: '3.1.2-20240425T1238' -- 2.16.6 From 99e7c9a6ebd2f2678cbe00c6d0ce2d4a79114fbd Mon Sep 17 00:00:00 2001 From: "saul.gill" Date: Fri, 26 Apr 2024 09:24:35 +0100 Subject: [PATCH 5/7] Update snapshot and/or references of policy/api to latest snapshots policy/api updated to its latest own and reference snapshots *** This commit is generated by a PF release script *** Issue-ID: POLICY-4970 Change-Id: I992030e6990aa9f73bfd413c0402833bf5560c4c Signed-off-by: saul.gill --- main/pom.xml | 2 +- packages/policy-api-docker/pom.xml | 2 +- packages/policy-api-docker/pom.xml.versionsBackup | 170 +++++++++++++++++++++ .../policy-api-docker/src/main/docker/Dockerfile | 2 +- packages/policy-api-tarball/pom.xml | 2 +- packages/pom.xml | 2 +- pom.xml | 8 +- testsuites/performance/pom.xml | 2 +- testsuites/pom.xml | 2 +- testsuites/stability/pom.xml | 2 +- version.properties | 2 +- 11 files changed, 183 insertions(+), 13 deletions(-) create mode 100644 packages/policy-api-docker/pom.xml.versionsBackup diff --git a/main/pom.xml b/main/pom.xml index 3faa05c0..00b2434f 100644 --- a/main/pom.xml +++ b/main/pom.xml @@ -30,7 +30,7 @@ org.onap.policy.api policy-api - 3.1.2-SNAPSHOT + 3.1.3-SNAPSHOT api-main ${project.artifactId} diff --git a/packages/policy-api-docker/pom.xml b/packages/policy-api-docker/pom.xml index 079b1f7b..36f66c19 100644 --- a/packages/policy-api-docker/pom.xml +++ b/packages/policy-api-docker/pom.xml @@ -28,7 +28,7 @@ org.onap.policy.api api-packages - 3.1.2-SNAPSHOT + 3.1.3-SNAPSHOT pom diff --git a/packages/policy-api-docker/pom.xml.versionsBackup b/packages/policy-api-docker/pom.xml.versionsBackup new file mode 100644 index 00000000..079b1f7b --- /dev/null +++ b/packages/policy-api-docker/pom.xml.versionsBackup @@ -0,0 +1,170 @@ + + + + + 4.0.0 + + + org.onap.policy.api + api-packages + 3.1.2-SNAPSHOT + + + pom + policy-api-docker + ${project.artifactId} + Policy api docker image + + + UTF-8 + UTF-8 + ${project.version} + false + false + false + ${project.basedir}/src/main/docker + yyyyMMdd'T'HHmm + + + + ${project.artifactId}-${project.version} + + + org.codehaus.gmaven + groovy-maven-plugin + + + validate + + execute + + + https://github.com/onap/policy-docker/raw/master/utils/groovy/docker-tag.groovy + + + + + + + io.github.git-commit-id + git-commit-id-maven-plugin + + + + io.fabric8 + docker-maven-plugin + + + true + 1.23 + ${docker.pull.registry} + ${docker.push.registry} + + + + onap/policy-api + + try + ${dockerFile} + ${docker.contextDir} + + ${project.version} + ${project.version}-${maven.build.timestamp} + ${project.docker.latest.minmax.tag.version} + + + + + + + org.onap.policy.api:policy-api-tarball + + /lib + policy-api.tar.gz + + + + org.onap.policy.api:api-main + + api.jar + + + + + + + + + + + + clean-images + pre-clean + + remove + + + true + + + + + generate-images + generate-sources + + build + + + + + push-images + deploy + + build + push + + + + + + + org.apache.maven.plugins + maven-deploy-plugin + + true + + + + + + + + org.onap.policy.api + policy-api-tarball + ${project.version} + tarball + tar.gz + + + diff --git a/packages/policy-api-docker/src/main/docker/Dockerfile b/packages/policy-api-docker/src/main/docker/Dockerfile index 7d6da44a..dd185a79 100644 --- a/packages/policy-api-docker/src/main/docker/Dockerfile +++ b/packages/policy-api-docker/src/main/docker/Dockerfile @@ -26,7 +26,7 @@ RUN mkdir /packages /extracted COPY /maven/lib/policy-api.tar.gz /packages/ RUN tar xvzf /packages/policy-api.tar.gz --directory /extracted/ -FROM onap/policy-jre-alpine:3.1.2 +FROM onap/policy-jre-alpine:3.1.3-SNAPSHOT LABEL maintainer="Policy Team" LABEL org.opencontainers.image.title="Policy API" diff --git a/packages/policy-api-tarball/pom.xml b/packages/policy-api-tarball/pom.xml index 8ad856aa..5b36de4d 100644 --- a/packages/policy-api-tarball/pom.xml +++ b/packages/policy-api-tarball/pom.xml @@ -25,7 +25,7 @@ org.onap.policy.api api-packages - 3.1.2-SNAPSHOT + 3.1.3-SNAPSHOT policy-api-tarball diff --git a/packages/pom.xml b/packages/pom.xml index 6943bf9f..91cfaf89 100644 --- a/packages/pom.xml +++ b/packages/pom.xml @@ -26,7 +26,7 @@ org.onap.policy.api policy-api - 3.1.2-SNAPSHOT + 3.1.3-SNAPSHOT api-packages diff --git a/pom.xml b/pom.xml index 9abfa444..fdde67af 100644 --- a/pom.xml +++ b/pom.xml @@ -28,13 +28,13 @@ org.onap.policy.parent integration - 4.1.2 + 4.1.3-SNAPSHOT org.onap.policy.api policy-api - 3.1.2-SNAPSHOT + 3.1.3-SNAPSHOT pom @@ -42,8 +42,8 @@ Code that define our external API. - 2.1.2 - 3.1.2 + 2.1.3-SNAPSHOT + 3.1.3-SNAPSHOT diff --git a/testsuites/performance/pom.xml b/testsuites/performance/pom.xml index 06833ce9..16c45547 100644 --- a/testsuites/performance/pom.xml +++ b/testsuites/performance/pom.xml @@ -24,7 +24,7 @@ org.onap.policy.api api-testsuites - 3.1.2-SNAPSHOT + 3.1.3-SNAPSHOT api-performance diff --git a/testsuites/pom.xml b/testsuites/pom.xml index e5e76048..b0079a53 100644 --- a/testsuites/pom.xml +++ b/testsuites/pom.xml @@ -24,7 +24,7 @@ org.onap.policy.api policy-api - 3.1.2-SNAPSHOT + 3.1.3-SNAPSHOT api-testsuites diff --git a/testsuites/stability/pom.xml b/testsuites/stability/pom.xml index 67a8232b..990f192b 100644 --- a/testsuites/stability/pom.xml +++ b/testsuites/stability/pom.xml @@ -24,7 +24,7 @@ org.onap.policy.api api-testsuites - 3.1.2-SNAPSHOT + 3.1.3-SNAPSHOT api-stability diff --git a/version.properties b/version.properties index d3faa021..95476595 100644 --- a/version.properties +++ b/version.properties @@ -4,7 +4,7 @@ major=3 minor=1 -patch=2 +patch=3 base_version=${major}.${minor}.${patch} -- 2.16.6 From 8b77a1dfa43893a8d6b67c23df56a66886c2c9ce Mon Sep 17 00:00:00 2001 From: waynedunican Date: Thu, 16 May 2024 16:01:13 +0100 Subject: [PATCH 6/7] update references in policy/api pom updated references in the policy/api pom *** This commit is generated by a PF release script *** Issue-ID: POLICY-5001 Change-Id: I4c7da1126ef6bac2d6d81d165d567d296a811fcf Signed-off-by: waynedunican --- packages/policy-api-docker/src/main/docker/Dockerfile | 2 +- pom.xml | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/policy-api-docker/src/main/docker/Dockerfile b/packages/policy-api-docker/src/main/docker/Dockerfile index dd185a79..67d8c5f0 100644 --- a/packages/policy-api-docker/src/main/docker/Dockerfile +++ b/packages/policy-api-docker/src/main/docker/Dockerfile @@ -26,7 +26,7 @@ RUN mkdir /packages /extracted COPY /maven/lib/policy-api.tar.gz /packages/ RUN tar xvzf /packages/policy-api.tar.gz --directory /extracted/ -FROM onap/policy-jre-alpine:3.1.3-SNAPSHOT +FROM onap/policy-jre-alpine:3.1.3 LABEL maintainer="Policy Team" LABEL org.opencontainers.image.title="Policy API" diff --git a/pom.xml b/pom.xml index fdde67af..633dc46f 100644 --- a/pom.xml +++ b/pom.xml @@ -28,7 +28,7 @@ org.onap.policy.parent integration - 4.1.3-SNAPSHOT + 4.1.4 @@ -42,8 +42,8 @@ Code that define our external API. - 2.1.3-SNAPSHOT - 3.1.3-SNAPSHOT + 2.1.3 + 3.1.3 -- 2.16.6 From 4cfb710dbb2bc750d5b5b11aee901655f91cada7 Mon Sep 17 00:00:00 2001 From: waynedunican Date: Thu, 16 May 2024 17:24:52 +0100 Subject: [PATCH 7/7] Release policy/api: 3.1.3 This commit releases repo policy/api. *** This commit is generated by a PF release script *** Issue-ID: POLICY-5001 Change-Id: I7d46c9fb4c677298231be34f321061e67249d3b5 Signed-off-by: waynedunican --- releases/3.1.3.yaml | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 releases/3.1.3.yaml diff --git a/releases/3.1.3.yaml b/releases/3.1.3.yaml new file mode 100644 index 00000000..8938f056 --- /dev/null +++ b/releases/3.1.3.yaml @@ -0,0 +1,5 @@ +distribution_type: 'maven' +version: '3.1.3' +project: 'policy-api' +tag_release: false +log_dir: 'policy-api-maven-stage-master/1418/' -- 2.16.6