diff options
11 files changed, 30 insertions, 22 deletions
diff --git a/appc-adapters/appc-chef-adapter/appc-chef-adapter-features/src/main/resources/features.xml b/appc-adapters/appc-chef-adapter/appc-chef-adapter-features/src/main/resources/features.xml index 6ae5fc736..20596369f 100644 --- a/appc-adapters/appc-chef-adapter/appc-chef-adapter-features/src/main/resources/features.xml +++ b/appc-adapters/appc-chef-adapter/appc-chef-adapter-features/src/main/resources/features.xml @@ -26,7 +26,7 @@ xsi:schemaLocation="http://karaf.apache.org/xmlns/features/v1.2.0 http://karaf.apache.org/xmlns/features/v1.2.0"> <!-- <repository>mvn:org.opendaylight.mdsal/features-mdsal/${odl.mdsal.version}/xml/features</repository> --> - <repository>mvn:org.opendaylight.mdsal/features-mdsal/${features-mdsal.version}/xml/features</repository> + <repository>mvn:org.opendaylight.mdsal/features-mdsal/${odl.mdsal.features.version}/xml/features</repository> <feature name='appc-chef-adapter' description="appc-chef-adapter" version='${project.version}'> <!-- Most applications will have a dependency on the ODL MD-SAL Broker --> diff --git a/appc-adapters/appc-dmaap-adapter/appc-dmaap-adapter-features/src/main/resources/features.xml b/appc-adapters/appc-dmaap-adapter/appc-dmaap-adapter-features/src/main/resources/features.xml index 33b9ee3a7..90a31629e 100644 --- a/appc-adapters/appc-dmaap-adapter/appc-dmaap-adapter-features/src/main/resources/features.xml +++ b/appc-adapters/appc-dmaap-adapter/appc-dmaap-adapter-features/src/main/resources/features.xml @@ -26,7 +26,7 @@ xsi:schemaLocation="http://karaf.apache.org/xmlns/features/v1.2.0 http://karaf.apache.org/xmlns/features/v1.2.0"> <!-- <repository>mvn:org.opendaylight.mdsal/features-mdsal/${odl.mdsal.version}/xml/features</repository> --> - <repository>mvn:org.opendaylight.mdsal/features-mdsal/${features-mdsal.version}/xml/features</repository> + <repository>mvn:org.opendaylight.mdsal/features-mdsal/${odl.mdsal.features.version}/xml/features</repository> <feature name='appc-dmaap-adapter' description="appc-dmaap-adapter" version='${project.version}'> <!-- Most applications will have a dependency on the ODL MD-SAL Broker --> diff --git a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-features/src/main/resources/features.xml b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-features/src/main/resources/features.xml index f68027e90..5ca8f8ebd 100644 --- a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-features/src/main/resources/features.xml +++ b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-features/src/main/resources/features.xml @@ -26,7 +26,7 @@ xsi:schemaLocation="http://karaf.apache.org/xmlns/features/v1.2.0 http://karaf.apache.org/xmlns/features/v1.2.0"> <!-- <repository>mvn:org.opendaylight.mdsal/features-mdsal/${odl.mdsal.version}/xml/features</repository> --> - <repository>mvn:org.opendaylight.mdsal/features-mdsal/${features-mdsal.version}/xml/features</repository> + <repository>mvn:org.opendaylight.mdsal/features-mdsal/${odl.mdsal.features.version}/xml/features</repository> <feature name='appc-iaas-adapter' description="appc-iaas-adapter" version='${project.version}'> diff --git a/appc-adapters/appc-netconf-adapter/appc-netconf-adapter-features/src/main/resources/features.xml b/appc-adapters/appc-netconf-adapter/appc-netconf-adapter-features/src/main/resources/features.xml index bfb4b8090..3ce57da86 100644 --- a/appc-adapters/appc-netconf-adapter/appc-netconf-adapter-features/src/main/resources/features.xml +++ b/appc-adapters/appc-netconf-adapter/appc-netconf-adapter-features/src/main/resources/features.xml @@ -25,7 +25,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://karaf.apache.org/xmlns/features/v1.2.0 http://karaf.apache.org/xmlns/features/v1.2.0"> - <repository>mvn:org.opendaylight.mdsal/features-mdsal/${features-mdsal.version}/xml/features</repository> + <repository>mvn:org.opendaylight.mdsal/features-mdsal/${odl.mdsal.features.version}/xml/features</repository> <feature name='appc-netconf-adapter' description="appc-netconf-adapter" version='${project.version}'> <!-- Most applications will have a dependency on the ODL MD-SAL Broker --> diff --git a/appc-adapters/appc-rest-adapter/appc-rest-adapter-features/src/main/resources/features.xml b/appc-adapters/appc-rest-adapter/appc-rest-adapter-features/src/main/resources/features.xml index e3fab488d..2acea58b1 100644 --- a/appc-adapters/appc-rest-adapter/appc-rest-adapter-features/src/main/resources/features.xml +++ b/appc-adapters/appc-rest-adapter/appc-rest-adapter-features/src/main/resources/features.xml @@ -25,7 +25,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://karaf.apache.org/xmlns/features/v1.2.0 http://karaf.apache.org/xmlns/features/v1.2.0"> - <repository>mvn:org.opendaylight.mdsal/features-mdsal/${features-mdsal.version}/xml/features</repository> + <repository>mvn:org.opendaylight.mdsal/features-mdsal/${odl.mdsal.features.version}/xml/features</repository> <feature name='appc-rest-adapter' description="appc-rest-adapter" version='${project.version}'> <!-- Most applications will have a dependency on the ODL MD-SAL Broker --> diff --git a/appc-asdc-listener/appc-asdc-listener-features/src/main/resources/features.xml b/appc-asdc-listener/appc-asdc-listener-features/src/main/resources/features.xml index 88a49d483..0af2a9d70 100644 --- a/appc-asdc-listener/appc-asdc-listener-features/src/main/resources/features.xml +++ b/appc-asdc-listener/appc-asdc-listener-features/src/main/resources/features.xml @@ -26,7 +26,7 @@ xsi:schemaLocation="http://karaf.apache.org/xmlns/features/v1.2.0 http://karaf.apache.org/xmlns/features/v1.2.0"> <!-- <repository>mvn:org.opendaylight.mdsal/features-mdsal/${odl.mdsal.version}/xml/features</repository> --> - <repository>mvn:org.opendaylight.mdsal/features-mdsal/${features-mdsal.version}/xml/features</repository> + <repository>mvn:org.opendaylight.mdsal/features-mdsal/${odl.mdsal.features.version}/xml/features</repository> <feature name='appc-asdc-listener' description="asdc listener" version='${project.version}'> <!-- Most applications will have a dependency on the ODL MD-SAL Broker --> diff --git a/appc-dg-util/appc-dg-util-features/src/main/resources/features.xml b/appc-dg-util/appc-dg-util-features/src/main/resources/features.xml index 9bcfbd0ac..7c641661a 100644 --- a/appc-dg-util/appc-dg-util-features/src/main/resources/features.xml +++ b/appc-dg-util/appc-dg-util-features/src/main/resources/features.xml @@ -25,7 +25,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://karaf.apache.org/xmlns/features/v1.2.0 http://karaf.apache.org/xmlns/features/v1.2.0"> - <repository>mvn:org.opendaylight.mdsal/features-mdsal/${features-mdsal.version}/xml/features</repository> + <repository>mvn:org.opendaylight.mdsal/features-mdsal/${odl.mdsal.features.version}/xml/features</repository> <feature name='appc-dg-util' description="application DG utillity" version='${project.version}'> <!--<feature version="${project.version}">appc-aai-adapter</feature>--> diff --git a/appc-event-listener/appc-event-listener-features/src/main/resources/features.xml b/appc-event-listener/appc-event-listener-features/src/main/resources/features.xml index 31e2d8f0a..4d4d24fd3 100644 --- a/appc-event-listener/appc-event-listener-features/src/main/resources/features.xml +++ b/appc-event-listener/appc-event-listener-features/src/main/resources/features.xml @@ -26,7 +26,7 @@ xsi:schemaLocation="http://karaf.apache.org/xmlns/features/v1.2.0 http://karaf.apache.org/xmlns/features/v1.2.0"> <!-- <repository>mvn:org.opendaylight.mdsal/features-mdsal/${odl.mdsal.version}/xml/features</repository> --> - <repository>mvn:org.opendaylight.mdsal/features-mdsal/${features-mdsal.version}/xml/features</repository> + <repository>mvn:org.opendaylight.mdsal/features-mdsal/${odl.mdsal.features.version}/xml/features</repository> <feature name='appc-event-listener' description="event listener" version='${project.version}'> <!-- Most applications will have a dependency on the ODL MD-SAL Broker --> diff --git a/appc-metric/appc-metric-features/src/main/resources/features.xml b/appc-metric/appc-metric-features/src/main/resources/features.xml index c7747dea0..e7d134a17 100644 --- a/appc-metric/appc-metric-features/src/main/resources/features.xml +++ b/appc-metric/appc-metric-features/src/main/resources/features.xml @@ -26,7 +26,7 @@ xsi:schemaLocation="http://karaf.apache.org/xmlns/features/v1.2.0 http://karaf.apache.org/xmlns/features/v1.2.0"> <!-- - <repository>mvn:org.opendaylight.mdsal/features-mdsal/${features-mdsal.version}/xml/features</repository> + <repository>mvn:org.opendaylight.mdsal/features-mdsal/${odl.mdsal.features.version}/xml/features</repository> --> <feature name='appc-metric' description="application executor" version='${project.version}'> diff --git a/appc-provider/appc-provider-features/src/main/resources/features.xml b/appc-provider/appc-provider-features/src/main/resources/features.xml index 278fa4285..f67333648 100644 --- a/appc-provider/appc-provider-features/src/main/resources/features.xml +++ b/appc-provider/appc-provider-features/src/main/resources/features.xml @@ -26,7 +26,7 @@ xsi:schemaLocation="http://karaf.apache.org/xmlns/features/v1.2.0 http://karaf.apache.org/xmlns/features/v1.2.0"> <!-- <repository>mvn:org.opendaylight.mdsal/features-mdsal/${odl.mdsal.version}/xml/features</repository> --> - <repository>mvn:org.opendaylight.mdsal/features-mdsal/${features-mdsal.version}/xml/features</repository> + <repository>mvn:org.opendaylight.mdsal/features-mdsal/${odl.mdsal.features.version}/xml/features</repository> <feature name='appc-provider' description="application controller" version='${project.version}'> <!--<feature version="${project.version}">appc-aai-adapter</feature>--> @@ -28,16 +28,24 @@ <properties> <!-- VERSIONS --> <!-- OpenDaylight Versions --> - <odl.controller.config.api.version>0.5.1-Boron-SR1</odl.controller.config.api.version> - <odl.karaf.empty.distro.version>${odl.version}</odl.karaf.empty.distro.version> - <odl.ietf-inet-types.version>2010.09.24.9.1-Boron-SR1</odl.ietf-inet-types.version> - <odl.ietf-yang-types.version>2010.09.24.9.1-Boron-SR1</odl.ietf-yang-types.version> - <odl.yang.jmx.generator.version>0.5.1-Boron-SR1</odl.yang.jmx.generator.version> - <odl.version>1.7.1-Boron-SR1</odl.version> - <odl.mdsal.yang.binding.version>0.9.1-Boron-SR1</odl.mdsal.yang.binding.version> - <odl.sal.api.gen.plugin.version>0.9.1-Boron-SR1</odl.sal.api.gen.plugin.version> - <odl.yangtools.version>1.0.1-Boron-SR1</odl.yangtools.version> - <odl.mdsal.version>1.4.1-Boron-SR1</odl.mdsal.version> + <odl.version>1.7.1-Boron-SR1</odl.version> + <odl.dlux.version>0.4.1-Boron-SR1</odl.dlux.version> + <odl.yangtools.version>1.0.1-Boron-SR1</odl.yangtools.version> + <odl.mdsal.version>1.4.1-Boron-SR1</odl.mdsal.version> + <odl.mdsal.features.version>2.1.1-Boron-SR1</odl.mdsal.features.version> + <odl.controller.mdsal.features.version>1.4.1-Boron-SR1</odl.controller.mdsal.features.version> + <odl.mdsal.model.version>0.9.1-Boron-SR1</odl.mdsal.model.version> + <odl.mdsal.yang.binding.version>0.9.1-Boron-SR1</odl.mdsal.yang.binding.version> + <odl.restconf.version>1.4.1-Boron-SR1</odl.restconf.version> + <odl.controller.model.version>${odl.mdsal.model.version}</odl.controller.model.version> + <odl.controller.config.api.version>0.5.1-Boron-SR1</odl.controller.config.api.version> + <odl.karaf.empty.distro.version>${odl.version}</odl.karaf.empty.distro.version> + <odl.commons.opendaylight.version>${odl.version}</odl.commons.opendaylight.version> + <odl.ietf-inet-types.version>2010.09.24.9.1-Boron-SR1</odl.ietf-inet-types.version> + <odl.ietf-yang-types.version>2010.09.24.9.1-Boron-SR1</odl.ietf-yang-types.version> + <odl.yang.jmx.generator.version>0.5.1-Boron-SR1</odl.yang.jmx.generator.version> + <odl.yangtools.yang.maven.plugin.version>${odl.yangtools.version}</odl.yangtools.yang.maven.plugin.version> + <odl.sal.api.gen.plugin.version>0.9.1-Boron-SR1</odl.sal.api.gen.plugin.version> <!-- OPENECOMP SDNC versions --> <sdnctl.sli.version>1.1.0-SNAPSHOT</sdnctl.sli.version> @@ -229,14 +237,14 @@ <dependency> <groupId>org.opendaylight.controller</groupId> <artifactId>features-mdsal</artifactId> - <version>1.3.2-Beryllium-SR2</version> + <version>${odl.controller.mdsal.features.version}</version> <classifier>features</classifier> <type>xml</type> </dependency> <dependency> <groupId>org.opendaylight.mdsal</groupId> <artifactId>features-mdsal</artifactId> - <version>2.0.2-Beryllium-SR2</version> + <version>${odl.mdsal.features.version}</version> <classifier>features</classifier> <type>xml</type> </dependency> |