Merge "Upgrade to latest oparent"

diff --combined pom.xml
index 8ba3911,4fdf2ad..2eae015
--- 1/pom.xml
--- 2/pom.xml
+++ b/pom.xml
@@@ -8,10 -8,10 +8,10 @@@
    <parent>
      <groupId>org.onap.oparent</groupId>
      <artifactId>oparent</artifactId>
-     <version>0.1.1</version>
+     <version>1.1.0</version>
      <relativePath/>
    </parent>
 -  <build>
 +    <build>
      <finalName>buscontroller</finalName>
  
      <plugins>
@@@ -84,6 -84,37 +84,6 @@@
                  </configuration>
              </plugin>
  
 -      <plugin>
 -              <groupId>com.spotify</groupId>
 -               <artifactId>docker-maven-plugin</artifactId>
 -               <version>1.0.0</version>
 -               <configuration>
 -                               <imageName>${onap.nexus.dockerregistry.daily}/${docker.image}</imageName>
 -                           <dockerDirectory>${project.basedir}</dockerDirectory>
 -                               <serverId>${onap.nexus.dockerregistry.daily}</serverId>
 -                               <imageTags>
 -                                               <imageTag>${artifact.version}</imageTag>
 -                                               <imageTag>latest</imageTag>
 -                               </imageTags>
 -                               <forceTags>true</forceTags>
 -                               <resources>
 -                                               <resource>
 -                                                               <targetPath>/</targetPath>
 -                                                               <directory>${project.basedir}</directory>
 -                                                               <excludes>
 -                                                                      <exclude>target/**/*</exclude>
 -                                                                      <exclude>pom.xml</exclude>
 -                                                              </excludes>
 -                                               </resource>
 -
 -                                               <resource>
 -                                                               <targetPath>/</targetPath>
 -                                                               <directory>${project.build.directory}</directory>
 -                                                               <include>**/**</include>
 -                                               </resource>
 -                               </resources>
 -               </configuration>
 -      </plugin>
  
        <!-- for Distribution management -->
                <plugin>
@@@ -131,46 -162,6 +131,46 @@@
        </plugins>
      </pluginManagement>
    </build>
 +      <profiles>
 +      <profile>
 +              <id>docker</id>
 +              <build>
 +                      <plugins>
 +      <plugin>
 +              <groupId>com.spotify</groupId>
 +               <artifactId>docker-maven-plugin</artifactId>
 +               <version>1.0.0</version>
 +               <configuration>
 +                               <imageName>${onap.nexus.dockerregistry.daily}/${docker.image}</imageName>
 +                           <dockerDirectory>${project.basedir}</dockerDirectory>
 +                               <serverId>${onap.nexus.dockerregistry.daily}</serverId>
 +                               <imageTags>
 +                                               <imageTag>${artifact.version}</imageTag>
 +                                               <imageTag>latest</imageTag>
 +                               </imageTags>
 +                               <forceTags>true</forceTags>
 +                               <resources>
 +                                               <resource>
 +                                                               <targetPath>/</targetPath>
 +                                                               <directory>${project.basedir}</directory>
 +                                                               <excludes>
 +                                                                      <exclude>target/**/*</exclude>
 +                                                                      <exclude>pom.xml</exclude>
 +                                                              </excludes>
 +                                               </resource>
 +
 +                                               <resource>
 +                                                               <targetPath>/</targetPath>
 +                                                               <directory>${project.build.directory}</directory>
 +                                                               <include>**/**</include>
 +                                               </resource>
 +                               </resources>
 +               </configuration>
 +      </plugin>
 +                      </plugins>
 +              </build>
 +      </profile>
 +      </profiles>
    <dependencyManagement>
      <dependencies>