summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLiam Fallon <liam.fallon@est.tech>2023-02-20 16:04:42 +0000
committerGerrit Code Review <gerrit@onap.org>2023-02-20 16:04:42 +0000
commitc8c13eef9a8b2c24baf7e5c3b7b2504e90a01e12 (patch)
treeeb687c809c3e104a5f1a4f3f86d2f03d873edb26
parent9164565729a729f5503f4d5f6589acf6e332bbbe (diff)
parent0e405f340fb2d35753251771816290fe44cd8386 (diff)
Merge "Clean up dependencies for London Release"
-rw-r--r--examples/pom.xml3
-rw-r--r--models/pom.xml3
-rw-r--r--packages/policy-clamp-docker/pom.xml3
-rw-r--r--participant/participant-impl/participant-impl-acelement/pom.xml3
-rw-r--r--participant/participant-impl/participant-impl-kubernetes/pom.xml3
-rw-r--r--participant/pom.xml3
-rw-r--r--pom.xml16
-rw-r--r--runtime-acm/pom.xml4
8 files changed, 13 insertions, 25 deletions
diff --git a/examples/pom.xml b/examples/pom.xml
index 4605ba51a..80fb18b8b 100644
--- a/examples/pom.xml
+++ b/examples/pom.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
============LICENSE_START=======================================================
- Copyright (C) 2022 Nordix Foundation.
+ Copyright (C) 2022-2023 Nordix Foundation.
================================================================================
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@@ -39,7 +39,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-remote-resources-plugin</artifactId>
- <version>1.7.0</version>
<executions>
<execution>
<goals>
diff --git a/models/pom.xml b/models/pom.xml
index c4678586d..e68a680c7 100644
--- a/models/pom.xml
+++ b/models/pom.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
============LICENSE_START=======================================================
- Copyright (C) 2021-2022 Nordix Foundation.
+ Copyright (C) 2021-2023 Nordix Foundation.
================================================================================
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@@ -46,7 +46,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-remote-resources-plugin</artifactId>
- <version>1.7.0</version>
<configuration>
<resourceBundles>
<resourceBundle>org.onap.policy.clamp:policy-clamp-examples:${project.version}</resourceBundle>
diff --git a/packages/policy-clamp-docker/pom.xml b/packages/policy-clamp-docker/pom.xml
index 576f3d057..8c8199d4b 100644
--- a/packages/policy-clamp-docker/pom.xml
+++ b/packages/policy-clamp-docker/pom.xml
@@ -1,6 +1,6 @@
<!--
============LICENSE_START=======================================================
- Copyright (C) 2021-2022 Nordix Foundation.
+ Copyright (C) 2021-2023 Nordix Foundation.
================================================================================
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@@ -87,7 +87,6 @@
<plugin>
<groupId>org.codehaus.gmaven</groupId>
<artifactId>groovy-maven-plugin</artifactId>
- <version>2.1.1</version>
<executions>
<execution>
<phase>validate</phase>
diff --git a/participant/participant-impl/participant-impl-acelement/pom.xml b/participant/participant-impl/participant-impl-acelement/pom.xml
index 3424c6d87..ed2d5bae4 100644
--- a/participant/participant-impl/participant-impl-acelement/pom.xml
+++ b/participant/participant-impl/participant-impl-acelement/pom.xml
@@ -1,6 +1,6 @@
<!--
============LICENSE_START=======================================================
- Copyright (C) 2021-2022 Nordix Foundation.
+ Copyright (C) 2021-2023 Nordix Foundation.
================================================================================
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@@ -38,7 +38,6 @@
<plugin>
<groupId>io.swagger.codegen.v3</groupId>
<artifactId>swagger-codegen-maven-plugin</artifactId>
- <version>${version.swagger.codegen.v3}</version>
<executions>
<execution>
<id>code-gen</id>
diff --git a/participant/participant-impl/participant-impl-kubernetes/pom.xml b/participant/participant-impl/participant-impl-kubernetes/pom.xml
index 503816e5f..b3c880273 100644
--- a/participant/participant-impl/participant-impl-kubernetes/pom.xml
+++ b/participant/participant-impl/participant-impl-kubernetes/pom.xml
@@ -1,6 +1,6 @@
<!--
============LICENSE_START=======================================================
- Copyright (C) 2021 Nordix Foundation.
+ Copyright (C) 2021,2023 Nordix Foundation.
================================================================================
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@@ -54,7 +54,6 @@
<plugin>
<groupId>io.swagger.codegen.v3</groupId>
<artifactId>swagger-codegen-maven-plugin</artifactId>
- <version>${version.swagger.codegen.v3}</version>
<executions>
<execution>
<id>code-gen</id>
diff --git a/participant/pom.xml b/participant/pom.xml
index 81e8ee274..12d2ff558 100644
--- a/participant/pom.xml
+++ b/participant/pom.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
============LICENSE_START=======================================================
- Copyright (C) 2021 Nordix Foundation.
+ Copyright (C) 2021,2023 Nordix Foundation.
================================================================================
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@@ -106,7 +106,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-remote-resources-plugin</artifactId>
- <version>1.7.0</version>
<configuration>
<resourceBundles>
<resourceBundle>org.onap.policy.clamp:policy-clamp-examples:${project.version}</resourceBundle>
diff --git a/pom.xml b/pom.xml
index c8d721c79..1e98c8a7f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -15,24 +15,23 @@
limitations under the License.
============LICENSE_END=========================================================
-->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0" 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">
+<project
+ xmlns="http://maven.apache.org/POM/4.0.0"
+ 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">
<modelVersion>4.0.0</modelVersion>
-
<parent>
<groupId>org.onap.policy.parent</groupId>
<artifactId>integration</artifactId>
<version>3.7.1-SNAPSHOT</version>
<relativePath />
</parent>
-
<groupId>org.onap.policy.clamp</groupId>
<artifactId>policy-clamp</artifactId>
<version>6.4.1-SNAPSHOT</version>
<name>${project.artifactId}</name>
-
<packaging>pom</packaging>
-
<description>
This is the root Maven module for the policy-clamp project.
@@ -50,12 +49,10 @@
o policy-clamp-participant-impl-http: A standard participant for http configurations
o policy-clamp-participant-impl-a1pms: A standard participant for accessing A1-Policy Management Service
</description>
-
<properties>
<policy.common.version>1.12.1-SNAPSHOT</policy.common.version>
<policy.models.version>2.8.1-SNAPSHOT</policy.models.version>
</properties>
-
<modules>
<module>common</module>
<module>examples</module>
@@ -64,7 +61,6 @@
<module>runtime-acm</module>
<module>participant</module>
</modules>
-
<dependencies>
<dependency>
<groupId>junit</groupId>
@@ -74,7 +70,7 @@
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-engine</artifactId>
- <version>5.7.1</version>
+ <version>${version.junit.jupiter}</version>
<scope>test</scope>
</dependency>
<dependency>
diff --git a/runtime-acm/pom.xml b/runtime-acm/pom.xml
index efc13f37c..e5f223749 100644
--- a/runtime-acm/pom.xml
+++ b/runtime-acm/pom.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
============LICENSE_START=======================================================
- Copyright (C) 2021-2022 Nordix Foundation.
+ Copyright (C) 2021-2023 Nordix Foundation.
================================================================================
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@@ -55,7 +55,6 @@
<plugin>
<groupId>io.swagger.codegen.v3</groupId>
<artifactId>swagger-codegen-maven-plugin</artifactId>
- <version>3.0.27</version>
<executions>
<execution>
<id>code-gen</id>
@@ -97,7 +96,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-remote-resources-plugin</artifactId>
- <version>1.7.0</version>
<configuration>
<resourceBundles>
<resourceBundle>org.onap.policy.clamp:policy-clamp-examples:${project.version}</resourceBundle>