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-08 13:24:56 -0400 |
| commit | 2901cd97235c50b03bed3c997246b950d0f68bf8 (patch) | |
| tree | 6ee039090b0ef16eac387d035872ae55092016a2 /core | |
| parent | 8a1e6dfddf777e5ce84a2112f4a0f1f42246f293 (diff) | |
Synching artifacts and features-all poms
Issue-ID: CCSDK-3368
Signed-off-by: Singal, Kapil (ks220y) <ks220y@att.com>
Change-Id: I0876bdc0c5ee704f6194691341df313248bdcf0a
Diffstat (limited to 'core')
| -rwxr-xr-x | core/artifacts/pom.xml | 12 | ||||
| -rw-r--r-- | core/features/ccsdk-dblib/src/main/feature/feature.xml | 1 | ||||
| -rw-r--r-- | core/features/ccsdk-sli-core-all/pom.xml | 10 |
3 files changed, 10 insertions, 13 deletions
diff --git a/core/artifacts/pom.xml b/core/artifacts/pom.xml index 7ce528895..4721514c8 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-dblib/src/main/feature/feature.xml b/core/features/ccsdk-dblib/src/main/feature/feature.xml index 771c37455..acb7a7399 100644 --- a/core/features/ccsdk-dblib/src/main/feature/feature.xml +++ b/core/features/ccsdk-dblib/src/main/feature/feature.xml @@ -5,7 +5,6 @@ <details>Root POM to be used in place of odlparent for CCSDK based projects</details> <feature prerequisite="true" dependency="false">wrap</feature> <bundle>mvn:org.onap.ccsdk.sli.core/dblib-provider/${project.version}</bundle> - <bundle>mvn:org.mariadb.jdbc/mariadb-java-client/${mariadb.connector.version}</bundle> <bundle>wrap:mvn:org.apache.tomcat/tomcat-jdbc/${tomcat-jdbc.version}/$DynamicImport-Package=org.mariadb.*,org.apache.derby.*&overwrite=merge</bundle> <bundle>wrap:mvn:org.apache.tomcat/tomcat-juli/${tomcat-jdbc.version}/$DynamicImport-Package=org.mariadb.*,org.apache.derby.*&overwrite=merge</bundle> <bundle>mvn:org.onap.ccsdk.sli.core/utils-provider/${project.version}</bundle> diff --git a/core/features/ccsdk-sli-core-all/pom.xml b/core/features/ccsdk-sli-core-all/pom.xml index 92aac79ec..28a780edb 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> |