Update sli for Argon release
Update sli to use OpenDaylight Argon versions of parent poms
Issue-ID: CCSDK-3914
Signed-off-by: Dan Timoney <dtimoney@att.com>
Change-Id: I8689a3389ce4fae3be3e9d353f479eb4cd3762c0
diff --git a/core/artifacts/pom.xml b/core/artifacts/pom.xml
index 7a59ae6..e5dfc89 100755
--- a/core/artifacts/pom.xml
+++ b/core/artifacts/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.onap.ccsdk.parent</groupId>
<artifactId>odlparent-lite</artifactId>
- <version>2.5.4</version>
+ <version>2.6.0</version>
<relativePath/>
</parent>
diff --git a/core/dblib/installer/pom.xml b/core/dblib/installer/pom.xml
index 672ac3a..d1e9928 100755
--- a/core/dblib/installer/pom.xml
+++ b/core/dblib/installer/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.onap.ccsdk.parent</groupId>
<artifactId>odlparent-lite</artifactId>
- <version>2.5.4</version>
+ <version>2.6.0</version>
<relativePath/>
</parent>
diff --git a/core/dblib/pom.xml b/core/dblib/pom.xml
index 39a6ee7..3cb6246 100755
--- a/core/dblib/pom.xml
+++ b/core/dblib/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.onap.ccsdk.parent</groupId>
<artifactId>odlparent-lite</artifactId>
- <version>2.5.4</version>
+ <version>2.6.0</version>
<relativePath/>
</parent>
diff --git a/core/dblib/provider/pom.xml b/core/dblib/provider/pom.xml
index 11cbb41..c2ca496 100755
--- a/core/dblib/provider/pom.xml
+++ b/core/dblib/provider/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.onap.ccsdk.parent</groupId>
<artifactId>binding-parent</artifactId>
- <version>2.5.4</version>
+ <version>2.6.0</version>
<relativePath/>
</parent>
diff --git a/core/features/ccsdk-dblib/pom.xml b/core/features/ccsdk-dblib/pom.xml
index 0291840..50c4dc6 100644
--- a/core/features/ccsdk-dblib/pom.xml
+++ b/core/features/ccsdk-dblib/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.onap.ccsdk.parent</groupId>
<artifactId>single-feature-parent</artifactId>
- <version>2.5.4</version>
+ <version>2.6.0</version>
<relativePath/>
</parent>
diff --git a/core/features/ccsdk-filters/pom.xml b/core/features/ccsdk-filters/pom.xml
index 9c283eb..25398b9 100644
--- a/core/features/ccsdk-filters/pom.xml
+++ b/core/features/ccsdk-filters/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.onap.ccsdk.parent</groupId>
<artifactId>single-feature-parent</artifactId>
- <version>2.5.4</version>
+ <version>2.6.0</version>
<relativePath/>
</parent>
diff --git a/core/features/ccsdk-sli-core-all/pom.xml b/core/features/ccsdk-sli-core-all/pom.xml
index b59f60e..9ace73c 100644
--- a/core/features/ccsdk-sli-core-all/pom.xml
+++ b/core/features/ccsdk-sli-core-all/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.onap.ccsdk.parent</groupId>
<artifactId>single-feature-parent</artifactId>
- <version>2.5.4</version>
+ <version>2.6.0</version>
<relativePath/>
</parent>
diff --git a/core/features/ccsdk-sli/pom.xml b/core/features/ccsdk-sli/pom.xml
index 00b8c89..3b597ba 100644
--- a/core/features/ccsdk-sli/pom.xml
+++ b/core/features/ccsdk-sli/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.onap.ccsdk.parent</groupId>
<artifactId>single-feature-parent</artifactId>
- <version>2.5.4</version>
+ <version>2.6.0</version>
<relativePath/>
</parent>
diff --git a/core/features/ccsdk-sliPluginUtils/pom.xml b/core/features/ccsdk-sliPluginUtils/pom.xml
index b1035cf..21c5fd9 100644
--- a/core/features/ccsdk-sliPluginUtils/pom.xml
+++ b/core/features/ccsdk-sliPluginUtils/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.onap.ccsdk.parent</groupId>
<artifactId>single-feature-parent</artifactId>
- <version>2.5.4</version>
+ <version>2.6.0</version>
<relativePath/>
</parent>
diff --git a/core/features/ccsdk-sliapi/pom.xml b/core/features/ccsdk-sliapi/pom.xml
index 4f6b23c..18524ad 100644
--- a/core/features/ccsdk-sliapi/pom.xml
+++ b/core/features/ccsdk-sliapi/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.onap.ccsdk.parent</groupId>
<artifactId>single-feature-parent</artifactId>
- <version>2.5.4</version>
+ <version>2.6.0</version>
<relativePath/>
</parent>
diff --git a/core/features/ccsdk-slicore-utils/pom.xml b/core/features/ccsdk-slicore-utils/pom.xml
index 580b3be..3f486ae 100644
--- a/core/features/ccsdk-slicore-utils/pom.xml
+++ b/core/features/ccsdk-slicore-utils/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.onap.ccsdk.parent</groupId>
<artifactId>single-feature-parent</artifactId>
- <version>2.5.4</version>
+ <version>2.6.0</version>
<relativePath/>
</parent>
diff --git a/core/features/features-sli-core/pom.xml b/core/features/features-sli-core/pom.xml
index 20c5503..8c05560 100644
--- a/core/features/features-sli-core/pom.xml
+++ b/core/features/features-sli-core/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.onap.ccsdk.parent</groupId>
<artifactId>feature-repo-parent</artifactId>
- <version>2.5.4</version>
+ <version>2.6.0</version>
<relativePath/>
</parent>
diff --git a/core/features/installer/pom.xml b/core/features/installer/pom.xml
index 9cc7324..a9a5702 100755
--- a/core/features/installer/pom.xml
+++ b/core/features/installer/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.onap.ccsdk.parent</groupId>
<artifactId>odlparent-lite</artifactId>
- <version>2.5.4</version>
+ <version>2.6.0</version>
<relativePath/>
</parent>
diff --git a/core/features/pom.xml b/core/features/pom.xml
index 1ea5bf5..3fdba8b 100755
--- a/core/features/pom.xml
+++ b/core/features/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.onap.ccsdk.parent</groupId>
<artifactId>odlparent-lite</artifactId>
- <version>2.5.4</version>
+ <version>2.6.0</version>
<relativePath/>
</parent>
diff --git a/core/filters/installer/pom.xml b/core/filters/installer/pom.xml
index 042e077..474b9d6 100755
--- a/core/filters/installer/pom.xml
+++ b/core/filters/installer/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.onap.ccsdk.parent</groupId>
<artifactId>odlparent-lite</artifactId>
- <version>2.5.4</version>
+ <version>2.6.0</version>
<relativePath/>
</parent>
diff --git a/core/filters/pom.xml b/core/filters/pom.xml
index 8d7db78..fd76b6a 100644
--- a/core/filters/pom.xml
+++ b/core/filters/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.onap.ccsdk.parent</groupId>
<artifactId>odlparent-lite</artifactId>
- <version>2.5.4</version>
+ <version>2.6.0</version>
<relativePath/>
</parent>
diff --git a/core/filters/provider/pom.xml b/core/filters/provider/pom.xml
index 5489ca5..7f5b237 100755
--- a/core/filters/provider/pom.xml
+++ b/core/filters/provider/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.onap.ccsdk.parent</groupId>
<artifactId>binding-parent</artifactId>
- <version>2.5.4</version>
+ <version>2.6.0</version>
<relativePath/>
</parent>
diff --git a/core/pom.xml b/core/pom.xml
index 15653a6..8073141 100755
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.onap.ccsdk.parent</groupId>
<artifactId>odlparent-lite</artifactId>
- <version>2.5.4</version>
+ <version>2.6.0</version>
<relativePath/>
</parent>
diff --git a/core/sli/common/pom.xml b/core/sli/common/pom.xml
index d8bbe7b..7ede9f1 100755
--- a/core/sli/common/pom.xml
+++ b/core/sli/common/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.onap.ccsdk.parent</groupId>
<artifactId>binding-parent</artifactId>
- <version>2.5.4</version>
+ <version>2.6.0</version>
<relativePath/>
</parent>
@@ -31,6 +31,10 @@
</dependency>
<dependency>
<groupId>org.antlr</groupId>
+ <artifactId>antlr4</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.antlr</groupId>
<artifactId>antlr4-runtime</artifactId>
</dependency>
<dependency>
@@ -119,13 +123,13 @@
<plugin>
<groupId>org.antlr</groupId>
<artifactId>antlr4-maven-plugin</artifactId>
+ <version>${antlr.version}</version>
<executions>
<execution>
- <configuration>
- <sourceDirectory>${basedir}/src/main/antlr4</sourceDirectory>
- <outputDirectory>${project.basedir}/src/main/java/</outputDirectory>
- </configuration>
<id>antlr</id>
+ <configuration>
+ <outputDirectory>${basedir}/src/main/java</outputDirectory>
+ </configuration>
<goals>
<goal>antlr4</goal>
</goals>
@@ -154,6 +158,7 @@
</environmentVariables>
</configuration>
</plugin>
+
</plugins>
</build>
</project>
diff --git a/core/sli/installer/pom.xml b/core/sli/installer/pom.xml
index 8f58127..7d69f46 100755
--- a/core/sli/installer/pom.xml
+++ b/core/sli/installer/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.onap.ccsdk.parent</groupId>
<artifactId>odlparent-lite</artifactId>
- <version>2.5.4</version>
+ <version>2.6.0</version>
<relativePath/>
</parent>
diff --git a/core/sli/model/pom.xml b/core/sli/model/pom.xml
index 82d22a7..35a56f2 100755
--- a/core/sli/model/pom.xml
+++ b/core/sli/model/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.onap.ccsdk.parent</groupId>
<artifactId>binding-parent</artifactId>
- <version>2.5.4</version>
+ <version>2.6.0</version>
<relativePath/>
</parent>
diff --git a/core/sli/pom.xml b/core/sli/pom.xml
index 344fc2f..81d46c0 100755
--- a/core/sli/pom.xml
+++ b/core/sli/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.onap.ccsdk.parent</groupId>
<artifactId>odlparent-lite</artifactId>
- <version>2.5.4</version>
+ <version>2.6.0</version>
<relativePath/>
</parent>
diff --git a/core/sli/provider-base/pom.xml b/core/sli/provider-base/pom.xml
index b4a90a1..4c90b07 100644
--- a/core/sli/provider-base/pom.xml
+++ b/core/sli/provider-base/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.onap.ccsdk.parent</groupId>
<artifactId>binding-parent</artifactId>
- <version>2.5.4</version>
+ <version>2.6.0</version>
<relativePath/>
</parent>
diff --git a/core/sli/provider/pom.xml b/core/sli/provider/pom.xml
index 3b71b65..2da08ea 100755
--- a/core/sli/provider/pom.xml
+++ b/core/sli/provider/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.onap.ccsdk.parent</groupId>
<artifactId>binding-parent</artifactId>
- <version>2.5.4</version>
+ <version>2.6.0</version>
<relativePath/>
</parent>
diff --git a/core/sli/provider/src/main/java/org/onap/ccsdk/sli/core/sli/provider/YangUtils.java b/core/sli/provider/src/main/java/org/onap/ccsdk/sli/core/sli/provider/YangUtils.java
index e4d7618..c6ab8dc 100644
--- a/core/sli/provider/src/main/java/org/onap/ccsdk/sli/core/sli/provider/YangUtils.java
+++ b/core/sli/provider/src/main/java/org/onap/ccsdk/sli/core/sli/provider/YangUtils.java
@@ -353,7 +353,7 @@
return child;
}
if (node instanceof ChoiceSchemaNode) {
- return ((ChoiceSchemaNode) node).findCase(qname).orElse(null);
+ return ((ChoiceSchemaNode) node).findCaseNode(qname).orElse(null);
}
if (node instanceof OperationDefinition) {
switch (qname.getLocalName()) {
diff --git a/core/sli/provider/src/test/java/org/opendaylight/yang/gen/v1/test/IpFragmentFlagEnumType.java b/core/sli/provider/src/test/java/org/opendaylight/yang/gen/v1/test/IpFragmentFlagEnumType.java
index 2c3f39b..54c6c12 100644
--- a/core/sli/provider/src/test/java/org/opendaylight/yang/gen/v1/test/IpFragmentFlagEnumType.java
+++ b/core/sli/provider/src/test/java/org/opendaylight/yang/gen/v1/test/IpFragmentFlagEnumType.java
@@ -7,9 +7,9 @@
import java.util.Map;
import java.util.Objects;
import java.util.Optional;
-import org.opendaylight.yangtools.yang.binding.Enumeration;
+// import org.opendaylight.yangtools.yang.binding.Enumeration;
-public enum IpFragmentFlagEnumType implements Enumeration {
+public enum IpFragmentFlagEnumType {
DF(0, "DF"),
ISF(1, "ISF"),
@@ -41,13 +41,10 @@
this.value = value;
this.name = name;
}
-
- @Override
public String getName() {
return name;
}
- @Override
public int getIntValue() {
return value;
}
diff --git a/core/sliPluginUtils/installer/pom.xml b/core/sliPluginUtils/installer/pom.xml
index 7f856e1..a1420ff 100755
--- a/core/sliPluginUtils/installer/pom.xml
+++ b/core/sliPluginUtils/installer/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.onap.ccsdk.parent</groupId>
<artifactId>odlparent-lite</artifactId>
- <version>2.5.4</version>
+ <version>2.6.0</version>
<relativePath/>
</parent>
diff --git a/core/sliPluginUtils/pom.xml b/core/sliPluginUtils/pom.xml
index 046e0b0..82e46ed 100755
--- a/core/sliPluginUtils/pom.xml
+++ b/core/sliPluginUtils/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.onap.ccsdk.parent</groupId>
<artifactId>odlparent-lite</artifactId>
- <version>2.5.4</version>
+ <version>2.6.0</version>
<relativePath/>
</parent>
diff --git a/core/sliPluginUtils/provider/pom.xml b/core/sliPluginUtils/provider/pom.xml
index 9badbc8..e3fe156 100755
--- a/core/sliPluginUtils/provider/pom.xml
+++ b/core/sliPluginUtils/provider/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.onap.ccsdk.parent</groupId>
<artifactId>binding-parent</artifactId>
- <version>2.5.4</version>
+ <version>2.6.0</version>
<relativePath/>
</parent>
diff --git a/core/sliapi/installer/pom.xml b/core/sliapi/installer/pom.xml
index 90e51dc..5644ea0 100755
--- a/core/sliapi/installer/pom.xml
+++ b/core/sliapi/installer/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.onap.ccsdk.parent</groupId>
<artifactId>odlparent-lite</artifactId>
- <version>2.5.4</version>
+ <version>2.6.0</version>
<relativePath/>
</parent>
diff --git a/core/sliapi/model/pom.xml b/core/sliapi/model/pom.xml
index a27e3c6..8535ba1 100755
--- a/core/sliapi/model/pom.xml
+++ b/core/sliapi/model/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.onap.ccsdk.parent</groupId>
<artifactId>odlparent-lite</artifactId>
- <version>2.5.4</version>
+ <version>2.6.0</version>
<relativePath/>
</parent>
diff --git a/core/sliapi/model/swagger/pom.xml b/core/sliapi/model/swagger/pom.xml
index 3598c8f..a9f886f 100644
--- a/core/sliapi/model/swagger/pom.xml
+++ b/core/sliapi/model/swagger/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.onap.ccsdk.parent</groupId>
<artifactId>odlparent-lite</artifactId>
- <version>2.5.4</version>
+ <version>2.6.0</version>
</parent>
<groupId>org.onap.ccsdk.sli.core</groupId>
diff --git a/core/sliapi/model/yang/pom.xml b/core/sliapi/model/yang/pom.xml
index b74a8e2..b0417b2 100755
--- a/core/sliapi/model/yang/pom.xml
+++ b/core/sliapi/model/yang/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.onap.ccsdk.parent</groupId>
<artifactId>binding-parent</artifactId>
- <version>2.5.4</version>
+ <version>2.6.0</version>
<relativePath/>
</parent>
diff --git a/core/sliapi/pom.xml b/core/sliapi/pom.xml
index 049e756..0401112 100755
--- a/core/sliapi/pom.xml
+++ b/core/sliapi/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.onap.ccsdk.parent</groupId>
<artifactId>odlparent-lite</artifactId>
- <version>2.5.4</version>
+ <version>2.6.0</version>
<relativePath/>
</parent>
diff --git a/core/sliapi/provider/pom.xml b/core/sliapi/provider/pom.xml
index 4035ca9..5418d66 100755
--- a/core/sliapi/provider/pom.xml
+++ b/core/sliapi/provider/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.onap.ccsdk.parent</groupId>
<artifactId>binding-parent</artifactId>
- <version>2.5.4</version>
+ <version>2.6.0</version>
<relativePath/>
</parent>
diff --git a/core/utils/installer/pom.xml b/core/utils/installer/pom.xml
index a235713..d5b211f 100755
--- a/core/utils/installer/pom.xml
+++ b/core/utils/installer/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.onap.ccsdk.parent</groupId>
<artifactId>odlparent-lite</artifactId>
- <version>2.5.4</version>
+ <version>2.6.0</version>
<relativePath/>
</parent>
diff --git a/core/utils/pom.xml b/core/utils/pom.xml
index aae2e3e..20350d3 100755
--- a/core/utils/pom.xml
+++ b/core/utils/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.onap.ccsdk.parent</groupId>
<artifactId>odlparent-lite</artifactId>
- <version>2.5.4</version>
+ <version>2.6.0</version>
<relativePath/>
</parent>
diff --git a/core/utils/provider/pom.xml b/core/utils/provider/pom.xml
index 0c2fa24..3da43be 100644
--- a/core/utils/provider/pom.xml
+++ b/core/utils/provider/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.onap.ccsdk.parent</groupId>
<artifactId>binding-parent</artifactId>
- <version>2.5.4</version>
+ <version>2.6.0</version>
<relativePath/>
</parent>