From ba78f17b2b2fffd33f09c06f0af1c199e5a00d3a Mon Sep 17 00:00:00 2001
From: Norman Maurer <norman_maurer@apple.com>
Date: Mon, 9 Jan 2023 19:07:46 +0100
Subject: [PATCH] Fix NPE caused by old bundle plugin version (#13106)

Motivation:

We used some very old bundle plugin version in our commons module. This caused a NPE when using a more recent JDK.

Modifications:

- Update the plugin version in general
- Remove extra version declaration in common pom.xml

Result:

No more NPE during build
---
 common/pom.xml | 1 -
 pom.xml        | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/common/pom.xml b/common/pom.xml
index 83512eb6b59..b6a5f4debc5 100644
--- a/common/pom.xml
+++ b/common/pom.xml
@@ -195,7 +195,6 @@
       <plugin>
         <groupId>org.apache.felix</groupId>
         <artifactId>maven-bundle-plugin</artifactId>
-        <version>2.5.4</version>
         <executions>
           <execution>
             <id>generate-manifest</id>
diff --git a/pom.xml b/pom.xml
index 10339ed4900..eb74da1ed02 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1490,7 +1490,7 @@
       <plugin>
         <groupId>org.apache.felix</groupId>
         <artifactId>maven-bundle-plugin</artifactId>
-        <version>2.5.4</version>
+        <version>5.1.8</version>
         <executions>
           <execution>
             <id>generate-manifest</id>