Bump upstreams

Adopt:
- odlparent-12.0.0
- yangtools-10.0.0

Change-Id: Ic101cb87855ee69680746d783e1a40b6f944e3f9
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>

diff --git a/artifacts/pom.xml b/artifacts/pom.xml
index eca7edf44d5dc513455a5ea8602b92eb774a33eb..0ac3463ebf32890b13754f6b8023d0951c67a5d5 100644 (file)
--- a/artifacts/pom.xml
+++ b/artifacts/pom.xml
@@ -13,7 +13,7 @@
     <parent>
       <groupId>org.opendaylight.odlparent</groupId>
       <artifactId>odlparent-lite</artifactId>
-      <version>11.0.1</version>
+      <version>12.0.0</version>
       <relativePath/>
     </parent>
 

diff --git a/binding/binding-parent/pom.xml b/binding/binding-parent/pom.xml
index f6186ca181a88527e257e4ba2e0958ddde1350c3..d7fb5355e9249344c09b4d4a7dc53c1ffe83c9ad 100644 (file)
--- a/binding/binding-parent/pom.xml
+++ b/binding/binding-parent/pom.xml
@@ -54,7 +54,7 @@
                         <plugin>
                             <groupId>org.opendaylight.yangtools</groupId>
                             <artifactId>yang-maven-plugin</artifactId>
-                            <version>9.0.1</version>
+                            <version>10.0.0</version>
                             <dependencies>
                                 <dependency>
                                     <groupId>org.opendaylight.mdsal</groupId>

diff --git a/binding/mdsal-binding-dom-codec/src/main/java/org/opendaylight/mdsal/binding/dom/codec/impl/DataObjectCodecContext.java b/binding/mdsal-binding-dom-codec/src/main/java/org/opendaylight/mdsal/binding/dom/codec/impl/DataObjectCodecContext.java
index 2fa41e9585c2599e14dd84413affe9c588828c1b..c29d6b6aef22adf414cbf888a6e4f27503ea4732 100644 (file)
--- a/binding/mdsal-binding-dom-codec/src/main/java/org/opendaylight/mdsal/binding/dom/codec/impl/DataObjectCodecContext.java
+++ b/binding/mdsal-binding-dom-codec/src/main/java/org/opendaylight/mdsal/binding/dom/codec/impl/DataObjectCodecContext.java
@@ -44,6 +44,7 @@ import org.opendaylight.yangtools.yang.binding.DataObject;
 import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
 import org.opendaylight.yangtools.yang.binding.InstanceIdentifier.Item;
 import org.opendaylight.yangtools.yang.binding.OpaqueObject;
+import org.opendaylight.yangtools.yang.common.QName;
 import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier;
 import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.AugmentationIdentifier;
 import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.NodeIdentifier;
@@ -393,7 +394,7 @@ public abstract class DataObjectCodecContext<D extends DataObject, T extends Com
         //        declaration site
         final var possibleChildren = augment.statement()
             .streamEffectiveSubstatements(SchemaTreeEffectiveStatement.class)
-            .map(SchemaTreeEffectiveStatement::getIdentifier)
+            .map(stmt -> (QName) stmt.argument())
             .collect(ImmutableSet.toImmutableSet());
         if (possibleChildren.isEmpty()) {
             return null;
@@ -431,8 +432,7 @@ public abstract class DataObjectCodecContext<D extends DataObject, T extends Com
         final Map map = new HashMap<>();
 
         for (final NormalizedNode childValue : data.body()) {
-            if (childValue instanceof AugmentationNode) {
-                final AugmentationNode augDomNode = (AugmentationNode) childValue;
+            if (childValue instanceof AugmentationNode augDomNode) {
                 final DataContainerCodecPrototype<?> codecProto = augmentationByYang.get(augDomNode.getIdentifier());
                 if (codecProto != null) {
                     final DataContainerCodecContext<?, ?> codec = codecProto.get();

diff --git a/binding/mdsal-binding-generator/src/main/java/org/opendaylight/mdsal/binding/generator/impl/reactor/AbstractAugmentGenerator.java b/binding/mdsal-binding-generator/src/main/java/org/opendaylight/mdsal/binding/generator/impl/reactor/AbstractAugmentGenerator.java
index d48e841929b81ff106c8cc81729270e0f08b9099..0a70ed04fb7e231a7dd31d35f6f97ce7133b388c 100644 (file)
--- a/binding/mdsal-binding-generator/src/main/java/org/opendaylight/mdsal/binding/generator/impl/reactor/AbstractAugmentGenerator.java
+++ b/binding/mdsal-binding-generator/src/main/java/org/opendaylight/mdsal/binding/generator/impl/reactor/AbstractAugmentGenerator.java
@@ -34,7 +34,6 @@ import org.opendaylight.yangtools.yang.model.api.meta.EffectiveStatement;
 import org.opendaylight.yangtools.yang.model.api.stmt.AugmentEffectiveStatement;
 import org.opendaylight.yangtools.yang.model.api.stmt.ChoiceEffectiveStatement;
 import org.opendaylight.yangtools.yang.model.api.stmt.SchemaTreeAwareEffectiveStatement;
-import org.opendaylight.yangtools.yang.model.api.stmt.SchemaTreeAwareEffectiveStatement.SchemaTreeNamespace;
 import org.opendaylight.yangtools.yang.model.api.stmt.SchemaTreeEffectiveStatement;
 import org.opendaylight.yangtools.yang.model.util.SchemaInferenceStack;
 
@@ -178,10 +177,10 @@ abstract class AbstractAugmentGenerator
         final var stmts = augment.effectiveSubstatements();
         final var builder = ImmutableList.<EffectiveStatement<?, ?>>builderWithExpectedSize(stmts.size());
         for (var child : stmts) {
-            if (child instanceof SchemaTreeEffectiveStatement) {
-                final var qname = ((SchemaTreeEffectiveStatement<?>) child).getIdentifier();
+            if (child instanceof SchemaTreeEffectiveStatement<?> schemaTreeChild) {
+                final var qname = schemaTreeChild.argument();
                 // Note: a match in target may be missing -- for example if it was 'deviate unsupported'
-                target.get(SchemaTreeNamespace.class, transform.apply(qname)).ifPresent(builder::add);
+                target.findSchemaTreeNode(transform.apply(qname)).ifPresent(builder::add);
             } else {
                 builder.add(child);
             }

diff --git a/binding/mdsal-binding-generator/src/main/java/org/opendaylight/mdsal/binding/generator/impl/reactor/AbstractTypeAwareGenerator.java b/binding/mdsal-binding-generator/src/main/java/org/opendaylight/mdsal/binding/generator/impl/reactor/AbstractTypeAwareGenerator.java
index eb98a613509936c89ffc2bc44afec48e51e418e0..ab40f29d9c8fed8b90a6f3cc1a5632f0318ae3d7 100644 (file)
--- a/binding/mdsal-binding-generator/src/main/java/org/opendaylight/mdsal/binding/generator/impl/reactor/AbstractTypeAwareGenerator.java
+++ b/binding/mdsal-binding-generator/src/main/java/org/opendaylight/mdsal/binding/generator/impl/reactor/AbstractTypeAwareGenerator.java
@@ -38,7 +38,7 @@ abstract class AbstractTypeAwareGenerator<T extends DataTreeEffectiveStatement<?
 
     @Override
     final void pushToInference(final SchemaInferenceStack dataTree) {
-        dataTree.enterDataTree(statement().getIdentifier());
+        dataTree.enterDataTree(statement().argument());
     }
 
     @Override

diff --git a/binding/mdsal-binding-generator/src/main/java/org/opendaylight/mdsal/binding/generator/impl/reactor/CompositeRuntimeTypeBuilder.java b/binding/mdsal-binding-generator/src/main/java/org/opendaylight/mdsal/binding/generator/impl/reactor/CompositeRuntimeTypeBuilder.java
index 763f04ab94e0e7ffd9527fa31d4bb981d3b81429..b58527adc250f9bdb32af784ac25c5fc806bf34f 100644 (file)
--- a/binding/mdsal-binding-generator/src/main/java/org/opendaylight/mdsal/binding/generator/impl/reactor/CompositeRuntimeTypeBuilder.java
+++ b/binding/mdsal-binding-generator/src/main/java/org/opendaylight/mdsal/binding/generator/impl/reactor/CompositeRuntimeTypeBuilder.java
@@ -109,7 +109,7 @@ abstract class CompositeRuntimeTypeBuilder<S extends EffectiveStatement<?, ?>, R
                 // such in the schema tree.
                 //
                 // That is in general -- 'choice' statements are doing their own thing separately.
-                if (!isAugmentedChild(child.getIdentifier())) {
+                if (!isAugmentedChild(child.argument())) {
                     final var childGen = verifyNotNull(findChildGenerator(generator, child.argument().getLocalName()),
                         "Cannot find child for %s in %s", child, generator);
                     final var childRuntimeType = childGen.createInternalRuntimeType(resolver, child);

diff --git a/binding/mdsal-binding-generator/src/main/java/org/opendaylight/mdsal/binding/generator/impl/reactor/ContainerGenerator.java b/binding/mdsal-binding-generator/src/main/java/org/opendaylight/mdsal/binding/generator/impl/reactor/ContainerGenerator.java
index 8e905ea9382fe1561922a106d589be31ee7ad43e..3855915202a218f52bff6d5425e6225d980a43e2 100644 (file)
--- a/binding/mdsal-binding-generator/src/main/java/org/opendaylight/mdsal/binding/generator/impl/reactor/ContainerGenerator.java
+++ b/binding/mdsal-binding-generator/src/main/java/org/opendaylight/mdsal/binding/generator/impl/reactor/ContainerGenerator.java
@@ -27,7 +27,7 @@ final class ContainerGenerator extends CompositeSchemaTreeGenerator<ContainerEff
 
     @Override
     void pushToInference(final SchemaInferenceStack dataTree) {
-        dataTree.enterDataTree(statement().getIdentifier());
+        dataTree.enterDataTree(statement().argument());
     }
 
     @Override

diff --git a/binding/mdsal-binding-generator/src/main/java/org/opendaylight/mdsal/binding/generator/impl/reactor/ListGenerator.java b/binding/mdsal-binding-generator/src/main/java/org/opendaylight/mdsal/binding/generator/impl/reactor/ListGenerator.java
index 07b2c5382fa63725ad7e37894a806000bcf30c32..8bf9b9fd1fc8cbee5839541a55a928fa35b75f08 100644 (file)
--- a/binding/mdsal-binding-generator/src/main/java/org/opendaylight/mdsal/binding/generator/impl/reactor/ListGenerator.java
+++ b/binding/mdsal-binding-generator/src/main/java/org/opendaylight/mdsal/binding/generator/impl/reactor/ListGenerator.java
@@ -48,7 +48,7 @@ final class ListGenerator extends CompositeSchemaTreeGenerator<ListEffectiveStat
 
     @Override
     void pushToInference(final SchemaInferenceStack dataTree) {
-        dataTree.enterDataTree(statement().getIdentifier());
+        dataTree.enterDataTree(statement().argument());
     }
 
     @Override

diff --git a/binding/mdsal-binding-generator/src/main/java/org/opendaylight/mdsal/binding/generator/impl/reactor/NotificationGenerator.java b/binding/mdsal-binding-generator/src/main/java/org/opendaylight/mdsal/binding/generator/impl/reactor/NotificationGenerator.java
index cc49b1d45516d4331fed3f62f1b096e09a132048..5243366dd84b72a3caa2798c33ca12518ef4a43e 100644 (file)
--- a/binding/mdsal-binding-generator/src/main/java/org/opendaylight/mdsal/binding/generator/impl/reactor/NotificationGenerator.java
+++ b/binding/mdsal-binding-generator/src/main/java/org/opendaylight/mdsal/binding/generator/impl/reactor/NotificationGenerator.java
@@ -32,7 +32,7 @@ final class NotificationGenerator
 
     @Override
     void pushToInference(final SchemaInferenceStack dataTree) {
-        dataTree.enterSchemaTree(statement().getIdentifier());
+        dataTree.enterSchemaTree(statement().argument());
     }
 
     @Override

diff --git a/binding/mdsal-binding-generator/src/main/java/org/opendaylight/mdsal/binding/generator/impl/reactor/OpaqueObjectGenerator.java b/binding/mdsal-binding-generator/src/main/java/org/opendaylight/mdsal/binding/generator/impl/reactor/OpaqueObjectGenerator.java
index a7175644333c672ad5e1ca0eb25352757c38dff2..06bf50016d680b543d8fe1f030dde3cdcdf3a7bd 100644 (file)
--- a/binding/mdsal-binding-generator/src/main/java/org/opendaylight/mdsal/binding/generator/impl/reactor/OpaqueObjectGenerator.java
+++ b/binding/mdsal-binding-generator/src/main/java/org/opendaylight/mdsal/binding/generator/impl/reactor/OpaqueObjectGenerator.java
@@ -69,7 +69,7 @@ abstract class OpaqueObjectGenerator<S extends DataTreeEffectiveStatement<?>, R
 
     @Override
     void pushToInference(final SchemaInferenceStack dataTree) {
-        dataTree.enterDataTree(statement().getIdentifier());
+        dataTree.enterDataTree(statement().argument());
     }
 
     @Override

diff --git a/binding/mdsal-binding-generator/src/main/java/org/opendaylight/mdsal/binding/generator/impl/reactor/OperationContainerGenerator.java b/binding/mdsal-binding-generator/src/main/java/org/opendaylight/mdsal/binding/generator/impl/reactor/OperationContainerGenerator.java
index 35a70e5824649f992ae495afc7e9351badc4429a..5da1711fd5e88fdce1d665008d4c368aee9343e7 100644 (file)
--- a/binding/mdsal-binding-generator/src/main/java/org/opendaylight/mdsal/binding/generator/impl/reactor/OperationContainerGenerator.java
+++ b/binding/mdsal-binding-generator/src/main/java/org/opendaylight/mdsal/binding/generator/impl/reactor/OperationContainerGenerator.java
@@ -31,7 +31,7 @@ abstract class OperationContainerGenerator<S extends DataTreeEffectiveStatement<
 
     @Override
     final void pushToInference(final SchemaInferenceStack dataTree) {
-        dataTree.enterSchemaTree(statement().getIdentifier());
+        dataTree.enterSchemaTree(statement().argument());
     }
 
     @Override

diff --git a/binding/mdsal-binding-generator/src/main/java/org/opendaylight/mdsal/binding/generator/impl/reactor/TargetAugmentEffectiveStatement.java b/binding/mdsal-binding-generator/src/main/java/org/opendaylight/mdsal/binding/generator/impl/reactor/TargetAugmentEffectiveStatement.java
index 0a800380221a844b22e08ca457254707e1942378..d8072c508d9d22d2018dc61b37fb972ff557a05d 100644 (file)
--- a/binding/mdsal-binding-generator/src/main/java/org/opendaylight/mdsal/binding/generator/impl/reactor/TargetAugmentEffectiveStatement.java
+++ b/binding/mdsal-binding-generator/src/main/java/org/opendaylight/mdsal/binding/generator/impl/reactor/TargetAugmentEffectiveStatement.java
@@ -15,7 +15,6 @@ import com.google.common.collect.Collections2;
 import com.google.common.collect.ImmutableList;
 import java.util.Collection;
 import java.util.List;
-import java.util.Map;
 import java.util.Optional;
 import org.eclipse.jdt.annotation.NonNull;
 import org.opendaylight.yangtools.yang.common.QName;
@@ -28,12 +27,12 @@ import org.opendaylight.yangtools.yang.model.api.Status;
 import org.opendaylight.yangtools.yang.model.api.TypeDefinition;
 import org.opendaylight.yangtools.yang.model.api.UsesNode;
 import org.opendaylight.yangtools.yang.model.api.meta.EffectiveStatement;
-import org.opendaylight.yangtools.yang.model.api.meta.IdentifierNamespace;
 import org.opendaylight.yangtools.yang.model.api.meta.StatementOrigin;
 import org.opendaylight.yangtools.yang.model.api.stmt.AugmentEffectiveStatement;
 import org.opendaylight.yangtools.yang.model.api.stmt.AugmentStatement;
 import org.opendaylight.yangtools.yang.model.api.stmt.SchemaNodeIdentifier;
 import org.opendaylight.yangtools.yang.model.api.stmt.SchemaTreeAwareEffectiveStatement;
+import org.opendaylight.yangtools.yang.model.api.stmt.SchemaTreeEffectiveStatement;
 import org.opendaylight.yangtools.yang.xpath.api.YangXPathExpression.QualifiedBound;
 
 final class TargetAugmentEffectiveStatement implements AugmentEffectiveStatement, AugmentationSchemaNode {
@@ -70,18 +69,22 @@ final class TargetAugmentEffectiveStatement implements AugmentEffectiveStatement
     }
 
     @Override
-    public <K, V, N extends IdentifierNamespace<K, V>> Optional<V> get(final Class<N> namespace, final K identifier) {
-        return Optional.empty();
+    public List<? extends EffectiveStatement<?, ?>> effectiveSubstatements() {
+        return substatements;
     }
 
     @Override
-    public <K, V, N extends IdentifierNamespace<K, V>> Map<K, V> getAll(final Class<N> namespace) {
-        return Map.of();
+    @SuppressWarnings({ "rawtypes", "unchecked" })
+    public Collection<SchemaTreeEffectiveStatement<?>> schemaTreeNodes() {
+        return (Collection) collectEffectiveSubstatements(SchemaTreeEffectiveStatement.class);
     }
 
     @Override
-    public List<? extends EffectiveStatement<?, ?>> effectiveSubstatements() {
-        return substatements;
+    @SuppressWarnings({ "rawtypes", "unchecked" })
+    public Optional<SchemaTreeEffectiveStatement<?>> findSchemaTreeNode(final QName qname) {
+        return (Optional) streamEffectiveSubstatements(SchemaTreeEffectiveStatement.class)
+            .filter(stmt -> qname.equals(stmt.argument()))
+            .findAny();
     }
 
     @Override

diff --git a/binding/mdsal-binding-test-utils/pom.xml b/binding/mdsal-binding-test-utils/pom.xml
index 375e1b565fba108cff117dee01404bfad18ff43f..0d50e08e70d6b23c1eb400365300f6c333beb86f 100644 (file)
--- a/binding/mdsal-binding-test-utils/pom.xml
+++ b/binding/mdsal-binding-test-utils/pom.xml
@@ -13,7 +13,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent</artifactId>
-        <version>11.0.1</version>
+        <version>12.0.0</version>
         <relativePath/>
     </parent>
 

diff --git a/binding/pom.xml b/binding/pom.xml
index 3ff5986ff885d5f277409ff208dc86de24eb1b8f..6eaff60ea99fdb8ce2ad90d780d6738086414fca 100644 (file)
--- a/binding/pom.xml
+++ b/binding/pom.xml
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>11.0.1</version>
+        <version>12.0.0</version>
         <relativePath/>
     </parent>
 

diff --git a/common/pom.xml b/common/pom.xml
index fc8274323cbf264ed2331653c8ad7d602674c5d5..2f83e1da8610a14ac4c862862d09c126c8403e1f 100644 (file)
--- a/common/pom.xml
+++ b/common/pom.xml
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>11.0.1</version>
+        <version>12.0.0</version>
         <relativePath/>
     </parent>
 

diff --git a/docs/pom.xml b/docs/pom.xml
index 9d7b43d0ed683c571e58bb14f9e393483ff8a30d..3798398ee63dc03bcabb1578a5e5aac954632202 100644 (file)
--- a/docs/pom.xml
+++ b/docs/pom.xml
@@ -606,8 +606,8 @@
                         <link>https://google.github.io/guava/releases/31.1-jre/api/docs/</link>
                         <link>https://commons.apache.org/proper/commons-lang/javadocs/api-release/</link>
 
-                        <link>https://www.javadoc.io/doc/org.opendaylight.odlparent/odlparent-docs/11.0.1/</link>
-                        <link>https://www.javadoc.io/doc/org.opendaylight.yangtools/yangtools-docs/9.0.1/</link>
+                        <link>https://www.javadoc.io/doc/org.opendaylight.odlparent/odlparent-docs/12.0.0/</link>
+                        <link>https://www.javadoc.io/doc/org.opendaylight.yangtools/yangtools-docs/10.0.0/</link>
                     </links>
                     <groups>
                         <group>

diff --git a/dom/dom-parent/pom.xml b/dom/dom-parent/pom.xml
index 4fefab86cea1e9cae022ed18b5dfb04dad5e2f7d..f0382d068f9d3fccf2d533c12990e0148133ee60 100644 (file)
--- a/dom/dom-parent/pom.xml
+++ b/dom/dom-parent/pom.xml
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>bundle-parent</artifactId>
-        <version>11.0.1</version>
+        <version>12.0.0</version>
         <relativePath/>
     </parent>
 
@@ -29,7 +29,7 @@
             <dependency>
                 <groupId>org.opendaylight.yangtools</groupId>
                 <artifactId>yangtools-artifacts</artifactId>
-                <version>9.0.1</version>
+                <version>10.0.0</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>

diff --git a/dom/pom.xml b/dom/pom.xml
index 016b385a76b5aad6419ff522a7f55d24090cdf53..5fc2a7856661433c47f62d5cc92ab2c5df3b2876 100644 (file)
--- a/dom/pom.xml
+++ b/dom/pom.xml
@@ -11,7 +11,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>11.0.1</version>
+        <version>12.0.0</version>
         <relativePath/>
     </parent>
 

diff --git a/entityownership/pom.xml b/entityownership/pom.xml
index 28118094773ffa73881e1d2a04dcdc85acc87026..a24ca014abfed7dcbff524bbd92b5bb84d5b4b2e 100644 (file)
--- a/entityownership/pom.xml
+++ b/entityownership/pom.xml
@@ -10,7 +10,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>11.0.1</version>
+        <version>12.0.0</version>
         <relativePath/>
     </parent>
 

diff --git a/features/feature-parent/pom.xml b/features/feature-parent/pom.xml
index 709722321273f86061837fc2eefaf56d3bb73112..a927f5837a427f8f3175c692f2c2a07f25251836 100644 (file)
--- a/features/feature-parent/pom.xml
+++ b/features/feature-parent/pom.xml
@@ -11,7 +11,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>11.0.1</version>
+        <version>12.0.0</version>
         <relativePath/>
     </parent>
 
@@ -27,7 +27,7 @@
             <dependency>
                 <groupId>org.opendaylight.yangtools</groupId>
                 <artifactId>yangtools-artifacts</artifactId>
-                <version>9.0.1</version>
+                <version>10.0.0</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>

diff --git a/features/features-mdsal-experimental/pom.xml b/features/features-mdsal-experimental/pom.xml
index ddf7e78b70430d2e7591ddc600991c1bedf804e4..57b749aebcab1ca1d792d95cc8fc58e23a33780e 100644 (file)
--- a/features/features-mdsal-experimental/pom.xml
+++ b/features/features-mdsal-experimental/pom.xml
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>feature-repo-parent</artifactId>
-        <version>11.0.1</version>
+        <version>12.0.0</version>
         <relativePath/>
     </parent>
 

diff --git a/features/features-mdsal/pom.xml b/features/features-mdsal/pom.xml
index 7a258ab31b4e54e61adeda2cb847cc524a2a7b61..7c623f709f424cc88970d2f512d3f831a12a4301 100644 (file)
--- a/features/features-mdsal/pom.xml
+++ b/features/features-mdsal/pom.xml
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>feature-repo-parent</artifactId>
-        <version>11.0.1</version>
+        <version>12.0.0</version>
         <relativePath/>
     </parent>
 

diff --git a/features/odl-mdsal-binding-api/src/main/feature/feature.xml b/features/odl-mdsal-binding-api/src/main/feature/feature.xml
index 71a21559ab728332fe2f75418d9870b5ba1ede07..cf0027b6b731dc8b5ef4de08748b808a28e594fe 100644 (file)
--- a/features/odl-mdsal-binding-api/src/main/feature/feature.xml
+++ b/features/odl-mdsal-binding-api/src/main/feature/feature.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <features xmlns="http://karaf.apache.org/xmlns/features/v1.4.0" name="odl-mdsal-binding-api">
     <feature name="odl-mdsal-binding-api">
-        <feature version="[9,10)">odl-yangtools-data-api</feature>
+        <feature version="[10,11)">odl-yangtools-data-api</feature>
     </feature>
 </features>

diff --git a/features/odl-mdsal-binding-base/src/main/feature/feature.xml b/features/odl-mdsal-binding-base/src/main/feature/feature.xml
index 59b5cc90c824565cd28647941342278769cc48d0..4611715bee678da2327ae1ce0ad397e11dae66d0 100644 (file)
--- a/features/odl-mdsal-binding-base/src/main/feature/feature.xml
+++ b/features/odl-mdsal-binding-base/src/main/feature/feature.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <features xmlns="http://karaf.apache.org/xmlns/features/v1.4.0" name="odl-mdsal-binding-base">
     <feature name="odl-mdsal-binding-base">
-        <feature version="[9,10)">odl-yangtools-common</feature>
+        <feature version="[10,11)">odl-yangtools-common</feature>
     </feature>
 </features>

diff --git a/features/odl-mdsal-binding-runtime-api/src/main/feature/feature.xml b/features/odl-mdsal-binding-runtime-api/src/main/feature/feature.xml
index 6f8ed41b2bf3c78d2287218e3b0eea7cb3905789..582657b26fd537918751e67d671e09588907cd69 100644 (file)
--- a/features/odl-mdsal-binding-runtime-api/src/main/feature/feature.xml
+++ b/features/odl-mdsal-binding-runtime-api/src/main/feature/feature.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <features xmlns="http://karaf.apache.org/xmlns/features/v1.4.0" name="odl-mdsal-runtime-api">
     <feature name="odl-mdsal-binding-runtime-api">
-        <feature version="[9,10)">odl-yangtools-data</feature>
-        <feature version="[9,10)">odl-yangtools-parser</feature>
+        <feature version="[10,11)">odl-yangtools-data</feature>
+        <feature version="[10,11)">odl-yangtools-parser</feature>
     </feature>
 </features>

diff --git a/features/odl-mdsal-common/src/main/feature/feature.xml b/features/odl-mdsal-common/src/main/feature/feature.xml
index 1e484f0e8fad9e29f9174c08edff344674b64fb4..ab7ba8b35c69b20a9290ea6e2382aeb2d51c0873 100644 (file)
--- a/features/odl-mdsal-common/src/main/feature/feature.xml
+++ b/features/odl-mdsal-common/src/main/feature/feature.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <features xmlns="http://karaf.apache.org/xmlns/features/v1.4.0" name="odl-mdsal-common">
     <feature name="odl-mdsal-common">
-        <feature version="[9,10)">odl-yangtools-common</feature>
+        <feature version="[10,11)">odl-yangtools-common</feature>
     </feature>
 </features>

diff --git a/features/odl-mdsal-dom-api/src/main/feature/feature.xml b/features/odl-mdsal-dom-api/src/main/feature/feature.xml
index b46c82edc00b83d6b619f82846da3cefc15d5d75..e00bd53f70d7b38d2b5a89b2ea7f4631f4d45b9a 100644 (file)
--- a/features/odl-mdsal-dom-api/src/main/feature/feature.xml
+++ b/features/odl-mdsal-dom-api/src/main/feature/feature.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <features xmlns="http://karaf.apache.org/xmlns/features/v1.4.0" name="odl-mdsal-dom-api">
     <feature name="odl-mdsal-dom-api">
-        <feature version="[9,10)">odl-yangtools-data-api</feature>
+        <feature version="[10,11)">odl-yangtools-data-api</feature>
     </feature>
 </features>

diff --git a/features/odl-mdsal-eos-common/src/main/feature/feature.xml b/features/odl-mdsal-eos-common/src/main/feature/feature.xml
index 945628d485b6897b8df574d9a7aff68db0ceb7b2..9b716906ad1d3a22626c79757b40c117dea437a2 100644 (file)
--- a/features/odl-mdsal-eos-common/src/main/feature/feature.xml
+++ b/features/odl-mdsal-eos-common/src/main/feature/feature.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <features xmlns="http://karaf.apache.org/xmlns/features/v1.4.0" name="odl-mdsal-eos-common">
     <feature name="odl-mdsal-eos-common">
-        <feature version="[9,10)">odl-yangtools-data-api</feature>
+        <feature version="[10,11)">odl-yangtools-data-api</feature>
     </feature>
 </features>

diff --git a/features/odl-mdsal-exp-yanglib-api/src/main/feature/feature.xml b/features/odl-mdsal-exp-yanglib-api/src/main/feature/feature.xml
index 9f1dc8b2781dfc339ed8d6c0193417374b586899..1a2308c6ebdfafa5f9513d5fba766e330b282fd9 100644 (file)
--- a/features/odl-mdsal-exp-yanglib-api/src/main/feature/feature.xml
+++ b/features/odl-mdsal-exp-yanglib-api/src/main/feature/feature.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <features xmlns="http://karaf.apache.org/xmlns/features/v1.4.0" name="odl-mdsal-exp-yanglib-api">
     <feature name="odl-mdsal-exp-yanglib-api">
-        <feature version="[9,10)">odl-yangtools-data-api</feature>
+        <feature version="[10,11)">odl-yangtools-data-api</feature>
     </feature>
 </features>

diff --git a/features/odl-mdsal-replicate-netty/src/main/feature/feature.xml b/features/odl-mdsal-replicate-netty/src/main/feature/feature.xml
index 317c8dbb3abc066ef9dcb5142c3e07f25a09a942..2f2998eaf7e168669e688547b2e77e86720a9cb5 100644 (file)
--- a/features/odl-mdsal-replicate-netty/src/main/feature/feature.xml
+++ b/features/odl-mdsal-replicate-netty/src/main/feature/feature.xml
@@ -4,6 +4,6 @@
         <configfile finalname="etc/org.opendaylight.mdsal.replicate.netty.sink.cfg">mvn:org.opendaylight.mdsal/mdsal-replicate-netty/${project.version}/config/sink</configfile>
         <configfile finalname="etc/org.opendaylight.mdsal.replicate.netty.source.cfg">mvn:org.opendaylight.mdsal/mdsal-replicate-netty/${project.version}/config/source</configfile>
         <feature version="[11,12)">odl-netty-4</feature>
-        <feature version="[9,10)">odl-yangtools-codec</feature>
+        <feature version="[10,11)">odl-yangtools-codec</feature>
     </feature>
 </features>

diff --git a/features/odl-mdsal-rfc8294-netty/src/main/feature/feature.xml b/features/odl-mdsal-rfc8294-netty/src/main/feature/feature.xml
index 762c8c7e17f811f71939a39877142865bef3873f..c22ee82343259c6935f855ea721ca8438c9c076a 100644 (file)
--- a/features/odl-mdsal-rfc8294-netty/src/main/feature/feature.xml
+++ b/features/odl-mdsal-rfc8294-netty/src/main/feature/feature.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <features xmlns="http://karaf.apache.org/xmlns/features/v1.4.0" name="odl-mdsal-uint24-netty">
     <feature name="odl-mdsal-uint24-netty">
-        <feature version="[9,10)">odl-yangtools-netty</feature>
+        <feature version="[10,11)">odl-yangtools-netty</feature>
     </feature>
 </features>

diff --git a/features/pom.xml b/features/pom.xml
index 9d060294872c2fd3fe2629a3a5f1ed43363fa5d7..1f73b312fdaa87621cf164be4e9fdb56847d7802 100644 (file)
--- a/features/pom.xml
+++ b/features/pom.xml
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>11.0.1</version>
+        <version>12.0.0</version>
         <relativePath/>
     </parent>
 

diff --git a/karaf/pom.xml b/karaf/pom.xml
index c3270df29df1458c558482b4112bdcf3d81b3e27..ca1353deda9ef71f859a0f00f5eeb0d21965a991 100644 (file)
--- a/karaf/pom.xml
+++ b/karaf/pom.xml
@@ -11,7 +11,7 @@
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>karaf4-parent</artifactId>
-    <version>11.0.1</version>
+    <version>12.0.0</version>
     <relativePath/>
 </parent>
 

diff --git a/model/iana/pom.xml b/model/iana/pom.xml
index 8f6a6ff9918030d291140413dea0e91a6f77169e..3764a41c8d2fabf17cde7da8a365bd8401800649 100644 (file)
--- a/model/iana/pom.xml
+++ b/model/iana/pom.xml
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>11.0.1</version>
+        <version>12.0.0</version>
         <relativePath/>
     </parent>
 

diff --git a/model/ietf/pom.xml b/model/ietf/pom.xml
index 23d99acaa3f87deb89751961ca1380ca2f7c4d7b..40b08b3aa86d951de3031cae547d376d3f905265 100644 (file)
--- a/model/ietf/pom.xml
+++ b/model/ietf/pom.xml
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>11.0.1</version>
+        <version>12.0.0</version>
         <relativePath/>
     </parent>
 

diff --git a/model/pom.xml b/model/pom.xml
index 47647391cf131abc33ce7b4121e9331b4db6e804..da26e833eeac02f6ef9ea3cee83d08a384a803aa 100644 (file)
--- a/model/pom.xml
+++ b/model/pom.xml
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>11.0.1</version>
+        <version>12.0.0</version>
         <relativePath/>
     </parent>
 

diff --git a/netty/pom.xml b/netty/pom.xml
index eed829c29376760d8c6b103b71767cb7f47fe3c6..82259db032e14df75875edabc95b67333e9e35ad 100644 (file)
--- a/netty/pom.xml
+++ b/netty/pom.xml
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>11.0.1</version>
+        <version>12.0.0</version>
         <relativePath/>
     </parent>
 

diff --git a/pom.xml b/pom.xml
index 9b6d1fe4732ff8c63b337c6298dfb72bea03b9cf..6a589d43e1d736780c52101af23726eab2a9117e 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>11.0.1</version>
+        <version>12.0.0</version>
         <relativePath/>
     </parent>
 

diff --git a/replicate/pom.xml b/replicate/pom.xml
index 39423a25cdba0b082e5b734b29cee5195ee72e2e..49e50af00224d2ee677a124d84e144752a52a6b7 100644 (file)
--- a/replicate/pom.xml
+++ b/replicate/pom.xml
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>11.0.1</version>
+        <version>12.0.0</version>
         <relativePath/>
     </parent>
 

diff --git a/singleton-service/pom.xml b/singleton-service/pom.xml
index c16a597a1e3476fb466e6bd649ec6f21c06c2e22..8ecc11b52541ae683b0c1e4596fe12085cb1b7e0 100644 (file)
--- a/singleton-service/pom.xml
+++ b/singleton-service/pom.xml
@@ -11,7 +11,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>11.0.1</version>
+        <version>12.0.0</version>
         <relativePath/>
     </parent>
 

diff --git a/trace/pom.xml b/trace/pom.xml
index 6dc0e0d292cae8062e3f4f4e0d1271e6910bc4e1..9d7e975219b6319a140016dfd33ff2d0e5cf433c 100644 (file)
--- a/trace/pom.xml
+++ b/trace/pom.xml
@@ -10,7 +10,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>11.0.1</version>
+        <version>12.0.0</version>
         <relativePath/>
     </parent>
 

diff --git a/yanglib/pom.xml b/yanglib/pom.xml
index b2934eefe1f77c03bf5fc56efcb5b252cc827241..4dc0f55de918ac41fc69069a6e2514dc644de76f 100644 (file)
--- a/yanglib/pom.xml
+++ b/yanglib/pom.xml
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>11.0.1</version>
+        <version>12.0.0</version>
         <relativePath/>
     </parent>