diff options
| author |   Marek Gradzki <mgradzki@cisco.com> | 2018-01-04 07:08:34 +0100 |
|---|---|---|
| committer | Marek Gradzki <mgradzki@cisco.com> | 2018-02-27 07:42:25 +0000 |
| commit | f1d785a6ae421351b70dd3eedfc121488ba0ea57 (patch) | |
| tree | 81172ff3dc41c55fc45c9c792f7bd2bb405b8ab0 | |
| parent | b69b4688446bdf790a714944c72b8324ba4efce8 (diff) | |
HONEYCOMB-418: Bump ODL dependencies from Nitrogen SR1 to Nitrogen SR2
Change-Id: I98f73e0cce217202e8c335b1fa06f1b3fc8bce05
Signed-off-by: Marek Gradzki <mgradzki@cisco.com>
(cherry picked from commit 468b7310802fc99600d21f89a387b5689f11a01c)
| -rw-r--r-- | common/honeycomb-parent/pom.xml | 16 | ||||
| -rw-r--r-- | common/scripts-parent/pom.xml | 2 | ||||
| -rw-r--r-- | infra/test-utils/test-tools/src/main/java/io/fd/honeycomb/test/tools/YangContextProducer.java | 2 |
3 files changed, 10 insertions, 10 deletions
diff --git a/common/honeycomb-parent/pom.xml b/common/honeycomb-parent/pom.xml index 8cf84d198..4242948cd 100644 --- a/common/honeycomb-parent/pom.xml +++ b/common/honeycomb-parent/pom.xml @@ -46,14 +46,14 @@ <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> <!-- ODL dependencies --> - <odl.yangtools.version>1.2.1</odl.yangtools.version> - <odl.mdsal.version>2.3.1</odl.mdsal.version> - <odl.mdsal.controller.version>1.6.1</odl.mdsal.controller.version> - <odl.mdsalmodel.version>0.11.1</odl.mdsalmodel.version> - <odl.netconf.version>1.3.1</odl.netconf.version> - <odl.restconf.version>1.6.1</odl.restconf.version> - <odl.salGenerator.version>0.11.1</odl.salGenerator.version> - <odl.bgpcep.version>0.8.1</odl.bgpcep.version> + <odl.yangtools.version>1.2.2</odl.yangtools.version> + <odl.mdsal.version>2.3.2</odl.mdsal.version> + <odl.mdsal.controller.version>1.6.2</odl.mdsal.controller.version> + <odl.mdsalmodel.version>0.11.2</odl.mdsalmodel.version> + <odl.netconf.version>1.3.2</odl.netconf.version> + <odl.restconf.version>1.6.2</odl.restconf.version> + <odl.salGenerator.version>0.11.2</odl.salGenerator.version> + <odl.bgpcep.version>0.8.2</odl.bgpcep.version> <salGeneratorPath>target/generated-sources/mdsal-binding</salGeneratorPath> <!-- common dependencies --> diff --git a/common/scripts-parent/pom.xml b/common/scripts-parent/pom.xml index b4ced36a4..5aeb72edf 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> - <odl.yang-binding.version>0.11.1</odl.yang-binding.version> + <odl.yang-binding.version>0.11.2</odl.yang-binding.version> </properties> <dependencyManagement> diff --git a/infra/test-utils/test-tools/src/main/java/io/fd/honeycomb/test/tools/YangContextProducer.java b/infra/test-utils/test-tools/src/main/java/io/fd/honeycomb/test/tools/YangContextProducer.java index beb30f837..802a3ae90 100644 --- a/infra/test-utils/test-tools/src/main/java/io/fd/honeycomb/test/tools/YangContextProducer.java +++ b/infra/test-utils/test-tools/src/main/java/io/fd/honeycomb/test/tools/YangContextProducer.java @@ -61,7 +61,7 @@ interface YangContextProducer { final JSONCodecFactory jsonCodecFactory = JSONCodecFactory.create(ctx.getSchemaContext()); final Constructor<?> cstr = - Class.forName("org.opendaylight.yangtools.yang.data.codec.gson.JSONStringInstanceIdentifierCodec") + Class.forName("org.opendaylight.yangtools.yang.data.codec.gson.JSONInstanceIdentifierCodec") .getDeclaredConstructor(SchemaContext.class, JSONCodecFactory.class); cstr.setAccessible(true); return (AbstractModuleStringInstanceIdentifierCodec) cstr.newInstance(ctx.getSchemaContext(), jsonCodecFactory); |