diff options
author | Singal, Kapil (ks220y) <ks220y@att.com> | 2021-07-07 18:22:28 -0400 |
---|---|---|
committer | Singal, Kapil (ks220y) <ks220y@att.com> | 2021-07-07 18:45:12 -0400 |
commit | 10a5e0fcee8ef9e31ea1147306a943386a81b6e3 (patch) | |
tree | c4a25257da93cde6395647303c48ab5f46355c73 | |
parent | dd477ba94c66fd9c5fd1a73b57a64348ac073023 (diff) |
Synching artifacts and features-all poms
Issue-ID: CCSDK-3368
Signed-off-by: Singal, Kapil (ks220y) <ks220y@att.com>
Change-Id: I1fc01511aa98dd8b416a3ff6dd378ae95399e3aa
-rwxr-xr-x | adaptors/artifacts/pom.xml | 77 | ||||
-rw-r--r-- | adaptors/features/ccsdk-sli-adaptors-all/pom.xml | 24 | ||||
-rwxr-xr-x | core/artifacts/pom.xml | 12 | ||||
-rw-r--r-- | core/features/ccsdk-sli-core-all/pom.xml | 10 | ||||
-rwxr-xr-x | northbound/artifacts/pom.xml | 6 | ||||
-rw-r--r-- | northbound/features/ccsdk-sli-northbound-all/pom.xml | 1 | ||||
-rwxr-xr-x | plugins/artifacts/pom.xml | 30 | ||||
-rw-r--r-- | plugins/features/ccsdk-sli-plugins-all/pom.xml | 8 |
8 files changed, 101 insertions, 67 deletions
diff --git a/adaptors/artifacts/pom.xml b/adaptors/artifacts/pom.xml index 6be2f96c9..f553b93f9 100755 --- a/adaptors/artifacts/pom.xml +++ b/adaptors/artifacts/pom.xml @@ -28,57 +28,67 @@ <artifactId>ccsdk-aai-service</artifactId> <version>${project.version}</version> <type>xml</type> - <classifier>feature</classifier> + <classifier>features</classifier> </dependency> <dependency> <groupId>org.onap.ccsdk.sli.adaptors</groupId> <artifactId>ccsdk-ansible-adapter</artifactId> <version>${project.version}</version> <type>xml</type> - <classifier>feature</classifier> + <classifier>features</classifier> </dependency> <dependency> <groupId>org.onap.ccsdk.sli.adaptors</groupId> - <artifactId>ccsdk-mdsal-resource</artifactId> + <artifactId>ccsdk-base-http</artifactId> <version>${project.version}</version> <type>xml</type> - <classifier>feature</classifier> + <classifier>features</classifier> </dependency> <dependency> <groupId>org.onap.ccsdk.sli.adaptors</groupId> - <artifactId>ccsdk-netbox-client</artifactId> + <artifactId>ccsdk-mdsal-resource</artifactId> <version>${project.version}</version> <type>xml</type> - <classifier>feature</classifier> + <classifier>features</classifier> + </dependency> + <dependency> + <groupId>org.onap.ccsdk.sli.adaptors.messagerouter</groupId> + <artifactId>ccsdk-messagerouter-publisher</artifactId> + <version>${project.version}</version> + <type>xml</type> + <classifier>features</classifier> </dependency> <dependency> <groupId>org.onap.ccsdk.sli.adaptors</groupId> - <artifactId>ccsdk-resource-management</artifactId> + <artifactId>ccsdk-netbox-client</artifactId> <version>${project.version}</version> <type>xml</type> - <classifier>feature</classifier> + <classifier>features</classifier> </dependency> <dependency> <groupId>org.onap.ccsdk.sli.adaptors</groupId> - <artifactId>ccsdk-saltstack-adapter</artifactId> + <artifactId>ccsdk-resource-assignment</artifactId> <version>${project.version}</version> <type>xml</type> - <classifier>feature</classifier> + <classifier>features</classifier> </dependency> + <!-- saltstack-adaptor needs to be changed to remove dependency on app-c code <dependency> <groupId>org.onap.ccsdk.sli.adaptors</groupId> - <artifactId>ccsdk-sql-resource</artifactId> + <artifactId>ccsdk-saltstack-adapter</artifactId> <version>${project.version}</version> <type>xml</type> - <classifier>feature</classifier> + <classifier>features</classifier> </dependency> + --> <dependency> <groupId>org.onap.ccsdk.sli.adaptors</groupId> - <artifactId>ccsdk-base-http</artifactId> + <artifactId>ccsdk-sql-resource</artifactId> <version>${project.version}</version> <type>xml</type> - <classifier>feature</classifier> + <classifier>features</classifier> </dependency> + <dependency> <groupId>org.onap.ccsdk.sli.adaptors</groupId> <artifactId>aai-service-provider</artifactId> @@ -91,7 +101,7 @@ </dependency> <dependency> <groupId>org.onap.ccsdk.sli.adaptors</groupId> - <artifactId>ansible-adapter-provider</artifactId> + <artifactId>ansible-adapter-bundle</artifactId> <version>${project.version}</version> </dependency> <dependency> @@ -101,6 +111,16 @@ </dependency> <dependency> <groupId>org.onap.ccsdk.sli.adaptors</groupId> + <artifactId>base-http-provider</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.onap.ccsdk.sli.adaptors</groupId> + <artifactId>base-http-installer</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.onap.ccsdk.sli.adaptors</groupId> <artifactId>mdsal-resource-provider</artifactId> <version>${project.version}</version> </dependency> @@ -110,6 +130,21 @@ <version>${project.version}</version> </dependency> <dependency> + <groupId>org.onap.ccsdk.sli.adaptors.messagerouter</groupId> + <artifactId>publisher.api</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.onap.ccsdk.sli.adaptors.messagerouter</groupId> + <artifactId>publisher.provider</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.onap.ccsdk.sli.adaptors.messagerouter</groupId> + <artifactId>publisher.installer</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> <groupId>org.onap.ccsdk.sli.adaptors</groupId> <artifactId>netbox-client-provider</artifactId> <version>${project.version}</version> @@ -129,6 +164,7 @@ <artifactId>resource-assignment-installer</artifactId> <version>${project.version}</version> </dependency> + <!-- saltstack-adaptor needs to be changed to remove dependency on app-c code <dependency> <groupId>org.onap.ccsdk.sli.adaptors</groupId> <artifactId>saltstack-adapter-provider</artifactId> @@ -139,6 +175,7 @@ <artifactId>saltstack-adapter-installer</artifactId> <version>${project.version}</version> </dependency> + --> <dependency> <groupId>org.onap.ccsdk.sli.adaptors</groupId> <artifactId>sql-resource-provider</artifactId> @@ -149,16 +186,6 @@ <artifactId>sql-resource-installer</artifactId> <version>${project.version}</version> </dependency> - <dependency> - <groupId>org.onap.ccsdk.sli.adaptors</groupId> - <artifactId>base-http-provider</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.onap.ccsdk.sli.adaptors</groupId> - <artifactId>base-http-installer</artifactId> - <version>${project.version}</version> - </dependency> </dependencies> </dependencyManagement> </project> diff --git a/adaptors/features/ccsdk-sli-adaptors-all/pom.xml b/adaptors/features/ccsdk-sli-adaptors-all/pom.xml index 0797a2352..7100219a3 100644 --- a/adaptors/features/ccsdk-sli-adaptors-all/pom.xml +++ b/adaptors/features/ccsdk-sli-adaptors-all/pom.xml @@ -31,26 +31,30 @@ <type>xml</type> <classifier>features</classifier> </dependency> - <!-- saltstack-adapter needs to be changed to remove dependency on app-c code <dependency> <groupId>${project.groupId}</groupId> - <artifactId>ccsdk-saltstack-adapter</artifactId> + <artifactId>ccsdk-base-http</artifactId> <version>${project.version}</version> <type>xml</type> <classifier>features</classifier> </dependency> - --> - <dependency> <groupId>${project.groupId}</groupId> - <artifactId>ccsdk-netbox-client</artifactId> + <artifactId>ccsdk-mdsal-resource</artifactId> + <version>${project.version}</version> + <type>xml</type> + <classifier>features</classifier> + </dependency> + <dependency> + <groupId>${project.groupId}.messagerouter</groupId> + <artifactId>ccsdk-messagerouter-publisher</artifactId> <version>${project.version}</version> <type>xml</type> <classifier>features</classifier> </dependency> <dependency> <groupId>${project.groupId}</groupId> - <artifactId>ccsdk-mdsal-resource</artifactId> + <artifactId>ccsdk-netbox-client</artifactId> <version>${project.version}</version> <type>xml</type> <classifier>features</classifier> @@ -62,16 +66,18 @@ <type>xml</type> <classifier>features</classifier> </dependency> + <!-- saltstack-adaptor needs to be changed to remove dependency on app-c code <dependency> <groupId>${project.groupId}</groupId> - <artifactId>ccsdk-sql-resource</artifactId> + <artifactId>ccsdk-saltstack-adaptor</artifactId> <version>${project.version}</version> <type>xml</type> <classifier>features</classifier> </dependency> + --> <dependency> - <groupId>${project.groupId}.messagerouter</groupId> - <artifactId>ccsdk-messagerouter-publisher</artifactId> + <groupId>${project.groupId}</groupId> + <artifactId>ccsdk-sql-resource</artifactId> <version>${project.version}</version> <type>xml</type> <classifier>features</classifier> diff --git a/core/artifacts/pom.xml b/core/artifacts/pom.xml index e63729210..aeea9cb4e 100755 --- a/core/artifacts/pom.xml +++ b/core/artifacts/pom.xml @@ -46,13 +46,6 @@ </dependency> <dependency> <groupId>org.onap.ccsdk.sli.core</groupId> - <artifactId>ccsdk-sli-core-all</artifactId> - <version>${project.version}</version> - <type>xml</type> - <classifier>features</classifier> - </dependency> - <dependency> - <groupId>org.onap.ccsdk.sli.core</groupId> <artifactId>ccsdk-sliapi</artifactId> <version>${project.version}</version> <type>xml</type> @@ -114,6 +107,11 @@ </dependency> <dependency> <groupId>org.onap.ccsdk.sli.core</groupId> + <artifactId>sli-installer</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.onap.ccsdk.sli.core</groupId> <artifactId>sliapi-model</artifactId> <version>${project.version}</version> </dependency> diff --git a/core/features/ccsdk-sli-core-all/pom.xml b/core/features/ccsdk-sli-core-all/pom.xml index 51275f0b2..ed28874d1 100644 --- a/core/features/ccsdk-sli-core-all/pom.xml +++ b/core/features/ccsdk-sli-core-all/pom.xml @@ -38,35 +38,35 @@ <dependencies> <dependency> <groupId>${project.groupId}</groupId> - <artifactId>ccsdk-slicore-utils</artifactId> + <artifactId>ccsdk-dblib</artifactId> <version>${project.version}</version> <type>xml</type> <classifier>features</classifier> </dependency> <dependency> <groupId>${project.groupId}</groupId> - <artifactId>ccsdk-dblib</artifactId> + <artifactId>ccsdk-filters</artifactId> <version>${project.version}</version> <type>xml</type> <classifier>features</classifier> </dependency> <dependency> <groupId>${project.groupId}</groupId> - <artifactId>ccsdk-filters</artifactId> + <artifactId>ccsdk-sli</artifactId> <version>${project.version}</version> <type>xml</type> <classifier>features</classifier> </dependency> <dependency> <groupId>${project.groupId}</groupId> - <artifactId>ccsdk-sli</artifactId> + <artifactId>ccsdk-sliapi</artifactId> <version>${project.version}</version> <type>xml</type> <classifier>features</classifier> </dependency> <dependency> <groupId>${project.groupId}</groupId> - <artifactId>ccsdk-sliapi</artifactId> + <artifactId>ccsdk-slicore-utils</artifactId> <version>${project.version}</version> <type>xml</type> <classifier>features</classifier> diff --git a/northbound/artifacts/pom.xml b/northbound/artifacts/pom.xml index cd2916ecd..e2b9ed95d 100755 --- a/northbound/artifacts/pom.xml +++ b/northbound/artifacts/pom.xml @@ -28,21 +28,21 @@ <artifactId>ccsdk-asdcApi</artifactId> <version>${project.version}</version> <type>xml</type> - <classifier>feature</classifier> + <classifier>features</classifier> </dependency> <dependency> <groupId>org.onap.ccsdk.sli.northbound</groupId> <artifactId>ccsdk-dataChange</artifactId> <version>${project.version}</version> <type>xml</type> - <classifier>feature</classifier> + <classifier>features</classifier> </dependency> <dependency> <groupId>org.onap.ccsdk.sli.northbound</groupId> <artifactId>ccsdk-lcm</artifactId> <version>${project.version}</version> <type>xml</type> - <classifier>feature</classifier> + <classifier>features</classifier> </dependency> <dependency> <groupId>org.onap.ccsdk.sli.northbound</groupId> diff --git a/northbound/features/ccsdk-sli-northbound-all/pom.xml b/northbound/features/ccsdk-sli-northbound-all/pom.xml index 1f547c825..ec5e4b4a7 100644 --- a/northbound/features/ccsdk-sli-northbound-all/pom.xml +++ b/northbound/features/ccsdk-sli-northbound-all/pom.xml @@ -38,6 +38,5 @@ <type>xml</type> <classifier>features</classifier> </dependency> - </dependencies> </project> diff --git a/plugins/artifacts/pom.xml b/plugins/artifacts/pom.xml index 30139b974..7dd5870aa 100755 --- a/plugins/artifacts/pom.xml +++ b/plugins/artifacts/pom.xml @@ -28,39 +28,37 @@ <artifactId>ccsdk-properties-node</artifactId> <version>${project.version}</version> <type>xml</type> - <classifier>feature</classifier> + <classifier>features</classifier> </dependency> <dependency> <groupId>org.onap.ccsdk.sli.plugins</groupId> <artifactId>ccsdk-restapi-call-node</artifactId> <version>${project.version}</version> <type>xml</type> - <classifier>feature</classifier> + <classifier>features</classifier> </dependency> <dependency> <groupId>org.onap.ccsdk.sli.plugins</groupId> <artifactId>ccsdk-restconf-client</artifactId> <version>${project.version}</version> <type>xml</type> - <classifier>feature</classifier> + <classifier>features</classifier> </dependency> <dependency> <groupId>org.onap.ccsdk.sli.plugins</groupId> - <artifactId>ccsdk-template-node</artifactId> + <artifactId>ccsdk-sshapi-call-node</artifactId> <version>${project.version}</version> <type>xml</type> - <classifier>feature</classifier> - </dependency> - <dependency> - <groupId>org.onap.ccsdk.sli.plugins</groupId> - <artifactId>fabric-discovery-plugin-provider</artifactId> - <version>${project.version}</version> + <classifier>features</classifier> </dependency> <dependency> <groupId>org.onap.ccsdk.sli.plugins</groupId> - <artifactId>fabric-discovery-plugin-installer</artifactId> + <artifactId>ccsdk-template-node</artifactId> <version>${project.version}</version> + <type>xml</type> + <classifier>features</classifier> </dependency> + <dependency> <groupId>org.onap.ccsdk.sli.plugins</groupId> <artifactId>properties-node-provider</artifactId> @@ -93,6 +91,16 @@ </dependency> <dependency> <groupId>org.onap.ccsdk.sli.plugins</groupId> + <artifactId>sshapi-call-node-provider</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.onap.ccsdk.sli.plugins</groupId> + <artifactId>sshapi-call-node-installer</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.onap.ccsdk.sli.plugins</groupId> <artifactId>template-node-provider</artifactId> <version>${project.version}</version> </dependency> diff --git a/plugins/features/ccsdk-sli-plugins-all/pom.xml b/plugins/features/ccsdk-sli-plugins-all/pom.xml index bd9785f9e..dfb025ab9 100644 --- a/plugins/features/ccsdk-sli-plugins-all/pom.xml +++ b/plugins/features/ccsdk-sli-plugins-all/pom.xml @@ -24,7 +24,6 @@ <type>xml</type> <classifier>features</classifier> </dependency> - <dependency> <groupId>${project.groupId}</groupId> <artifactId>ccsdk-restapi-call-node</artifactId> @@ -32,7 +31,6 @@ <type>xml</type> <classifier>features</classifier> </dependency> - <dependency> <groupId>${project.groupId}</groupId> <artifactId>ccsdk-restconf-client</artifactId> @@ -40,18 +38,16 @@ <type>xml</type> <classifier>features</classifier> </dependency> - <dependency> <groupId>${project.groupId}</groupId> - <artifactId>ccsdk-template-node</artifactId> + <artifactId>ccsdk-sshapi-call-node</artifactId> <version>${project.version}</version> <type>xml</type> <classifier>features</classifier> </dependency> - <dependency> <groupId>${project.groupId}</groupId> - <artifactId>ccsdk-sshapi-call-node</artifactId> + <artifactId>ccsdk-template-node</artifactId> <version>${project.version}</version> <type>xml</type> <classifier>features</classifier> |