diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md index 3ec4af7..f9f9398 100644 --- 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 index 950a3f0..bfe52ed 100644 --- a/pom.xml +++ b/pom.xml @@ -93,14 +93,35 @@ - org.assertj - assertj-core - test + org.jdbi + jdbi3-testing + true + + + + org.testcontainers + oracle-xe + provided + true + + + + org.testcontainers + jdbc + provided + true junit junit + provided + true + + + + org.assertj + assertj-core test @@ -123,12 +144,6 @@ test - - org.jdbi - jdbi3-testing - test - - org.jdbi jdbi3-testcontainers @@ -140,18 +155,6 @@ junit-jupiter test - - - org.testcontainers - jdbc - test - - - - org.testcontainers - oracle-xe - test - diff --git a/src/test/java/org/jdbi/v3/oracle12/OracleDatabaseRule.java b/src/main/java/org/jdbi/v3/oracle12/OracleDatabaseRule.java similarity index 92% rename from src/test/java/org/jdbi/v3/oracle12/OracleDatabaseRule.java rename to src/main/java/org/jdbi/v3/oracle12/OracleDatabaseRule.java index ace620c..eebb7fc 100644 --- a/src/test/java/org/jdbi/v3/oracle12/OracleDatabaseRule.java +++ b/src/main/java/org/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;