diff options
| author |   Dan Timoney <dtimoney@att.com> | 2020-02-18 19:13:54 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2020-02-18 19:13:54 +0000 |
| commit | 1762ca3b89c703d86925d2f68486594916d804b0 (patch) | |
| tree | f25ee8aa9fa0d827898d45cd376eb45e8b6f3588 | |
| parent | fad2018502f1794f2569becaaa65b6f44bb93a8c (diff) | |
| parent | 47722fd71ca4c3ca4cf4ef2dc86dfe7ac4c8fb61 (diff) | |
Merge "Fix build error due to missing 0.7.0 artifacts"
Former-commit-id: 11a572815f8b0f24f6b801211db16420b52f489e
| -rw-r--r-- | installation/sdnc/pom.xml | 4 | ||||
| -rw-r--r-- | platform-logic/setup/pom.xml | 93 |
2 files changed, 48 insertions, 49 deletions
diff --git a/installation/sdnc/pom.xml b/installation/sdnc/pom.xml index 7eb4e629..3d8d14e4 100644 --- a/installation/sdnc/pom.xml +++ b/installation/sdnc/pom.xml @@ -22,8 +22,8 @@ <sdnc.project.version>${project.version}</sdnc.project.version> <sdnc.build.timestamp>${maven.build.timestamp}</sdnc.build.timestamp> <sdnc.northbound.version>1.8.0-SNAPSHOT</sdnc.northbound.version> - <ccsdk.docker.version>0.7.0</ccsdk.docker.version> - <ccsdk.features.version>0.7.0</ccsdk.features.version> + <ccsdk.docker.version>0.7.1-STAGING-latest</ccsdk.docker.version> + <ccsdk.features.version>0.7.1-SNAPSHOT</ccsdk.features.version> <sdnc.keystore>org.onap.sdnc.p12</sdnc.keystore> <sdnc.keypass><![CDATA[ff^G9D]yf&r}Ktum@BJ0YB?N]]></sdnc.keypass> <sdnc.secureport>8443</sdnc.secureport> diff --git a/platform-logic/setup/pom.xml b/platform-logic/setup/pom.xml index fd9b9866..be43fddd 100644 --- a/platform-logic/setup/pom.xml +++ b/platform-logic/setup/pom.xml @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="UTF-8"?> <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/xsd/maven-4.0.0.xsd"> - <modelVersion>4.0.0</modelVersion> + <modelVersion>4.0.0</modelVersion> - <parent> + <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>odlparent-lite</artifactId> <version>1.5.1</version> @@ -10,51 +10,50 @@ </parent> <groupId>org.onap.sdnc.oam</groupId> - <artifactId>platform-logic-setup</artifactId> - <version>1.8.0-SNAPSHOT</version> - <packaging>pom</packaging> + <artifactId>platform-logic-setup</artifactId> + <version>1.8.0-SNAPSHOT</version> + <packaging>pom</packaging> <name>sdnc-oam :: platform-logic :: ${project.artifactId}</name> - <description>Copies base ONAP platform-logic</description> - - <build> - <plugins> - - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-dependency-plugin</artifactId> - <version>3.0.0</version> - <executions> - <execution> - <id>unpack</id> - <phase>validate</phase> - <goals> - <goal>unpack</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> - <localRepositoryDirectory>../target/repository</localRepositoryDirectory> - </configuration> - </execution> - </executions> - </plugin> - - - - - - </plugins> - </build> + <description>Copies base ONAP platform-logic</description> + + <properties> + <ccsdk.distribution.version>0.7.1-SNAPSHOT</ccsdk.distribution.version> + </properties> + + <build> + <plugins> + + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-dependency-plugin</artifactId> + <version>3.0.0</version> + <executions> + <execution> + <id>unpack</id> + <phase>validate</phase> + <goals> + <goal>unpack</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> + <localRepositoryDirectory>../target/repository</localRepositoryDirectory> + </configuration> + </execution> + </executions> + </plugin> + </plugins> + </build> </project> |