From ba7a45eb6e6b3d5a051b1a9c0556e608a8cd380c Mon Sep 17 00:00:00 2001 From: amckenzie Date: Tue, 28 Feb 2017 12:31:18 +0000 Subject: [PATCH] remove dependency on microservices --- file-service-it/pom.xml | 3 --- .../it/helpers/JdbcConnectionProvider.java | 5 +---- file-service-persistence/pom.xml | 15 +++++++-------- 3 files changed, 8 insertions(+), 15 deletions(-) diff --git a/file-service-it/pom.xml b/file-service-it/pom.xml index c08a8de..0e3a3c6 100644 --- a/file-service-it/pom.xml +++ b/file-service-it/pom.xml @@ -58,9 +58,6 @@ org.hamcrest hamcrest-all - - - 1.3 diff --git a/file-service-it/src/test/java/uk/gov/justice/services/fileservice/it/helpers/JdbcConnectionProvider.java b/file-service-it/src/test/java/uk/gov/justice/services/fileservice/it/helpers/JdbcConnectionProvider.java index 0844dde..6218da6 100644 --- a/file-service-it/src/test/java/uk/gov/justice/services/fileservice/it/helpers/JdbcConnectionProvider.java +++ b/file-service-it/src/test/java/uk/gov/justice/services/fileservice/it/helpers/JdbcConnectionProvider.java @@ -3,15 +3,12 @@ import static java.lang.String.format; import static java.sql.DriverManager.registerDriver; -import uk.gov.justice.services.jdbc.persistence.DataAccessException; - import java.sql.Connection; import java.sql.DriverManager; import java.sql.SQLException; public class JdbcConnectionProvider { - public Connection getConnection(final String url, final String username, final String password, final String driverClassName) { try { final java.sql.Driver driver = (java.sql.Driver) Class.forName(driverClassName).newInstance(); @@ -23,7 +20,7 @@ public Connection getConnection(final String url, final String username, final S username, password); - throw new DataAccessException(message, e); + throw new RuntimeException(message, e); } } } diff --git a/file-service-persistence/pom.xml b/file-service-persistence/pom.xml index d360a3a..4a2156a 100644 --- a/file-service-persistence/pom.xml +++ b/file-service-persistence/pom.xml @@ -12,19 +12,11 @@ file-service-persistence - - uk.gov.justice.services - persistence-jdbc - uk.gov.justice.services file-service-api ${project.version} - - uk.gov.justice.services - messaging-core - javax javaee-api @@ -40,6 +32,13 @@ guava + + uk.gov.justice.utils + utilities-core + + 1.1.0 + +