Merge "Depend on opendaylight-karaf-empty from odlparent"

diff --combined dblib/features/pom.xml
index 00b3c2a,b6793d8..995a1c5
--- 1/dblib/features/pom.xml
--- 2/dblib/features/pom.xml
+++ b/dblib/features/pom.xml
@@@ -37,15 -37,10 +37,15 @@@
                        <scope>runtime</scope>
                </dependency>
  
 +              <dependency>
 +                  <groupId>org.apache.tomcat</groupId>
 +                  <artifactId>tomcat-jdbc</artifactId>
 +                  <version>${tomcat-jdbc.version}</version>
 +              </dependency>
  
                <!-- dependency for opendaylight-karaf-empty for use by testing -->
                <dependency>
-                       <groupId>org.opendaylight.controller</groupId>
+                       <groupId>org.opendaylight.odlparent</groupId>
                        <artifactId>opendaylight-karaf-empty</artifactId>
              <version>${odl.karaf.empty.distro.version}</version>
                        <type>zip</type>
@@@ -101,7 -96,7 +101,7 @@@
                                <version>2.16</version>
                                <configuration>
                                        <systemPropertyVariables>
-                                               <karaf.distro.groupId>org.opendaylight.controller</karaf.distro.groupId>
+                                               <karaf.distro.groupId>org.opendaylight.odlparent</karaf.distro.groupId>
                                                <karaf.distro.artifactId>opendaylight-karaf-empty</karaf.distro.artifactId>
                                                <karaf.distro.version>${odl.karaf.empty.distro.version}</karaf.distro.version>
                                        </systemPropertyVariables>

diff --combined rootpom/pom.xml
index 41cf463,4ace6f4..84dbc43
--- 1/rootpom/pom.xml
--- 2/rootpom/pom.xml
+++ b/rootpom/pom.xml
@@@ -157,13 -157,13 +157,13 @@@
        <packaging>pom</packaging>
        <groupId>org.openecomp.sdnc.core</groupId>
        <artifactId>root</artifactId>
 -      <version>1.1.0</version>
 +      <version>1.1.1</version>
  
  
                <dependencyManagement>
                        <dependencies>
                                <dependency>
-                                       <groupId>org.opendaylight.controller</groupId>
+                                       <groupId>org.opendaylight.odlparent</groupId>
                                        <artifactId>opendaylight-karaf-empty</artifactId>
                                        <version>${odl.karaf.empty.distro.version}</version>
                                        <type>zip</type>
@@@ -506,26 -506,16 +506,26 @@@
                                                <artifactId>maven-site-plugin</artifactId>
                                                <version>3.6</version>
                                                <dependencies>
 -                                                      <dependency><!-- add support for ssh/scp -->
 -                                                              <groupId>org.apache.maven.wagon</groupId>
 -                                                              <artifactId>wagon-ssh</artifactId>
 -                                                              <version>1.0</version>
 -                                                      </dependency>
                                                        <dependency>
                                                                <groupId>org.apache.maven.wagon</groupId>
                                                                <artifactId>wagon-webdav-jackrabbit</artifactId>
                                                                <version>2.10</version>
                                                        </dependency>
 +                                                      <dependency>
 +                                                              <groupId>org.apache.maven.doxia</groupId>
 +                                                              <artifactId>doxia-core</artifactId>
 +                                                              <version>1.7</version>
 +                                                      </dependency>
 +                                                      <dependency>
 +                                                              <groupId>org.apache.maven.doxia</groupId>
 +                                                              <artifactId>doxia-sink-api</artifactId>
 +                                                              <version>1.7</version>
 +                                                      </dependency>
 +                                                      <dependency>
 +                                                              <groupId>org.apache.maven.doxia</groupId>
 +                                                              <artifactId>doxia-logging-api</artifactId>
 +                                                              <version>1.7</version>
 +                                                      </dependency>
                                                </dependencies>
                                                <executions>
                                                        <execution>