summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan Timoney <dtimoney@att.com>2020-02-18 12:38:55 -0500
committerDan Timoney <dtimoney@att.com>2020-02-18 12:38:58 -0500
commit47722fd71ca4c3ca4cf4ef2dc86dfe7ac4c8fb61 (patch)
treed6aa52937c65390c32fd0692cef650fb14afcc1c
parent6cad29cfc9b771dfaf99a7c1b47c04ca9fcf328c (diff)
Fix build error due to missing 0.7.0 artifacts
Fixed to use latest CCSDK snapshot version instead of using version 0.7.0, which was not released due to bug in auto-release process. Change-Id: I14a764c9999bd533d7e0029cc0361f556749d65e Issue-ID: SDNC-1077 Signed-off-by: Dan Timoney <dtimoney@att.com> Former-commit-id: dc7a05c352b80786efd7f6bb1fcb8845dbc57bbc
-rw-r--r--installation/sdnc/pom.xml4
-rw-r--r--platform-logic/setup/pom.xml93
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>