From 82745c995641d604beca24316fda96424691edc5 Mon Sep 17 00:00:00 2001
From: Chris Morris <chris.morris@vistra.com>
Date: Thu, 7 Oct 2021 09:30:25 +0100
Subject: [PATCH 1/2] Bundle compatibility client for OSGI

---
 compatibility-client/bnd.bnd | 8 ++++++++
 compatibility-client/pom.xml | 7 +++++++
 2 files changed, 15 insertions(+)
 create mode 100644 compatibility-client/bnd.bnd

diff --git a/compatibility-client/bnd.bnd b/compatibility-client/bnd.bnd
new file mode 100644
index 00000000000..51ad66e121c
--- /dev/null
+++ b/compatibility-client/bnd.bnd
@@ -0,0 +1,8 @@
+Bundle-SymbolicName: ${project.groupId}.compatibility-client
+Bundle-Name: Vaadin Compatibility Client
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-License: http://www.apache.org/licenses/LICENSE-2.0
+Import-Package: com.vaadin*;version="[${osgi.bundle.version},${osgi.bundle.version}]",\
+    javax.validation*;resolution:=optional;version='${javax.validation.version}',\
+    *
+Export-Package: com.vaadin.v7.client*;-noimport:=true
diff --git a/compatibility-client/pom.xml b/compatibility-client/pom.xml
index 47d52432b69..218fb7787ed 100644
--- a/compatibility-client/pom.xml
+++ b/compatibility-client/pom.xml
@@ -38,12 +38,19 @@
 
     <build>
         <plugins>
+		
+			<plugin>
+                <groupId>biz.aQute.bnd</groupId>
+                <artifactId>bnd-maven-plugin</artifactId>
+            </plugin>
+		
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-jar-plugin</artifactId>
                 <configuration>
                     <archive>
                         <index>false</index>
+						<manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
                         <manifest>
                             <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
                         </manifest>

From 537e820e775d98736ffe78ed00ad236792f59bf2 Mon Sep 17 00:00:00 2001
From: Chris Morris <chris.morris@vistra.com>
Date: Thu, 7 Oct 2021 10:57:53 +0100
Subject: [PATCH 2/2] Replace tabs with spaces

---
 compatibility-client/pom.xml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/compatibility-client/pom.xml b/compatibility-client/pom.xml
index 218fb7787ed..32ad5e59453 100644
--- a/compatibility-client/pom.xml
+++ b/compatibility-client/pom.xml
@@ -38,19 +38,19 @@
 
     <build>
         <plugins>
-		
-			<plugin>
+
+            <plugin>
                 <groupId>biz.aQute.bnd</groupId>
                 <artifactId>bnd-maven-plugin</artifactId>
             </plugin>
-		
+
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-jar-plugin</artifactId>
                 <configuration>
                     <archive>
                         <index>false</index>
-						<manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
+                        <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
                         <manifest>
                             <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
                         </manifest>