Udpate dependencies for TCK

ops4j · Jul 5, 2024 · 5670de6 · 5670de6
1 parent a65caa1
commit 5670de6
Show file tree

Hide file tree

Showing 3 changed files with 36 additions and 32 deletions.
diff --git a/pax-jpa-tck/pom.xml b/pax-jpa-tck/pom.xml
@@ -89,7 +89,6 @@
 		<dependency>
 			<groupId>org.slf4j</groupId>
 			<artifactId>slf4j-api</artifactId>
-			<version>1.7.0</version>
 		</dependency>
 		<dependency>
 			<groupId>com.sun.activation</groupId>
@@ -104,13 +103,12 @@
 		<dependency>
 			<groupId>jakarta.xml.bind</groupId>
 			<artifactId>jakarta.xml.bind-api</artifactId>
-			<version>3.0.0</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
 			<groupId>com.sun.xml.bind</groupId>
-			<artifactId>jaxb-osgi</artifactId>
-			<version>3.0.2</version>
+			<artifactId>jaxb-impl</artifactId>
+			<scope>compile</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.eclipse.persistence</groupId>
@@ -120,7 +118,8 @@
 		<dependency>
 			<groupId>org.glassfish.hk2</groupId>
 			<artifactId>osgi-resource-locator</artifactId>
-			<version>1.0.3</version>
+			<version>2.4.0</version>
+			<type>jar</type>
 		</dependency>
 		<dependency>
 			<groupId>org.slf4j</groupId>

diff --git a/pax-jpa-tck/tck.bndrun b/pax-jpa-tck/tck.bndrun
@@ -17,23 +17,23 @@
 -runrequires: \
 	bnd.identity;id='org.ops4j.pax.jpa',\
 	bnd.identity;id='slf4j.simple',\
-	bnd.identity;id='com.sun.xml.bind.jaxb-osgi',\
+	bnd.identity;id='com.sun.xml.bind.jaxb-impl',\
 	bnd.identity;id='org.glassfish.hk2.osgi-resource-locator',\
 	bnd.identity;id='org.eclipse.persistence.jpa'
 
 -runbundles: \
 	assertj-core;version='[3.22.0,3.22.1)',\
-	com.sun.activation.jakarta.activation;version='[2.0.0,2.0.1)',\
-	com.sun.xml.bind.jaxb-osgi;version='[3.0.2,3.0.3)',\
-	jakarta.xml.bind-api;version='[3.0.0,3.0.1)',\
-	javax.activation-api;version='[1.2.0,1.2.1)',\
-	jaxb-api;version='[2.3.1,2.3.2)',\
+	com.sun.xml.bind.jaxb-core;version='[4.0.5,4.0.6)',\
+	com.sun.xml.bind.jaxb-impl;version='[4.0.5,4.0.6)',\
+	jakarta.activation-api;version='[2.1.0,2.1.1)',\
+	jakarta.xml.bind-api;version='[4.0.0,4.0.1)',\
+	javax.persistence;version='[2.0.5,2.0.6)',\
 	org.apache.geronimo.specs.geronimo-jpa_2.0_spec;version='[1.1.0,1.1.1)',\
 	org.apache.servicemix.bundles.junit;version='[4.13.2,4.13.3)',\
 	org.eclipse.persistence.asm;version='[3.3.1,3.3.2)',\
 	org.eclipse.persistence.core;version='[2.4.2,2.4.3)',\
 	org.eclipse.persistence.jpa;version='[2.4.2,2.4.3)',\
-	org.glassfish.hk2.osgi-resource-locator;version='[1.0.3,1.0.4)',\
+	org.glassfish.hk2.osgi-resource-locator;version='[2.4.0,2.4.1)',\
 	org.ops4j.pax.jpa;version='[1.0.0,1.0.1)',\
 	org.osgi.service.cm;version='[1.6.1,1.6.2)',\
 	org.osgi.service.jdbc;version='[1.0.0,1.0.1)',\

diff --git a/pom.xml b/pom.xml
@@ -1,4 +1,6 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<groupId>org.ops4j</groupId>
@@ -30,7 +32,7 @@
 		<pax.jdbc.version>0.6.0</pax.jdbc.version>
 		<pax.swissbox.version>1.8.0</pax.swissbox.version>
 		<pax.url.version>2.2.0</pax.url.version>
-		<slf4j.version>1.6.4</slf4j.version>
+		<slf4j.version>1.7.0</slf4j.version>
 		<lifecycle-mapping.version>1.0.0</lifecycle-mapping.version>
 		<pax.jpa.wiki.url>https://github.com/ops4j/org.ops4j.pax.jpa/wiki</pax.jpa.wiki.url>
 		<org.apache.derby_derby.version>10.8.2.2</org.apache.derby_derby.version>
@@ -240,7 +242,8 @@
 			<dependency>
 				<groupId>org.apache.geronimo.specs</groupId>
 				<artifactId>geronimo-jta_1.1_spec</artifactId>
-				<version>${org.apache.geronimo.specs_geronimo-jta_1.1_spec.version}</version>
+				<version>
+					${org.apache.geronimo.specs_geronimo-jta_1.1_spec.version}</version>
 			</dependency>
 
 			<dependency>
@@ -392,7 +395,7 @@
 			<dependency>
 				<groupId>com.sun.xml.bind</groupId>
 				<artifactId>jaxb-impl</artifactId>
-				<version>${jakarta.xml.version}</version>
+				<version>4.0.5</version>
 				<scope>provided</scope>
 			</dependency>
 			<dependency>
@@ -529,22 +532,24 @@
 			<name>Apache License, Version 2.0</name>
 			<url>http://www.apache.org/licenses/LICENSE-2.0</url>
 			<comments>
-                Copyright 2012 Harald Wellmann
-
-                Licensed under the Apache License, Version 2.0 (the "License");
-                you may not use this file except in compliance with the License.
-                You may obtain a copy of the License at
-
-                http://www.apache.org/licenses/LICENSE-2.0
-
-                Unless required by applicable law or agreed to in writing, software
-                distributed under the License is distributed on an "AS IS" BASIS,
-                WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-                implied.
-
-                See the License for the specific language governing permissions and
-                limitations under the License.
-            </comments>
+				Copyright 2012 Harald Wellmann
+
+				Licensed under the Apache License, Version 2.0 (the "License");
+				you may not use this file except in compliance with the License.
+				You may obtain a copy of the License at
+				http://www.apache.org/licenses/LICENSE-2.0
+
+				Unless required by applicable law or agreed to in writing,
+				software
+				distributed under the License is distributed on an "AS IS"
+				BASIS,
+				WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+				implied.
+
+				See the License for the specific language governing permissions
+				and
+				limitations under the License.
+			</comments>
 		</license>
 	</licenses>