From 69baaebcb6112c0b2f80ec654442c52a5b3e1cb1 Mon Sep 17 00:00:00 2001 From: Dan Timoney Date: Thu, 22 Jun 2023 16:05:50 -0400 Subject: Update sli for Argon release Update sli to use OpenDaylight Argon versions of parent poms Issue-ID: CCSDK-3914 Signed-off-by: Dan Timoney Change-Id: I8689a3389ce4fae3be3e9d353f479eb4cd3762c0 --- core/artifacts/pom.xml | 2 +- core/dblib/installer/pom.xml | 2 +- core/dblib/pom.xml | 2 +- core/dblib/provider/pom.xml | 2 +- core/features/ccsdk-dblib/pom.xml | 2 +- core/features/ccsdk-filters/pom.xml | 2 +- core/features/ccsdk-sli-core-all/pom.xml | 2 +- core/features/ccsdk-sli/pom.xml | 2 +- core/features/ccsdk-sliPluginUtils/pom.xml | 2 +- core/features/ccsdk-sliapi/pom.xml | 2 +- core/features/ccsdk-slicore-utils/pom.xml | 2 +- core/features/features-sli-core/pom.xml | 2 +- core/features/installer/pom.xml | 2 +- core/features/pom.xml | 2 +- core/filters/installer/pom.xml | 2 +- core/filters/pom.xml | 2 +- core/filters/provider/pom.xml | 2 +- core/pom.xml | 2 +- core/sli/common/pom.xml | 13 +++++++++---- core/sli/installer/pom.xml | 2 +- core/sli/model/pom.xml | 2 +- core/sli/pom.xml | 2 +- core/sli/provider-base/pom.xml | 2 +- core/sli/provider/pom.xml | 2 +- .../org/onap/ccsdk/sli/core/sli/provider/YangUtils.java | 2 +- .../yang/gen/v1/test/IpFragmentFlagEnumType.java | 7 ++----- core/sliPluginUtils/installer/pom.xml | 2 +- core/sliPluginUtils/pom.xml | 2 +- core/sliPluginUtils/provider/pom.xml | 2 +- core/sliapi/installer/pom.xml | 2 +- core/sliapi/model/pom.xml | 2 +- core/sliapi/model/swagger/pom.xml | 2 +- core/sliapi/model/yang/pom.xml | 2 +- core/sliapi/pom.xml | 2 +- core/sliapi/provider/pom.xml | 2 +- core/utils/installer/pom.xml | 2 +- core/utils/pom.xml | 2 +- core/utils/provider/pom.xml | 2 +- 38 files changed, 47 insertions(+), 45 deletions(-) (limited to 'core') diff --git a/core/artifacts/pom.xml b/core/artifacts/pom.xml index 7a59ae6a5..e5dfc89ba 100755 --- a/core/artifacts/pom.xml +++ b/core/artifacts/pom.xml @@ -5,7 +5,7 @@ org.onap.ccsdk.parent odlparent-lite - 2.5.4 + 2.6.0 diff --git a/core/dblib/installer/pom.xml b/core/dblib/installer/pom.xml index 672ac3a5e..d1e992889 100755 --- a/core/dblib/installer/pom.xml +++ b/core/dblib/installer/pom.xml @@ -5,7 +5,7 @@ org.onap.ccsdk.parent odlparent-lite - 2.5.4 + 2.6.0 diff --git a/core/dblib/pom.xml b/core/dblib/pom.xml index 39a6ee73b..3cb624619 100755 --- a/core/dblib/pom.xml +++ b/core/dblib/pom.xml @@ -5,7 +5,7 @@ org.onap.ccsdk.parent odlparent-lite - 2.5.4 + 2.6.0 diff --git a/core/dblib/provider/pom.xml b/core/dblib/provider/pom.xml index 11cbb411d..c2ca4961e 100755 --- a/core/dblib/provider/pom.xml +++ b/core/dblib/provider/pom.xml @@ -5,7 +5,7 @@ org.onap.ccsdk.parent binding-parent - 2.5.4 + 2.6.0 diff --git a/core/features/ccsdk-dblib/pom.xml b/core/features/ccsdk-dblib/pom.xml index 0291840e9..50c4dc660 100644 --- a/core/features/ccsdk-dblib/pom.xml +++ b/core/features/ccsdk-dblib/pom.xml @@ -5,7 +5,7 @@ org.onap.ccsdk.parent single-feature-parent - 2.5.4 + 2.6.0 diff --git a/core/features/ccsdk-filters/pom.xml b/core/features/ccsdk-filters/pom.xml index 9c283eb87..25398b9e7 100644 --- a/core/features/ccsdk-filters/pom.xml +++ b/core/features/ccsdk-filters/pom.xml @@ -5,7 +5,7 @@ org.onap.ccsdk.parent single-feature-parent - 2.5.4 + 2.6.0 diff --git a/core/features/ccsdk-sli-core-all/pom.xml b/core/features/ccsdk-sli-core-all/pom.xml index b59f60e68..9ace73c7c 100644 --- a/core/features/ccsdk-sli-core-all/pom.xml +++ b/core/features/ccsdk-sli-core-all/pom.xml @@ -5,7 +5,7 @@ org.onap.ccsdk.parent single-feature-parent - 2.5.4 + 2.6.0 diff --git a/core/features/ccsdk-sli/pom.xml b/core/features/ccsdk-sli/pom.xml index 00b8c8943..3b597ba39 100644 --- a/core/features/ccsdk-sli/pom.xml +++ b/core/features/ccsdk-sli/pom.xml @@ -5,7 +5,7 @@ org.onap.ccsdk.parent single-feature-parent - 2.5.4 + 2.6.0 diff --git a/core/features/ccsdk-sliPluginUtils/pom.xml b/core/features/ccsdk-sliPluginUtils/pom.xml index b1035cfa7..21c5fd918 100644 --- a/core/features/ccsdk-sliPluginUtils/pom.xml +++ b/core/features/ccsdk-sliPluginUtils/pom.xml @@ -5,7 +5,7 @@ org.onap.ccsdk.parent single-feature-parent - 2.5.4 + 2.6.0 diff --git a/core/features/ccsdk-sliapi/pom.xml b/core/features/ccsdk-sliapi/pom.xml index 4f6b23ce7..18524ad28 100644 --- a/core/features/ccsdk-sliapi/pom.xml +++ b/core/features/ccsdk-sliapi/pom.xml @@ -5,7 +5,7 @@ org.onap.ccsdk.parent single-feature-parent - 2.5.4 + 2.6.0 diff --git a/core/features/ccsdk-slicore-utils/pom.xml b/core/features/ccsdk-slicore-utils/pom.xml index 580b3bebc..3f486ae0b 100644 --- a/core/features/ccsdk-slicore-utils/pom.xml +++ b/core/features/ccsdk-slicore-utils/pom.xml @@ -5,7 +5,7 @@ org.onap.ccsdk.parent single-feature-parent - 2.5.4 + 2.6.0 diff --git a/core/features/features-sli-core/pom.xml b/core/features/features-sli-core/pom.xml index 20c55037c..8c05560fc 100644 --- a/core/features/features-sli-core/pom.xml +++ b/core/features/features-sli-core/pom.xml @@ -5,7 +5,7 @@ org.onap.ccsdk.parent feature-repo-parent - 2.5.4 + 2.6.0 diff --git a/core/features/installer/pom.xml b/core/features/installer/pom.xml index 9cc732449..a9a5702ec 100755 --- a/core/features/installer/pom.xml +++ b/core/features/installer/pom.xml @@ -5,7 +5,7 @@ org.onap.ccsdk.parent odlparent-lite - 2.5.4 + 2.6.0 diff --git a/core/features/pom.xml b/core/features/pom.xml index 1ea5bf51e..3fdba8b41 100755 --- a/core/features/pom.xml +++ b/core/features/pom.xml @@ -5,7 +5,7 @@ org.onap.ccsdk.parent odlparent-lite - 2.5.4 + 2.6.0 diff --git a/core/filters/installer/pom.xml b/core/filters/installer/pom.xml index 042e077eb..474b9d6cb 100755 --- a/core/filters/installer/pom.xml +++ b/core/filters/installer/pom.xml @@ -5,7 +5,7 @@ org.onap.ccsdk.parent odlparent-lite - 2.5.4 + 2.6.0 diff --git a/core/filters/pom.xml b/core/filters/pom.xml index 8d7db7885..fd76b6a90 100644 --- a/core/filters/pom.xml +++ b/core/filters/pom.xml @@ -5,7 +5,7 @@ org.onap.ccsdk.parent odlparent-lite - 2.5.4 + 2.6.0 diff --git a/core/filters/provider/pom.xml b/core/filters/provider/pom.xml index 5489ca565..7f5b2377f 100755 --- a/core/filters/provider/pom.xml +++ b/core/filters/provider/pom.xml @@ -5,7 +5,7 @@ org.onap.ccsdk.parent binding-parent - 2.5.4 + 2.6.0 diff --git a/core/pom.xml b/core/pom.xml index 15653a6f5..807314181 100755 --- a/core/pom.xml +++ b/core/pom.xml @@ -5,7 +5,7 @@ org.onap.ccsdk.parent odlparent-lite - 2.5.4 + 2.6.0 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 @@ org.onap.ccsdk.parent binding-parent - 2.5.4 + 2.6.0 @@ -29,6 +29,10 @@ derby test + + org.antlr + antlr4 + org.antlr antlr4-runtime @@ -119,13 +123,13 @@ org.antlr antlr4-maven-plugin + ${antlr.version} + antlr - ${basedir}/src/main/antlr4 - ${project.basedir}/src/main/java/ + ${basedir}/src/main/java - antlr antlr4 @@ -154,6 +158,7 @@ + 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 @@ org.onap.ccsdk.parent odlparent-lite - 2.5.4 + 2.6.0 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 @@ org.onap.ccsdk.parent binding-parent - 2.5.4 + 2.6.0 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 @@ org.onap.ccsdk.parent odlparent-lite - 2.5.4 + 2.6.0 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 @@ org.onap.ccsdk.parent binding-parent - 2.5.4 + 2.6.0 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 @@ org.onap.ccsdk.parent binding-parent - 2.5.4 + 2.6.0 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; } diff --git a/core/sliPluginUtils/installer/pom.xml b/core/sliPluginUtils/installer/pom.xml index 7f856e10f..a1420ff70 100755 --- a/core/sliPluginUtils/installer/pom.xml +++ b/core/sliPluginUtils/installer/pom.xml @@ -5,7 +5,7 @@ org.onap.ccsdk.parent odlparent-lite - 2.5.4 + 2.6.0 diff --git a/core/sliPluginUtils/pom.xml b/core/sliPluginUtils/pom.xml index 046e0b005..82e46ed6e 100755 --- a/core/sliPluginUtils/pom.xml +++ b/core/sliPluginUtils/pom.xml @@ -5,7 +5,7 @@ org.onap.ccsdk.parent odlparent-lite - 2.5.4 + 2.6.0 diff --git a/core/sliPluginUtils/provider/pom.xml b/core/sliPluginUtils/provider/pom.xml index 9badbc845..e3fe1568f 100755 --- a/core/sliPluginUtils/provider/pom.xml +++ b/core/sliPluginUtils/provider/pom.xml @@ -5,7 +5,7 @@ org.onap.ccsdk.parent binding-parent - 2.5.4 + 2.6.0 diff --git a/core/sliapi/installer/pom.xml b/core/sliapi/installer/pom.xml index 90e51dc44..5644ea0d2 100755 --- a/core/sliapi/installer/pom.xml +++ b/core/sliapi/installer/pom.xml @@ -5,7 +5,7 @@ org.onap.ccsdk.parent odlparent-lite - 2.5.4 + 2.6.0 diff --git a/core/sliapi/model/pom.xml b/core/sliapi/model/pom.xml index a27e3c6ed..8535ba1b5 100755 --- a/core/sliapi/model/pom.xml +++ b/core/sliapi/model/pom.xml @@ -5,7 +5,7 @@ org.onap.ccsdk.parent odlparent-lite - 2.5.4 + 2.6.0 diff --git a/core/sliapi/model/swagger/pom.xml b/core/sliapi/model/swagger/pom.xml index 3598c8f41..a9f886f5a 100644 --- a/core/sliapi/model/swagger/pom.xml +++ b/core/sliapi/model/swagger/pom.xml @@ -5,7 +5,7 @@ org.onap.ccsdk.parent odlparent-lite - 2.5.4 + 2.6.0 org.onap.ccsdk.sli.core diff --git a/core/sliapi/model/yang/pom.xml b/core/sliapi/model/yang/pom.xml index b74a8e2d9..b0417b26c 100755 --- a/core/sliapi/model/yang/pom.xml +++ b/core/sliapi/model/yang/pom.xml @@ -5,7 +5,7 @@ org.onap.ccsdk.parent binding-parent - 2.5.4 + 2.6.0 diff --git a/core/sliapi/pom.xml b/core/sliapi/pom.xml index 049e756f3..0401112d7 100755 --- a/core/sliapi/pom.xml +++ b/core/sliapi/pom.xml @@ -5,7 +5,7 @@ org.onap.ccsdk.parent odlparent-lite - 2.5.4 + 2.6.0 diff --git a/core/sliapi/provider/pom.xml b/core/sliapi/provider/pom.xml index 4035ca924..5418d66c5 100755 --- a/core/sliapi/provider/pom.xml +++ b/core/sliapi/provider/pom.xml @@ -5,7 +5,7 @@ org.onap.ccsdk.parent binding-parent - 2.5.4 + 2.6.0 diff --git a/core/utils/installer/pom.xml b/core/utils/installer/pom.xml index a23571354..d5b211fb4 100755 --- a/core/utils/installer/pom.xml +++ b/core/utils/installer/pom.xml @@ -5,7 +5,7 @@ org.onap.ccsdk.parent odlparent-lite - 2.5.4 + 2.6.0 diff --git a/core/utils/pom.xml b/core/utils/pom.xml index aae2e3e94..20350d313 100755 --- a/core/utils/pom.xml +++ b/core/utils/pom.xml @@ -5,7 +5,7 @@ org.onap.ccsdk.parent odlparent-lite - 2.5.4 + 2.6.0 diff --git a/core/utils/provider/pom.xml b/core/utils/provider/pom.xml index 0c2fa2458..3da43be24 100644 --- a/core/utils/provider/pom.xml +++ b/core/utils/provider/pom.xml @@ -5,7 +5,7 @@ org.onap.ccsdk.parent binding-parent - 2.5.4 + 2.6.0 -- cgit 1.2.3-korg