diff options
| -rw-r--r-- | adapters/mso-adapters-rest-interface/src/main/java/org/onap/so/adapters/sdncrest/SDNCServiceRequest.java | 3 | ||||
| -rw-r--r-- | packages/docker/pom.xml | 32 |
2 files changed, 31 insertions, 4 deletions
diff --git a/adapters/mso-adapters-rest-interface/src/main/java/org/onap/so/adapters/sdncrest/SDNCServiceRequest.java b/adapters/mso-adapters-rest-interface/src/main/java/org/onap/so/adapters/sdncrest/SDNCServiceRequest.java index b271af2f9b..950362e986 100644 --- a/adapters/mso-adapters-rest-interface/src/main/java/org/onap/so/adapters/sdncrest/SDNCServiceRequest.java +++ b/adapters/mso-adapters-rest-interface/src/main/java/org/onap/so/adapters/sdncrest/SDNCServiceRequest.java @@ -22,9 +22,6 @@ package org.onap.so.adapters.sdncrest; import java.io.Serializable; -import javax.ws.rs.Consumes; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlRootElement; diff --git a/packages/docker/pom.xml b/packages/docker/pom.xml index 5fafb4afd9..41495ccb1e 100644 --- a/packages/docker/pom.xml +++ b/packages/docker/pom.xml @@ -49,7 +49,7 @@ if ( project.properties['so.project.version'].endsWith("-SNAPSHOT") ) { project.properties['project.docker.latesttag.version']=versionArray[0] + "-SNAPSHOT-latest"; } else { - project.properties['project.docker.latesttag.version']=versionArray[0] + '.' + versionArray[1] + "-STAGING-latest"; + project.properties['project.docker.latesttag.version']=versionArray[0] + "-STAGING-latest"; } println 'New tag for docker: ' + project.properties['project.docker.latesttag.version']; @@ -180,6 +180,31 @@ </build> </image> <image> + <name>so/vfc-adapter</name> + <build> + <cleanup>try</cleanup> + <dockerFileDir>docker-files</dockerFileDir> + <dockerFile>Dockerfile.so-app</dockerFile> + <tags> + <tag>${project.version}</tag> + <tag>${project.version}-${maven.build.timestamp}</tag> + <tag>${project.docker.latesttag.version}</tag> + </tags> + <assembly> + <inline> + <dependencySets> + <dependencySet> + <includes> + <include>org.onap.so.adapters:mso-vfc-adapter</include> + </includes> + <outputFileNameMapping>app.jar</outputFileNameMapping> + </dependencySet> + </dependencySets> + </inline> + </assembly> + </build> + </image> + <image> <name>so/asdc-controller</name> <build> <cleanup>try</cleanup> @@ -324,6 +349,11 @@ <version>${project.version}</version> </dependency> <dependency> + <groupId>org.onap.so.adapters</groupId> + <artifactId>mso-vfc-adapter</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> <groupId>org.onap.so</groupId> <artifactId>asdc-controller</artifactId> <version>${project.version}</version> |