From 6f402b1da43c34457220ee3666d8434e4a6d0df8 Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Thu, 13 Aug 2026 00:50:58 +0200 Subject: [PATCH 1/3] Fix modernization warnings Upgraded modernizer is flagging a number of violations, fix them up. Change-Id: Ibcbaa8024a5ddadac6a458d41625103846ce0010 Signed-off-by: Robert Varga --- .../dsbackend/DataStoreBackEndTest.java | 6 ++--- .../LispMappingServiceTest.java | 7 +++-- .../implementation/MappingSystemTest.java | 26 +++++++++---------- .../implementation/lisp/MapResolverTest.java | 13 +++++----- .../implementation/lisp/MapServerTest.java | 25 +++++++----------- .../mdsal/MappingDataListenerTest.java | 19 +++++++------- .../util/LispNotificationHelperTest.java | 8 +++--- .../lisp/util/MapRequestUtilTest.java | 13 +++++----- .../southbound/LispSouthboundRpcTest.java | 8 +++--- .../AuthenticationKeyDataListenerTest.java | 12 ++++----- .../lisp/LispXtrSouthboundHandlerTest.java | 9 +++---- 11 files changed, 67 insertions(+), 79 deletions(-) diff --git a/mappingservice/dsbackend/src/test/java/org/opendaylight/lispflowmapping/dsbackend/DataStoreBackEndTest.java b/mappingservice/dsbackend/src/test/java/org/opendaylight/lispflowmapping/dsbackend/DataStoreBackEndTest.java index 69b9a430..41e08c4a 100644 --- a/mappingservice/dsbackend/src/test/java/org/opendaylight/lispflowmapping/dsbackend/DataStoreBackEndTest.java +++ b/mappingservice/dsbackend/src/test/java/org/opendaylight/lispflowmapping/dsbackend/DataStoreBackEndTest.java @@ -11,10 +11,10 @@ import static org.junit.Assert.assertEquals; import com.google.common.util.concurrent.FluentFuture; import java.util.ArrayList; +import java.util.HexFormat; import java.util.LinkedHashMap; import java.util.Map; import java.util.Optional; -import javax.xml.bind.DatatypeConverter; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; @@ -161,7 +161,7 @@ public class DataStoreBackEndTest { XtrIdMappingKey xtrIdResult = iidCaptorXtrIdMapping.getValue().firstKeyOf(XtrIdMapping.class); MappingKey mappingResult = iidCaptorXtrIdMapping.getValue().firstKeyOf(Mapping.class); - assertEquals(DatatypeConverter.printHexBinary(XTR_ID), xtrIdResult.getXtrIdUri().getValue()); + assertEquals(HexFormat.of().withUpperCase().formatHex(XTR_ID), xtrIdResult.getXtrIdUri().getValue()); assertEquals(MappingOrigin.Southbound, mappingResult.getOrigin()); assertEquals("ipv4:" + IPV4_STRING_1, mappingResult.getEidUri().getValue()); } @@ -217,7 +217,7 @@ public class DataStoreBackEndTest { XtrIdMappingKey xtrIdResult = iidCaptorXtrIdMapping.getValue().firstKeyOf(XtrIdMapping.class); MappingKey mappingResult = iidCaptorXtrIdMapping.getValue().firstKeyOf(Mapping.class); - assertEquals(DatatypeConverter.printHexBinary(XTR_ID), xtrIdResult.getXtrIdUri().getValue()); + assertEquals(HexFormat.of().withUpperCase().formatHex(XTR_ID), xtrIdResult.getXtrIdUri().getValue()); assertEquals(MappingOrigin.Southbound, mappingResult.getOrigin()); assertEquals("ipv4:" + IPV4_STRING_1, mappingResult.getEidUri().getValue()); } diff --git a/mappingservice/implementation/src/test/java/org/opendaylight/lispflowmapping/implementation/LispMappingServiceTest.java b/mappingservice/implementation/src/test/java/org/opendaylight/lispflowmapping/implementation/LispMappingServiceTest.java index 3de8ba08..26751797 100644 --- a/mappingservice/implementation/src/test/java/org/opendaylight/lispflowmapping/implementation/LispMappingServiceTest.java +++ b/mappingservice/implementation/src/test/java/org/opendaylight/lispflowmapping/implementation/LispMappingServiceTest.java @@ -10,7 +10,6 @@ package org.opendaylight.lispflowmapping.implementation; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNull; -import com.google.common.collect.Lists; import java.lang.reflect.Field; import java.util.ArrayList; import java.util.List; @@ -283,7 +282,7 @@ public class LispMappingServiceTest { final Rloc subscriber = LispAddressUtil.asIpv4Rloc(IPV4_STRING_1); Mockito.when(mapRequest.getSourceEid()).thenReturn(new SourceEidBuilder().setEid(IPV4_SOURCE_EID).build()); - Mockito.when(mapRequest.getEidItem()).thenReturn(Lists.newArrayList(EID_ITEM_BUILDER.build())); + Mockito.when(mapRequest.getEidItem()).thenReturn(List.of(EID_ITEM_BUILDER.build())); // result final SendMapRequestInputBuilder smrib = new SendMapRequestInputBuilder() @@ -391,12 +390,12 @@ public class LispMappingServiceTest { private static Pair> getDefaultMapNotifyPair() { final MapNotify mapNotify = new MapNotifyBuilder().setKeyId((short) 1).build(); - return new MutablePair<>(mapNotify, Lists.newArrayList(TRANSPORT_ADDRESS_1, TRANSPORT_ADDRESS_2)); + return new MutablePair<>(mapNotify, List.of(TRANSPORT_ADDRESS_1, TRANSPORT_ADDRESS_2)); } private static Pair getDefaultMapRequestPair() { final MapRequestBuilder mapRequestBuilder = new MapRequestBuilder() - .setEidItem(Lists.newArrayList(EID_ITEM_BUILDER.build())); + .setEidItem(List.of(EID_ITEM_BUILDER.build())); return new ImmutablePair<>(mapRequestBuilder.build(), TRANSPORT_ADDRESS_1); } diff --git a/mappingservice/implementation/src/test/java/org/opendaylight/lispflowmapping/implementation/MappingSystemTest.java b/mappingservice/implementation/src/test/java/org/opendaylight/lispflowmapping/implementation/MappingSystemTest.java index f129a0e7..95fc12d3 100644 --- a/mappingservice/implementation/src/test/java/org/opendaylight/lispflowmapping/implementation/MappingSystemTest.java +++ b/mappingservice/implementation/src/test/java/org/opendaylight/lispflowmapping/implementation/MappingSystemTest.java @@ -11,10 +11,10 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNull; import static org.junit.Assert.assertTrue; -import com.google.common.collect.Lists; import java.lang.reflect.Field; import java.net.InetAddress; import java.net.UnknownHostException; +import java.util.ArrayList; import java.util.Arrays; import java.util.Date; import java.util.EnumMap; @@ -210,7 +210,7 @@ public class MappingSystemTest { @Test public void getMappingTest_NbFirst_withServicePathDestinationAddress_multipleLocatorRecords() { final MappingRecord mappingRecord = getDefaultMappingRecordBuilder() - .setLocatorRecord(Lists.newArrayList( + .setLocatorRecord(List.of( // set two locators getDefaultLocatorRecordBuilder().build(), getDefaultLocatorRecordBuilder().build())).build(); @@ -227,7 +227,7 @@ public class MappingSystemTest { @Test public void getMappingTest_NbFirst_withServicePathDestinationAddress_singleIpv4LocatorRecord() { final MappingRecord mappingRecord = getDefaultMappingRecordBuilder() - .setLocatorRecord(Lists.newArrayList( + .setLocatorRecord(List.of( // Ipv4 type Rloc getDefaultLocatorRecordBuilder().build())).build(); final MappingData mappingData = getDefaultMappingData(mappingRecord); @@ -243,7 +243,7 @@ public class MappingSystemTest { @Test public void getMappingTest_NbFirst_withServicePathDestinationAddress_singleELPLocatorRecord_IndexOutOfBounds() { final MappingRecord mappingRecord = getDefaultMappingRecordBuilder() - .setLocatorRecord(Lists.newArrayList( + .setLocatorRecord(List.of( getDefaultLocatorRecordBuilder() .setRloc(getELPTypeRloc()).build())).build(); final MappingData mappingData = getDefaultMappingData(mappingRecord); @@ -260,7 +260,7 @@ public class MappingSystemTest { public void getMappingTest_NbFirst_withServicePathDestinationAddress_singleELPLocatorRecord() throws UnknownHostException { final MappingRecord mappingRecord = getDefaultMappingRecordBuilder() - .setLocatorRecord(Lists.newArrayList( + .setLocatorRecord(List.of( getDefaultLocatorRecordBuilder() .setRloc(getELPTypeRloc()).build())).build(); final MappingData mappingData = getDefaultMappingData(mappingRecord); @@ -279,7 +279,7 @@ public class MappingSystemTest { @Test public void getMappingTest_NbFirst_withServicePathDestinationAddress_IpPrefixLocatorRecord() { final MappingRecord mappingRecord = getDefaultMappingRecordBuilder() - .setLocatorRecord(Lists.newArrayList( + .setLocatorRecord(List.of( getDefaultLocatorRecordBuilder() .setRloc(getIpPrefixTypeRloc()).build())).build(); final MappingData mappingData = getDefaultMappingData(mappingRecord); @@ -294,7 +294,7 @@ public class MappingSystemTest { @Test public void getMappingTest_NbFirst() { final MappingRecord mappingRecord = getDefaultMappingRecordBuilder() - .setLocatorRecord(Lists.newArrayList( + .setLocatorRecord(List.of( getDefaultLocatorRecordBuilder().build())).build(); final MappingData mappingData = getDefaultMappingData(mappingRecord); Mockito.when(pmcMock.getMapping(EID_IPV4_SRC, EID_IPV4_DST)).thenReturn(mappingData); @@ -323,7 +323,7 @@ public class MappingSystemTest { IllegalAccessException { setLookupPolicy(IMappingService.LookupPolicy.NB_AND_SB); final MappingRecord mappingRecord = getDefaultMappingRecordBuilder() - .setLocatorRecord(Lists.newArrayList( + .setLocatorRecord(List.of( // Ipv4 type Rloc getDefaultLocatorRecordBuilder().build())).build(); final MappingData mappingData = getDefaultMappingData(mappingRecord); @@ -342,7 +342,7 @@ public class MappingSystemTest { setLookupPolicy(IMappingService.LookupPolicy.NB_AND_SB); final MappingRecord mappingRecord = getDefaultMappingRecordBuilder() - .setLocatorRecord(Lists.newArrayList( + .setLocatorRecord(List.of( // Ipv4 type Rloc getDefaultLocatorRecordBuilder().build())).build(); MappingData nbMappingData = getDefaultMappingData(mappingRecord); @@ -372,7 +372,7 @@ public class MappingSystemTest { setLookupPolicy(IMappingService.LookupPolicy.NB_AND_SB); final MappingRecord mappingRecord = getDefaultMappingRecordBuilder() - .setLocatorRecord(Lists.newArrayList( + .setLocatorRecord(List.of( getDefaultLocatorRecordBuilder().build())).build(); final MappingData nbMappingData = getDefaultMappingData(mappingRecord); final MappingData sbMappingData = getDefaultMappingData(mappingRecord); @@ -483,8 +483,8 @@ public class MappingSystemTest { .setMappingAuthkey(mappingAuthkey_2) .setEid(EID_IPV4_2).build(); - final List mappings = Lists.newArrayList(mapping_1, mapping_2); - final List authenticationKeys = Lists.newArrayList(authenticationKey_1, authenticationKey_2); + final List mappings = new ArrayList<>(Arrays.asList(mapping_1, mapping_2)); + final List authenticationKeys = List.of(authenticationKey_1, authenticationKey_2); Mockito.when(dsbeMock.getLastUpdateTimestamp()).thenReturn(System.currentTimeMillis()); Mockito.when(dsbeMock.getAllMappings(LogicalDatastoreType.CONFIGURATION)).thenReturn(mappings); @@ -617,7 +617,7 @@ public class MappingSystemTest { final ExplicitLocatorPath explicitLocatorPath = new ExplicitLocatorPathBuilder().setExplicitLocatorPath(new org .opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp.address.types.rev151105.lisp.address .address.explicit.locator.path.ExplicitLocatorPathBuilder() - .setHop(Lists.newArrayList(HOP_1, HOP_2, HOP_3)).build()).build(); + .setHop(List.of(HOP_1, HOP_2, HOP_3)).build()).build(); return new RlocBuilder() .setAddress(explicitLocatorPath) diff --git a/mappingservice/implementation/src/test/java/org/opendaylight/lispflowmapping/implementation/lisp/MapResolverTest.java b/mappingservice/implementation/src/test/java/org/opendaylight/lispflowmapping/implementation/lisp/MapResolverTest.java index 7d370d5f..e6c4f469 100644 --- a/mappingservice/implementation/src/test/java/org/opendaylight/lispflowmapping/implementation/lisp/MapResolverTest.java +++ b/mappingservice/implementation/src/test/java/org/opendaylight/lispflowmapping/implementation/lisp/MapResolverTest.java @@ -9,7 +9,6 @@ package org.opendaylight.lispflowmapping.implementation.lisp; import static org.junit.Assert.assertEquals; -import com.google.common.collect.Lists; import java.util.ArrayList; import java.util.List; import java.util.Set; @@ -225,7 +224,7 @@ public class MapResolverTest { // ---------------------- // with sourceRloc = null - List itrRlocList = Lists.newArrayList( + List itrRlocList = List.of( newItrRloc(MacAfi.VALUE, null), newItrRloc(Ipv4BinaryAfi.VALUE, IPV4_ADDRESS)); @@ -237,7 +236,7 @@ public class MapResolverTest { // ---------------------- // with sourceRloc address = itrRloc address - itrRlocList = Lists.newArrayList( + itrRlocList = List.of( newItrRloc(MacAfi.VALUE, null), newItrRloc(Ipv4BinaryAfi.VALUE, IPV4_ADDRESS)); @@ -252,7 +251,7 @@ public class MapResolverTest { // ---------------------- // with sourceRloc address Afi = itrRloc address Afi (for Ipv4) - itrRlocList = Lists.newArrayList( + itrRlocList = List.of( newItrRloc(MacAfi.VALUE, null), newItrRloc(Ipv6Afi.VALUE, IPV6_ADDRESS), newItrRloc(Ipv4Afi.VALUE, IPV4_ADDRESS)); @@ -268,7 +267,7 @@ public class MapResolverTest { // ---------------------- // with sourceRloc address Afi = itrRloc address Afi (for Ipv6) - itrRlocList = Lists.newArrayList( + itrRlocList = List.of( newItrRloc(MacAfi.VALUE, null), newItrRloc(Ipv6Afi.VALUE, IPV6_ADDRESS), newItrRloc(Ipv4Afi.VALUE, IPV4_ADDRESS)); @@ -285,7 +284,7 @@ public class MapResolverTest { // ---------------------- // with no common ip address nor Afi final Mac mac = new MacBuilder().setMac(new MacAddress("aa:bb:cc:dd:ee:ff")).build(); - itrRlocList = Lists.newArrayList( + itrRlocList = List.of( newItrRloc(MacAfi.VALUE, mac), newItrRloc(NoAddressAfi.VALUE, Mockito.mock(NoAddress.class))); @@ -499,7 +498,7 @@ public class MapResolverTest { Mockito.verify(lispMappingServiceMock).handleMapReply(mapReplyBuilder.build()); } - private static ItrRloc newItrRloc(LispAddressFamily clazz, Address address) { + private static ItrRloc newItrRloc(final LispAddressFamily clazz, final Address address) { return new ItrRlocBuilder().setRloc(new RlocBuilder() .setAddress(address) .setAddressType(clazz).build()).build(); diff --git a/mappingservice/implementation/src/test/java/org/opendaylight/lispflowmapping/implementation/lisp/MapServerTest.java b/mappingservice/implementation/src/test/java/org/opendaylight/lispflowmapping/implementation/lisp/MapServerTest.java index 5a96f03f..370fe765 100644 --- a/mappingservice/implementation/src/test/java/org/opendaylight/lispflowmapping/implementation/lisp/MapServerTest.java +++ b/mappingservice/implementation/src/test/java/org/opendaylight/lispflowmapping/implementation/lisp/MapServerTest.java @@ -9,9 +9,6 @@ package org.opendaylight.lispflowmapping.implementation.lisp; import static org.junit.Assert.assertEquals; -import com.google.common.collect.ImmutableSet; -import com.google.common.collect.Lists; -import com.google.common.collect.Sets; import java.lang.reflect.Field; import java.util.ArrayList; import java.util.Date; @@ -153,9 +150,9 @@ public class MapServerTest { .setRloc(RLOC_2).build(); private static final MappingRecord OLD_MAPPING_RECORD_1 = getDefaultMappingRecordBuilder() - .setLocatorRecord(Lists.newArrayList(LOCATOR_RECORD_1)).build(); + .setLocatorRecord(List.of(LOCATOR_RECORD_1)).build(); private static final MappingRecord OLD_MAPPING_RECORD_2 = getDefaultMappingRecordBuilder() - .setLocatorRecord(Lists.newArrayList(LOCATOR_RECORD_2)).build(); + .setLocatorRecord(List.of(LOCATOR_RECORD_2)).build(); private static final MappingData OLD_MAPPING_DATA_1 = new MappingData(OLD_MAPPING_RECORD_1); private static final MappingData OLD_MAPPING_DATA_2 = new MappingData(OLD_MAPPING_RECORD_2); @@ -237,7 +234,7 @@ public class MapServerTest { Mockito.when(subscriber1.timedOut()).thenReturn(true); Mockito.when(subscriber1.toString()).thenReturn("sub1"); - final Set set1 = Sets.newHashSet(subscriber1); + final Set set1 = Set.of(subscriber1); Mockito.when(mapService.getAuthenticationKey(IPV4_PREFIX_EID_1)).thenReturn(MAPPING_AUTHKEY); Mockito.when(mapService.getData(MappingOrigin.Southbound, IPV4_PREFIX_EID_1, SubKeys.SRC_RLOCS)) @@ -374,7 +371,7 @@ public class MapServerTest { return getDefaultMappingRecordItemBuilder(IPV4_EID_1); } - private static MappingRecordItemBuilder getDefaultMappingRecordItemBuilder(Eid eid) { + private static MappingRecordItemBuilder getDefaultMappingRecordItemBuilder(final Eid eid) { return new MappingRecordItemBuilder() .setMappingRecordItemId("mapping-record-item-id") .withKey(new MappingRecordItemKey("mapping-record-item-key")) @@ -385,7 +382,7 @@ public class MapServerTest { return getDefaultMappingRecordBuilder(IPV4_EID_1); } - private static MappingRecordBuilder getDefaultMappingRecordBuilder(Eid eid) { + private static MappingRecordBuilder getDefaultMappingRecordBuilder(final Eid eid) { return new MappingRecordBuilder() .setAction(MappingRecord.Action.NoAction) .setAuthoritative(false) @@ -395,7 +392,7 @@ public class MapServerTest { .setEid(eid); } - private static MapNotifyBuilder getDefaultMapNotifyBuilder(MapRegister mr) { + private static MapNotifyBuilder getDefaultMapNotifyBuilder(final MapRegister mr) { final MapNotifyBuilder mapNotifyBuilder = new MapNotifyBuilder() .setXtrSiteIdPresent(mr.getXtrSiteIdPresent()) .setSiteId(mr.getSiteId()) @@ -410,7 +407,7 @@ public class MapServerTest { return mapNotifyBuilder; } - private static void setConfigIniMappingMergeField(boolean value) throws NoSuchFieldException, + private static void setConfigIniMappingMergeField(final boolean value) throws NoSuchFieldException, IllegalAccessException { final Field mappingMergeField = CONFIG_INI.getClass().getDeclaredField("mappingMerge"); mappingMergeField.setAccessible(true); @@ -418,7 +415,7 @@ public class MapServerTest { } private static Set getDefaultIpAddressSet() { - return ImmutableSet.of(IPV4_BINARY_1, IPV4_BINARY_2); + return Set.of(IPV4_BINARY_1, IPV4_BINARY_2); } private static List getTransportAddressList() { @@ -430,10 +427,6 @@ public class MapServerTest { .setIpAddress(IPV4_BINARY_2) .setPort(new PortNumber(LispMessage.PORT_NUMBER)); - final List transportAddressList = Lists.newArrayList( - transportAddressBuilder1.build(), - transportAddressBuilder2.build()); - - return transportAddressList; + return List.of(transportAddressBuilder1.build(), transportAddressBuilder2.build()); } } diff --git a/mappingservice/implementation/src/test/java/org/opendaylight/lispflowmapping/implementation/mdsal/MappingDataListenerTest.java b/mappingservice/implementation/src/test/java/org/opendaylight/lispflowmapping/implementation/mdsal/MappingDataListenerTest.java index 8e5558f6..3f2752a2 100644 --- a/mappingservice/implementation/src/test/java/org/opendaylight/lispflowmapping/implementation/mdsal/MappingDataListenerTest.java +++ b/mappingservice/implementation/src/test/java/org/opendaylight/lispflowmapping/implementation/mdsal/MappingDataListenerTest.java @@ -9,7 +9,6 @@ package org.opendaylight.lispflowmapping.implementation.mdsal; import static org.junit.Assert.assertEquals; -import com.google.common.collect.Lists; import java.util.List; import org.junit.Before; import org.junit.Ignore; @@ -108,7 +107,7 @@ public class MappingDataListenerTest { */ @Test public void onDataTreeChangedTest_delete_NB() throws InterruptedException { - final List> changes = Lists.newArrayList(change_del); + final List> changes = List.of(change_del); Mockito.when(mod_del.dataBefore()).thenReturn(MAPPING_EID_1_NB); mappingDataListener.onDataTreeChanged(changes); @@ -120,7 +119,7 @@ public class MappingDataListenerTest { */ @Test public void onDataTreeChangedTest_delete_SB() { - final List> changes = Lists.newArrayList(change_del); + final List> changes = List.of(change_del); Mockito.when(mod_del.dataBefore()).thenReturn(MAPPING_EID_1_SB); mappingDataListener.onDataTreeChanged(changes); @@ -135,7 +134,7 @@ public class MappingDataListenerTest { @Test @Ignore public void onDataTreeChangedTest_subtreeModified_NB() throws InterruptedException { - final List> changes = Lists.newArrayList(change_subtreeModified); + final List> changes = List.of(change_subtreeModified); final MappingChanged mapChanged = MSNotificationInputUtil.toMappingChanged( MAPPING_EID_2_NB.getMappingRecord(), null, null, null, MappingChange.Updated); Mockito.when(mod_subtreeModified.dataAfter()).thenReturn(MAPPING_EID_2_NB); @@ -154,7 +153,7 @@ public class MappingDataListenerTest { */ @Test public void onDataTreeChangedTest_subtreeModified_SB() { - final List> changes = Lists.newArrayList(change_subtreeModified); + final List> changes = List.of(change_subtreeModified); Mockito.when(mod_subtreeModified.dataAfter()).thenReturn(MAPPING_EID_2_SB); mappingDataListener.onDataTreeChanged(changes); @@ -168,7 +167,7 @@ public class MappingDataListenerTest { @Test @Ignore public void onDataTreeChangedTest_write_NB() throws InterruptedException { - final List> changes = Lists.newArrayList(change_write); + final List> changes = List.of(change_write); final MappingChanged mapChanged = MSNotificationInputUtil.toMappingChanged( MAPPING_EID_3_NB.getMappingRecord(), null, null, null, MappingChange.Created); Mockito.when(mod_write.dataAfter()).thenReturn(MAPPING_EID_3_NB); @@ -186,7 +185,7 @@ public class MappingDataListenerTest { */ @Test public void onDataTreeChangedTest_write_SB() { - final List> changes = Lists.newArrayList(change_write); + final List> changes = List.of(change_write); Mockito.when(mod_write.dataAfter()).thenReturn(MAPPING_EID_3_SB); mappingDataListener.onDataTreeChanged(changes); @@ -201,7 +200,7 @@ public class MappingDataListenerTest { @Ignore public void onDataTreeChangedTest_multipleChanges() throws InterruptedException { final List> changes = - Lists.newArrayList(change_del, change_subtreeModified, change_write); + List.of(change_del, change_subtreeModified, change_write); final MappingChanged mapChangedSubtreeMod = MSNotificationInputUtil.toMappingChanged( MAPPING_EID_2_NB.getMappingRecord(), null, null, null, MappingChange.Updated); @@ -228,7 +227,7 @@ public class MappingDataListenerTest { public void onDataTreeChangedTest_noModType() { final DataTreeModification changeNoModType = Mockito.mock(DataTreeModification.class); final DataObjectModification modNoType = Mockito.mock(DataObjectModification.class); - final List> changes = Lists.newArrayList(changeNoModType); + final List> changes = List.of(changeNoModType); Mockito.when(changeNoModType.getRootNode()).thenReturn(modNoType); Mockito.when(modNoType.modificationType()).thenReturn(null); @@ -239,7 +238,7 @@ public class MappingDataListenerTest { Mockito.verifyZeroInteractions(notificationPublishServiceMock); } - private static Mapping getDefaultMapping(Eid eid, MappingOrigin origin) { + private static Mapping getDefaultMapping(final Eid eid, final MappingOrigin origin) { final MappingRecord record = new MappingRecordBuilder().setEid(eid).build(); return new MappingBuilder() .withKey(new MappingKey(new EidUri(LispAddressStringifier.getURIString(eid)), origin)) diff --git a/mappingservice/implementation/src/test/java/org/opendaylight/lispflowmapping/implementation/util/LispNotificationHelperTest.java b/mappingservice/implementation/src/test/java/org/opendaylight/lispflowmapping/implementation/util/LispNotificationHelperTest.java index c3f3a275..6911cdbf 100644 --- a/mappingservice/implementation/src/test/java/org/opendaylight/lispflowmapping/implementation/util/LispNotificationHelperTest.java +++ b/mappingservice/implementation/src/test/java/org/opendaylight/lispflowmapping/implementation/util/LispNotificationHelperTest.java @@ -10,10 +10,10 @@ package org.opendaylight.lispflowmapping.implementation.util; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNull; -import com.google.common.collect.Lists; import com.google.common.net.InetAddresses; import java.net.InetAddress; import java.net.UnknownHostException; +import java.util.List; import java.util.Set; import org.junit.Test; import org.opendaylight.lispflowmapping.lisp.type.LispMessage; @@ -240,7 +240,7 @@ public class LispNotificationHelperTest { .setOrigin(MappingOrigin.Southbound) .setSiteId(Set.of(SITE_ID)); - assertEquals(Lists.newArrayList(mappingBuilder_1.build(), mappingBuilder_2.build()), + assertEquals(List.of(mappingBuilder_1.build(), mappingBuilder_2.build()), LispNotificationHelper.getMapping(getDefaultAddMapping(true))); } @@ -259,7 +259,7 @@ public class LispNotificationHelperTest { .setEidUri(new EidUri("ipv6:" + IPV6_STRING)) .setOrigin(MappingOrigin.Southbound); - assertEquals(Lists.newArrayList(mappingBuilder_1.build(), mappingBuilder_2.build()), + assertEquals(List.of(mappingBuilder_1.build(), mappingBuilder_2.build()), LispNotificationHelper.getMapping(getDefaultAddMapping(false))); } @@ -308,7 +308,7 @@ public class LispNotificationHelperTest { .setMappingRecord(new MappingRecordBuilder().setEid(EID_IPV6).build()).build(); final MapRegisterBuilder mapRegisterBuilder = new MapRegisterBuilder() - .setMappingRecordItem(Lists.newArrayList(mappingRecordItem_1, mappingRecordItem_2)) + .setMappingRecordItem(List.of(mappingRecordItem_1, mappingRecordItem_2)) .setXtrSiteIdPresent(isXtrSiteIdPresent) .setSiteId(SITE_ID); diff --git a/mappingservice/lisp-proto/src/test/java/org/opendaylight/lispflowmapping/lisp/util/MapRequestUtilTest.java b/mappingservice/lisp-proto/src/test/java/org/opendaylight/lispflowmapping/lisp/util/MapRequestUtilTest.java index 01a5ca08..dcc7b53f 100644 --- a/mappingservice/lisp-proto/src/test/java/org/opendaylight/lispflowmapping/lisp/util/MapRequestUtilTest.java +++ b/mappingservice/lisp-proto/src/test/java/org/opendaylight/lispflowmapping/lisp/util/MapRequestUtilTest.java @@ -10,9 +10,9 @@ package org.opendaylight.lispflowmapping.lisp.util; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNull; -import com.google.common.collect.Lists; import com.google.common.net.InetAddresses; import java.net.InetAddress; +import java.util.List; import org.junit.Test; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Ipv4Address; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Ipv4Prefix; @@ -55,8 +55,7 @@ public class MapRequestUtilTest { public void selectItrRlocTest_Ipv4() { final ItrRlocBuilder itrRloc = new ItrRlocBuilder().setRloc(new RlocBuilder().setAddress(IPV4_ADDRESS) .build()).setItrRlocId("foo"); - final MapRequest request = new MapRequestBuilder().setItrRloc(Lists.newArrayList(itrRloc.build())) - .build(); + final MapRequest request = new MapRequestBuilder().setItrRloc(List.of(itrRloc.build())).build(); // expected result InetAddress expectedResult = InetAddresses.forString(IPV4_STRING); @@ -73,7 +72,7 @@ public class MapRequestUtilTest { public void selectItrRlocTest_Ipv6() { final ItrRlocBuilder itrRloc = new ItrRlocBuilder().setRloc(new RlocBuilder().setAddress(IPV6_ADDRESS).build()) .setItrRlocId("foo"); - final MapRequest request = new MapRequestBuilder().setItrRloc(Lists.newArrayList(itrRloc.build())).build(); + final MapRequest request = new MapRequestBuilder().setItrRloc(List.of(itrRloc.build())).build(); // expected result InetAddress expectedResult = InetAddresses.forString(IPV6_STRING); @@ -90,7 +89,7 @@ public class MapRequestUtilTest { public void selectItrRlocTest_Ipv4Binary() { final ItrRlocBuilder itrRloc = new ItrRlocBuilder().setItrRlocId("foo") .setRloc(new RlocBuilder().setAddress(IPV4_ADDRESS_BINARY).build()); - final MapRequest request = new MapRequestBuilder().setItrRloc(Lists.newArrayList(itrRloc.build())).build(); + final MapRequest request = new MapRequestBuilder().setItrRloc(List.of(itrRloc.build())).build(); // expected result InetAddress expectedResult = InetAddresses.forString(IPV4_STRING); @@ -107,7 +106,7 @@ public class MapRequestUtilTest { public void selectItrRlocTest_Ipv6Binary() { final ItrRlocBuilder itrRloc = new ItrRlocBuilder().setItrRlocId("foo") .setRloc(new RlocBuilder().setAddress(IPV6_ADDRESS_BINARY).build()); - final MapRequest request = new MapRequestBuilder().setItrRloc(Lists.newArrayList(itrRloc.build())).build(); + final MapRequest request = new MapRequestBuilder().setItrRloc(List.of(itrRloc.build())).build(); // expected result InetAddress expectedResult = InetAddresses.forString(IPV6_STRING); @@ -124,7 +123,7 @@ public class MapRequestUtilTest { public void selectItrRlocTest_Ipv4Prefix() { final ItrRlocBuilder itrRloc = new ItrRlocBuilder().setItrRlocId("foo") .setRloc(new RlocBuilder().setAddress(IPV4_ADDRESS_PREFIX).build()); - final MapRequest request = new MapRequestBuilder().setItrRloc(Lists.newArrayList(itrRloc.build())).build(); + final MapRequest request = new MapRequestBuilder().setItrRloc(List.of(itrRloc.build())).build(); assertNull(MapRequestUtil.selectItrRloc(request)); } diff --git a/mappingservice/southbound/src/test/java/org/opendaylight/lispflowmapping/southbound/LispSouthboundRpcTest.java b/mappingservice/southbound/src/test/java/org/opendaylight/lispflowmapping/southbound/LispSouthboundRpcTest.java index 2ea85afa..b093e06c 100644 --- a/mappingservice/southbound/src/test/java/org/opendaylight/lispflowmapping/southbound/LispSouthboundRpcTest.java +++ b/mappingservice/southbound/src/test/java/org/opendaylight/lispflowmapping/southbound/LispSouthboundRpcTest.java @@ -9,7 +9,7 @@ package org.opendaylight.lispflowmapping.southbound; import static org.junit.Assert.assertEquals; -import com.google.common.collect.Lists; +import java.util.List; import java.util.concurrent.ExecutionException; import java.util.concurrent.Future; import org.junit.Test; @@ -266,17 +266,17 @@ public class LispSouthboundRpcTest { private static MapNotifyBuilder getDefaultMapNotifyBuilder() { return new MapNotifyBuilder() - .setMappingRecordItem(Lists.newArrayList(getDefaultMappingRecordItem())); + .setMappingRecordItem(List.of(getDefaultMappingRecordItem())); } private static MapReplyBuilder getDefaultMapReplyBuilder() { return new MapReplyBuilder() - .setMappingRecordItem(Lists.newArrayList(getDefaultMappingRecordItem())); + .setMappingRecordItem(List.of(getDefaultMappingRecordItem())); } private static MapRegisterBuilder getDefaultMapRegisterBuilder() { return new MapRegisterBuilder() - .setMappingRecordItem(Lists.newArrayList(getDefaultMappingRecordItem())); + .setMappingRecordItem(List.of(getDefaultMappingRecordItem())); } private static void incrementAll(final ConcurrentLispSouthboundStats stats) { diff --git a/mappingservice/southbound/src/test/java/org/opendaylight/lispflowmapping/southbound/lisp/AuthenticationKeyDataListenerTest.java b/mappingservice/southbound/src/test/java/org/opendaylight/lispflowmapping/southbound/lisp/AuthenticationKeyDataListenerTest.java index 995815a7..caa5ddf2 100644 --- a/mappingservice/southbound/src/test/java/org/opendaylight/lispflowmapping/southbound/lisp/AuthenticationKeyDataListenerTest.java +++ b/mappingservice/southbound/src/test/java/org/opendaylight/lispflowmapping/southbound/lisp/AuthenticationKeyDataListenerTest.java @@ -7,7 +7,7 @@ */ package org.opendaylight.lispflowmapping.southbound.lisp; -import com.google.common.collect.Lists; +import java.util.List; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; @@ -108,7 +108,7 @@ public class AuthenticationKeyDataListenerTest { public void onDataTreeChangedTest_delete_BinaryEid() { Mockito.when(mod_del.dataBefore()).thenReturn(AUTHENTICATION_KEY_1); - authenticationKeyDataListener.onDataTreeChanged(Lists.newArrayList(change_del)); + authenticationKeyDataListener.onDataTreeChanged(List.of(change_del)); Mockito.verify(akdbMock).removeAuthenticationKey(IPV4_BINARY_EID_1); } @@ -119,7 +119,7 @@ public class AuthenticationKeyDataListenerTest { public void onDataTreeChangedTest_delete_Ipv4PrefixEid() { Mockito.when(mod_del.dataBefore()).thenReturn(AUTHENTICATION_KEY_PREFIX); - authenticationKeyDataListener.onDataTreeChanged(Lists.newArrayList(change_del)); + authenticationKeyDataListener.onDataTreeChanged(List.of(change_del)); Mockito.verify(akdbMock).removeAuthenticationKey(IPV4_PREFIX_BINARY_EID); } @@ -130,7 +130,7 @@ public class AuthenticationKeyDataListenerTest { public void onDataTreeChangedTest_subtreeModified() { Mockito.when(mod_subtreeModified.dataAfter()).thenReturn(AUTHENTICATION_KEY_2); - authenticationKeyDataListener.onDataTreeChanged(Lists.newArrayList(change_subtreeModified)); + authenticationKeyDataListener.onDataTreeChanged(List.of(change_subtreeModified)); Mockito.verify(akdbMock).addAuthenticationKey(IPV4_BINARY_EID_2, MAPPING_AUTHKEY); } @@ -141,7 +141,7 @@ public class AuthenticationKeyDataListenerTest { public void onDataTreeChangedTest_write() { Mockito.when(mod_write.dataAfter()).thenReturn(AUTHENTICATION_KEY_3); - authenticationKeyDataListener.onDataTreeChanged(Lists.newArrayList(change_write)); + authenticationKeyDataListener.onDataTreeChanged(List.of(change_write)); Mockito.verify(akdbMock).addAuthenticationKey(IPV4_BINARY_EID_3, MAPPING_AUTHKEY); } @@ -156,7 +156,7 @@ public class AuthenticationKeyDataListenerTest { Mockito.when(change_nullModType.getRootNode()).thenReturn(mod_nullModType); Mockito.when(mod_nullModType.modificationType()).thenReturn(null); - authenticationKeyDataListener.onDataTreeChanged(Lists.newArrayList(change_nullModType)); + authenticationKeyDataListener.onDataTreeChanged(List.of(change_nullModType)); Mockito.verifyNoInteractions(akdbMock); } diff --git a/mappingservice/southbound/src/test/java/org/opendaylight/lispflowmapping/southbound/lisp/LispXtrSouthboundHandlerTest.java b/mappingservice/southbound/src/test/java/org/opendaylight/lispflowmapping/southbound/lisp/LispXtrSouthboundHandlerTest.java index e7362a0c..3aa328d8 100644 --- a/mappingservice/southbound/src/test/java/org/opendaylight/lispflowmapping/southbound/lisp/LispXtrSouthboundHandlerTest.java +++ b/mappingservice/southbound/src/test/java/org/opendaylight/lispflowmapping/southbound/lisp/LispXtrSouthboundHandlerTest.java @@ -10,7 +10,6 @@ package org.opendaylight.lispflowmapping.southbound.lisp; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; -import com.google.common.collect.Lists; import io.netty.buffer.Unpooled; import io.netty.channel.ChannelHandlerContext; import io.netty.channel.socket.DatagramPacket; @@ -18,6 +17,7 @@ import java.net.InetAddress; import java.net.InetSocketAddress; import java.nio.ByteBuffer; import java.util.Arrays; +import java.util.List; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; @@ -206,8 +206,7 @@ public class LispXtrSouthboundHandlerTest { } } - byte[] result = Arrays.copyOfRange(buffer.array(), - headerLength, headerLength + lispPacketLength); + byte[] result = Arrays.copyOfRange(buffer.array(), headerLength, headerLength + lispPacketLength); final InetAddress inetAddress = null; final InetSocketAddress recipient = new InetSocketAddress(PORT); final InetSocketAddress sender = new InetSocketAddress(inetAddress, PORT); @@ -230,8 +229,8 @@ public class LispXtrSouthboundHandlerTest { .setEid(eid).build(); return new MapRequestBuilder() - .setItrRloc(Lists.newArrayList(itrRloc)) - .setEidItem(Lists.newArrayList(eidItem)) + .setItrRloc(List.of(itrRloc)) + .setEidItem(List.of(eidItem)) .setNonce(NONCE) .setSourceEid(new SourceEidBuilder().setEid(LispAddressUtil.asIpv4Eid(IPV4_STRING_1)).build()) .setAuthoritative(false) -- 2.34.1 From d40bc228573d9971eeb8c17d353d14d6538f744a Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Wed, 12 Aug 2026 21:32:56 +0200 Subject: [PATCH 2/3] Bump upstreams Adopt: - odlparent-14.3.7 - infrautils-7.1.14 - yangtools-14.0.25 - mdsal-14.0.22 - controller-11.0.5 - netconf-9.0.3 Change-Id: Iad54010a916db6df797048bed03a9be404d7e1cb Signed-off-by: Robert Varga --- artifacts/pom.xml | 2 +- commons/parent/pom.xml | 6 +++--- features/features-lispflowmapping/pom.xml | 2 +- features/odl-lispflowmapping-inmemorydb/pom.xml | 4 ++-- features/odl-lispflowmapping-mappingservice-shell/pom.xml | 2 +- features/odl-lispflowmapping-mappingservice/pom.xml | 4 ++-- features/odl-lispflowmapping-models/pom.xml | 4 ++-- features/odl-lispflowmapping-msmr/pom.xml | 2 +- features/odl-lispflowmapping-southbound/pom.xml | 6 +++--- features/pom.xml | 2 +- integrationtest/pom.xml | 2 +- lispflowmapping-karaf/pom.xml | 2 +- mappingservice/api/pom.xml | 2 +- mappingservice/lisp-proto/pom.xml | 2 +- mappingservice/pom.xml | 4 ++-- 15 files changed, 23 insertions(+), 23 deletions(-) diff --git a/artifacts/pom.xml b/artifacts/pom.xml index dfb4288c..2a39ace6 100644 --- a/artifacts/pom.xml +++ b/artifacts/pom.xml @@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.odlparent odlparent-lite - 14.3.1 + 14.3.7 diff --git a/commons/parent/pom.xml b/commons/parent/pom.xml index 882abc80..e1f3d49a 100644 --- a/commons/parent/pom.xml +++ b/commons/parent/pom.xml @@ -15,7 +15,7 @@ for plugin configuration etc. --> org.opendaylight.odlparent odlparent - 14.3.1 + 14.3.7 @@ -45,14 +45,14 @@ org.opendaylight.mdsal mdsal-artifacts - 14.0.21 + 14.0.22 pom import org.opendaylight.controller controller-artifacts - 11.0.4 + 11.0.5 pom import diff --git a/features/features-lispflowmapping/pom.xml b/features/features-lispflowmapping/pom.xml index adef6607..0dbe3f89 100644 --- a/features/features-lispflowmapping/pom.xml +++ b/features/features-lispflowmapping/pom.xml @@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.odlparent feature-repo-parent - 14.3.1 + 14.3.7 diff --git a/features/odl-lispflowmapping-inmemorydb/pom.xml b/features/odl-lispflowmapping-inmemorydb/pom.xml index 0bd24c07..8e686bb0 100644 --- a/features/odl-lispflowmapping-inmemorydb/pom.xml +++ b/features/odl-lispflowmapping-inmemorydb/pom.xml @@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.odlparent single-feature-parent - 14.3.1 + 14.3.7 @@ -29,7 +29,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.controller controller-artifacts - 11.0.4 + 11.0.5 pom import diff --git a/features/odl-lispflowmapping-mappingservice-shell/pom.xml b/features/odl-lispflowmapping-mappingservice-shell/pom.xml index 5a196dcc..970176ef 100644 --- a/features/odl-lispflowmapping-mappingservice-shell/pom.xml +++ b/features/odl-lispflowmapping-mappingservice-shell/pom.xml @@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.odlparent single-feature-parent - 14.3.1 + 14.3.7 diff --git a/features/odl-lispflowmapping-mappingservice/pom.xml b/features/odl-lispflowmapping-mappingservice/pom.xml index 8aa0619d..493bf1b3 100644 --- a/features/odl-lispflowmapping-mappingservice/pom.xml +++ b/features/odl-lispflowmapping-mappingservice/pom.xml @@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.odlparent single-feature-parent - 14.3.1 + 14.3.7 @@ -29,7 +29,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.netconf netconf-artifacts - 9.0.2 + 9.0.3 import pom diff --git a/features/odl-lispflowmapping-models/pom.xml b/features/odl-lispflowmapping-models/pom.xml index 86c4a5e1..8721d3d2 100644 --- a/features/odl-lispflowmapping-models/pom.xml +++ b/features/odl-lispflowmapping-models/pom.xml @@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.odlparent single-feature-parent - 14.3.1 + 14.3.7 @@ -29,7 +29,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.mdsal mdsal-artifacts - 14.0.21 + 14.0.22 pom import diff --git a/features/odl-lispflowmapping-msmr/pom.xml b/features/odl-lispflowmapping-msmr/pom.xml index e7ee9a53..bb8f0058 100644 --- a/features/odl-lispflowmapping-msmr/pom.xml +++ b/features/odl-lispflowmapping-msmr/pom.xml @@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.odlparent single-feature-parent - 14.3.1 + 14.3.7 diff --git a/features/odl-lispflowmapping-southbound/pom.xml b/features/odl-lispflowmapping-southbound/pom.xml index 79a9d044..91b7a943 100644 --- a/features/odl-lispflowmapping-southbound/pom.xml +++ b/features/odl-lispflowmapping-southbound/pom.xml @@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.odlparent single-feature-parent - 14.3.1 + 14.3.7 @@ -29,14 +29,14 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.controller controller-artifacts - 11.0.4 + 11.0.5 import pom org.opendaylight.netconf netconf-artifacts - 9.0.2 + 9.0.3 import pom diff --git a/features/pom.xml b/features/pom.xml index 3f9b759d..4a6520b9 100644 --- a/features/pom.xml +++ b/features/pom.xml @@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.odlparent odlparent-lite - 14.3.1 + 14.3.7 diff --git a/integrationtest/pom.xml b/integrationtest/pom.xml index 19f2a84c..e82214c5 100644 --- a/integrationtest/pom.xml +++ b/integrationtest/pom.xml @@ -11,7 +11,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.controller mdsal-it-parent - 11.0.4 + 11.0.5 diff --git a/lispflowmapping-karaf/pom.xml b/lispflowmapping-karaf/pom.xml index a1a67631..391dc195 100644 --- a/lispflowmapping-karaf/pom.xml +++ b/lispflowmapping-karaf/pom.xml @@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.odlparent karaf4-parent - 14.3.1 + 14.3.7 diff --git a/mappingservice/api/pom.xml b/mappingservice/api/pom.xml index 2edf6cf3..c01a1c8c 100644 --- a/mappingservice/api/pom.xml +++ b/mappingservice/api/pom.xml @@ -5,7 +5,7 @@ org.opendaylight.mdsal binding-parent - 14.0.21 + 14.0.22 diff --git a/mappingservice/lisp-proto/pom.xml b/mappingservice/lisp-proto/pom.xml index 9afe5481..c6b3d1c4 100644 --- a/mappingservice/lisp-proto/pom.xml +++ b/mappingservice/lisp-proto/pom.xml @@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.mdsal binding-parent - 14.0.21 + 14.0.22 diff --git a/mappingservice/pom.xml b/mappingservice/pom.xml index a249d345..be04a12c 100644 --- a/mappingservice/pom.xml +++ b/mappingservice/pom.xml @@ -5,7 +5,7 @@ org.opendaylight.odlparent odlparent - 14.3.1 + 14.3.7 @@ -38,7 +38,7 @@ org.opendaylight.mdsal mdsal-artifacts - 14.0.21 + 14.0.22 pom import -- 2.34.1 From b151c75ea9233e58d8d5c4a65b0b3d2ff348c7a2 Mon Sep 17 00:00:00 2001 From: jenkins-releng Date: Wed, 12 Aug 2026 22:54:43 +0000 Subject: [PATCH 3/3] Release Validate --- artifacts/pom.xml | 2 +- commons/build_tools/pom.xml | 2 +- commons/parent/pom.xml | 8 ++++---- features/features-lispflowmapping/pom.xml | 2 +- features/odl-lispflowmapping-inmemorydb/pom.xml | 2 +- features/odl-lispflowmapping-mappingservice-shell/pom.xml | 2 +- features/odl-lispflowmapping-mappingservice/pom.xml | 2 +- features/odl-lispflowmapping-models/pom.xml | 2 +- features/odl-lispflowmapping-msmr/pom.xml | 2 +- features/odl-lispflowmapping-southbound/pom.xml | 2 +- features/pom.xml | 2 +- integrationtest/pom.xml | 4 ++-- lispflowmapping-karaf/pom.xml | 2 +- mappingservice/api/pom.xml | 2 +- mappingservice/config/pom.xml | 4 ++-- mappingservice/dsbackend/pom.xml | 2 +- mappingservice/implementation/pom.xml | 2 +- mappingservice/inmemorydb/pom.xml | 2 +- mappingservice/lisp-proto/pom.xml | 2 +- mappingservice/mapcache/pom.xml | 2 +- mappingservice/pom.xml | 2 +- mappingservice/shell/pom.xml | 2 +- mappingservice/southbound/pom.xml | 2 +- pom.xml | 2 +- 24 files changed, 29 insertions(+), 29 deletions(-) diff --git a/artifacts/pom.xml b/artifacts/pom.xml index 2a39ace6..40314895 100644 --- a/artifacts/pom.xml +++ b/artifacts/pom.xml @@ -18,7 +18,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.lispflowmapping lispflowmapping-artifacts - 1.21.3-SNAPSHOT + 1.21.3 pom diff --git a/commons/build_tools/pom.xml b/commons/build_tools/pom.xml index 9f63fdfc..d6117fd7 100644 --- a/commons/build_tools/pom.xml +++ b/commons/build_tools/pom.xml @@ -5,7 +5,7 @@ org.opendaylight.lispflowmapping lispflowmapping-commons - 1.21.3-SNAPSHOT + 1.21.3 ../parent diff --git a/commons/parent/pom.xml b/commons/parent/pom.xml index e1f3d49a..09b514ec 100644 --- a/commons/parent/pom.xml +++ b/commons/parent/pom.xml @@ -21,7 +21,7 @@ org.opendaylight.lispflowmapping lispflowmapping-commons - 1.21.3-SNAPSHOT + 1.21.3 pom @@ -30,9 +30,9 @@ 1.0.0 0.5.0 - 1.21.3-SNAPSHOT - 0.24.3-SNAPSHOT - 0.28.3-SNAPSHOT + 1.21.3 + 0.24.3 + 0.28.3 src/main/yang-gen-sal 0.5.0 src/main/yang diff --git a/features/features-lispflowmapping/pom.xml b/features/features-lispflowmapping/pom.xml index 0dbe3f89..62de5857 100644 --- a/features/features-lispflowmapping/pom.xml +++ b/features/features-lispflowmapping/pom.xml @@ -18,7 +18,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.lispflowmapping features-lispflowmapping - 1.21.3-SNAPSHOT + 1.21.3 feature diff --git a/features/odl-lispflowmapping-inmemorydb/pom.xml b/features/odl-lispflowmapping-inmemorydb/pom.xml index 8e686bb0..1af94af1 100644 --- a/features/odl-lispflowmapping-inmemorydb/pom.xml +++ b/features/odl-lispflowmapping-inmemorydb/pom.xml @@ -18,7 +18,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.lispflowmapping odl-lispflowmapping-inmemorydb - 1.21.3-SNAPSHOT + 1.21.3 feature diff --git a/features/odl-lispflowmapping-mappingservice-shell/pom.xml b/features/odl-lispflowmapping-mappingservice-shell/pom.xml index 970176ef..501221ec 100644 --- a/features/odl-lispflowmapping-mappingservice-shell/pom.xml +++ b/features/odl-lispflowmapping-mappingservice-shell/pom.xml @@ -18,7 +18,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.lispflowmapping odl-lispflowmapping-mappingservice-shell - 1.21.3-SNAPSHOT + 1.21.3 feature diff --git a/features/odl-lispflowmapping-mappingservice/pom.xml b/features/odl-lispflowmapping-mappingservice/pom.xml index 493bf1b3..aa8d0103 100644 --- a/features/odl-lispflowmapping-mappingservice/pom.xml +++ b/features/odl-lispflowmapping-mappingservice/pom.xml @@ -18,7 +18,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.lispflowmapping odl-lispflowmapping-mappingservice - 1.21.3-SNAPSHOT + 1.21.3 feature diff --git a/features/odl-lispflowmapping-models/pom.xml b/features/odl-lispflowmapping-models/pom.xml index 8721d3d2..87d1b788 100644 --- a/features/odl-lispflowmapping-models/pom.xml +++ b/features/odl-lispflowmapping-models/pom.xml @@ -18,7 +18,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.lispflowmapping odl-lispflowmapping-models - 1.21.3-SNAPSHOT + 1.21.3 feature diff --git a/features/odl-lispflowmapping-msmr/pom.xml b/features/odl-lispflowmapping-msmr/pom.xml index bb8f0058..41ba3b60 100644 --- a/features/odl-lispflowmapping-msmr/pom.xml +++ b/features/odl-lispflowmapping-msmr/pom.xml @@ -18,7 +18,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.lispflowmapping odl-lispflowmapping-msmr - 1.21.3-SNAPSHOT + 1.21.3 feature diff --git a/features/odl-lispflowmapping-southbound/pom.xml b/features/odl-lispflowmapping-southbound/pom.xml index 91b7a943..2d0aa3ac 100644 --- a/features/odl-lispflowmapping-southbound/pom.xml +++ b/features/odl-lispflowmapping-southbound/pom.xml @@ -18,7 +18,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.lispflowmapping odl-lispflowmapping-southbound - 1.21.3-SNAPSHOT + 1.21.3 feature diff --git a/features/pom.xml b/features/pom.xml index 4a6520b9..fe7e4aea 100644 --- a/features/pom.xml +++ b/features/pom.xml @@ -18,7 +18,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.lispflowmapping features-aggregator - 1.21.3-SNAPSHOT + 1.21.3 pom diff --git a/integrationtest/pom.xml b/integrationtest/pom.xml index e82214c5..856eb4af 100644 --- a/integrationtest/pom.xml +++ b/integrationtest/pom.xml @@ -18,7 +18,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html 4.0.0 org.opendaylight.lispflowmapping mappingservice.integrationtest - 1.21.3-SNAPSHOT + 1.21.3 bundle @@ -28,7 +28,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html false org.opendaylight.lispflowmapping lispflowmapping-karaf - 1.21.3-SNAPSHOT + 1.21.3 zip diff --git a/lispflowmapping-karaf/pom.xml b/lispflowmapping-karaf/pom.xml index 391dc195..9458350d 100644 --- a/lispflowmapping-karaf/pom.xml +++ b/lispflowmapping-karaf/pom.xml @@ -18,7 +18,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.lispflowmapping lispflowmapping-karaf - 1.21.3-SNAPSHOT + 1.21.3 pom diff --git a/mappingservice/api/pom.xml b/mappingservice/api/pom.xml index c01a1c8c..35e87dcb 100644 --- a/mappingservice/api/pom.xml +++ b/mappingservice/api/pom.xml @@ -11,7 +11,7 @@ org.opendaylight.lispflowmapping mappingservice.api - 1.21.3-SNAPSHOT + 1.21.3 bundle diff --git a/mappingservice/config/pom.xml b/mappingservice/config/pom.xml index 5ac30fdf..6f10a866 100644 --- a/mappingservice/config/pom.xml +++ b/mappingservice/config/pom.xml @@ -5,7 +5,7 @@ org.opendaylight.lispflowmapping mappingservice-parent - 1.21.3-SNAPSHOT + 1.21.3 mappingservice.config @@ -22,7 +22,7 @@ org.opendaylight.lispflowmapping mappingservice.api - 1.21.3-SNAPSHOT + 1.21.3 diff --git a/mappingservice/dsbackend/pom.xml b/mappingservice/dsbackend/pom.xml index 47355bbe..0a1974eb 100644 --- a/mappingservice/dsbackend/pom.xml +++ b/mappingservice/dsbackend/pom.xml @@ -13,7 +13,7 @@ org.opendaylight.lispflowmapping mappingservice-parent - 1.21.3-SNAPSHOT + 1.21.3 mappingservice.dsbackend diff --git a/mappingservice/implementation/pom.xml b/mappingservice/implementation/pom.xml index fef15157..a0e4faa8 100644 --- a/mappingservice/implementation/pom.xml +++ b/mappingservice/implementation/pom.xml @@ -5,7 +5,7 @@ org.opendaylight.lispflowmapping mappingservice-parent - 1.21.3-SNAPSHOT + 1.21.3 mappingservice.implementation diff --git a/mappingservice/inmemorydb/pom.xml b/mappingservice/inmemorydb/pom.xml index d53ebfb6..61e4d936 100644 --- a/mappingservice/inmemorydb/pom.xml +++ b/mappingservice/inmemorydb/pom.xml @@ -5,7 +5,7 @@ org.opendaylight.lispflowmapping mappingservice-parent - 1.21.3-SNAPSHOT + 1.21.3 mappingservice.inmemorydb diff --git a/mappingservice/lisp-proto/pom.xml b/mappingservice/lisp-proto/pom.xml index c6b3d1c4..373bb4e8 100644 --- a/mappingservice/lisp-proto/pom.xml +++ b/mappingservice/lisp-proto/pom.xml @@ -18,7 +18,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.lispflowmapping mappingservice.lisp-proto - 1.21.3-SNAPSHOT + 1.21.3 bundle diff --git a/mappingservice/mapcache/pom.xml b/mappingservice/mapcache/pom.xml index 3218a8c8..44bf653f 100644 --- a/mappingservice/mapcache/pom.xml +++ b/mappingservice/mapcache/pom.xml @@ -5,7 +5,7 @@ org.opendaylight.lispflowmapping mappingservice-parent - 1.21.3-SNAPSHOT + 1.21.3 mappingservice.mapcache diff --git a/mappingservice/pom.xml b/mappingservice/pom.xml index be04a12c..c516c357 100644 --- a/mappingservice/pom.xml +++ b/mappingservice/pom.xml @@ -11,7 +11,7 @@ org.opendaylight.lispflowmapping mappingservice-parent - 1.21.3-SNAPSHOT + 1.21.3 pom diff --git a/mappingservice/shell/pom.xml b/mappingservice/shell/pom.xml index 44ea9c46..d239e0dc 100644 --- a/mappingservice/shell/pom.xml +++ b/mappingservice/shell/pom.xml @@ -5,7 +5,7 @@ org.opendaylight.lispflowmapping mappingservice-parent - 1.21.3-SNAPSHOT + 1.21.3 mappingservice.shell diff --git a/mappingservice/southbound/pom.xml b/mappingservice/southbound/pom.xml index 928ff5a1..721dd404 100644 --- a/mappingservice/southbound/pom.xml +++ b/mappingservice/southbound/pom.xml @@ -5,7 +5,7 @@ org.opendaylight.lispflowmapping mappingservice-parent - 1.21.3-SNAPSHOT + 1.21.3 mappingservice.southbound diff --git a/pom.xml b/pom.xml index e24b14d4..61b05ef3 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ org.opendaylight.lispflowmapping lispflowmapping-commons - 1.21.3-SNAPSHOT + 1.21.3 commons/parent -- 2.34.1