diff options
| author |   Michal Cmarada <mcmarada@cisco.com> | 2019-04-11 04:18:16 -0400 |
|---|---|---|
| committer | Michal Cmarada <mcmarada@cisco.com> | 2019-04-11 04:18:16 -0400 |
| commit | 37039138afcddedb1af4035aae5fb6c603c4c4e1 (patch) | |
| tree | 50764c40df951b4e7bd4afa027ec86c346ad4075 | |
| parent | d726d0f173544c8d0078c5f918b5d086f6e85f79 (diff) | |
HC2VPP-397: add support for java 11
- dependency updates
- compilation error fixes
- javadoc fixes
Change-Id: Ic7371931b0728c888a39350a77c959121afb9786
Signed-off-by: Michal Cmarada <mcmarada@cisco.com>
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 @@ </dependency> <dependency> <groupId>org.hamcrest</groupId> - <artifactId>hamcrest-all</artifactId> + <artifactId>hamcrest</artifactId> <scope>test</scope> </dependency> <dependency> 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 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-dependency-plugin</artifactId> - <version>2.10</version> + <version>3.1.1</version> <executions> <execution> <id>copy-dependencies</id> @@ -105,8 +105,8 @@ </plugin> <!-- Generate module to yang provider index --> <plugin> - <groupId>org.codehaus.gmaven</groupId> - <artifactId>groovy-maven-plugin</artifactId> + <groupId>org.codehaus.gmavenplus</groupId> + <artifactId>gmavenplus-plugin</artifactId> <executions> <execution> <id>generate-yang-index</id> @@ -115,9 +115,14 @@ <goal>execute</goal> </goals> <configuration> - <source> - io.fd.honeycomb.common.scripts.ModuleYangIndexGenerator.generateIndexForPresentModules(project, log) - </source> + <scripts> + <script> + <![CDATA[ + import io.fd.honeycomb.common.scripts.ModuleYangIndexGenerator + ModuleYangIndexGenerator.generateIndexForPresentModules(project, log) + ]]> + </script> + </scripts> </configuration> </execution> </executions> 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 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-dependency-plugin</artifactId> - <version>2.10</version> + <version>3.1.1</version> <executions> <execution> <id>unpack-configuration</id> @@ -83,8 +83,8 @@ <!-- Generate shell script --> <!-- Extract modules started by distribution --> <plugin> - <groupId>org.codehaus.gmaven</groupId> - <artifactId>groovy-maven-plugin</artifactId> + <groupId>org.codehaus.gmavenplus</groupId> + <artifactId>gmavenplus-plugin</artifactId> <executions> <execution> <id>start-scripts-generation</id> @@ -93,9 +93,14 @@ <goal>execute</goal> </goals> <configuration> - <source> - io.fd.honeycomb.common.scripts.StartupScriptGenerator.generate(project, properties, log) - </source> + <scripts> + <script> + <![CDATA[ + import io.fd.honeycomb.common.scripts.StartupScriptGenerator + StartupScriptGenerator.generate(project, properties, log) + ]]> + </script> + </scripts> </configuration> </execution> <execution> @@ -107,9 +112,14 @@ <goal>execute</goal> </goals> <configuration> - <source> - io.fd.honeycomb.common.scripts.ModulesListGenerator.generate(project, properties, log) - </source> + <scripts> + <script> + <![CDATA[ + import io.fd.honeycomb.common.scripts.ModulesListGenerator + ModulesListGenerator.generate(project, log) + ]]> + </script> + </scripts> </configuration> </execution> <execution> @@ -119,9 +129,14 @@ <goal>execute</goal> </goals> <configuration> - <source> - io.fd.honeycomb.common.scripts.ModuleYangIndexGenerator.pairDistributionModulesWithYangModules(project, log) - </source> + <scripts> + <script> + <![CDATA[ + import io.fd.honeycomb.common.scripts.ModuleYangIndexGenerator + ModuleYangIndexGenerator.pairDistributionModulesWithYangModules(project, log) + ]]> + </script> + </scripts> </configuration> </execution> </executions> @@ -170,5 +185,15 @@ </plugin> </plugins> </pluginManagement> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-compiler-plugin</artifactId> + <configuration> + <source>1.8</source> + <target>1.8</target> + </configuration> + </plugin> + </plugins> </build> </project>
\ 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 @@ </dependency> <dependency> <groupId>org.hamcrest</groupId> - <artifactId>hamcrest-all</artifactId> + <artifactId>hamcrest</artifactId> <scope>test</scope> </dependency> <dependency> 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 @@ </dependency> <dependency> <groupId>org.hamcrest</groupId> - <artifactId>hamcrest-all</artifactId> + <artifactId>hamcrest</artifactId> <scope>test</scope> </dependency> <dependency> 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 @@ </dependency> <dependency> <groupId>org.hamcrest</groupId> - <artifactId>hamcrest-all</artifactId> + <artifactId>hamcrest</artifactId> <scope>test</scope> </dependency> 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 @@ </dependency> <dependency> <groupId>org.hamcrest</groupId> - <artifactId>hamcrest-all</artifactId> + <artifactId>hamcrest</artifactId> <scope>test</scope> </dependency> <dependency> 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 @@ </dependency> <dependency> <groupId>org.hamcrest</groupId> - <artifactId>hamcrest-all</artifactId> + <artifactId>hamcrest</artifactId> <scope>test</scope> </dependency> <dependency> 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 @@ </dependency> <dependency> <groupId>org.hamcrest</groupId> - <artifactId>hamcrest-all</artifactId> + <artifactId>hamcrest</artifactId> <scope>test</scope> </dependency> <dependency> 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 @@ </dependency> <dependency> <groupId>org.hamcrest</groupId> - <artifactId>hamcrest-all</artifactId> + <artifactId>hamcrest</artifactId> <scope>test</scope> </dependency> <dependency> 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 @@ <packaging>bundle</packaging> <properties> - <guice.version>4.1.0</guice.version> + <guice.version>4.2.2</guice.version> <guice.config.version>1.2.0</guice.config.version> </properties> @@ -62,7 +62,7 @@ </dependency> <dependency> <groupId>org.hamcrest</groupId> - <artifactId>hamcrest-all</artifactId> + <artifactId>hamcrest</artifactId> <scope>test</scope> </dependency> 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 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-dependency-plugin</artifactId> - <version>2.10</version> + <version>3.1.1</version> <executions> <execution> <id>unpack-configuration</id> 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 @@ </dependency> <dependency> <groupId>org.hamcrest</groupId> - <artifactId>hamcrest-all</artifactId> + <artifactId>hamcrest</artifactId> <scope>test</scope> </dependency> <dependency> 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 @@ <!-- Tests --> <dependency> <groupId>org.hamcrest</groupId> - <artifactId>hamcrest-all</artifactId> + <artifactId>hamcrest</artifactId> <scope>test</scope> </dependency> <dependency> 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 @@ </dependency> <dependency> <groupId>org.hamcrest</groupId> - <artifactId>hamcrest-all</artifactId> + <artifactId>hamcrest</artifactId> <scope>test</scope> </dependency> </dependencies> 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<br> <li>subId == unique number of - * sub-interface within set of sub-interfaces of single interface <li>swIfIndex == unique index of - * interface/sub-interface within all interfaces <li>supSwIfIndex == unique index of parent interface <li>in case of - * interface , swIfIndex value equals supSwIfIndex <li>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<br> + * <ul> + * <li>subId == unique number of sub-interface within set of sub-interfaces of single interface</li> + * <li>swIfIndex == unique index of interface/sub-interface within all interfaces</li> + * <li>supSwIfIndex == unique index of parent interface</li> + * <li>in case of interface , swIfIndex value equals supSwIfIndex</li> + * <li>in case of subinterface, supSwIfIndex equals index of parent interface, swIfIndex is index of + * subinterface itselt</li> + * </ul> */ 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<br> <li>subId == unique number of - * subinterface within set of subinterfaces of single interface <li>swIfIndex == unique index of - * interface/subinterface within all interfaces <li>supSwIfIndex == unique index of parent interface <li>in case of - * interface , swIfIndex value equals supSwIfIndex <li>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<br> + * <ul> + * <li>subId == unique number of subinterface within set of subinterfaces of single interface</li> + * <li>swIfIndex == unique index of interface/subinterface within all interfaces</li> + * <li>supSwIfIndex == unique index of parent interface</li> + * <li>in case of interface , swIfIndex value equals supSwIfIndex</li> + * <li>in case of subinterface, supSwIfIndex equals index of parent interface, swIfIndex is index + * of subinterface itselt</li> + * </ul> */ 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)). - * <p/> + * * 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 @@ <artifactId>vpp-translate-utils</artifactId> <version>${project.version}</version> </dependency> + <dependency> + <groupId>javax.xml.bind</groupId> + <artifactId>jaxb-api</artifactId> + <version>2.4.0-b180725.0427</version> + </dependency> <!-- TODO - HC2VPP-97 change once interfaces-impl once modules present @@ -123,7 +128,7 @@ </dependency> <dependency> <groupId>org.hamcrest</groupId> - <artifactId>hamcrest-all</artifactId> + <artifactId>hamcrest</artifactId> <scope>test</scope> </dependency> </dependencies> diff --git a/vpp-common/vpp-common-integration/pom.xml b/vpp-common/vpp-common-integration/pom.xml index 4c96405fd..f56773885 100644 --- a/vpp-common/vpp-common-integration/pom.xml +++ b/vpp-common/vpp-common-integration/pom.xml @@ -31,7 +31,7 @@ <properties> <jvpp.version>19.04-SNAPSHOT</jvpp.version> - <hamcrest.version>1.3</hamcrest.version> + <hamcrest.version>2.1</hamcrest.version> </properties> <build> @@ -111,7 +111,7 @@ </dependency> <dependency> <groupId>org.hamcrest</groupId> - <artifactId>hamcrest-all</artifactId> + <artifactId>hamcrest</artifactId> <version>${hamcrest.version}</version> <scope>test</scope> </dependency> diff --git a/vpp-common/vpp-translate-test/src/main/java/io/fd/hc2vpp/common/test/read/JvppDumpExecutorTest.java b/vpp-common/vpp-translate-test/src/main/java/io/fd/hc2vpp/common/test/read/JvppDumpExecutorTest.java index 45c28aace..88a012641 100644 --- a/vpp-common/vpp-translate-test/src/main/java/io/fd/hc2vpp/common/test/read/JvppDumpExecutorTest.java +++ b/vpp-common/vpp-translate-test/src/main/java/io/fd/hc2vpp/common/test/read/JvppDumpExecutorTest.java @@ -61,6 +61,11 @@ public abstract class JvppDumpExecutorTest<T extends EntityDumpExecutor<?, ?>> i /** * Return pre-stubed mock that will throw {@link TimeoutException}, * while performing desired method + * + * @return pre-stubed mock that will throw {@link TimeoutException} + * @throws InterruptedException when the operation is interrupted + * @throws ExecutionException when execution fails + * @throws TimeoutException when timeout occurs */ protected FutureJVppCore doThrowTimeoutExceptionWhen() throws InterruptedException, ExecutionException, TimeoutException { @@ -76,6 +81,8 @@ public abstract class JvppDumpExecutorTest<T extends EntityDumpExecutor<?, ?>> i /** * Return pre-stubed mock that will throw {@link VppInvocationException}, * while performing desired method + * + * @return pre-stubed mock that will throw {@link VppInvocationException} */ protected FutureJVppCore doThrowFailExceptionWhen() { return doReturn(failedFuture()).when(api); @@ -84,6 +91,9 @@ public abstract class JvppDumpExecutorTest<T extends EntityDumpExecutor<?, ?>> i /** * Return pre-stubed mock that will return specified result * while performing desired method + * + * @param replyDump type of reply dump + * @return pre-stubed mock that will return specified result */ protected <U> FutureJVppCore doReturnResponseWhen(U replyDump) { return doReturn(future(replyDump)).when(api); diff --git a/vpp-common/vpp-translate-test/src/main/java/io/fd/hc2vpp/common/test/util/FutureProducer.java b/vpp-common/vpp-translate-test/src/main/java/io/fd/hc2vpp/common/test/util/FutureProducer.java index b2771239d..7e1599704 100644 --- a/vpp-common/vpp-translate-test/src/main/java/io/fd/hc2vpp/common/test/util/FutureProducer.java +++ b/vpp-common/vpp-translate-test/src/main/java/io/fd/hc2vpp/common/test/util/FutureProducer.java @@ -33,6 +33,7 @@ public interface FutureProducer { * * @param result returned when {@link CompletableFuture#get()} is invoked * @param <T> the result type of returned future + * @return {@link CompletableFuture} with desired result */ default <T> CompletableFuture<T> future(@Nonnull final T result) { final CompletableFuture<T> future = new CompletableFuture<>(); @@ -45,6 +46,7 @@ public interface FutureProducer { * * @param exception to be thrown when {@link CompletableFuture#get()} is invoked * @param <T> the result type of returned future + * @return {@link CompletableFuture} with provided {@link Exception} as a result */ default <T> CompletableFuture<T> failedFuture(@Nonnull final Exception exception) { final CompletableFuture<T> future = new CompletableFuture<>(); @@ -56,6 +58,7 @@ public interface FutureProducer { * Returns {@link CompletableFuture} with VppCallbackException(retval = -1) as a cause. * * @param <T> the result type of returned future + * @return {@link CompletableFuture} with VppCallbackException(retval = -1) as a cause */ default <T> CompletableFuture<T> failedFuture() { return failedFuture(new VppCallbackException("test-call", "test error msg", 1 /* ctxId */, -1 /* retval */)); diff --git a/vpp-common/vpp-translate-test/src/main/java/io/fd/hc2vpp/common/test/util/NamingContextHelper.java b/vpp-common/vpp-translate-test/src/main/java/io/fd/hc2vpp/common/test/util/NamingContextHelper.java index f4f9790c2..5273a5a6b 100644 --- a/vpp-common/vpp-translate-test/src/main/java/io/fd/hc2vpp/common/test/util/NamingContextHelper.java +++ b/vpp-common/vpp-translate-test/src/main/java/io/fd/hc2vpp/common/test/util/NamingContextHelper.java @@ -35,7 +35,7 @@ import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; import org.opendaylight.yangtools.yang.binding.KeyedInstanceIdentifier; /** - * Utility that helps stubbing {@link io.fd.hc2vpp.common.translate.util.NamingContext} methods. + * Utility that helps stubbing {@link NamingContext} methods. */ // TODO(HONEYCOMB-226): the class needs to be refactored or even removed after extracting interface from NamingContext public interface NamingContextHelper { @@ -86,7 +86,7 @@ public interface NamingContextHelper { } /** - * Stubs {@link MappingContext#read} for given {@link NamingContext} to return {@link Optional#absent} for provided + * Stubs {@link MappingContext#read} for given {@link NamingContext} to return {@link Optional#empty} for provided * name. * * @param mappingContext mock instance of {@link MappingContext} diff --git a/vpp-common/vpp-translate-test/src/main/java/io/fd/hc2vpp/common/test/write/WriterCustomizerTest.java b/vpp-common/vpp-translate-test/src/main/java/io/fd/hc2vpp/common/test/write/WriterCustomizerTest.java index 6a8fc2410..7edb964cc 100644 --- a/vpp-common/vpp-translate-test/src/main/java/io/fd/hc2vpp/common/test/write/WriterCustomizerTest.java +++ b/vpp-common/vpp-translate-test/src/main/java/io/fd/hc2vpp/common/test/write/WriterCustomizerTest.java @@ -57,6 +57,8 @@ public abstract class WriterCustomizerTest implements FutureProducer, /** * Optional setup for subclasses. Invoked after parent initialization. + * + * @throws Exception unspecified exception while setting up tests */ protected void setUpTest() throws Exception { // this method would normally trigger this warning while compiling: diff --git a/vpp-common/vpp-translate-utils/pom.xml b/vpp-common/vpp-translate-utils/pom.xml index 0d87515a6..ae49ca563 100644 --- a/vpp-common/vpp-translate-utils/pom.xml +++ b/vpp-common/vpp-translate-utils/pom.xml @@ -94,7 +94,7 @@ </dependency> <dependency> <groupId>org.hamcrest</groupId> - <artifactId>hamcrest-all</artifactId> + <artifactId>hamcrest</artifactId> <scope>test</scope> </dependency> </dependencies> diff --git a/vpp-common/vpp-translate-utils/src/main/java/io/fd/hc2vpp/common/translate/util/TagRewriteOperation.java b/vpp-common/vpp-translate-utils/src/main/java/io/fd/hc2vpp/common/translate/util/TagRewriteOperation.java index 32b2b16cd..25c7862b2 100644 --- a/vpp-common/vpp-translate-utils/src/main/java/io/fd/hc2vpp/common/translate/util/TagRewriteOperation.java +++ b/vpp-common/vpp-translate-utils/src/main/java/io/fd/hc2vpp/common/translate/util/TagRewriteOperation.java @@ -23,7 +23,7 @@ import javax.annotation.Nullable; /** * Defines vlan tag rewrite config options for VPP. - * <p/> + * * TODO HONEYCOMB-184 corresponding enum (defined in l2_vtr.h) should be defined in vpe.api * (does vpp's IDL support enum type definition?) * which would allow to generate this class in jvpp diff --git a/vpp-integration/api-docs/core/pom.xml b/vpp-integration/api-docs/core/pom.xml index 5df6324e8..b36c901ab 100644 --- a/vpp-integration/api-docs/core/pom.xml +++ b/vpp-integration/api-docs/core/pom.xml @@ -33,8 +33,8 @@ <properties> <mockito-core.version>2.2.9</mockito-core.version> <junit.version>4.11</junit.version> - <guice.version>4.1.0</guice.version> - <asm.version>5.2</asm.version> + <guice.version>4.2.2</guice.version> + <asm.version>7.0</asm.version> <asciidoctorj.version>1.5.4</asciidoctorj.version> <slf4j-simple.version>1.7.25</slf4j-simple.version> <jvpp.version>19.04-SNAPSHOT</jvpp.version> diff --git a/vpp-integration/api-docs/core/src/main/java/io/fd/hc2vpp/docs/core/MethodDelegatingClassVisitor.java b/vpp-integration/api-docs/core/src/main/java/io/fd/hc2vpp/docs/core/MethodDelegatingClassVisitor.java index 39a06e626..47c605a1e 100644 --- a/vpp-integration/api-docs/core/src/main/java/io/fd/hc2vpp/docs/core/MethodDelegatingClassVisitor.java +++ b/vpp-integration/api-docs/core/src/main/java/io/fd/hc2vpp/docs/core/MethodDelegatingClassVisitor.java @@ -35,7 +35,7 @@ public class MethodDelegatingClassVisitor extends ClassVisitor { String reference, Set<PluginMethodReference> foundReferences, Set<String> allreadyProcessedLocalMethods) { - super(Opcodes.ASM5); + super(Opcodes.ASM7); this.currentClass = currentClass; this.methodName = methodName; this.reference = reference; diff --git a/vpp-integration/api-docs/core/src/main/java/io/fd/hc2vpp/docs/core/MethodPluginCoverageVisitor.java b/vpp-integration/api-docs/core/src/main/java/io/fd/hc2vpp/docs/core/MethodPluginCoverageVisitor.java index fe15f5e79..a1e7a61ed 100644 --- a/vpp-integration/api-docs/core/src/main/java/io/fd/hc2vpp/docs/core/MethodPluginCoverageVisitor.java +++ b/vpp-integration/api-docs/core/src/main/java/io/fd/hc2vpp/docs/core/MethodPluginCoverageVisitor.java @@ -38,7 +38,7 @@ public class MethodPluginCoverageVisitor extends MethodVisitor { public MethodPluginCoverageVisitor(String currentClass, Set<PluginMethodReference> foundReferences, String reference, Set<String> allreadyProcessedLocal) { - super(Opcodes.ASM5); + super(Opcodes.ASM7); this.currentClass = currentClass; this.foundReferences = foundReferences; this.reference = reference; diff --git a/vpp-integration/api-docs/docs/pom.xml b/vpp-integration/api-docs/docs/pom.xml index 018578ee8..38ad96707 100644 --- a/vpp-integration/api-docs/docs/pom.xml +++ b/vpp-integration/api-docs/docs/pom.xml @@ -26,6 +26,8 @@ <name>${project.artifactId}</name> <properties> + <maven.groovy.version>1.6.2</maven.groovy.version> + <groovy.version>2.5.4</groovy.version> <!-- List of modules that are used to extract Writer/Reader factories, and therefore generate api documentation --> <api.docs.modules> io.fd.hc2vpp.docs.core.mock.binding.MockBindingModule, @@ -78,15 +80,16 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-compiler-plugin</artifactId> - <version>3.6.1</version> + <version>3.8.0</version> <configuration> <source>1.8</source> <target>1.8</target> </configuration> </plugin> <plugin> - <groupId>org.codehaus.gmaven</groupId> - <artifactId>groovy-maven-plugin</artifactId> + <groupId>org.codehaus.gmavenplus</groupId> + <artifactId>gmavenplus-plugin</artifactId> + <version>${maven.groovy.version}</version> <executions> <execution> <id>generate-coverage-doc</id> @@ -95,14 +98,25 @@ <goal>execute</goal> </goals> <configuration> - <source> - io.fd.hc2vpp.docs.scripts.ApiDocsIndexGenerator.generate(project, log) - </source> + <scripts> + <script> + <![CDATA[ + import io.fd.hc2vpp.docs.scripts.ApiDocsIndexGenerator + ApiDocsIndexGenerator.generate(project, log) + ]]> + </script> + </scripts> </configuration> </execution> </executions> <dependencies> <dependency> + <groupId>org.codehaus.groovy</groupId> + <artifactId>groovy-all</artifactId> + <type>pom</type> + <version>${groovy.version}</version> + </dependency> + <dependency> <groupId>io.fd.hc2vpp.docs</groupId> <artifactId>scripts</artifactId> <version>${project.version}</version> 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 @@ <name>${project.artifactId}</name> <properties> - <groovy.version>2.4.7</groovy.version> - <groovy.eclipse.compiler.version>2.9.2-01</groovy.eclipse.compiler.version> - <groovy.eclipse.batch.version>2.4.3-01</groovy.eclipse.batch.version> + <groovy.version>2.5.4</groovy.version> + <groovy.eclipse.compiler.version>3.3.0-01</groovy.eclipse.compiler.version> + <groovy.eclipse.batch.version>2.5.6-02</groovy.eclipse.batch.version> <jvpp.version>19.04-SNAPSHOT</jvpp.version> <junit.version>4.11</junit.version> @@ -46,6 +46,12 @@ <groupId>org.codehaus.groovy</groupId> <artifactId>groovy-all</artifactId> <version>${groovy.version}</version> + <type>pom</type> + </dependency> + <dependency> + <groupId>org.codehaus.groovy</groupId> + <artifactId>groovy-templates</artifactId> + <version>${groovy.version}</version> </dependency> <dependency> <groupId>io.fd.jvpp</groupId> @@ -174,7 +180,7 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-dependency-plugin</artifactId> - <version>2.10</version> + <version>3.1.1</version> <executions> <!-- Dependencies are copied by parent project --> <execution> @@ -184,6 +190,7 @@ <goal>unpack-dependencies</goal> </goals> <configuration> + <excludeTypes>pom</excludeTypes> <includes>**/honeycomb-minimal-resources/</includes> <outputDirectory>${project.build.outputDirectory}/</outputDirectory> </configuration> @@ -217,6 +224,11 @@ <artifactId>groovy-eclipse-batch</artifactId> <version>${groovy.eclipse.batch.version}</version> </dependency> + <dependency> + <groupId>org.codehaus.groovy</groupId> + <artifactId>groovy-templates</artifactId> + <version>${groovy.version}</version> + </dependency> </dependencies> </plugin> </plugins> 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}" |