diff options
author | Marek Gradzki <mgradzki@cisco.com> | 2017-07-21 15:26:10 +0200 |
---|---|---|
committer | Marek Gradzki <mgradzki@cisco.com> | 2017-08-03 07:53:43 +0200 |
commit | fd692c20d9dc48529aa7d545397f1b009d3bd479 (patch) | |
tree | 9df2be315acf1600212424c7ef2f6db62151a303 /common | |
parent | 8768252309014a2a1cfc71b9e78cfd3de3dae1f9 (diff) |
HONEYCOMB-362: bump ODL dependencies to Carbon
Change-Id: I63fa239e34178ab03c4eecd421bf19d80303d30e
Signed-off-by: Marek Gradzki <mgradzki@cisco.com>
Diffstat (limited to 'common')
-rw-r--r-- | common/api-parent/pom.xml | 2 | ||||
-rw-r--r-- | common/common-scripts/pom.xml | 2 | ||||
-rw-r--r-- | common/honeycomb-parent/pom.xml | 30 |
3 files changed, 23 insertions, 11 deletions
diff --git a/common/api-parent/pom.xml b/common/api-parent/pom.xml index 9f5239286..c5562b368 100644 --- a/common/api-parent/pom.xml +++ b/common/api-parent/pom.xml @@ -53,7 +53,7 @@ <configuration> <codeGenerators> <generator> - <codeGeneratorClass>org.opendaylight.yangtools.maven.sal.api.gen.plugin.CodeGeneratorImpl</codeGeneratorClass> + <codeGeneratorClass>org.opendaylight.mdsal.binding.maven.api.gen.plugin.CodeGeneratorImpl</codeGeneratorClass> <outputBaseDir>${salGeneratorPath}</outputBaseDir> </generator> </codeGenerators> diff --git a/common/common-scripts/pom.xml b/common/common-scripts/pom.xml index 9e818d7cb..5469efd69 100644 --- a/common/common-scripts/pom.xml +++ b/common/common-scripts/pom.xml @@ -32,7 +32,7 @@ <groovy.eclipse.compiler.version>2.9.2-01</groovy.eclipse.compiler.version> <groovy.eclipse.batch.version>2.4.3-01</groovy.eclipse.batch.version> <commons-io.version>2.5</commons-io.version> - <yang-binding.version>0.9.3-Boron-SR3</yang-binding.version> + <yang-binding.version>0.10.1-Carbon</yang-binding.version> </properties> <build> diff --git a/common/honeycomb-parent/pom.xml b/common/honeycomb-parent/pom.xml index 869641dac..ae19c5972 100644 --- a/common/honeycomb-parent/pom.xml +++ b/common/honeycomb-parent/pom.xml @@ -43,21 +43,23 @@ <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> <!-- ODL dependencies --> - <yangtools.version>1.0.4-Boron-SR4</yangtools.version> - <mdsal.version>2.1.4-Boron-SR4</mdsal.version> - <mdsal.controller.version>1.4.4-Boron-SR4</mdsal.controller.version> - <mdsalmodel.version>0.9.4-Boron-SR4</mdsalmodel.version> - <netconf.version>1.1.4-Boron-SR4</netconf.version> - <restconf.version>1.4.4-Boron-SR4</restconf.version> - <salGenerator.version>0.9.4-Boron-SR4</salGenerator.version> - <bgpcep.version>0.6.4-Boron-SR4</bgpcep.version> + <yangtools.version>1.1.1-Carbon</yangtools.version> + <mdsal.version>2.2.1-Carbon</mdsal.version> + <mdsal.controller.version>1.5.1-Carbon</mdsal.controller.version> + <mdsalmodel.version>0.10.1-Carbon</mdsalmodel.version> + <netconf.version>1.2.1-Carbon</netconf.version> + <restconf.version>1.5.1-Carbon</restconf.version> + <salGenerator.version>0.10.1-Carbon</salGenerator.version> + <bgpcep.version>0.7.1-Carbon</bgpcep.version> <salGeneratorPath>target/generated-sources/mdsal-binding</salGeneratorPath> - <!-- dependencies --> + <!-- 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> + <jsr305.version>3.0.0</jsr305.version> + <slf4j.version>1.7.21</slf4j.version> <!-- plugins --> <checkstyle.plugin.version>2.17</checkstyle.plugin.version> @@ -181,6 +183,16 @@ <artifactId>guava</artifactId> <version>${guava.version}</version> </dependency> + <dependency> + <groupId>com.google.code.findbugs</groupId> + <artifactId>jsr305</artifactId> + <version>${jsr305.version}</version> + </dependency> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-api</artifactId> + <version>${slf4j.version}</version> + </dependency> <!-- Testing Dependencies --> <dependency> |