diff options
| author |   Dan Timoney <dtimoney@att.com> | 2017-05-16 18:55:55 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2017-05-16 18:55:55 +0000 |
| commit | 4beb73a5b87180befeb199f905a1ede78f8eb79a (patch) | |
| tree | d2741b22b310b1177a8ef3f619279078627f8d40 | |
| parent | 62ba12c8deefcf750e02206c6cf76679d4e64198 (diff) | |
| parent | 44775a0ec9732f2874c1b07fee15c393949b55b8 (diff) | |
Merge "Depend on opendaylight-karaf-empty from odlparent"
| -rwxr-xr-x | dblib/features/pom.xml | 4 | ||||
| -rwxr-xr-x | filters/features/pom.xml | 2 | ||||
| -rwxr-xr-x | rootpom/pom.xml | 2 | ||||
| -rwxr-xr-x | sli/features/pom.xml | 4 | ||||
| -rwxr-xr-x | sliPluginUtils/features/pom.xml | 4 | ||||
| -rwxr-xr-x | sliapi/features/pom.xml | 4 |
6 files changed, 10 insertions, 10 deletions
diff --git a/dblib/features/pom.xml b/dblib/features/pom.xml index 00b3c2a..995a1c5 100755 --- a/dblib/features/pom.xml +++ b/dblib/features/pom.xml @@ -45,7 +45,7 @@ <!-- 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 +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 --git a/filters/features/pom.xml b/filters/features/pom.xml index 74247a6..74cdc3b 100755 --- a/filters/features/pom.xml +++ b/filters/features/pom.xml @@ -64,7 +64,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 --git a/rootpom/pom.xml b/rootpom/pom.xml index 41cf463..84dbc43 100755 --- a/rootpom/pom.xml +++ b/rootpom/pom.xml @@ -163,7 +163,7 @@ <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> diff --git a/sli/features/pom.xml b/sli/features/pom.xml index d796986..d308105 100755 --- a/sli/features/pom.xml +++ b/sli/features/pom.xml @@ -44,7 +44,7 @@ <!-- 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.version}</version> <type>zip</type> @@ -99,7 +99,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 --git a/sliPluginUtils/features/pom.xml b/sliPluginUtils/features/pom.xml index 46a8b04..d1c9614 100755 --- a/sliPluginUtils/features/pom.xml +++ b/sliPluginUtils/features/pom.xml @@ -35,7 +35,7 @@ </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> @@ -89,7 +89,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 --git a/sliapi/features/pom.xml b/sliapi/features/pom.xml index 9f2ed4f..4a572cb 100755 --- a/sliapi/features/pom.xml +++ b/sliapi/features/pom.xml @@ -40,7 +40,7 @@ <!-- 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> <type>zip</type> </dependency> @@ -96,7 +96,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> |