diff options
| author |   Dan Timoney <dtimoney@att.com> | 2021-07-28 11:35:03 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2021-07-28 11:35:03 +0000 |
| commit | 954895be00005e8b1bbfae360c474d4fac4d69e7 (patch) | |
| tree | 30877bc116d6f55ec2f484eeab88a1d300845116 | |
| parent | 03a1b2b63cf77790d357e15f2cd20a197ec6d26f (diff) | |
| parent | 87b0822e6cbde73db2fd7b2ba2824b7df4bc94d7 (diff) | |
Merge "Update to support use of version ranges"
Former-commit-id: 894a8b9fb692863b1e34bc4ed368cd1887a76265
| -rw-r--r-- | admportal/pom.xml | 12 | ||||
| -rw-r--r-- | platform-logic/setup/pom.xml | 27 | ||||
| -rwxr-xr-x | pom.xml | 1 |
3 files changed, 14 insertions, 26 deletions
diff --git a/admportal/pom.xml b/admportal/pom.xml index b8166aed..ac5c5b98 100644 --- a/admportal/pom.xml +++ b/admportal/pom.xml @@ -29,21 +29,11 @@ <SWM_VERSION>${project.version}-${build.number}</SWM_VERSION> </properties> - <dependencyManagement> - <dependencies> - <dependency> - <groupId>org.onap.ccsdk.sli.core</groupId> - <artifactId>sli-core-artifacts</artifactId> - <version>${ccsdk.sli.core.version}</version> - <type>pom</type> - <scope>import</scope> - </dependency> - </dependencies> - </dependencyManagement> <dependencies> <dependency> <groupId>org.onap.ccsdk.sli.core</groupId> <artifactId>sli-common</artifactId> + <version>${ccsdk.sli.version}</version> </dependency> <dependency> <groupId>org.mariadb.jdbc</groupId> diff --git a/platform-logic/setup/pom.xml b/platform-logic/setup/pom.xml index b68c5257..c4c08313 100644 --- a/platform-logic/setup/pom.xml +++ b/platform-logic/setup/pom.xml @@ -13,6 +13,14 @@ <name>sdnc-oam :: platform-logic :: ${project.artifactId}</name> <description>Copies base ONAP platform-logic</description> + <dependencies> + <dependency> + <groupId>org.onap.ccsdk.distribution</groupId> + <artifactId>platform-logic-installer</artifactId> + <version>${ccsdk.distribution.version}</version> + <type>zip</type> + </dependency> + </dependencies> <build> <plugins> @@ -23,25 +31,14 @@ <version>3.0.0</version> <executions> <execution> - <id>unpack</id> + <id>unpack-dgs</id> <phase>validate</phase> <goals> - <goal>unpack</goal> + <goal>unpack-dependencies</goal> </goals> <configuration> - <artifactItems> - <artifactItem> - <groupId>org.onap.ccsdk.distribution</groupId> - <artifactId>platform-logic-installer</artifactId> - <version>${ccsdk.distribution.version}</version> - <type>zip</type> - <overWrite>true</overWrite> - <outputDirectory>../target</outputDirectory> - </artifactItem> - </artifactItems> - <overWriteReleases>false</overWriteReleases> - <overWriteSnapshots>true</overWriteSnapshots> - <overWriteIfNewer>true</overWriteIfNewer> + <outputDirectory>../target</outputDirectory> + <excludeTransitive>true</excludeTransitive> </configuration> </execution> </executions> @@ -27,6 +27,7 @@ <!-- All Version definition is placed in org.onap.ccsdk.parent/odlparent-lite --> <ccsdk.oran.a1adapter.version>1.2.0-SNAPSHOT</ccsdk.oran.a1adapter.version> <sdnc.northbound.version>2.2.0-SNAPSHOT</sdnc.northbound.version> <!-- Used by installation/sdnc --> + <ccsdk.distribution.version>[1.2.0-SNAPSHOT, 1.2.99999)</ccsdk.distribution.version> <!-- docker images versions --> <ccsdk.docker.alpine.j11.version>1.2-STAGING-latest</ccsdk.docker.alpine.j11.version> <!-- Used by dmaap-listener, ueb-listener --> |