Fixes examples after pool2 upgrade due to OpenJPA using an old pool2 …

…impl
apache · Nov 17, 2023 · e5076d4 · e5076d4
1 parent 5ce33b6
commit e5076d4
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 1 deletion.
diff --git a/examples/alternate-descriptors/pom.xml b/examples/alternate-descriptors/pom.xml
@@ -69,6 +69,12 @@
       <artifactId>openjpa</artifactId>
       <version>4.0.0-SNAPSHOT</version>
       <scope>provided</scope>
+      <exclusions>
+        <exclusion>
+          <groupId>org.apache.commons</groupId>
+          <artifactId>commons-pool2</artifactId>
+        </exclusion>
+      </exclusions>
     </dependency>
     <dependency>
       <groupId>junit</groupId>

diff --git a/examples/multi-jpa-provider-testing/pom.xml b/examples/multi-jpa-provider-testing/pom.xml
@@ -140,6 +140,12 @@
       <artifactId>openjpa</artifactId>
       <version>4.0.0-SNAPSHOT</version>
       <scope>test</scope>
+      <exclusions>
+        <exclusion>
+          <groupId>org.apache.commons</groupId>
+          <artifactId>commons-pool2</artifactId>
+        </exclusion>
+      </exclusions>
     </dependency>
     <dependency>
       <!-- just a facade pom which will bring hibernate for us -->

diff --git a/examples/multi-jpa-provider-testing/src/test/resources/hibernate-pom.xml b/examples/multi-jpa-provider-testing/src/test/resources/hibernate-pom.xml
@@ -24,7 +24,7 @@
   <artifactId>hibernate-deps</artifactId>
 
   <properties>
-    <version.hibernate.orm>6.1.4.Final</version.hibernate.orm>
+    <version.hibernate.orm>6.1.7.Final</version.hibernate.orm>
     <version.hibernate.validator>7.0.5.Final</version.hibernate.validator>
   </properties>
   <dependencies>

diff --git a/examples/multi-jpa-provider-testing/src/test/resources/openjpa-pom.xml b/examples/multi-jpa-provider-testing/src/test/resources/openjpa-pom.xml
@@ -28,6 +28,12 @@
       <groupId>org.apache.openjpa</groupId>
       <artifactId>openjpa</artifactId>
       <version>4.0.0-SNAPSHOT</version>
+      <exclusions>
+        <exclusion>
+          <groupId>org.apache.commons</groupId>
+          <artifactId>commons-pool2</artifactId>
+        </exclusion>
+      </exclusions>
     </dependency>
   </dependencies>
 </project>
diff --git a/examples/pom.xml b/examples/pom.xml
@@ -43,6 +43,7 @@
     <module>cdi-alternative-and-stereotypes</module>
     <module>cdi-application-scope</module>
     <module>cdi-basic</module>
+    <module>cdi-dynamic-inject</module>
     <module>cdi-ejbcontext-jaas</module>
     <module>cdi-events</module>
     <module>cdi-interceptors</module>