summaryrefslogtreecommitdiffstats
path: root/platform-logic
diff options
context:
space:
mode:
authorTimoney, Dan (dt5972) <dt5972@att.com>2018-03-01 10:59:28 -0500
committerTimoney, Dan (dt5972) <dt5972@att.com>2018-03-01 10:59:28 -0500
commit632987493c6c24532b2ec526b17daf73ee6d21f0 (patch)
treeb27efd6f9d621122c9fcab4e0e32c7ad11bb08c2 /platform-logic
parent33314626c3c8cf06a364deb11dfb6f006aed5d82 (diff)
Nitrogen port : sdnc-oam
Update sdnc-oam to create docker containers based on ODL Nitrogen release. Change-Id: If8df28c417a2dec69be6eee2fc4521541126085a Issue-ID: SDNC-269 Signed-off-by: Timoney, Dan (dt5972) <dt5972@att.com> Former-commit-id: 2822ea7882e20879b1556bf98cf28695f5052348
Diffstat (limited to 'platform-logic')
-rw-r--r--platform-logic/generic-resource-api/pom.xml99
-rw-r--r--platform-logic/installer/pom.xml21
-rw-r--r--platform-logic/pom.xml36
-rw-r--r--platform-logic/restapi-templates/pom.xml99
-rw-r--r--platform-logic/setup/pom.xml18
-rw-r--r--platform-logic/vnfapi/pom.xml20
6 files changed, 146 insertions, 147 deletions
diff --git a/platform-logic/generic-resource-api/pom.xml b/platform-logic/generic-resource-api/pom.xml
index c6ee9d5f..862f83e6 100644
--- a/platform-logic/generic-resource-api/pom.xml
+++ b/platform-logic/generic-resource-api/pom.xml
@@ -1,54 +1,57 @@
<?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>
+<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>
- <parent>
- <groupId>org.onap.sdnc.oam</groupId>
- <artifactId>platform-logic</artifactId>
- <version>1.3.0-SNAPSHOT</version>
- </parent>
+ <parent>
+ <groupId>org.onap.ccsdk.parent</groupId>
+ <artifactId>odlparent-lite</artifactId>
+ <version>1.0.1-SNAPSHOT</version>
+ <relativePath />
+ </parent>
- <artifactId>platform-logic-generic-resource-api</artifactId>
- <version>1.3.0-SNAPSHOT</version>
- <packaging>pom</packaging>
+ <groupId>org.onap.sdnc.oam</groupId>
+ <artifactId>platform-logic-generic-resource-api</artifactId>
+ <version>1.3.1-SNAPSHOT</version>
+ <packaging>pom</packaging>
- <name>Platform Logic : Generic Resource API</name>
- <description>Contains platform-level service logic for the Generic Resource API</description>
+ <name>sdnc-oam :: platform-logic :: ${project.artifactId}</name>
+ <description>Contains platform-level service logic for the Generic Resource API</description>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-resources-plugin</artifactId>
- <version>2.6</version>
- <executions>
- <execution>
- <id>copy-version</id>
- <goals>
- <goal>copy-resources</goal>
- </goals><!-- here the phase you need -->
- <phase>validate</phase>
- <configuration>
- <outputDirectory>../target/svclogic/graphs/generic-resource-api</outputDirectory>
- <resources>
- <resource>
- <directory>src/main/xml</directory>
- <includes>
- <include>*.xml</include>
- </includes>
- <filtering>true</filtering>
- </resource>
- <resource>
- <directory>src/main/resources</directory>
- <includes>
- <include>graph.versions</include>
- </includes>
- <filtering>true</filtering>
- </resource>
- </resources>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-resources-plugin</artifactId>
+ <version>2.6</version>
+ <executions>
+ <execution>
+ <id>copy-version</id>
+ <goals>
+ <goal>copy-resources</goal>
+ </goals><!-- here the phase you need -->
+ <phase>validate</phase>
+ <configuration>
+ <outputDirectory>../target/svclogic/graphs/generic-resource-api</outputDirectory>
+ <resources>
+ <resource>
+ <directory>src/main/xml</directory>
+ <includes>
+ <include>*.xml</include>
+ </includes>
+ <filtering>true</filtering>
+ </resource>
+ <resource>
+ <directory>src/main/resources</directory>
+ <includes>
+ <include>graph.versions</include>
+ </includes>
+ <filtering>true</filtering>
+ </resource>
+ </resources>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
</project>
diff --git a/platform-logic/installer/pom.xml b/platform-logic/installer/pom.xml
index ce50689d..d5208944 100644
--- a/platform-logic/installer/pom.xml
+++ b/platform-logic/installer/pom.xml
@@ -1,24 +1,21 @@
<?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/maven-v4_0_0.xsd">
+<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>
<parent>
- <groupId>org.onap.sdnc.oam</groupId>
- <artifactId>platform-logic</artifactId>
- <version>1.3.0-SNAPSHOT</version>
+ <groupId>org.onap.ccsdk.parent</groupId>
+ <artifactId>odlparent-lite</artifactId>
+ <version>1.0.1-SNAPSHOT</version>
</parent>
- <modelVersion>4.0.0</modelVersion>
- <packaging>pom</packaging>
<groupId>org.onap.sdnc.oam</groupId>
<artifactId>platform-logic-installer</artifactId>
- <version>1.3.0-SNAPSHOT</version>
+ <version>1.3.1-SNAPSHOT</version>
+ <packaging>pom</packaging>
- <name>Platform Logic Installer</name>
+ <name>sdnc-oam :: platform-logic :: ${project.artifactId}</name>
<description>Contains platform-level service logic installer</description>
-
-
<build>
<plugins>
@@ -46,6 +43,4 @@
</plugins>
</build>
-
-
</project>
diff --git a/platform-logic/pom.xml b/platform-logic/pom.xml
index 111744b1..d70db97c 100644
--- a/platform-logic/pom.xml
+++ b/platform-logic/pom.xml
@@ -1,28 +1,24 @@
<?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/maven-v4_0_0.xsd">
+<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>
<parent>
- <groupId>org.onap.sdnc.oam</groupId>
- <artifactId>sdnc-oam</artifactId>
- <version>1.3.0-SNAPSHOT</version>
+ <groupId>org.onap.ccsdk.parent</groupId>
+ <artifactId>odlparent-lite</artifactId>
+ <version>1.0.1-SNAPSHOT</version>
+ <relativePath />
</parent>
- <modelVersion>4.0.0</modelVersion>
- <packaging>pom</packaging>
<groupId>org.onap.sdnc.oam</groupId>
<artifactId>platform-logic</artifactId>
<version>1.3.0-SNAPSHOT</version>
+ <packaging>pom</packaging>
- <name>Platform Logic </name>
+ <name>sdnc-oam :: platform-logic</name>
<description>Contains platform-level service logic</description>
-
- <properties>
- <application.name>platform-logic</application.name>
-
- <maven.build.timestamp.format>yyMMdd-HHmmss</maven.build.timestamp.format>
- <build.number>${maven.build.timestamp}</build.number>
- </properties>
+ <organization>
+ <name>ONAP</name>
+ </organization>
<modules>
<module>setup</module>
@@ -31,7 +27,11 @@
<module>restapi-templates</module>
<module>installer</module>
</modules>
- <organization>
- <name>ONAP</name>
- </organization>
+
+ <properties>
+ <application.name>platform-logic</application.name>
+
+ <maven.build.timestamp.format>yyMMdd-HHmmss</maven.build.timestamp.format>
+ <build.number>${maven.build.timestamp}</build.number>
+ </properties>
</project>
diff --git a/platform-logic/restapi-templates/pom.xml b/platform-logic/restapi-templates/pom.xml
index 7f0d7b40..0ada96fe 100644
--- a/platform-logic/restapi-templates/pom.xml
+++ b/platform-logic/restapi-templates/pom.xml
@@ -1,54 +1,57 @@
<?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>
+<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>
- <parent>
- <groupId>org.onap.sdnc.oam</groupId>
- <artifactId>platform-logic</artifactId>
- <version>1.3.0-SNAPSHOT</version>
- </parent>
+ <parent>
+ <groupId>org.onap.ccsdk.parent</groupId>
+ <artifactId>odlparent-lite</artifactId>
+ <version>1.0.1-SNAPSHOT</version>
+ <relativePath />
+ </parent>
- <artifactId>platform-logic-restapi-templates</artifactId>
- <version>1.3.0-SNAPSHOT</version>
- <packaging>pom</packaging>
+ <groupId>org.onap.sdnc.oam</groupId>
+ <artifactId>platform-logic-restapi-templates</artifactId>
+ <version>1.3.0-SNAPSHOT</version>
+ <packaging>pom</packaging>
- <name>Platform Logic : REST API templates</name>
- <description>Contains platform-level platform logic for REST API templates</description>
+ <name>sdnc-oam :: platform-logic :: ${project.artifactId}</name>
+ <description>Contains platform-level platform logic for REST API templates</description>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-resources-plugin</artifactId>
- <version>2.6</version>
- <executions>
- <execution>
- <id>copy-version</id>
- <goals>
- <goal>copy-resources</goal>
- </goals><!-- here the phase you need -->
- <phase>validate</phase>
- <configuration>
- <outputDirectory>../target/restapi/templates</outputDirectory>
- <resources>
- <resource>
- <directory>src/main/json</directory>
- <includes>
- <include>*.json</include>
- </includes>
- <filtering>true</filtering>
- </resource>
- <resource>
- <directory>src/main/xml</directory>
- <includes>
- <include>*.xml</include>
- </includes>
- <filtering>true</filtering>
- </resource>
- </resources>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-resources-plugin</artifactId>
+ <version>2.6</version>
+ <executions>
+ <execution>
+ <id>copy-version</id>
+ <goals>
+ <goal>copy-resources</goal>
+ </goals><!-- here the phase you need -->
+ <phase>validate</phase>
+ <configuration>
+ <outputDirectory>../target/restapi/templates</outputDirectory>
+ <resources>
+ <resource>
+ <directory>src/main/json</directory>
+ <includes>
+ <include>*.json</include>
+ </includes>
+ <filtering>true</filtering>
+ </resource>
+ <resource>
+ <directory>src/main/xml</directory>
+ <includes>
+ <include>*.xml</include>
+ </includes>
+ <filtering>true</filtering>
+ </resource>
+ </resources>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
</project>
diff --git a/platform-logic/setup/pom.xml b/platform-logic/setup/pom.xml
index c035fe6c..33fde7db 100644
--- a/platform-logic/setup/pom.xml
+++ b/platform-logic/setup/pom.xml
@@ -2,22 +2,23 @@
<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>
- <parent>
- <groupId>org.onap.sdnc.oam</groupId>
- <artifactId>platform-logic</artifactId>
- <version>1.3.0-SNAPSHOT</version>
+ <parent>
+ <groupId>org.onap.ccsdk.parent</groupId>
+ <artifactId>odlparent-lite</artifactId>
+ <version>1.0.1-SNAPSHOT</version>
+ <relativePath />
</parent>
+ <groupId>org.onap.sdnc.oam</groupId>
<artifactId>platform-logic-setup</artifactId>
- <version>1.3.0-SNAPSHOT</version>
+ <version>1.3.1-SNAPSHOT</version>
<packaging>pom</packaging>
- <name>Platform Logic : Setup</name>
+ <name>sdnc-oam :: platform-logic :: ${project.artifactId}</name>
<description>Copies base ONAP platform-logic</description>
-
<properties>
- <ccsdk.distribution.version>0.2.0-SNAPSHOT</ccsdk.distribution.version>
+ <ccsdk.distribution.version>0.2.1-SNAPSHOT</ccsdk.distribution.version>
</properties>
<build>
@@ -59,6 +60,5 @@
</plugins>
-
</build>
</project>
diff --git a/platform-logic/vnfapi/pom.xml b/platform-logic/vnfapi/pom.xml
index 7b70190f..c094f094 100644
--- a/platform-logic/vnfapi/pom.xml
+++ b/platform-logic/vnfapi/pom.xml
@@ -1,23 +1,22 @@
<?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/maven-v4_0_0.xsd">
+<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>
<parent>
- <groupId>org.onap.sdnc.oam</groupId>
- <artifactId>platform-logic</artifactId>
- <version>1.3.0-SNAPSHOT</version>
+ <groupId>org.onap.ccsdk.parent</groupId>
+ <artifactId>odlparent-lite</artifactId>
+ <version>1.0.1-SNAPSHOT</version>
+ <relativePath />
</parent>
- <modelVersion>4.0.0</modelVersion>
- <packaging>pom</packaging>
<groupId>org.onap.sdnc.oam</groupId>
<artifactId>platform-logic-vnfapi</artifactId>
- <version>1.3.0-SNAPSHOT</version>
+ <version>1.3.1-SNAPSHOT</version>
+ <packaging>pom</packaging>
- <name>Platform Logic : VNF-API</name>
+ <name>sdnc-oam :: platform-logic :: ${project.artifactId}</name>
<description>Contains platform-level service logic for the VNF-API</description>
-
<build>
<plugins>
<plugin>
@@ -54,5 +53,4 @@
</plugin>
</plugins>
</build>
-
</project>