Merge "Fix docker building issue"

5 files changed, 42 insertions, 56 deletions

diff --git a/pom.xml b/pom.xml
index 263afcf..0eb2260 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,70 +1,30 @@
 <?xml version="1.0"?>
 <!--
- Copyright (c) 2017 VMware, Inc.
+    Copyright 2017 VMware Inc.
 
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at:
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
 
-       http://www.apache.org/licenses/LICENSE-2.0
+            http://www.apache.org/licenses/LICENSE-2.0
 
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
 -->
 <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">
-
     <parent>
         <groupId>org.onap.oparent</groupId>
         <artifactId>oparent</artifactId>
         <version>1.0.0-SNAPSHOT</version>
-        <relativePath>../oparent</relativePath>
     </parent>
-
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.onap.multicloud.openstack.vmware</groupId>
     <artifactId>multicloud-vio</artifactId>
     <version>1.0.0-SNAPSHOT</version>
-    <name>multicloud-openstack-vmware</name>
     <packaging>pom</packaging>
-    
-    <modules>
-        <module>vio</module>
-    </modules>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>com.mycila</groupId>
-                <artifactId>license-maven-plugin</artifactId>
-                <version>2.3</version>
-                <configuration>
-                    <includes>
-                        <include>**\*.java</include>
-                    </includes>
-                </configuration>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-release-plugin</artifactId>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.3</version>
-                    <configuration>
-                        <source>1.8</source>
-                        <target>1.8</target>
-                    </configuration>
-             </plugin>
-             <plugin>
-                 <groupId>org.apache.maven.plugins</groupId>
-                 <artifactId>maven-deploy-plugin</artifactId>
-                 <version>2.7</version>
-                     <configuration>
-                         <retryFailedDeploymentCount>2</retryFailedDeploymentCount>
-                     </configuration>
-             </plugin>
-        </plugins>
-    </build>
+    <name>multicloud-opentack-vmware</name>
+    <description>multicloud vio</description>
 </project>
diff --git a/version.properties b/version.properties
new file mode 100644
index 0000000..639c1f7
--- /dev/null
+++ b/version.properties
@@ -0,0 +1,28 @@
+#!/bin/bash
+# Copyright (c) 2017 VMware, Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#         http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+# Versioning variables
+# Note that these variables cannot be structured (e.g. : version.release or version.snapshot etc... )
+# because they are used in Jenkins, whose plug-in doesn't support
+
+major=1
+minor=1
+patch=0
+
+base_version=${major}.${minor}.${patch}
+
+# Release must be completed with git revision # in Jenkins
+release_version=${base_version}
+snapshot_version=${base_version}-SNAPSHOT
diff --git a/vio/docker/instance-run.sh b/vio/docker/instance-run.sh
index 2393c5d..d01cebb 100755
--- a/vio/docker/instance-run.sh
+++ b/vio/docker/instance-run.sh
@@ -1,7 +1,5 @@
 #!/bin/bash -v
 
-redis-server &
-
 cd ./vio
 ./run.sh
 
diff --git a/vio/pom.xml b/vio/pom.xml
index dd05ffe..0c60fac 100644
--- a/vio/pom.xml
+++ b/vio/pom.xml
@@ -26,7 +26,7 @@
     <artifactId>multicloud-vio</artifactId>
     <version>1.0.0-SNAPSHOT</version>
     <packaging>pom</packaging>
-    <name>multicloud/opentack/vmware</name>
+    <name>multicloud-opentack-vmware</name>
     <description>multicloud vio</description>
     <build>
       <plugins>
diff --git a/vio/version.properties b/vio/version.properties
index 5128787..7f86aa1 100644
--- a/vio/version.properties
+++ b/vio/version.properties
@@ -3,7 +3,7 @@
 # because they are used in Jenkins, whose plug-in doesn't support
 
 major=1
-minor=0
+minor=1
 patch=0
 
 base_version=${major}.${minor}.${patch}