From 3d3c95462a7344a56e677b452e074783b040271e Mon Sep 17 00:00:00 2001
From: Joakim Erdfelt <joakim.erdfelt@gmail.com>
Date: Wed, 7 Dec 2022 07:51:59 -0600
Subject: [PATCH] Fixing OSGi bundle + tycho-p2 build failures (#9017)

* Fixing errors/warnings from maven-bundle-plugin
* avoid issues with eclipse ranges
* Fixing version of p2.core
* revert bach tycho eclipse plugin to last working version 2.7.5

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
Signed-off-by: Olivier Lamy <olamy@apache.org>
Co-authored-by: Olivier Lamy <olamy@apache.org>
---
 documentation/jetty-asciidoctor-extensions/pom.xml | 4 ++++
 documentation/jetty-documentation/pom.xml          | 4 ++++
 jetty-p2/pom.xml                                   | 2 +-
 3 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/documentation/jetty-asciidoctor-extensions/pom.xml b/documentation/jetty-asciidoctor-extensions/pom.xml
index 627ebdf93ba..ac1116f07ae 100644
--- a/documentation/jetty-asciidoctor-extensions/pom.xml
+++ b/documentation/jetty-asciidoctor-extensions/pom.xml
@@ -11,6 +11,10 @@
   <name>Jetty :: Documentation :: AsciiDoctor Extensions</name>
   <packaging>jar</packaging>
 
+  <properties>
+    <bundle-symbolic-name>${project.groupId}.asciidoctor.extensions</bundle-symbolic-name>
+  </properties>
+
   <dependencies>
     <dependency>
       <groupId>org.asciidoctor</groupId>
diff --git a/documentation/jetty-documentation/pom.xml b/documentation/jetty-documentation/pom.xml
index a356ebbfdb6..1f55d207081 100644
--- a/documentation/jetty-documentation/pom.xml
+++ b/documentation/jetty-documentation/pom.xml
@@ -11,6 +11,10 @@
   <name>Jetty :: Documentation</name>
   <packaging>jar</packaging>
 
+  <properties>
+    <bundle-symbolic-name>${project.groupId}</bundle-symbolic-name>
+  </properties>
+
   <build>
     <plugins>
       <plugin>
diff --git a/jetty-p2/pom.xml b/jetty-p2/pom.xml
index 5d763dbaa63..fc042253ca8 100644
--- a/jetty-p2/pom.xml
+++ b/jetty-p2/pom.xml
@@ -12,7 +12,7 @@
   <description>Generates a (maven based) P2 Updatesite</description>
   <packaging>pom</packaging>
   <properties>
-    <tycho-version>3.0.0</tycho-version>
+    <tycho-version>2.7.5</tycho-version>
   </properties>
   <build>
     <plugins>