From cdfb1e52dbd325a7be9b91d58c93c0edc05c3ba0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Christoph=20L=C3=A4ubrich?= <christoph@laeubi-soft.de>
Date: Sat, 4 Feb 2023 12:50:57 +0100
Subject: [PATCH 1/3] Move from compendium to jdbc spec artifact

---
 pom.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pom.xml b/pom.xml
index c2e9be953..da9e65620 100644
--- a/pom.xml
+++ b/pom.xml
@@ -66,7 +66,7 @@
 		<azure-security-keyvault-keys.version>4.5.3</azure-security-keyvault-keys.version>
 		<azure-identity.version>1.7.0</azure-identity.version>
 		<msal.version>1.13.3</msal.version>
-		<org.osgi.compendium.version>5.0.0</org.osgi.compendium.version>
+		<osgi.jdbc.version>1.1.0</osgi.jdbc.version>
 		<antlr-runtime.version>4.9.3</antlr-runtime.version>
 		<com.google.code.gson.version>2.9.0</com.google.code.gson.version>
 		<bcprov-jdk15on.version>1.70</bcprov-jdk15on.version>
@@ -150,8 +150,8 @@
 		</dependency>
 		<dependency>
 			<groupId>org.osgi</groupId>
-			<artifactId>org.osgi.compendium</artifactId>
-			<version>${org.osgi.compendium.version}</version>
+			<artifactId>org.osgi.service.jdbc</artifactId>
+			<version>${osgi.jdbc.version}</version>
 			<scope>provided</scope>
 		</dependency>
 

From 945f944b603eea6866b1ecc0aebf9d9302802d1c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Christoph=20L=C3=A4ubrich?= <christoph@laeubi-soft.de>
Date: Sat, 4 Feb 2023 12:56:15 +0100
Subject: [PATCH 2/3] Add the new required properties from the updated spec

---
 .../java/com/microsoft/sqlserver/jdbc/osgi/Activator.java   | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/main/java/com/microsoft/sqlserver/jdbc/osgi/Activator.java b/src/main/java/com/microsoft/sqlserver/jdbc/osgi/Activator.java
index 241448cad..df29400ee 100644
--- a/src/main/java/com/microsoft/sqlserver/jdbc/osgi/Activator.java
+++ b/src/main/java/com/microsoft/sqlserver/jdbc/osgi/Activator.java
@@ -38,6 +38,12 @@ public void start(BundleContext context) throws Exception {
         properties.put(DataSourceFactory.OSGI_JDBC_DRIVER_NAME, "Microsoft JDBC Driver for SQL Server");
         properties.put(DataSourceFactory.OSGI_JDBC_DRIVER_VERSION,
                 driver.getMajorVersion() + "." + driver.getMinorVersion());
+        properties.put(DataSourceFactory.OSGI_JDBC_CAPABILITY, new String[] {
+                DataSourceFactory.OSGI_JDBC_CAPABILITY_DRIVER,
+                DataSourceFactory.OSGI_JDBC_CAPABILITY_DATASOURCE,
+                DataSourceFactory.OSGI_JDBC_CAPABILITY_CONNECTIONPOOLDATASOURCE,
+                DataSourceFactory.OSGI_JDBC_CAPABILITY_XADATASOURCE
+        });
         service = context.registerService(DataSourceFactory.class, new SQLServerDataSourceFactory(), properties);
         SQLServerDriver.register();
     }

From b51405589720a5619f9a611635378983b17e84a4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Christoph=20L=C3=A4ubrich?= <christoph@laeubi-soft.de>
Date: Sat, 4 Feb 2023 13:56:45 +0100
Subject: [PATCH 3/3] Add the official TCK test to check the compliance of the
 OSGi driver

---
 pom.xml    | 42 ++++++++++++++++++++++++++++++++++++++++++
 tck.bndrun |  6 ++++++
 2 files changed, 48 insertions(+)
 create mode 100644 tck.bndrun

diff --git a/pom.xml b/pom.xml
index da9e65620..165ed980e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -67,6 +67,9 @@
 		<azure-identity.version>1.7.0</azure-identity.version>
 		<msal.version>1.13.3</msal.version>
 		<osgi.jdbc.version>1.1.0</osgi.jdbc.version>
+		<osgi.jdbc.tck.version>8.1.0</osgi.jdbc.tck.version>
+		<org.eclipse.osgi.version>3.18.200</org.eclipse.osgi.version>
+		<bnd.version>6.3.1</bnd.version>
 		<antlr-runtime.version>4.9.3</antlr-runtime.version>
 		<com.google.code.gson.version>2.9.0</com.google.code.gson.version>
 		<bcprov-jdk15on.version>1.70</bcprov-jdk15on.version>
@@ -240,6 +243,17 @@
 			<version>${junit.jupiter.version}</version>
 			<scope>test</scope>
 		</dependency>
+		<dependency>
+			<groupId>org.osgi</groupId>
+			<artifactId>org.osgi.test.cases.jdbc</artifactId>
+			<version>${osgi.jdbc.tck.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.eclipse.platform</groupId>
+			<artifactId>org.eclipse.osgi</artifactId>
+			<version>${org.eclipse.osgi.version}</version>
+			<scope>test</scope>
+		</dependency>
 	</dependencies>
 
 	<profiles>
@@ -509,6 +523,34 @@
 					</execution>
 				</executions>
 			</plugin>
+			<!-- Execute OSGi Compatibility Test -->
+			<plugin>
+				<groupId>biz.aQute.bnd</groupId>
+				<artifactId>bnd-testing-maven-plugin</artifactId>
+				<version>${bnd.version}</version>
+				<executions>
+					<execution>
+						<id>osgi-tck-testing</id>
+						<goals>
+							<goal>testing</goal>
+						</goals>
+						<configuration>
+							<bndruns>
+								<include>tck.bndrun</include>
+							</bndruns>
+							<failOnChanges>false</failOnChanges>
+							<includeDependencyManagement>true</includeDependencyManagement>
+							<resolve>true</resolve>
+							<scopes>
+								<scope>compile</scope>
+								<scope>runtime</scope>
+								<scope>provided</scope>
+								<scope>test</scope>
+							</scopes>
+						</configuration>
+					</execution>
+				</executions>
+			</plugin>
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-javadoc-plugin</artifactId>
diff --git a/tck.bndrun b/tck.bndrun
new file mode 100644
index 000000000..6effc2074
--- /dev/null
+++ b/tck.bndrun
@@ -0,0 +1,6 @@
+-runfw: org.eclipse.osgi
+-tester: biz.aQute.tester.junit-platform
+-runrequires: bnd.identity;id=com.microsoft.sqlserver.mssql-jdbc, \
+	bnd.identity;id=org.osgi.test.cases.jdbc, \
+	bnd.identity;id=junit-jupiter-engine, \
+	bnd.identity;id=junit-platform-launcher
\ No newline at end of file