From 37039138afcddedb1af4035aae5fb6c603c4c4e1 Mon Sep 17 00:00:00 2001 From: Michal Cmarada Date: Thu, 11 Apr 2019 04:18:16 -0400 Subject: HC2VPP-397: add support for java 11 - dependency updates - compilation error fixes - javadoc fixes Change-Id: Ic7371931b0728c888a39350a77c959121afb9786 Signed-off-by: Michal Cmarada --- acl/acl-impl/pom.xml | 2 +- common/impl-parent/pom.xml | 17 +++++--- common/minimal-distribution-parent/pom.xml | 49 ++++++++++++++++------ dhcp/dhcp-impl/pom.xml | 2 +- .../yang/vpp-fib-table-management@2018-05-21.yang | 6 +-- fib-management/fib-management-impl/pom.xml | 2 +- ioam/impl/pom.xml | 2 +- ipsec/ipsec-impl/pom.xml | 2 +- l3/impl/pom.xml | 2 +- lisp/lisp2vpp/pom.xml | 2 +- nat/nat2vpp/pom.xml | 2 +- nsh/impl/pom.xml | 4 +- release-notes/pom.xml | 2 +- routing/routing-impl/pom.xml | 2 +- srv6/srv6-impl/pom.xml | 2 +- v3po/v3po2vpp/pom.xml | 2 +- .../interfacesstate/InterfaceDataTranslator.java | 30 ++++++++----- .../InterfaceChangeNotificationProducer.java | 2 +- vpp-classifier/impl/pom.xml | 7 +++- vpp-common/vpp-common-integration/pom.xml | 4 +- .../common/test/read/JvppDumpExecutorTest.java | 10 +++++ .../fd/hc2vpp/common/test/util/FutureProducer.java | 3 ++ .../common/test/util/NamingContextHelper.java | 4 +- .../common/test/write/WriterCustomizerTest.java | 2 + vpp-common/vpp-translate-utils/pom.xml | 2 +- .../common/translate/util/TagRewriteOperation.java | 2 +- vpp-integration/api-docs/core/pom.xml | 4 +- .../docs/core/MethodDelegatingClassVisitor.java | 2 +- .../docs/core/MethodPluginCoverageVisitor.java | 2 +- vpp-integration/api-docs/docs/pom.xml | 26 +++++++++--- vpp-integration/api-docs/scripts/pom.xml | 20 +++++++-- .../docs/scripts/ApiDocsIndexGenerator.groovy | 3 +- 32 files changed, 154 insertions(+), 69 deletions(-) diff --git a/acl/acl-impl/pom.xml b/acl/acl-impl/pom.xml index 3ea1d09eb..e7edd5791 100644 --- a/acl/acl-impl/pom.xml +++ b/acl/acl-impl/pom.xml @@ -104,7 +104,7 @@ org.hamcrest - hamcrest-all + hamcrest test diff --git a/common/impl-parent/pom.xml b/common/impl-parent/pom.xml index d02e39488..96b051c90 100644 --- a/common/impl-parent/pom.xml +++ b/common/impl-parent/pom.xml @@ -86,7 +86,7 @@ org.apache.maven.plugins maven-dependency-plugin - 2.10 + 3.1.1 copy-dependencies @@ -105,8 +105,8 @@ - org.codehaus.gmaven - groovy-maven-plugin + org.codehaus.gmavenplus + gmavenplus-plugin generate-yang-index @@ -115,9 +115,14 @@ execute - - io.fd.honeycomb.common.scripts.ModuleYangIndexGenerator.generateIndexForPresentModules(project, log) - + + + diff --git a/common/minimal-distribution-parent/pom.xml b/common/minimal-distribution-parent/pom.xml index bb456f3a3..c3b0eef45 100644 --- a/common/minimal-distribution-parent/pom.xml +++ b/common/minimal-distribution-parent/pom.xml @@ -64,7 +64,7 @@ org.apache.maven.plugins maven-dependency-plugin - 2.10 + 3.1.1 unpack-configuration @@ -83,8 +83,8 @@ - org.codehaus.gmaven - groovy-maven-plugin + org.codehaus.gmavenplus + gmavenplus-plugin start-scripts-generation @@ -93,9 +93,14 @@ execute - - io.fd.honeycomb.common.scripts.StartupScriptGenerator.generate(project, properties, log) - + + + @@ -107,9 +112,14 @@ execute - - io.fd.honeycomb.common.scripts.ModulesListGenerator.generate(project, properties, log) - + + + @@ -119,9 +129,14 @@ execute - - io.fd.honeycomb.common.scripts.ModuleYangIndexGenerator.pairDistributionModulesWithYangModules(project, log) - + + + @@ -170,5 +185,15 @@ + + + org.apache.maven.plugins + maven-compiler-plugin + + 1.8 + 1.8 + + + \ No newline at end of file diff --git a/dhcp/dhcp-impl/pom.xml b/dhcp/dhcp-impl/pom.xml index e62d537fc..b9024eb42 100644 --- a/dhcp/dhcp-impl/pom.xml +++ b/dhcp/dhcp-impl/pom.xml @@ -84,7 +84,7 @@ org.hamcrest - hamcrest-all + hamcrest test diff --git a/fib-management/fib-management-api/src/main/yang/vpp-fib-table-management@2018-05-21.yang b/fib-management/fib-management-api/src/main/yang/vpp-fib-table-management@2018-05-21.yang index d7d0f0aa1..4b2ba9387 100644 --- a/fib-management/fib-management-api/src/main/yang/vpp-fib-table-management@2018-05-21.yang +++ b/fib-management/fib-management-api/src/main/yang/vpp-fib-table-management@2018-05-21.yang @@ -86,10 +86,10 @@ module vpp-fib-table-management { In VPP this table is mapped to ip_table_add_del VPP API message: Add/del table request A table can be added multiple times, but need be deleted only once. - @param is_ipv6 - V4 or V6 table - @param table_id - table ID associated with the route + param is_ipv6 - V4 or V6 table + param table_id - table ID associated with the route This table ID will apply to both the unicats and mlticast FIBs - @param name - A client provided name/tag for the table. If this is + param name - A client provided name/tag for the table. If this is not set by the client, then VPP will generate something meaningfull"; leaf address-family { type identityref { diff --git a/fib-management/fib-management-impl/pom.xml b/fib-management/fib-management-impl/pom.xml index 77732b20e..fd6a05d34 100644 --- a/fib-management/fib-management-impl/pom.xml +++ b/fib-management/fib-management-impl/pom.xml @@ -87,7 +87,7 @@ org.hamcrest - hamcrest-all + hamcrest test diff --git a/ioam/impl/pom.xml b/ioam/impl/pom.xml index 42de48abc..2536d7a95 100644 --- a/ioam/impl/pom.xml +++ b/ioam/impl/pom.xml @@ -60,7 +60,7 @@ org.hamcrest - hamcrest-all + hamcrest test diff --git a/ipsec/ipsec-impl/pom.xml b/ipsec/ipsec-impl/pom.xml index bf705c480..7d112d7ea 100644 --- a/ipsec/ipsec-impl/pom.xml +++ b/ipsec/ipsec-impl/pom.xml @@ -100,7 +100,7 @@ org.hamcrest - hamcrest-all + hamcrest test diff --git a/l3/impl/pom.xml b/l3/impl/pom.xml index fcfc7033b..e6fbef5fa 100644 --- a/l3/impl/pom.xml +++ b/l3/impl/pom.xml @@ -63,7 +63,7 @@ org.hamcrest - hamcrest-all + hamcrest test diff --git a/lisp/lisp2vpp/pom.xml b/lisp/lisp2vpp/pom.xml index 9a0060c90..26c0cdf7b 100755 --- a/lisp/lisp2vpp/pom.xml +++ b/lisp/lisp2vpp/pom.xml @@ -103,7 +103,7 @@ org.hamcrest - hamcrest-all + hamcrest test diff --git a/nat/nat2vpp/pom.xml b/nat/nat2vpp/pom.xml index cab6187c9..413852fd4 100644 --- a/nat/nat2vpp/pom.xml +++ b/nat/nat2vpp/pom.xml @@ -119,7 +119,7 @@ org.hamcrest - hamcrest-all + hamcrest test diff --git a/nsh/impl/pom.xml b/nsh/impl/pom.xml index 1d7d08d08..958d024d6 100644 --- a/nsh/impl/pom.xml +++ b/nsh/impl/pom.xml @@ -29,7 +29,7 @@ bundle - 4.1.0 + 4.2.2 1.2.0 @@ -62,7 +62,7 @@ org.hamcrest - hamcrest-all + hamcrest test diff --git a/release-notes/pom.xml b/release-notes/pom.xml index 11e199ce4..cb5447822 100644 --- a/release-notes/pom.xml +++ b/release-notes/pom.xml @@ -60,7 +60,7 @@ org.apache.maven.plugins maven-dependency-plugin - 2.10 + 3.1.1 unpack-configuration diff --git a/routing/routing-impl/pom.xml b/routing/routing-impl/pom.xml index 3a4d16ec0..f13e3d0d8 100644 --- a/routing/routing-impl/pom.xml +++ b/routing/routing-impl/pom.xml @@ -93,7 +93,7 @@ org.hamcrest - hamcrest-all + hamcrest test diff --git a/srv6/srv6-impl/pom.xml b/srv6/srv6-impl/pom.xml index 8b7c2791e..fdcad9aa2 100644 --- a/srv6/srv6-impl/pom.xml +++ b/srv6/srv6-impl/pom.xml @@ -88,7 +88,7 @@ org.hamcrest - hamcrest-all + hamcrest test diff --git a/v3po/v3po2vpp/pom.xml b/v3po/v3po2vpp/pom.xml index 7f5914290..4794c0132 100644 --- a/v3po/v3po2vpp/pom.xml +++ b/v3po/v3po2vpp/pom.xml @@ -114,7 +114,7 @@ org.hamcrest - hamcrest-all + hamcrest test diff --git a/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfacesstate/InterfaceDataTranslator.java b/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfacesstate/InterfaceDataTranslator.java index 5e025c5cc..659a7feb2 100644 --- a/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfacesstate/InterfaceDataTranslator.java +++ b/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfacesstate/InterfaceDataTranslator.java @@ -71,7 +71,7 @@ public interface InterfaceDataTranslator extends ByteDataTranslator, JvppReplyCo * @param vppPhysAddress byte array of bytes in big endian order, constructing the network IF physical address. * @return String like "aa:bb:cc:dd:ee:ff" * @throws NullPointerException if vppPhysAddress is null - * @throws IllegalArgumentException if vppPhysAddress.length < 6 + * @throws IllegalArgumentException if vppPhysAddress.length < 6 */ default String vppPhysAddrToYang(@Nonnull final byte[] vppPhysAddress) { Objects.requireNonNull(vppPhysAddress, "Empty physical address bytes"); @@ -171,11 +171,15 @@ public interface InterfaceDataTranslator extends ByteDataTranslator, JvppReplyCo } /** - * Checks whether provided {@link SwInterfaceDetails} is detail of sub-interface
  • subId == unique number of - * sub-interface within set of sub-interfaces of single interface
  • swIfIndex == unique index of - * interface/sub-interface within all interfaces
  • supSwIfIndex == unique index of parent interface
  • in case of - * interface , swIfIndex value equals supSwIfIndex
  • in case of subinterface, supSwIfIndex equals index of parent - * interface, swIfIndex is index of subinterface itselt + * Checks whether provided {@link SwInterfaceDetails} is detail of sub-interface
    + *
      + *
    • subId == unique number of sub-interface within set of sub-interfaces of single interface
      • + *
    • swIfIndex == unique index of interface/sub-interface within all interfaces
      • + *
    • supSwIfIndex == unique index of parent interface
      • + *
    • in case of interface , swIfIndex value equals supSwIfIndex
      • + *
    • in case of subinterface, supSwIfIndex equals index of parent interface, swIfIndex is index of + * subinterface itselt
      • + *
    */ default boolean isSubInterface(@Nonnull final SwInterfaceDetails elt) { //cant check by subId != 0, because you can pick 0 as value @@ -183,11 +187,15 @@ public interface InterfaceDataTranslator extends ByteDataTranslator, JvppReplyCo } /** - * Checks whether provided {@link SwInterfaceDetails} is detail of interface
  • subId == unique number of - * subinterface within set of subinterfaces of single interface
  • swIfIndex == unique index of - * interface/subinterface within all interfaces
  • supSwIfIndex == unique index of parent interface
  • in case of - * interface , swIfIndex value equals supSwIfIndex
  • in case of subinterface, supSwIfIndex equals index of parent - * interface, swIfIndex is index of subinterface itselt + * Checks whether provided {@link SwInterfaceDetails} is detail of interface
    + *
      + *
    • subId == unique number of subinterface within set of subinterfaces of single interface
      • + *
    • swIfIndex == unique index of interface/subinterface within all interfaces
      • + *
    • supSwIfIndex == unique index of parent interface
      • + *
    • in case of interface , swIfIndex value equals supSwIfIndex
      • + *
    • in case of subinterface, supSwIfIndex equals index of parent interface, swIfIndex is index + * of subinterface itselt
      • + *
    */ default boolean isRegularInterface(@Nonnull final SwInterfaceDetails elt) { return !isSubInterface(elt); diff --git a/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/notification/InterfaceChangeNotificationProducer.java b/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/notification/InterfaceChangeNotificationProducer.java index baf321a1c..8d4b93a8e 100644 --- a/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/notification/InterfaceChangeNotificationProducer.java +++ b/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/notification/InterfaceChangeNotificationProducer.java @@ -121,7 +121,7 @@ final class InterfaceChangeNotificationProducer implements ManagedNotificationPr * Get mapped name for the interface. Best effort only! The mapping might not yet be stored in context data tree * (write transaction is still in progress and context changes have not been committed yet, or VPP sends the * notification before it returns create request(that would store mapping)). - *

    + * * In case mapping is not available, index is used as name. */ private InterfaceNameOrIndex getIfcName(final SwInterfaceEvent swInterfaceEventNotification) { diff --git a/vpp-classifier/impl/pom.xml b/vpp-classifier/impl/pom.xml index 1b362c63a..662d42d5b 100644 --- a/vpp-classifier/impl/pom.xml +++ b/vpp-classifier/impl/pom.xml @@ -77,6 +77,11 @@ vpp-translate-utils ${project.version} + + javax.xml.bind + jaxb-api + 2.4.0-b180725.0427 + io.fd.hc2vpp.docs.core.mock.binding.MockBindingModule, @@ -78,15 +80,16 @@ org.apache.maven.plugins maven-compiler-plugin - 3.6.1 + 3.8.0 1.8 1.8 - org.codehaus.gmaven - groovy-maven-plugin + org.codehaus.gmavenplus + gmavenplus-plugin + ${maven.groovy.version} generate-coverage-doc @@ -95,13 +98,24 @@ execute - - io.fd.hc2vpp.docs.scripts.ApiDocsIndexGenerator.generate(project, log) - + + + + + org.codehaus.groovy + groovy-all + pom + ${groovy.version} + io.fd.hc2vpp.docs scripts diff --git a/vpp-integration/api-docs/scripts/pom.xml b/vpp-integration/api-docs/scripts/pom.xml index f9fa65d82..b1196fbda 100644 --- a/vpp-integration/api-docs/scripts/pom.xml +++ b/vpp-integration/api-docs/scripts/pom.xml @@ -26,9 +26,9 @@ ${project.artifactId} - 2.4.7 - 2.9.2-01 - 2.4.3-01 + 2.5.4 + 3.3.0-01 + 2.5.6-02 19.04-SNAPSHOT 4.11 @@ -46,6 +46,12 @@ org.codehaus.groovy groovy-all ${groovy.version} + pom + + + org.codehaus.groovy + groovy-templates + ${groovy.version} io.fd.jvpp @@ -174,7 +180,7 @@ org.apache.maven.plugins maven-dependency-plugin - 2.10 + 3.1.1 @@ -184,6 +190,7 @@ unpack-dependencies + pom **/honeycomb-minimal-resources/ ${project.build.outputDirectory}/ @@ -217,6 +224,11 @@ groovy-eclipse-batch ${groovy.eclipse.batch.version} + + org.codehaus.groovy + groovy-templates + ${groovy.version} + diff --git a/vpp-integration/api-docs/scripts/src/main/groovy/io/fd/hc2vpp/docs/scripts/ApiDocsIndexGenerator.groovy b/vpp-integration/api-docs/scripts/src/main/groovy/io/fd/hc2vpp/docs/scripts/ApiDocsIndexGenerator.groovy index 2c6b24f42..7c920f353 100644 --- a/vpp-integration/api-docs/scripts/src/main/groovy/io/fd/hc2vpp/docs/scripts/ApiDocsIndexGenerator.groovy +++ b/vpp-integration/api-docs/scripts/src/main/groovy/io/fd/hc2vpp/docs/scripts/ApiDocsIndexGenerator.groovy @@ -70,7 +70,7 @@ class ApiDocsIndexGenerator { .map { moduleName -> moduleName.trim() } .map { moduleName -> log.info "Loading class $moduleName" - loader.loadClass(moduleName).newInstance() + loader.loadClass(moduleName).getDeclaredConstructor().newInstance() } .collect(toList()) @@ -82,6 +82,7 @@ class ApiDocsIndexGenerator { ClassPathTypeIndex classPathIndex = new ClassPathTypeIndex(projectRoot) log.info "Generating VPP API to YANG mapping" + PLUGIN_CLASSES.stream() .forEach { pluginClass -> log.info "Generating mapping for ${pluginClass}" -- cgit 1.2.3-korg