From 3d062df7fe6b8c3e1e1b45388a3985df54811dbd Mon Sep 17 00:00:00 2001
From: Robert Varga <robert.varga@pantheon.tech>
Date: Mon, 21 Oct 2024 11:24:05 +0200
Subject: [PATCH 1/3] Fixup checkstyle

Upgraded checkstyle is finding day-0 violations, fix them up.

Change-Id: I0805645448dd493952879e16b4a74e45b893c4cd
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
(cherry picked from commit 9e11f04e236a0d6e7d57e53a8a3701c267d4bba4)
---
 .../lispflowmapping/southbound/LispSouthboundRPC.java            | 1 -
 1 file changed, 1 deletion(-)

diff --git a/mappingservice/southbound/src/main/java/org/opendaylight/lispflowmapping/southbound/LispSouthboundRPC.java b/mappingservice/southbound/src/main/java/org/opendaylight/lispflowmapping/southbound/LispSouthboundRPC.java
index 587a0dae..b737b9f4 100644
--- a/mappingservice/southbound/src/main/java/org/opendaylight/lispflowmapping/southbound/LispSouthboundRPC.java
+++ b/mappingservice/southbound/src/main/java/org/opendaylight/lispflowmapping/southbound/LispSouthboundRPC.java
@@ -65,7 +65,6 @@ import org.slf4j.LoggerFactory;
 /**
  * This class holds all RPCs methods for LispSouthbound Plugin.
  *
- * <p>
  * @author Florin Coras (fcoras@cisco.com)
  * @author Lorand Jakab (lojakab@cisco.com)
  */
-- 
2.34.1


From fc59e00f2f888bc91ddf456d9346ceba0fc1593f Mon Sep 17 00:00:00 2001
From: Robert Varga <robert.varga@pantheon.tech>
Date: Wed, 9 Jul 2025 12:15:24 +0200
Subject: [PATCH 2/3] Bump upstreams

Adopt:
- odlparent-14.1.0
- infrautils-7.1.4
- yangtools-14.0.14
- mdsal-14.0.13
- controller-11.0.0
- aaa-0.21.0
- netconf-9.0.0

Change-Id: I0a041ef7e65d6a6d9fac9b4fac570eefb8fdcd3b
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
---
 artifacts/pom.xml                             |  2 +-
 commons/parent/pom.xml                        |  6 +++---
 features/features-lispflowmapping/pom.xml     |  2 +-
 .../odl-lispflowmapping-inmemorydb/pom.xml    |  4 ++--
 .../src/main/feature/feature.xml              |  2 +-
 .../pom.xml                                   |  2 +-
 .../pom.xml                                   |  4 ++--
 .../src/main/feature/feature.xml              |  2 +-
 features/odl-lispflowmapping-models/pom.xml   |  4 ++--
 features/odl-lispflowmapping-msmr/pom.xml     |  2 +-
 .../odl-lispflowmapping-southbound/pom.xml    |  6 +++---
 .../src/main/feature/feature.xml              |  4 ++--
 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 ++--
 mappingservice/southbound/pom.xml             | 19 +++++++++++++++++++
 19 files changed, 46 insertions(+), 27 deletions(-)

diff --git a/artifacts/pom.xml b/artifacts/pom.xml
index 0daf22e8..392186eb 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
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>odlparent-lite</artifactId>
-    <version>14.0.3</version>
+    <version>14.1.0</version>
     <relativePath/>
   </parent>
 
diff --git a/commons/parent/pom.xml b/commons/parent/pom.xml
index 32c44439..410117d4 100644
--- a/commons/parent/pom.xml
+++ b/commons/parent/pom.xml
@@ -15,7 +15,7 @@
          for plugin configuration etc. -->
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>odlparent</artifactId>
-    <version>14.0.3</version>
+    <version>14.1.0</version>
     <relativePath/>
   </parent>
 
@@ -45,14 +45,14 @@
       <dependency>
         <groupId>org.opendaylight.mdsal</groupId>
         <artifactId>mdsal-artifacts</artifactId>
-        <version>14.0.2</version>
+        <version>14.0.13</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>
       <dependency>
         <groupId>org.opendaylight.controller</groupId>
         <artifactId>controller-artifacts</artifactId>
-        <version>10.0.2</version>
+        <version>11.0.0</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>
diff --git a/features/features-lispflowmapping/pom.xml b/features/features-lispflowmapping/pom.xml
index 2e41f106..7a28fa68 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
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>feature-repo-parent</artifactId>
-    <version>14.0.3</version>
+    <version>14.1.0</version>
     <relativePath/>
   </parent>
 
diff --git a/features/odl-lispflowmapping-inmemorydb/pom.xml b/features/odl-lispflowmapping-inmemorydb/pom.xml
index 849d1360..ff6b0d96 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
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>single-feature-parent</artifactId>
-    <version>14.0.3</version>
+    <version>14.1.0</version>
     <relativePath/>
   </parent>
 
@@ -29,7 +29,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
       <dependency>
         <groupId>org.opendaylight.controller</groupId>
         <artifactId>controller-artifacts</artifactId>
-        <version>10.0.2</version>
+        <version>11.0.0</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>
diff --git a/features/odl-lispflowmapping-inmemorydb/src/main/feature/feature.xml b/features/odl-lispflowmapping-inmemorydb/src/main/feature/feature.xml
index bf7d377e..f631fe43 100644
--- a/features/odl-lispflowmapping-inmemorydb/src/main/feature/feature.xml
+++ b/features/odl-lispflowmapping-inmemorydb/src/main/feature/feature.xml
@@ -8,6 +8,6 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
 -->
 <features xmlns="http://karaf.apache.org/xmlns/features/v1.4.0" name="odl-lispflowmapping-inmemorydb">
     <feature name="odl-lispflowmapping-inmemorydb">
-        <feature version="[10,11)">odl-mdsal-broker</feature>
+        <feature version="[11,12)">odl-mdsal-broker</feature>
     </feature>
 </features>
diff --git a/features/odl-lispflowmapping-mappingservice-shell/pom.xml b/features/odl-lispflowmapping-mappingservice-shell/pom.xml
index 2541e45c..c5cb3054 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
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>single-feature-parent</artifactId>
-    <version>14.0.3</version>
+    <version>14.1.0</version>
     <relativePath/>
   </parent>
 
diff --git a/features/odl-lispflowmapping-mappingservice/pom.xml b/features/odl-lispflowmapping-mappingservice/pom.xml
index 65a5b3bb..9c0ef46e 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
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>single-feature-parent</artifactId>
-    <version>14.0.3</version>
+    <version>14.1.0</version>
     <relativePath/>
   </parent>
 
@@ -29,7 +29,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
       <dependency>
         <groupId>org.opendaylight.netconf</groupId>
         <artifactId>netconf-artifacts</artifactId>
-        <version>8.0.2</version>
+        <version>9.0.0</version>
         <scope>import</scope>
         <type>pom</type>
       </dependency>
diff --git a/features/odl-lispflowmapping-mappingservice/src/main/feature/feature.xml b/features/odl-lispflowmapping-mappingservice/src/main/feature/feature.xml
index 90f0c5d6..0b1025ca 100644
--- a/features/odl-lispflowmapping-mappingservice/src/main/feature/feature.xml
+++ b/features/odl-lispflowmapping-mappingservice/src/main/feature/feature.xml
@@ -8,6 +8,6 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
 -->
 <features xmlns="http://karaf.apache.org/xmlns/features/v1.4.0" name="odl-lispflowmapping-mappingservice">
     <feature name="odl-lispflowmapping-mappingservice">
-        <feature version="[8,9)">odl-restconf</feature>
+        <feature version="[9,10)">odl-restconf</feature>
     </feature>
 </features>
diff --git a/features/odl-lispflowmapping-models/pom.xml b/features/odl-lispflowmapping-models/pom.xml
index 65154ce6..40a7dfbb 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
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>single-feature-parent</artifactId>
-    <version>14.0.3</version>
+    <version>14.1.0</version>
     <relativePath/>
   </parent>
 
@@ -29,7 +29,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
       <dependency>
         <groupId>org.opendaylight.mdsal</groupId>
         <artifactId>mdsal-artifacts</artifactId>
-        <version>14.0.2</version>
+        <version>14.0.13</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>
diff --git a/features/odl-lispflowmapping-msmr/pom.xml b/features/odl-lispflowmapping-msmr/pom.xml
index 86aae016..52f1ec83 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
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>single-feature-parent</artifactId>
-    <version>14.0.3</version>
+    <version>14.1.0</version>
     <relativePath/>
   </parent>
 
diff --git a/features/odl-lispflowmapping-southbound/pom.xml b/features/odl-lispflowmapping-southbound/pom.xml
index 955df24e..2f900c85 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
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>single-feature-parent</artifactId>
-    <version>14.0.3</version>
+    <version>14.1.0</version>
     <relativePath/>
   </parent>
 
@@ -29,14 +29,14 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
       <dependency>
         <groupId>org.opendaylight.controller</groupId>
         <artifactId>controller-artifacts</artifactId>
-        <version>10.0.2</version>
+        <version>11.0.0</version>
         <scope>import</scope>
         <type>pom</type>
       </dependency>
       <dependency>
         <groupId>org.opendaylight.netconf</groupId>
         <artifactId>netconf-artifacts</artifactId>
-        <version>8.0.2</version>
+        <version>9.0.0</version>
         <scope>import</scope>
         <type>pom</type>
       </dependency>
diff --git a/features/odl-lispflowmapping-southbound/src/main/feature/feature.xml b/features/odl-lispflowmapping-southbound/src/main/feature/feature.xml
index ac78388a..55abe6f2 100644
--- a/features/odl-lispflowmapping-southbound/src/main/feature/feature.xml
+++ b/features/odl-lispflowmapping-southbound/src/main/feature/feature.xml
@@ -9,7 +9,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
 <features xmlns="http://karaf.apache.org/xmlns/features/v1.4.0" name="odl-lispflowmapping-southbound">
     <feature name="odl-lispflowmapping-southbound">
         <feature version="[12,15)">odl-netty-4</feature>
-        <feature version="[10,11)">odl-mdsal-broker</feature>
-        <feature version="[8,9)">odl-restconf</feature>
+        <feature version="[11,12)">odl-mdsal-broker</feature>
+        <feature version="[9,10)">odl-restconf</feature>
     </feature>
 </features>
diff --git a/features/pom.xml b/features/pom.xml
index 020c3f08..ef7697f5 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
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>odlparent-lite</artifactId>
-    <version>14.0.3</version>
+    <version>14.1.0</version>
     <relativePath/>
   </parent>
 
diff --git a/integrationtest/pom.xml b/integrationtest/pom.xml
index aa2f5607..e2ca6fae 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
   <parent>
     <groupId>org.opendaylight.controller</groupId>
     <artifactId>mdsal-it-parent</artifactId>
-    <version>10.0.2</version>
+    <version>11.0.0</version>
     <relativePath/>
   </parent>
 
diff --git a/lispflowmapping-karaf/pom.xml b/lispflowmapping-karaf/pom.xml
index 9754c2f8..d463e4e5 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
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>karaf4-parent</artifactId>
-    <version>14.0.3</version>
+    <version>14.1.0</version>
     <relativePath/>
   </parent>
 
diff --git a/mappingservice/api/pom.xml b/mappingservice/api/pom.xml
index 6513c117..b52bc3c8 100644
--- a/mappingservice/api/pom.xml
+++ b/mappingservice/api/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.opendaylight.mdsal</groupId>
     <artifactId>binding-parent</artifactId>
-    <version>14.0.2</version>
+    <version>14.0.13</version>
     <relativePath/>
   </parent>
 
diff --git a/mappingservice/lisp-proto/pom.xml b/mappingservice/lisp-proto/pom.xml
index 6ad2422a..b1ece6da 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
   <parent>
     <groupId>org.opendaylight.mdsal</groupId>
     <artifactId>binding-parent</artifactId>
-    <version>14.0.2</version>
+    <version>14.0.13</version>
     <relativePath/>
   </parent>
 
diff --git a/mappingservice/pom.xml b/mappingservice/pom.xml
index a6646fa2..165d3f39 100644
--- a/mappingservice/pom.xml
+++ b/mappingservice/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>odlparent</artifactId>
-    <version>14.0.3</version>
+    <version>14.1.0</version>
     <relativePath/>
   </parent>
 
@@ -38,7 +38,7 @@
       <dependency>
         <groupId>org.opendaylight.mdsal</groupId>
         <artifactId>mdsal-artifacts</artifactId>
-        <version>14.0.2</version>
+        <version>14.0.13</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>
diff --git a/mappingservice/southbound/pom.xml b/mappingservice/southbound/pom.xml
index b82d37df..9a8ab141 100644
--- a/mappingservice/southbound/pom.xml
+++ b/mappingservice/southbound/pom.xml
@@ -55,6 +55,14 @@
       <groupId>io.netty</groupId>
       <artifactId>netty-common</artifactId>
     </dependency>
+    <dependency>
+      <groupId>io.netty</groupId>
+      <artifactId>netty-transport</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>io.netty</groupId>
+      <artifactId>netty-transport-classes-epoll</artifactId>
+    </dependency>
     <dependency>
       <groupId>io.netty</groupId>
       <artifactId>netty-transport-native-epoll</artifactId>
@@ -107,6 +115,17 @@
     </dependency>
   </dependencies>
 
+  <build>
+    <plugins>
+      <plugin>
+        <artifactId>maven-surefire-plugin</artifactId>
+        <configuration>
+          <argLine>@{argLine}</argLine>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
+
   <!--
       Maven Site Configuration
 
-- 
2.34.1


From d839af3efb035ff65aca67e23b6d4580c4628b67 Mon Sep 17 00:00:00 2001
From: jenkins-releng <jenkins-releng@opendaylight.org>
Date: Wed, 9 Jul 2025 11:08:17 +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 392186eb..66fb462c 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
 
   <groupId>org.opendaylight.lispflowmapping</groupId>
   <artifactId>lispflowmapping-artifacts</artifactId>
-  <version>1.21.0-SNAPSHOT</version>
+  <version>1.21.0</version>
   <packaging>pom</packaging>
   <!-- <name> formatting is used by autorelease to parse and notify projects on
        build failure. Please do not modify this unless you have a good reason. -->
diff --git a/commons/build_tools/pom.xml b/commons/build_tools/pom.xml
index f269f318..dc51443a 100644
--- a/commons/build_tools/pom.xml
+++ b/commons/build_tools/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.opendaylight.lispflowmapping</groupId>
     <artifactId>lispflowmapping-commons</artifactId>
-    <version>1.21.0-SNAPSHOT</version>
+    <version>1.21.0</version>
     <relativePath>../parent</relativePath>
   </parent>
 
diff --git a/commons/parent/pom.xml b/commons/parent/pom.xml
index 410117d4..b24c9b69 100644
--- a/commons/parent/pom.xml
+++ b/commons/parent/pom.xml
@@ -21,7 +21,7 @@
 
   <groupId>org.opendaylight.lispflowmapping</groupId>
   <artifactId>lispflowmapping-commons</artifactId>
-  <version>1.21.0-SNAPSHOT</version>
+  <version>1.21.0</version>
   <packaging>pom</packaging>
   <!-- <name> formatting is used by autorelease to parse and notify projects on
        build failure. Please do not modify this unless you have a good reason. -->
@@ -30,9 +30,9 @@
   <properties>
     <build.suffix>1.0.0</build.suffix>
     <forwardingrulesmanager.version>0.5.0</forwardingrulesmanager.version>
-    <lispflowmapping.version>1.21.0-SNAPSHOT</lispflowmapping.version>
-    <nsf.version>0.24.0-SNAPSHOT</nsf.version>
-    <sal.version>0.28.0-SNAPSHOT</sal.version>
+    <lispflowmapping.version>1.21.0</lispflowmapping.version>
+    <nsf.version>0.24.0</nsf.version>
+    <sal.version>0.28.0</sal.version>
     <salGeneratorPath>src/main/yang-gen-sal</salGeneratorPath>
     <statisticsmanager.version>0.5.0</statisticsmanager.version>
     <yang.src.path>src/main/yang</yang.src.path>
diff --git a/features/features-lispflowmapping/pom.xml b/features/features-lispflowmapping/pom.xml
index 7a28fa68..b9356e22 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
 
   <groupId>org.opendaylight.lispflowmapping</groupId>
   <artifactId>features-lispflowmapping</artifactId>
-  <version>1.21.0-SNAPSHOT</version>
+  <version>1.21.0</version>
   <packaging>feature</packaging>
   <!-- <name> formatting is used by autorelease to parse and notify projects on
        build failure. Please do not modify this unless you have a good reason. -->
diff --git a/features/odl-lispflowmapping-inmemorydb/pom.xml b/features/odl-lispflowmapping-inmemorydb/pom.xml
index ff6b0d96..5fd0bbf9 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
 
   <groupId>org.opendaylight.lispflowmapping</groupId>
   <artifactId>odl-lispflowmapping-inmemorydb</artifactId>
-  <version>1.21.0-SNAPSHOT</version>
+  <version>1.21.0</version>
   <packaging>feature</packaging>
   <!-- <name> formatting is used by autorelease to parse and notify projects on
        build failure. Please do not modify this unless you have a good reason. -->
diff --git a/features/odl-lispflowmapping-mappingservice-shell/pom.xml b/features/odl-lispflowmapping-mappingservice-shell/pom.xml
index c5cb3054..0b778f1b 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
 
   <groupId>org.opendaylight.lispflowmapping</groupId>
   <artifactId>odl-lispflowmapping-mappingservice-shell</artifactId>
-  <version>1.21.0-SNAPSHOT</version>
+  <version>1.21.0</version>
   <packaging>feature</packaging>
   <!-- <name> formatting is used by autorelease to parse and notify projects on
        build failure. Please do not modify this unless you have a good reason. -->
diff --git a/features/odl-lispflowmapping-mappingservice/pom.xml b/features/odl-lispflowmapping-mappingservice/pom.xml
index 9c0ef46e..0f491845 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
 
   <groupId>org.opendaylight.lispflowmapping</groupId>
   <artifactId>odl-lispflowmapping-mappingservice</artifactId>
-  <version>1.21.0-SNAPSHOT</version>
+  <version>1.21.0</version>
   <packaging>feature</packaging>
   <!-- <name> formatting is used by autorelease to parse and notify projects on
        build failure. Please do not modify this unless you have a good reason. -->
diff --git a/features/odl-lispflowmapping-models/pom.xml b/features/odl-lispflowmapping-models/pom.xml
index 40a7dfbb..3a28b999 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
 
   <groupId>org.opendaylight.lispflowmapping</groupId>
   <artifactId>odl-lispflowmapping-models</artifactId>
-  <version>1.21.0-SNAPSHOT</version>
+  <version>1.21.0</version>
   <packaging>feature</packaging>
   <!-- <name> formatting is used by autorelease to parse and notify projects on
        build failure. Please do not modify this unless you have a good reason. -->
diff --git a/features/odl-lispflowmapping-msmr/pom.xml b/features/odl-lispflowmapping-msmr/pom.xml
index 52f1ec83..4a17817e 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
 
   <groupId>org.opendaylight.lispflowmapping</groupId>
   <artifactId>odl-lispflowmapping-msmr</artifactId>
-  <version>1.21.0-SNAPSHOT</version>
+  <version>1.21.0</version>
   <packaging>feature</packaging>
   <!-- <name> formatting is used by autorelease to parse and notify projects on
        build failure. Please do not modify this unless you have a good reason. -->
diff --git a/features/odl-lispflowmapping-southbound/pom.xml b/features/odl-lispflowmapping-southbound/pom.xml
index 2f900c85..e2a81a49 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
 
   <groupId>org.opendaylight.lispflowmapping</groupId>
   <artifactId>odl-lispflowmapping-southbound</artifactId>
-  <version>1.21.0-SNAPSHOT</version>
+  <version>1.21.0</version>
   <packaging>feature</packaging>
   <!-- <name> formatting is used by autorelease to parse and notify projects on
        build failure. Please do not modify this unless you have a good reason. -->
diff --git a/features/pom.xml b/features/pom.xml
index ef7697f5..bab2595b 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
 
   <groupId>org.opendaylight.lispflowmapping</groupId>
   <artifactId>features-aggregator</artifactId>
-  <version>1.21.0-SNAPSHOT</version>
+  <version>1.21.0</version>
   <packaging>pom</packaging>
   <!-- <name> formatting is used by autorelease to parse and notify projects on
        build failure. Please do not modify this unless you have a good reason. -->
diff --git a/integrationtest/pom.xml b/integrationtest/pom.xml
index e2ca6fae..fa168663 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
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.opendaylight.lispflowmapping</groupId>
   <artifactId>mappingservice.integrationtest</artifactId>
-  <version>1.21.0-SNAPSHOT</version>
+  <version>1.21.0</version>
   <packaging>bundle</packaging>
   <!-- <name> formatting is used by autorelease to parse and notify projects on
        build failure. Please do not modify this unless you have a good reason. -->
@@ -28,7 +28,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
     <skipITs>false</skipITs>
     <karaf.distro.groupId>org.opendaylight.lispflowmapping</karaf.distro.groupId>
     <karaf.distro.artifactId>lispflowmapping-karaf</karaf.distro.artifactId>
-    <karaf.distro.version>1.21.0-SNAPSHOT</karaf.distro.version>
+    <karaf.distro.version>1.21.0</karaf.distro.version>
     <karaf.distro.type>zip</karaf.distro.type>
   </properties>
 
diff --git a/lispflowmapping-karaf/pom.xml b/lispflowmapping-karaf/pom.xml
index d463e4e5..fc192a32 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
 
   <groupId>org.opendaylight.lispflowmapping</groupId>
   <artifactId>lispflowmapping-karaf</artifactId>
-  <version>1.21.0-SNAPSHOT</version>
+  <version>1.21.0</version>
   <packaging>pom</packaging>
   <!-- <name> formatting is used by autorelease to parse and notify projects on
        build failure. Please do not modify this unless you have a good reason. -->
diff --git a/mappingservice/api/pom.xml b/mappingservice/api/pom.xml
index b52bc3c8..f2c06e02 100644
--- a/mappingservice/api/pom.xml
+++ b/mappingservice/api/pom.xml
@@ -11,7 +11,7 @@
 
   <groupId>org.opendaylight.lispflowmapping</groupId>
   <artifactId>mappingservice.api</artifactId>
-  <version>1.21.0-SNAPSHOT</version>
+  <version>1.21.0</version>
   <packaging>bundle</packaging>
   <!-- <name> formatting is used by autorelease to parse and notify projects on
        build failure. Please do not modify this unless you have a good reason. -->
diff --git a/mappingservice/config/pom.xml b/mappingservice/config/pom.xml
index 214900c8..67773e98 100644
--- a/mappingservice/config/pom.xml
+++ b/mappingservice/config/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.opendaylight.lispflowmapping</groupId>
     <artifactId>mappingservice-parent</artifactId>
-    <version>1.21.0-SNAPSHOT</version>
+    <version>1.21.0</version>
   </parent>
 
   <artifactId>mappingservice.config</artifactId>
@@ -22,7 +22,7 @@
     <dependency>
       <groupId>org.opendaylight.lispflowmapping</groupId>
       <artifactId>mappingservice.api</artifactId>
-      <version>1.21.0-SNAPSHOT</version>
+      <version>1.21.0</version>
     </dependency>
   </dependencies>
 </project>
diff --git a/mappingservice/dsbackend/pom.xml b/mappingservice/dsbackend/pom.xml
index 427407b2..8025e995 100644
--- a/mappingservice/dsbackend/pom.xml
+++ b/mappingservice/dsbackend/pom.xml
@@ -13,7 +13,7 @@
   <parent>
     <groupId>org.opendaylight.lispflowmapping</groupId>
     <artifactId>mappingservice-parent</artifactId>
-    <version>1.21.0-SNAPSHOT</version>
+    <version>1.21.0</version>
   </parent>
 
   <artifactId>mappingservice.dsbackend</artifactId>
diff --git a/mappingservice/implementation/pom.xml b/mappingservice/implementation/pom.xml
index 768c4af6..38b35465 100644
--- a/mappingservice/implementation/pom.xml
+++ b/mappingservice/implementation/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.opendaylight.lispflowmapping</groupId>
     <artifactId>mappingservice-parent</artifactId>
-    <version>1.21.0-SNAPSHOT</version>
+    <version>1.21.0</version>
   </parent>
 
   <artifactId>mappingservice.implementation</artifactId>
diff --git a/mappingservice/inmemorydb/pom.xml b/mappingservice/inmemorydb/pom.xml
index 5cf0be92..5669a707 100644
--- a/mappingservice/inmemorydb/pom.xml
+++ b/mappingservice/inmemorydb/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.opendaylight.lispflowmapping</groupId>
     <artifactId>mappingservice-parent</artifactId>
-    <version>1.21.0-SNAPSHOT</version>
+    <version>1.21.0</version>
   </parent>
 
   <artifactId>mappingservice.inmemorydb</artifactId>
diff --git a/mappingservice/lisp-proto/pom.xml b/mappingservice/lisp-proto/pom.xml
index b1ece6da..983544bd 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
 
   <groupId>org.opendaylight.lispflowmapping</groupId>
   <artifactId>mappingservice.lisp-proto</artifactId>
-  <version>1.21.0-SNAPSHOT</version>
+  <version>1.21.0</version>
   <packaging>bundle</packaging>
   <!-- <name> formatting is used by autorelease to parse and notify projects on
        build failure. Please do not modify this unless you have a good reason. -->
diff --git a/mappingservice/mapcache/pom.xml b/mappingservice/mapcache/pom.xml
index bc6a76ec..f42b3c6e 100644
--- a/mappingservice/mapcache/pom.xml
+++ b/mappingservice/mapcache/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.opendaylight.lispflowmapping</groupId>
     <artifactId>mappingservice-parent</artifactId>
-    <version>1.21.0-SNAPSHOT</version>
+    <version>1.21.0</version>
   </parent>
 
   <artifactId>mappingservice.mapcache</artifactId>
diff --git a/mappingservice/pom.xml b/mappingservice/pom.xml
index 165d3f39..8fc90b62 100644
--- a/mappingservice/pom.xml
+++ b/mappingservice/pom.xml
@@ -11,7 +11,7 @@
 
   <groupId>org.opendaylight.lispflowmapping</groupId>
   <artifactId>mappingservice-parent</artifactId>
-  <version>1.21.0-SNAPSHOT</version>
+  <version>1.21.0</version>
   <packaging>pom</packaging>
   <!-- <name> formatting is used by autorelease to parse and notify projects on
        build failure. Please do not modify this unless you have a good reason. -->
diff --git a/mappingservice/shell/pom.xml b/mappingservice/shell/pom.xml
index 5e7bdb95..de20f6b7 100644
--- a/mappingservice/shell/pom.xml
+++ b/mappingservice/shell/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.opendaylight.lispflowmapping</groupId>
     <artifactId>mappingservice-parent</artifactId>
-    <version>1.21.0-SNAPSHOT</version>
+    <version>1.21.0</version>
   </parent>
 
   <artifactId>mappingservice.shell</artifactId>
diff --git a/mappingservice/southbound/pom.xml b/mappingservice/southbound/pom.xml
index 9a8ab141..1a3a484d 100644
--- a/mappingservice/southbound/pom.xml
+++ b/mappingservice/southbound/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.opendaylight.lispflowmapping</groupId>
     <artifactId>mappingservice-parent</artifactId>
-    <version>1.21.0-SNAPSHOT</version>
+    <version>1.21.0</version>
   </parent>
 
   <artifactId>mappingservice.southbound</artifactId>
diff --git a/pom.xml b/pom.xml
index 0b38905e..e77cf4b7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.opendaylight.lispflowmapping</groupId>
     <artifactId>lispflowmapping-commons</artifactId>
-    <version>1.21.0-SNAPSHOT</version>
+    <version>1.21.0</version>
     <relativePath>commons/parent</relativePath>
   </parent>
 
-- 
2.34.1