diff options
Diffstat (limited to 'common')
-rw-r--r-- | common/api-parent/pom.xml | 4 | ||||
-rw-r--r-- | common/honeycomb-parent/pom.xml | 34 | ||||
-rw-r--r-- | common/scripts-parent/pom.xml | 4 | ||||
-rw-r--r-- | common/yang-whitelist/yang-whitelist-impl/pom.xml | 1 |
4 files changed, 21 insertions, 22 deletions
diff --git a/common/api-parent/pom.xml b/common/api-parent/pom.xml index 2c7442ab4..08939c57e 100644 --- a/common/api-parent/pom.xml +++ b/common/api-parent/pom.xml @@ -35,12 +35,12 @@ <plugin> <groupId>org.opendaylight.yangtools</groupId> <artifactId>yang-maven-plugin</artifactId> - <version>${yangtools.version}</version> + <version>${odl.yangtools.version}</version> <dependencies> <dependency> <groupId>org.opendaylight.mdsal</groupId> <artifactId>maven-sal-api-gen-plugin</artifactId> - <version>${salGenerator.version}</version> + <version>${odl.salGenerator.version}</version> <type>jar</type> </dependency> </dependencies> diff --git a/common/honeycomb-parent/pom.xml b/common/honeycomb-parent/pom.xml index 8f38eb9c6..0e8e52755 100644 --- a/common/honeycomb-parent/pom.xml +++ b/common/honeycomb-parent/pom.xml @@ -46,21 +46,21 @@ <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> <!-- ODL dependencies --> - <yangtools.version>1.1.2-Carbon</yangtools.version> - <mdsal.version>2.2.2-Carbon</mdsal.version> - <mdsal.controller.version>1.5.2-Carbon</mdsal.controller.version> - <mdsalmodel.version>0.10.2-Carbon</mdsalmodel.version> - <netconf.version>1.2.2-Carbon</netconf.version> - <restconf.version>1.5.2-Carbon</restconf.version> - <salGenerator.version>0.10.2-Carbon</salGenerator.version> - <bgpcep.version>0.7.2-Carbon</bgpcep.version> + <odl.yangtools.version>1.2.0</odl.yangtools.version> + <odl.mdsal.version>2.3.0</odl.mdsal.version> + <odl.mdsal.controller.version>1.6.0</odl.mdsal.controller.version> + <odl.mdsalmodel.version>0.11.0</odl.mdsalmodel.version> + <odl.netconf.version>1.3.0</odl.netconf.version> + <odl.restconf.version>1.6.0</odl.restconf.version> + <odl.salGenerator.version>0.11.0</odl.salGenerator.version> + <odl.bgpcep.version>0.8.0</odl.bgpcep.version> <salGeneratorPath>target/generated-sources/mdsal-binding</salGeneratorPath> <!-- common dependencies --> <junit.version>4.11</junit.version> <mockito.version>2.2.9</mockito.version> <hamcrest.version>1.3</hamcrest.version> - <guava.version>18.0</guava.version> + <guava.version>22.0</guava.version> <jsr305.version>3.0.0</jsr305.version> <slf4j.version>1.7.21</slf4j.version> @@ -133,49 +133,49 @@ <dependency> <groupId>org.opendaylight.yangtools</groupId> <artifactId>yangtools-artifacts</artifactId> - <version>${yangtools.version}</version> + <version>${odl.yangtools.version}</version> <type>pom</type> <scope>import</scope> </dependency> <dependency> <groupId>org.opendaylight.controller</groupId> <artifactId>mdsal-artifacts</artifactId> - <version>${mdsal.controller.version}</version> + <version>${odl.mdsal.controller.version}</version> <type>pom</type> <scope>import</scope> </dependency> <dependency> <groupId>org.opendaylight.mdsal</groupId> <artifactId>mdsal-artifacts</artifactId> - <version>${mdsal.version}</version> + <version>${odl.mdsal.version}</version> <type>pom</type> <scope>import</scope> </dependency> <dependency> <groupId>org.opendaylight.netconf</groupId> <artifactId>netconf-artifacts</artifactId> - <version>${netconf.version}</version> + <version>${odl.netconf.version}</version> <type>pom</type> <scope>import</scope> </dependency> <dependency> <groupId>org.opendaylight.netconf</groupId> <artifactId>restconf-artifacts</artifactId> - <version>${restconf.version}</version> + <version>${odl.restconf.version}</version> <type>pom</type> <scope>import</scope> </dependency> <dependency> <groupId>org.opendaylight.mdsal.model</groupId> <artifactId>mdsal-model-artifacts</artifactId> - <version>${mdsalmodel.version}</version> + <version>${odl.mdsalmodel.version}</version> <type>pom</type> <scope>import</scope> </dependency> <dependency> <groupId>org.opendaylight.bgpcep</groupId> <artifactId>bgpcep-artifacts</artifactId> - <version>${bgpcep.version}</version> + <version>${odl.bgpcep.version}</version> <type>pom</type> <scope>import</scope> </dependency> @@ -295,7 +295,7 @@ <dependency> <groupId>org.opendaylight.yangtools</groupId> <artifactId>checkstyle-logging</artifactId> - <version>${yangtools.version}</version> + <version>${odl.yangtools.version}</version> </dependency> <!-- Needed by ODL's checkstyle-logging --> <dependency> diff --git a/common/scripts-parent/pom.xml b/common/scripts-parent/pom.xml index b47bb46a6..9e730e84e 100644 --- a/common/scripts-parent/pom.xml +++ b/common/scripts-parent/pom.xml @@ -32,7 +32,7 @@ <groovy.version>2.4.7</groovy.version> <groovy.eclipse.compiler.version>2.9.2-01</groovy.eclipse.compiler.version> <groovy.eclipse.batch.version>2.4.3-01</groovy.eclipse.batch.version> - <yang-binding.version>0.10.2-Carbon</yang-binding.version> + <odl.yang-binding.version>0.11.0</odl.yang-binding.version> </properties> <dependencyManagement> @@ -45,7 +45,7 @@ <dependency> <groupId>org.opendaylight.mdsal</groupId> <artifactId>yang-binding</artifactId> - <version>${yang-binding.version}</version> + <version>${odl.yang-binding.version}</version> </dependency> </dependencies> </dependencyManagement> diff --git a/common/yang-whitelist/yang-whitelist-impl/pom.xml b/common/yang-whitelist/yang-whitelist-impl/pom.xml index b40fad14f..518dacc54 100644 --- a/common/yang-whitelist/yang-whitelist-impl/pom.xml +++ b/common/yang-whitelist/yang-whitelist-impl/pom.xml @@ -68,7 +68,6 @@ <dependency> <groupId>com.google.guava</groupId> <artifactId>guava</artifactId> - <version>19.0</version> <scope>test</scope> </dependency> <dependency> |