diff options
Diffstat (limited to 'core/sli')
| -rwxr-xr-x | core/sli/common/pom.xml | 13 | ||||
| -rwxr-xr-x | core/sli/installer/pom.xml | 2 | ||||
| -rwxr-xr-x | core/sli/model/pom.xml | 2 | ||||
| -rwxr-xr-x | core/sli/pom.xml | 2 | ||||
| -rw-r--r-- | core/sli/provider-base/pom.xml | 2 | ||||
| -rwxr-xr-x | core/sli/provider/pom.xml | 2 | ||||
| -rw-r--r-- | core/sli/provider/src/main/java/org/onap/ccsdk/sli/core/sli/provider/YangUtils.java | 2 | ||||
| -rw-r--r-- | core/sli/provider/src/test/java/org/opendaylight/yang/gen/v1/test/IpFragmentFlagEnumType.java | 7 |
8 files changed, 17 insertions, 15 deletions
diff --git a/core/sli/common/pom.xml b/core/sli/common/pom.xml index d8bbe7b16..7ede9f15e 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> + <id>antlr</id> <configuration> - <sourceDirectory>${basedir}/src/main/antlr4</sourceDirectory> - <outputDirectory>${project.basedir}/src/main/java/</outputDirectory> + <outputDirectory>${basedir}/src/main/java</outputDirectory> </configuration> - <id>antlr</id> <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 8f5812704..7d69f4695 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 82d22a7b0..35a56f2a1 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 344fc2ff1..81d46c011 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 b4a90a1d4..4c90b0705 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 3b71b6579..2da08ea8f 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 e4d7618fe..c6ab8dcbd 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 @@ public final class YangUtils { 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 2c3f39b7e..54c6c12cb 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.lang.String; 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 @@ public enum IpFragmentFlagEnumType implements Enumeration { this.value = value; this.name = name; } - - @Override public String getName() { return name; } - @Override public int getIntValue() { return value; } |