Bump to odlparent-8.0.0/yangtools-8.0.0-SNAPSHOT

This patch starts integration for MRI window.

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

diff --git a/artifacts/pom.xml b/artifacts/pom.xml
index 9395fa2ed177195dbc59e90261f1d729d616a330..81ac8856060372a4ea2f7c5f9b567c6758720650 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>7.0.6</version>
+      <version>8.0.0</version>
       <relativePath/>
     </parent>
 

diff --git a/binding/binding-parent/pom.xml b/binding/binding-parent/pom.xml
index 5ef01dc53dc45f91f3f09862e04879bb86f49a9f..444cd52e4fe9e1f95b00866e1854e436dbecb8ae 100644 (file)
--- a/binding/binding-parent/pom.xml
+++ b/binding/binding-parent/pom.xml
@@ -58,7 +58,7 @@
                         <plugin>
                             <groupId>org.opendaylight.yangtools</groupId>
                             <artifactId>yang-maven-plugin</artifactId>
-                            <version>5.0.6</version>
+                            <version>6.0.0-SNAPSHOT</version>
                             <dependencies>
                                 <dependency>
                                     <groupId>org.opendaylight.mdsal</groupId>

diff --git a/binding/maven-sal-api-gen-plugin/pom.xml b/binding/maven-sal-api-gen-plugin/pom.xml
index d60daeecbfa3779a08e0f2338b3d0ccfb78cced9..a968e687f15273ed4ab9b48cf945f501ec3b3e99 100644 (file)
--- a/binding/maven-sal-api-gen-plugin/pom.xml
+++ b/binding/maven-sal-api-gen-plugin/pom.xml
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent</artifactId>
-        <version>7.0.6</version>
+        <version>8.0.0</version>
         <relativePath/>
     </parent>
 
@@ -39,7 +39,7 @@
             <dependency>
                 <groupId>org.opendaylight.yangtools</groupId>
                 <artifactId>yangtools-artifacts</artifactId>
-                <version>5.0.6</version>
+                <version>6.0.0-SNAPSHOT</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>

diff --git a/binding/maven-sal-api-gen-plugin/src/main/java/org/opendaylight/mdsal/binding/maven/api/gen/plugin/CodeGeneratorImpl.java b/binding/maven-sal-api-gen-plugin/src/main/java/org/opendaylight/mdsal/binding/maven/api/gen/plugin/CodeGeneratorImpl.java
index 7e7e3a1cbc2d8b119a8407c4ba32e403a28b80cc..018d2b9cd386c86cf2ee9bc74b3c3d713f4fef6f 100644 (file)
--- a/binding/maven-sal-api-gen-plugin/src/main/java/org/opendaylight/mdsal/binding/maven/api/gen/plugin/CodeGeneratorImpl.java
+++ b/binding/maven-sal-api-gen-plugin/src/main/java/org/opendaylight/mdsal/binding/maven/api/gen/plugin/CodeGeneratorImpl.java
@@ -29,10 +29,8 @@ import java.nio.file.Path;
 import java.util.Collection;
 import java.util.List;
 import java.util.Map;
-import java.util.Optional;
 import java.util.ServiceLoader;
 import java.util.Set;
-import java.util.function.Function;
 import java.util.function.Supplier;
 import java.util.stream.Collectors;
 import org.apache.maven.project.MavenProject;
@@ -45,9 +43,11 @@ import org.opendaylight.mdsal.binding.spec.naming.BindingMapping;
 import org.opendaylight.yangtools.yang.binding.YangModelBindingProvider;
 import org.opendaylight.yangtools.yang.model.api.EffectiveModelContext;
 import org.opendaylight.yangtools.yang.model.api.Module;
+import org.opendaylight.yangtools.yang.model.repo.api.YangTextSchemaSource;
 import org.opendaylight.yangtools.yang2sources.spi.BasicCodeGenerator;
 import org.opendaylight.yangtools.yang2sources.spi.BuildContextAware;
 import org.opendaylight.yangtools.yang2sources.spi.MavenProjectAware;
+import org.opendaylight.yangtools.yang2sources.spi.ModuleResourceResolver;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.sonatype.plexus.build.incremental.BuildContext;
@@ -67,8 +67,7 @@ public final class CodeGeneratorImpl implements BasicCodeGenerator, BuildContext
 
     @Override
     public Collection<File> generateSources(final EffectiveModelContext context, final File outputDir,
-            final Set<Module> yangModules, final Function<Module, Optional<String>> moduleResourcePathResolver)
-                    throws IOException {
+            final Set<Module> yangModules, final ModuleResourceResolver moduleResourcePathResolver) throws IOException {
         final File outputBaseDir;
 
         outputBaseDir = outputDir == null ? getDefaultOutputBaseDir() : outputDir;
@@ -148,7 +147,7 @@ public final class CodeGeneratorImpl implements BasicCodeGenerator, BuildContext
     }
 
     private Collection<? extends File> generateModuleInfos(final File outputBaseDir, final Set<Module> yangModules,
-            final EffectiveModelContext context, final Function<Module, Optional<String>> moduleResourcePathResolver) {
+            final EffectiveModelContext context, final ModuleResourceResolver moduleResourcePathResolver) {
         Builder<File> result = ImmutableSet.builder();
         Builder<String> bindingProviders = ImmutableSet.builder();
         for (Module module : yangModules) {
@@ -215,11 +214,12 @@ public final class CodeGeneratorImpl implements BasicCodeGenerator, BuildContext
     }
 
     private Set<File> generateYangModuleInfo(final File outputBaseDir, final Module module,
-            final EffectiveModelContext ctx, final Function<Module, Optional<String>> moduleResourcePathResolver,
+            final EffectiveModelContext ctx, final ModuleResourceResolver moduleResourcePathResolver,
             final Builder<String> providerSourceSet) {
         Builder<File> generatedFiles = ImmutableSet.builder();
 
-        final YangModuleInfoTemplate template = new YangModuleInfoTemplate(module, ctx, moduleResourcePathResolver);
+        final YangModuleInfoTemplate template = new YangModuleInfoTemplate(module, ctx,
+            mod -> moduleResourcePathResolver.findModuleResourcePath(module, YangTextSchemaSource.class));
         String moduleInfoSource = template.generate();
         if (moduleInfoSource.isEmpty()) {
             throw new IllegalStateException("Generated code should not be empty!");

diff --git a/binding/maven-sal-api-gen-plugin/src/main/java/org/opendaylight/mdsal/binding/yang/unified/doc/generator/maven/DocumentationGeneratorImpl.java b/binding/maven-sal-api-gen-plugin/src/main/java/org/opendaylight/mdsal/binding/yang/unified/doc/generator/maven/DocumentationGeneratorImpl.java
index a2b90efb9f9adc291231fa8cbc3a9dd6c7f4c736..a4ba233143be362fb7fbbdbbac5aa36afa12ba7a 100644 (file)
--- a/binding/maven-sal-api-gen-plugin/src/main/java/org/opendaylight/mdsal/binding/yang/unified/doc/generator/maven/DocumentationGeneratorImpl.java
+++ b/binding/maven-sal-api-gen-plugin/src/main/java/org/opendaylight/mdsal/binding/yang/unified/doc/generator/maven/DocumentationGeneratorImpl.java
@@ -13,14 +13,13 @@ import java.io.File;
 import java.io.IOException;
 import java.util.Collection;
 import java.util.Map;
-import java.util.Optional;
 import java.util.Set;
-import java.util.function.Function;
 import org.opendaylight.mdsal.binding.yang.unified.doc.generator.GeneratorImpl;
 import org.opendaylight.yangtools.yang.model.api.EffectiveModelContext;
 import org.opendaylight.yangtools.yang.model.api.Module;
 import org.opendaylight.yangtools.yang2sources.spi.BasicCodeGenerator;
 import org.opendaylight.yangtools.yang2sources.spi.BuildContextAware;
+import org.opendaylight.yangtools.yang2sources.spi.ModuleResourceResolver;
 import org.sonatype.plexus.build.incremental.BuildContext;
 
 public class DocumentationGeneratorImpl extends GeneratorImpl implements BasicCodeGenerator, BuildContextAware {
@@ -43,7 +42,7 @@ public class DocumentationGeneratorImpl extends GeneratorImpl implements BasicCo
 
     @Override
     public Collection<File> generateSources(final EffectiveModelContext context, final File outputBaseDir,
-            final Set<Module> currentModules, final Function<Module, Optional<String>> moduleResourcePathResolver)
+            final Set<Module> currentModules, final ModuleResourceResolver moduleResourcePathResolver)
             throws IOException {
         return generate(buildContext, context, outputBaseDir, currentModules);
     }

diff --git a/binding/maven-sal-api-gen-plugin/src/main/java/org/opendaylight/mdsal/binding/yang/wadl/generator/maven/WadlGenerator.java b/binding/maven-sal-api-gen-plugin/src/main/java/org/opendaylight/mdsal/binding/yang/wadl/generator/maven/WadlGenerator.java
index 3b43e22e1af78458ce53369fb805bd73fb2d9367..d48cadecbbaf11e6991e7f183aba79da9e2f1f25 100644 (file)
--- a/binding/maven-sal-api-gen-plugin/src/main/java/org/opendaylight/mdsal/binding/yang/wadl/generator/maven/WadlGenerator.java
+++ b/binding/maven-sal-api-gen-plugin/src/main/java/org/opendaylight/mdsal/binding/yang/wadl/generator/maven/WadlGenerator.java
@@ -14,14 +14,13 @@ import java.io.File;
 import java.io.IOException;
 import java.util.Collection;
 import java.util.Map;
-import java.util.Optional;
 import java.util.Set;
-import java.util.function.Function;
 import org.opendaylight.mdsal.binding.yang.wadl.generator.WadlRestconfGenerator;
 import org.opendaylight.yangtools.yang.model.api.EffectiveModelContext;
 import org.opendaylight.yangtools.yang.model.api.Module;
 import org.opendaylight.yangtools.yang2sources.spi.BasicCodeGenerator;
 import org.opendaylight.yangtools.yang2sources.spi.BuildContextAware;
+import org.opendaylight.yangtools.yang2sources.spi.ModuleResourceResolver;
 import org.sonatype.plexus.build.incremental.BuildContext;
 
 public class WadlGenerator implements BasicCodeGenerator, BuildContextAware {
@@ -44,7 +43,7 @@ public class WadlGenerator implements BasicCodeGenerator, BuildContextAware {
 
     @Override
     public Collection<File> generateSources(final EffectiveModelContext context, final File outputBaseDir,
-            final Set<Module> currentModules, final Function<Module, Optional<String>> moduleResourcePathResolver)
+            final Set<Module> currentModules, final ModuleResourceResolver moduleResourcePathResolver)
             throws IOException {
         final File outputDir;
         if (outputBaseDir == null) {

diff --git a/binding/maven-sal-api-gen-plugin/src/test/java/org/opendaylight/mdsal/binding/yang/unified/doc/generator/maven/DocGenTest.java b/binding/maven-sal-api-gen-plugin/src/test/java/org/opendaylight/mdsal/binding/yang/unified/doc/generator/maven/DocGenTest.java
index 9e54aebdaf7c3ab25ec9578588076d14fb480c3d..007003e21ffd985dd329fec6e7cf21f95a6a9ab6 100644 (file)
--- a/binding/maven-sal-api-gen-plugin/src/test/java/org/opendaylight/mdsal/binding/yang/unified/doc/generator/maven/DocGenTest.java
+++ b/binding/maven-sal-api-gen-plugin/src/test/java/org/opendaylight/mdsal/binding/yang/unified/doc/generator/maven/DocGenTest.java
@@ -53,7 +53,7 @@ public class DocGenTest {
         final DocumentationGeneratorImpl generator = new DocumentationGeneratorImpl();
         generator.setBuildContext(new DefaultBuildContext());
         Collection<File> generatedFiles = generator.generateSources(context, GENERATOR_OUTPUT_DIR,
-            Set.copyOf(context.getModules()), module -> Optional.empty());
+            Set.copyOf(context.getModules()), (module, representation) -> Optional.empty());
         assertEquals(4, generatedFiles.size());
     }
 

diff --git a/binding/maven-sal-api-gen-plugin/src/test/java/org/opendaylight/mdsal/binding/yang/unified/doc/generator/maven/YangModuleInfoCompilationTest.java b/binding/maven-sal-api-gen-plugin/src/test/java/org/opendaylight/mdsal/binding/yang/unified/doc/generator/maven/YangModuleInfoCompilationTest.java
index cee5dfd251256aa84143c71b86bb4eaf2087d351..fbb4da42118ecb3ea381c434b254c5d8961dc70b 100644 (file)
--- a/binding/maven-sal-api-gen-plugin/src/test/java/org/opendaylight/mdsal/binding/yang/unified/doc/generator/maven/YangModuleInfoCompilationTest.java
+++ b/binding/maven-sal-api-gen-plugin/src/test/java/org/opendaylight/mdsal/binding/yang/unified/doc/generator/maven/YangModuleInfoCompilationTest.java
@@ -149,7 +149,7 @@ public class YangModuleInfoCompilationTest {
         CodeGeneratorImpl codegen = new CodeGeneratorImpl();
         codegen.setBuildContext(new DefaultBuildContext());
         codegen.generateSources(context, sourcesOutputDir, Set.copyOf(context.getModules()),
-            module -> Optional.of(resourceDirPath + File.separator + module.getName()
+            (module, representation) -> Optional.of(resourceDirPath + File.separator + module.getName()
             + YangConstants.RFC6020_YANG_FILE_EXTENSION));
     }
 
@@ -163,7 +163,7 @@ public class YangModuleInfoCompilationTest {
         codegen.setMavenProject(new MavenProject());
         codegen.setAdditionalConfig(ImmutableMap.of("test", "test"));
         Collection<File> files = codegen.generateSources(context, null, Set.copyOf(context.getModules()),
-            module -> Optional.of(module.getName()));
+            (module, representation) -> Optional.of(module.getName()));
         assertFalse(files.isEmpty());
         files.forEach(file -> {
             deleteTestDir(file);

diff --git a/binding/maven-sal-api-gen-plugin/src/test/java/org/opendaylight/mdsal/binding/yang/wadl/generator/maven/WadlGenTest.java b/binding/maven-sal-api-gen-plugin/src/test/java/org/opendaylight/mdsal/binding/yang/wadl/generator/maven/WadlGenTest.java
index ae95922cfa90704498ac5d88b0551ab33404887a..fe65e91a9b4e52789d01e62a5b92d7de98eeff9b 100644 (file)
--- a/binding/maven-sal-api-gen-plugin/src/test/java/org/opendaylight/mdsal/binding/yang/wadl/generator/maven/WadlGenTest.java
+++ b/binding/maven-sal-api-gen-plugin/src/test/java/org/opendaylight/mdsal/binding/yang/wadl/generator/maven/WadlGenTest.java
@@ -55,7 +55,7 @@ public class WadlGenTest {
         final WadlGenerator generator = new WadlGenerator();
         generator.setBuildContext(new DefaultBuildContext());
         Collection<File> generatedWadlFiles = generator.generateSources(context, GENERATOR_OUTPUT_DIR,
-            Set.copyOf(context.getModules()), module -> Optional.empty());
+            Set.copyOf(context.getModules()), (module, representation) -> Optional.empty());
         assertEquals(3, generatedWadlFiles.size());
         generatedWadlFiles.forEach(file -> assertTrue(file.exists()));
     }
@@ -67,7 +67,7 @@ public class WadlGenTest {
         final WadlGenerator generator = new WadlGenerator();
         generator.setBuildContext(new DefaultBuildContext());
         Collection<File> generatedWadlFiles = generator.generateSources(context, null, Set.copyOf(context.getModules()),
-            module -> Optional.empty());
+            (module, representation) -> Optional.empty());
         assertEquals(3, generatedWadlFiles.size());
         generatedWadlFiles.forEach(file -> {
             deleteTestDir(file);

diff --git a/binding/mdsal-binding-test-utils/pom.xml b/binding/mdsal-binding-test-utils/pom.xml
index 2a8c726bfd759c75819697b0c4739b4cdbdee2d8..f04d031fe0619bbb425970743e96cd29fa3eaf4e 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>7.0.6</version>
+        <version>8.0.0</version>
         <relativePath/>
     </parent>
 

diff --git a/binding/pom.xml b/binding/pom.xml
index bd3a4a53371a1db35625cf76af6ebce94148c67b..b6ad3faab42023f4fab4dbca11636cc2053b51ed 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>7.0.6</version>
+        <version>8.0.0</version>
         <relativePath/>
     </parent>
 

diff --git a/common/pom.xml b/common/pom.xml
index 2fd4d2a4dbb35ed902a6768d3b8110df712cb002..2f784f31487f3538755b52a8a0f13d346f26eea7 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>7.0.6</version>
+        <version>8.0.0</version>
         <relativePath/>
     </parent>
 

diff --git a/docs/pom.xml b/docs/pom.xml
index 18585587fff87e7b9536e5aee28d0f59fe80ceb8..7f871bbb0f3e8adf84a98fe34c97df66facaddbc 100644 (file)
--- a/docs/pom.xml
+++ b/docs/pom.xml
@@ -614,8 +614,8 @@
                         <link>https://commons.apache.org/proper/commons-lang/javadocs/api-3.10/</link>
                         <link>https://commons.apache.org/proper/commons-codec/apidocs/</link>
 
-                        <link>https://www.javadoc.io/doc/org.opendaylight.odlparent/odlparent-docs/7.0.6/</link>
-                        <link>https://www.javadoc.io/doc/org.opendaylight.yangtools/yangtools-docs/5.0.6/</link>
+                        <link>https://www.javadoc.io/doc/org.opendaylight.odlparent/odlparent-docs/8.0.0/</link>
+                        <link>https://www.javadoc.io/doc/org.opendaylight.yangtools/yangtools-docs/6.0.0-SNAPSHOT/</link>
                     </links>
                     <groups>
                         <group>

diff --git a/dom/dom-parent/pom.xml b/dom/dom-parent/pom.xml
index 67f049d0c8ac9fb072e69ff016ec803d4853f5b3..d14ee09230d7d7d4861b9efb07cd41101616621c 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>7.0.6</version>
+        <version>8.0.0</version>
         <relativePath/>
     </parent>
 
@@ -29,7 +29,7 @@
             <dependency>
                 <groupId>org.opendaylight.yangtools</groupId>
                 <artifactId>yangtools-artifacts</artifactId>
-                <version>5.0.6</version>
+                <version>6.0.0-SNAPSHOT</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>

diff --git a/dom/pom.xml b/dom/pom.xml
index 48a448a583f10b06f2bb794e607edb16f79e134f..9c2ee217d82f27d06824e3b0f50ead9504d7a5c6 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>7.0.6</version>
+        <version>8.0.0</version>
         <relativePath/>
     </parent>
 

diff --git a/entityownership/pom.xml b/entityownership/pom.xml
index 79902250aca0b6bbfb5f4938e99125fc31cfabf9..49bad082dee7344308e4fa5a5f970b2fb1c2b5f0 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>7.0.6</version>
+        <version>8.0.0</version>
         <relativePath/>
     </parent>
 

diff --git a/features/feature-parent/pom.xml b/features/feature-parent/pom.xml
index e1dbf48ae681f24170fcb9ee7cd4d1ce994752d3..dd5806b6083a2cf96fe6d34b51c114739850d3d4 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>7.0.6</version>
+        <version>8.0.0</version>
         <relativePath/>
     </parent>
 
@@ -27,7 +27,7 @@
             <dependency>
                 <groupId>org.opendaylight.yangtools</groupId>
                 <artifactId>yangtools-artifacts</artifactId>
-                <version>5.0.6</version>
+                <version>6.0.0-SNAPSHOT</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 606387130c257481eddf3966dbd15e7aaa28dd29..7461fa2ee9c4c9d0ddc1f2af9153766fc9881080 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>7.0.6</version>
+        <version>8.0.0</version>
         <relativePath/>
     </parent>
 

diff --git a/features/features-mdsal/pom.xml b/features/features-mdsal/pom.xml
index 890dad29af19a70616a1fc9fa454618b180fcea8..e6deeaea2da5cb0a772126bb76cd95f53c08d1be 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>7.0.6</version>
+        <version>8.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 ecb2c4d397a9a34720070ca46c0e64cc7507c156..6a2a0fb48e05691c78cdfd8eb101b737f3f7790c 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="[5,6)">odl-yangtools-data-api</feature>
+        <feature version="[6,7)">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 068e0e0fd18345bd0769e7b84778194824d7a978..01cec26a4adf4e6e6b375272f4b3ec8a4606a1c3 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="[5,6)">odl-yangtools-common</feature>
+        <feature version="[6,7)">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 a1bf9b085c6e07efc47dc1c3bd394bfd50123299..503fbcdcaf48a3f542715b688585fa7d56d8e520 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="[5,6)">odl-yangtools-data</feature>
-        <feature version="[5,6)">odl-yangtools-parser</feature>
+        <feature version="[6,7)">odl-yangtools-data</feature>
+        <feature version="[6,7)">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 416e93bad406ed23decdfbf9a3625b3e00eb1f8c..178d716987a9935c7ded9baa4d0feaac0cf5c601 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="[5,6)">odl-yangtools-common</feature>
+        <feature version="[6,7)">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 91241ed70946b42e69621384d3c4d2700ace6591..f6c188fbc40f6ceb77828ac88841de4c55691e34 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="[5,6)">odl-yangtools-data-api</feature>
+        <feature version="[6,7)">odl-yangtools-data-api</feature>
     </feature>
 </features>

diff --git a/features/odl-mdsal-dom-broker/src/main/feature/feature.xml b/features/odl-mdsal-dom-broker/src/main/feature/feature.xml
index 1a9c89d8fa32207ae9e136d656360e2575cfc8b1..2924a366d2741ce64aca0343fd958b61e74ab3ce 100644 (file)
--- a/features/odl-mdsal-dom-broker/src/main/feature/feature.xml
+++ b/features/odl-mdsal-dom-broker/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-broker">
     <feature name="odl-mdsal-dom-broker">
-        <feature version="[7,8)">odl-lmax-3</feature>
+        <feature version="[8,9)">odl-lmax-3</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 a5e489b33ecaeee8299053b72acea6eb064ab71b..2017a91934d6b3b215a8a590432d835f53f568f6 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="[5,6)">odl-yangtools-data-api</feature>
+        <feature version="[6,7)">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 0461deea9b79b125621ea23e8fa2fb4a323e7313..10b2cb6a28b269b59d522c32538928629d3f23c9 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="[5,6)">odl-yangtools-data-api</feature>
+        <feature version="[6,7)">odl-yangtools-data-api</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 47dacdc94f8c45b2e21308b48b38598a8a96e145..b3a38a57c9cfb47a96868031473829d8ab4e2684 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="[5,6)">odl-yangtools-netty</feature>
+        <feature version="[6,7)">odl-yangtools-netty</feature>
     </feature>
 </features>

diff --git a/features/pom.xml b/features/pom.xml
index 8f6df7a89deaff3ffc9e9fa40128df64a8d11951..6723e1cdeb0b58c92a88d9f4cbf43e20656d4d1a 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>7.0.6</version>
+        <version>8.0.0</version>
         <relativePath/>
     </parent>
 

diff --git a/model/iana/pom.xml b/model/iana/pom.xml
index dba9629e789525a5f8f9b8e28c65280e52d64ac6..65b2e69885b0e2fc2805372bc745a7113173455a 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>7.0.6</version>
+        <version>8.0.0</version>
         <relativePath/>
     </parent>
 

diff --git a/model/ietf/pom.xml b/model/ietf/pom.xml
index d484896982415ed2bed6c52f560dba68e2af63df..bc218f9bd3de1e27e9b5c69f98ead128feb83b34 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>7.0.6</version>
+        <version>8.0.0</version>
         <relativePath/>
     </parent>
 

diff --git a/model/pom.xml b/model/pom.xml
index 50b7183ac5b61ed044343305df99bea362ce9bdd..6137adc284a5c5ba988be231bc87f9f38acd46b7 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>7.0.6</version>
+        <version>8.0.0</version>
         <relativePath/>
     </parent>
 

diff --git a/netty/pom.xml b/netty/pom.xml
index c0ba42da0d97fdf536ca4051982d07724bac6ae1..6d2cdc0c70bf4d88e2b18e7d98134688f4b34c89 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>7.0.6</version>
+        <version>8.0.0</version>
         <relativePath/>
     </parent>
 

diff --git a/pom.xml b/pom.xml
index e6064c633c5dcaea31d0ed3b03bbf449b9127df3..e49ea45d539e441ead26dccaf3d8c739af6d162e 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>7.0.6</version>
+        <version>8.0.0</version>
         <relativePath/>
     </parent>
 

diff --git a/singleton-service/pom.xml b/singleton-service/pom.xml
index 27c5f5f1bbcc7e872081f2c346e62dcfa0c3d44e..1395486481b538ddb15d17ff103dd0af975ab8fc 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>7.0.6</version>
+        <version>8.0.0</version>
         <relativePath/>
     </parent>
 

diff --git a/trace/pom.xml b/trace/pom.xml
index f165f3da49081039aa994e59e53aee58aa6097f7..d9670ad9a3b13bfb0626b796fc419e2c8f0fd748 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>7.0.6</version>
+        <version>8.0.0</version>
         <relativePath/>
     </parent>
 

diff --git a/yanglib/pom.xml b/yanglib/pom.xml
index 290ac0a76bdcc8d44526acc7bdbd91c7afe7b976..72bb1098b09f2964a4c55dccd2bfc1a569475d68 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>7.0.6</version>
+        <version>8.0.0</version>
         <relativePath/>
     </parent>