move JUnit 4 rule to main jar

jdbi · Jan 3, 2024 · 1683af4 · 1683af4
1 parent 2bdefc8
commit 1683af4
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 27 deletions.
diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
@@ -1,5 +1,5 @@
-# Unreleased
-* Deprecated OracleDatabaseRule; use testcontainer rule.
+# 3.43.0
+* Moved JUnit 4 OracleDatabaseRule to main jar.
 
 # 3.42.0
 * synced with mainline 3.42.0 release

diff --git a/pom.xml b/pom.xml
@@ -93,14 +93,35 @@
         </dependency>
 
         <dependency>
-            <groupId>org.assertj</groupId>
-            <artifactId>assertj-core</artifactId>
-            <scope>test</scope>
+            <groupId>org.jdbi</groupId>
+            <artifactId>jdbi3-testing</artifactId>
+            <optional>true</optional>
+        </dependency>
+
+        <dependency>
+            <groupId>org.testcontainers</groupId>
+            <artifactId>oracle-xe</artifactId>
+            <scope>provided</scope>
+            <optional>true</optional>
+        </dependency>
+
+        <dependency>
+            <groupId>org.testcontainers</groupId>
+            <artifactId>jdbc</artifactId>
+            <scope>provided</scope>
+            <optional>true</optional>
         </dependency>
 
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
+            <scope>provided</scope>
+            <optional>true</optional>
+        </dependency>
+
+        <dependency>
+            <groupId>org.assertj</groupId>
+            <artifactId>assertj-core</artifactId>
             <scope>test</scope>
         </dependency>
 
@@ -123,12 +144,6 @@
             <scope>test</scope>
         </dependency>
 
-        <dependency>
-            <groupId>org.jdbi</groupId>
-            <artifactId>jdbi3-testing</artifactId>
-            <scope>test</scope>
-        </dependency>
-
         <dependency>
             <groupId>org.jdbi</groupId>
             <artifactId>jdbi3-testcontainers</artifactId>
@@ -140,18 +155,6 @@
             <artifactId>junit-jupiter</artifactId>
             <scope>test</scope>
         </dependency>
-
-        <dependency>
-            <groupId>org.testcontainers</groupId>
-            <artifactId>jdbc</artifactId>
-            <scope>test</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.testcontainers</groupId>
-            <artifactId>oracle-xe</artifactId>
-            <scope>test</scope>
-        </dependency>
     </dependencies>
 
     <!-- repos are required to access the snapshot deps from the main build -->

diff --git a/.../jdbi/v3/oracle12/OracleDatabaseRule.java → .../jdbi/v3/oracle12/OracleDatabaseRule.java b/.../jdbi/v3/oracle12/OracleDatabaseRule.java → .../jdbi/v3/oracle12/OracleDatabaseRule.java
@@ -24,11 +24,8 @@
 import org.testcontainers.containers.OracleContainer;
 
 /**
- * Helper for a database managed by testcontainers.
- *
- * @deprecated Use the testcontainer {@link org.jdbi.v3.testing.junit5.tc.JdbiTestcontainersExtension}.
+ * JUnit 4 Helper for a database managed by testcontainers.
  */
-@Deprecated
 public class OracleDatabaseRule extends JdbiRule {
 
     private final String uri;