Ensure integration tests run against the current provider versions and fix the imports for HikariCP 3.3.0
diff --git a/tx-control-providers/jdbc/tx-control-jdbc-itests/pom.xml b/tx-control-providers/jdbc/tx-control-jdbc-itests/pom.xml
index e550338..6eaa746 100644
--- a/tx-control-providers/jdbc/tx-control-jdbc-itests/pom.xml
+++ b/tx-control-providers/jdbc/tx-control-jdbc-itests/pom.xml
@@ -73,13 +73,13 @@
<groupId>org.apache.aries.tx-control</groupId>
<artifactId>tx-control-provider-jdbc-local</artifactId>
<scope>test</scope>
- <version>1.0.0</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.aries.tx-control</groupId>
<artifactId>tx-control-provider-jdbc-xa</artifactId>
<scope>test</scope>
- <version>1.0.0</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
diff --git a/tx-control-providers/jdbc/tx-control-provider-jdbc-local/bnd.bnd b/tx-control-providers/jdbc/tx-control-provider-jdbc-local/bnd.bnd
index 6700ca3..fde985e 100644
--- a/tx-control-providers/jdbc/tx-control-provider-jdbc-local/bnd.bnd
+++ b/tx-control-providers/jdbc/tx-control-provider-jdbc-local/bnd.bnd
@@ -39,6 +39,8 @@
Import-Package: !com.codahale.*, \
!com.zaxxer.hikari.metrics.dropwizard, \
+ !com.zaxxer.hikari.metrics.micrometer, \
+ !io.micrometer.core.instrument, \
!javassist.*, \
org.osgi.service.transaction.control, \
org.osgi.service.transaction.control.jdbc, \
diff --git a/tx-control-providers/jdbc/tx-control-provider-jdbc-xa/bnd.bnd b/tx-control-providers/jdbc/tx-control-provider-jdbc-xa/bnd.bnd
index 1aa7e25..59ea833 100644
--- a/tx-control-providers/jdbc/tx-control-provider-jdbc-xa/bnd.bnd
+++ b/tx-control-providers/jdbc/tx-control-provider-jdbc-xa/bnd.bnd
@@ -39,6 +39,8 @@
Import-Package: !com.codahale.*, \
!com.zaxxer.hikari.metrics.dropwizard, \
+ !com.zaxxer.hikari.metrics.micrometer, \
+ !io.micrometer.core.instrument, \
!javassist.*, \
org.osgi.service.transaction.control, \
org.osgi.service.transaction.control.jdbc, \
diff --git a/tx-control-providers/jpa/tx-control-jpa-itests/pom.xml b/tx-control-providers/jpa/tx-control-jpa-itests/pom.xml
index a21daa0..86861ae 100644
--- a/tx-control-providers/jpa/tx-control-jpa-itests/pom.xml
+++ b/tx-control-providers/jpa/tx-control-jpa-itests/pom.xml
@@ -71,13 +71,13 @@
<groupId>org.apache.aries.tx-control</groupId>
<artifactId>tx-control-provider-jpa-local</artifactId>
<scope>test</scope>
- <version>1.0.0</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.aries.tx-control</groupId>
<artifactId>tx-control-provider-jpa-xa</artifactId>
<scope>test</scope>
- <version>1.0.0</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.aries.jpa.javax.persistence</groupId>
diff --git a/tx-control-providers/jpa/tx-control-provider-jpa-local/bnd.bnd b/tx-control-providers/jpa/tx-control-provider-jpa-local/bnd.bnd
index 5db467d..9c3c33a 100644
--- a/tx-control-providers/jpa/tx-control-provider-jpa-local/bnd.bnd
+++ b/tx-control-providers/jpa/tx-control-provider-jpa-local/bnd.bnd
@@ -40,6 +40,8 @@
Import-Package: !com.codahale.*, \
!com.zaxxer.hikari.metrics.dropwizard, \
+ !com.zaxxer.hikari.metrics.micrometer, \
+ !io.micrometer.core.instrument, \
!javassist.*, \
org.osgi.service.transaction.control, \
org.osgi.service.transaction.control.jdbc, \
diff --git a/tx-control-providers/jpa/tx-control-provider-jpa-parent/pom.xml b/tx-control-providers/jpa/tx-control-provider-jpa-parent/pom.xml
index 3412580..0b21ab1 100644
--- a/tx-control-providers/jpa/tx-control-provider-jpa-parent/pom.xml
+++ b/tx-control-providers/jpa/tx-control-provider-jpa-parent/pom.xml
@@ -37,7 +37,7 @@
<dependency>
<groupId>org.apache.aries.tx-control</groupId>
<artifactId>tx-control-provider-common</artifactId>
- <version>1.0.0</version>
+ <version>${project.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
diff --git a/tx-control-providers/jpa/tx-control-provider-jpa-xa/bnd.bnd b/tx-control-providers/jpa/tx-control-provider-jpa-xa/bnd.bnd
index 205836a..2795c96 100644
--- a/tx-control-providers/jpa/tx-control-provider-jpa-xa/bnd.bnd
+++ b/tx-control-providers/jpa/tx-control-provider-jpa-xa/bnd.bnd
@@ -43,6 +43,8 @@
Import-Package: !com.codahale.*, \
!com.zaxxer.hikari.metrics.dropwizard, \
+ !com.zaxxer.hikari.metrics.micrometer, \
+ !io.micrometer.core.instrument, \
!javassist.*, \
!javax.transaction, \
!org.apache.geronimo.osgi.registry.api, \
diff --git a/tx-control-providers/jpa/tx-control-provider-jpa-xa/pom.xml b/tx-control-providers/jpa/tx-control-provider-jpa-xa/pom.xml
index b2dda2c..73def3e 100644
--- a/tx-control-providers/jpa/tx-control-provider-jpa-xa/pom.xml
+++ b/tx-control-providers/jpa/tx-control-provider-jpa-xa/pom.xml
@@ -35,6 +35,17 @@
</description>
<dependencies>
+ <!--
+ Hikari CP dependency
+ This must come before the JDBC dependency to ensure
+ we embed the dependent version not whatever is
+ repackaged in the jdbc-xa bundle we depend on
+ -->
+ <dependency>
+ <groupId>com.zaxxer</groupId>
+ <artifactId>HikariCP</artifactId>
+ </dependency>
+
<!-- Internal Aries project dependencies -->
<dependency>
<groupId>org.apache.aries.tx-control</groupId>
@@ -99,33 +110,28 @@
<dependency>
<groupId>org.apache.aries.tx-control</groupId>
<artifactId>tx-control-provider-jpa-xa-plugin-eclipselink</artifactId>
- <version>1.0.0</version>
+ <version>${project.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.aries.tx-control</groupId>
<artifactId>tx-control-provider-jpa-xa-plugin-hibernate-5_0</artifactId>
- <version>1.0.0</version>
+ <version>${project.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.aries.tx-control</groupId>
<artifactId>tx-control-provider-jpa-xa-plugin-hibernate-5_2</artifactId>
- <version>1.0.0</version>
+ <version>${project.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.aries.tx-control</groupId>
<artifactId>tx-control-provider-jpa-xa-plugin-openjpa</artifactId>
- <version>1.0.0</version>
+ <version>${project.version}</version>
<scope>provided</scope>
</dependency>
- <!-- Hikari CP dependency -->
- <dependency>
- <groupId>com.zaxxer</groupId>
- <artifactId>HikariCP</artifactId>
- </dependency>
<!-- Logging dependencies -->
<dependency>
