From 1a846833de91c0c1f249d76a012e66a4d973c7ca Mon Sep 17 00:00:00 2001 From: Oliver Kopp Date: Sat, 26 Oct 2019 02:14:57 +0200 Subject: [PATCH 1/2] Include Oracle's JDBC driver directly --- build.gradle | 2 + external-libraries.txt | 5 + .../java/oracle/jdbc/OracleConnection.java | 367 ------------------ .../java/oracle/jdbc/OracleStatement.java | 13 - .../oracle/jdbc/dcn/DatabaseChangeEvent.java | 8 - .../jdbc/dcn/DatabaseChangeListener.java | 9 - .../jdbc/dcn/DatabaseChangeRegistration.java | 11 - .../java/oracle/jdbc/driver/OracleDriver.java | 8 - src/main/java/oracle/jdbc/package-info.java | 4 - 9 files changed, 7 insertions(+), 420 deletions(-) delete mode 100644 src/main/java/oracle/jdbc/OracleConnection.java delete mode 100644 src/main/java/oracle/jdbc/OracleStatement.java delete mode 100644 src/main/java/oracle/jdbc/dcn/DatabaseChangeEvent.java delete mode 100644 src/main/java/oracle/jdbc/dcn/DatabaseChangeListener.java delete mode 100644 src/main/java/oracle/jdbc/dcn/DatabaseChangeRegistration.java delete mode 100644 src/main/java/oracle/jdbc/driver/OracleDriver.java delete mode 100644 src/main/java/oracle/jdbc/package-info.java diff --git a/build.gradle b/build.gradle index 5e3b16b3270..134ba178b68 100644 --- a/build.gradle +++ b/build.gradle @@ -139,6 +139,8 @@ dependencies { compile 'org.postgresql:postgresql:42.2.8' + compile 'com.oracle.ojdbc:ojdbc10:19.3.0.0' + compile ('com.google.guava:guava:28.1-jre') { // TODO: Remove this as soon as https://github.com/google/guava/issues/2960 is fixed exclude module: "jsr305" diff --git a/external-libraries.txt b/external-libraries.txt index 107ae83f6e4..2c9abc6bff8 100644 --- a/external-libraries.txt +++ b/external-libraries.txt @@ -65,6 +65,11 @@ Project: Application Insights SDK for Java URL: https://github.com/Microsoft/ApplicationInsights-Java License: MIT +Id: com.oracle.ojdbc:ojdbc10 +Project: Oracle's JDBC drivers +URL: https://medium.com/oracledevs/oracle-jdbc-drivers-on-maven-central-64fcf724d8b +License: Proprietary + Id: com.sibvisions.external.jvxfx:DnDTabPane Project: Drag'n'Drop TabPane URL: https://github.com/sibvisions/javafx.DndTabPane diff --git a/src/main/java/oracle/jdbc/OracleConnection.java b/src/main/java/oracle/jdbc/OracleConnection.java deleted file mode 100644 index 693a9ff5814..00000000000 --- a/src/main/java/oracle/jdbc/OracleConnection.java +++ /dev/null @@ -1,367 +0,0 @@ -package oracle.jdbc; - -import java.sql.Array; -import java.sql.Blob; -import java.sql.CallableStatement; -import java.sql.Clob; -import java.sql.Connection; -import java.sql.DatabaseMetaData; -import java.sql.NClob; -import java.sql.PreparedStatement; -import java.sql.SQLClientInfoException; -import java.sql.SQLException; -import java.sql.SQLWarning; -import java.sql.SQLXML; -import java.sql.Savepoint; -import java.sql.Statement; -import java.sql.Struct; -import java.util.Map; -import java.util.Properties; -import java.util.concurrent.Executor; - -import oracle.jdbc.dcn.DatabaseChangeRegistration; - -/** - * A mocking class used as a placeholder for the real Oracle JDBC drivers to prevent build errors. - */ -public class OracleConnection implements Connection { - - public static String DCN_NOTIFY_ROWIDS; - public static String DCN_QUERY_CHANGE_NOTIFICATION; - - @Override - public T unwrap(Class iface) throws SQLException { - // Auto-generated method stub - return null; - } - - @Override - public boolean isWrapperFor(Class iface) throws SQLException { - // Auto-generated method stub - return false; - } - - @Override - public Statement createStatement() throws SQLException { - // Auto-generated method stub - return null; - } - - @Override - public PreparedStatement prepareStatement(String sql) throws SQLException { - // Auto-generated method stub - return null; - } - - @Override - public CallableStatement prepareCall(String sql) throws SQLException { - // Auto-generated method stub - return null; - } - - @Override - public String nativeSQL(String sql) throws SQLException { - // Auto-generated method stub - return null; - } - - @Override - public void setAutoCommit(boolean autoCommit) throws SQLException { - // Auto-generated method stub - - } - - @Override - public boolean getAutoCommit() throws SQLException { - // Auto-generated method stub - return false; - } - - @Override - public void commit() throws SQLException { - // Auto-generated method stub - - } - - @Override - public void rollback() throws SQLException { - // Auto-generated method stub - - } - - @Override - public void close() throws SQLException { - // Auto-generated method stub - - } - - @Override - public boolean isClosed() throws SQLException { - // Auto-generated method stub - return false; - } - - @Override - public DatabaseMetaData getMetaData() throws SQLException { - // Auto-generated method stub - return null; - } - - @Override - public void setReadOnly(boolean readOnly) throws SQLException { - // Auto-generated method stub - - } - - @Override - public boolean isReadOnly() throws SQLException { - // Auto-generated method stub - return false; - } - - @Override - public void setCatalog(String catalog) throws SQLException { - // Auto-generated method stub - - } - - @Override - public String getCatalog() throws SQLException { - // Auto-generated method stub - return null; - } - - @Override - public void setTransactionIsolation(int level) throws SQLException { - // Auto-generated method stub - - } - - @Override - public int getTransactionIsolation() throws SQLException { - // Auto-generated method stub - return 0; - } - - @Override - public SQLWarning getWarnings() throws SQLException { - // Auto-generated method stub - return null; - } - - @Override - public void clearWarnings() throws SQLException { - // Auto-generated method stub - - } - - @Override - public Statement createStatement(int resultSetType, int resultSetConcurrency) throws SQLException { - // Auto-generated method stub - return null; - } - - @Override - public PreparedStatement prepareStatement(String sql, int resultSetType, int resultSetConcurrency) - throws SQLException { - // Auto-generated method stub - return null; - } - - @Override - public CallableStatement prepareCall(String sql, int resultSetType, int resultSetConcurrency) throws SQLException { - // Auto-generated method stub - return null; - } - - @Override - public Map> getTypeMap() throws SQLException { - // Auto-generated method stub - return null; - } - - @Override - public void setTypeMap(Map> map) throws SQLException { - // Auto-generated method stub - - } - - @Override - public void setHoldability(int holdability) throws SQLException { - // Auto-generated method stub - - } - - @Override - public int getHoldability() throws SQLException { - // Auto-generated method stub - return 0; - } - - @Override - public Savepoint setSavepoint() throws SQLException { - // Auto-generated method stub - return null; - } - - @Override - public Savepoint setSavepoint(String name) throws SQLException { - // Auto-generated method stub - return null; - } - - @Override - public void rollback(Savepoint savepoint) throws SQLException { - // Auto-generated method stub - - } - - @Override - public void releaseSavepoint(Savepoint savepoint) throws SQLException { - // Auto-generated method stub - - } - - @Override - public Statement createStatement(int resultSetType, int resultSetConcurrency, int resultSetHoldability) - throws SQLException { - // Auto-generated method stub - return null; - } - - @Override - public PreparedStatement prepareStatement(String sql, int resultSetType, int resultSetConcurrency, - int resultSetHoldability) throws SQLException { - // Auto-generated method stub - return null; - } - - @Override - public CallableStatement prepareCall(String sql, int resultSetType, int resultSetConcurrency, - int resultSetHoldability) throws SQLException { - // Auto-generated method stub - return null; - } - - @Override - public PreparedStatement prepareStatement(String sql, int autoGeneratedKeys) throws SQLException { - // Auto-generated method stub - return null; - } - - @Override - public PreparedStatement prepareStatement(String sql, int[] columnIndexes) throws SQLException { - // Auto-generated method stub - return null; - } - - @Override - public PreparedStatement prepareStatement(String sql, String[] columnNames) throws SQLException { - // Auto-generated method stub - return null; - } - - @Override - public Clob createClob() throws SQLException { - // Auto-generated method stub - return null; - } - - @Override - public Blob createBlob() throws SQLException { - // Auto-generated method stub - return null; - } - - @Override - public NClob createNClob() throws SQLException { - // Auto-generated method stub - return null; - } - - @Override - public SQLXML createSQLXML() throws SQLException { - // Auto-generated method stub - return null; - } - - @Override - public boolean isValid(int timeout) throws SQLException { - // Auto-generated method stub - return false; - } - - @Override - public void setClientInfo(String name, String value) throws SQLClientInfoException { - // Auto-generated method stub - - } - - @Override - public void setClientInfo(Properties properties) throws SQLClientInfoException { - // Auto-generated method stub - - } - - @Override - public String getClientInfo(String name) throws SQLException { - // Auto-generated method stub - return null; - } - - @Override - public Properties getClientInfo() throws SQLException { - // Auto-generated method stub - return null; - } - - @Override - public Array createArrayOf(String typeName, Object[] elements) throws SQLException { - // Auto-generated method stub - return null; - } - - @Override - public Struct createStruct(String typeName, Object[] attributes) throws SQLException { - // Auto-generated method stub - return null; - } - - @Override - public void setSchema(String schema) throws SQLException { - // Auto-generated method stub - - } - - @Override - public String getSchema() throws SQLException { - // Auto-generated method stub - return null; - } - - @Override - public void abort(Executor executor) throws SQLException { - // Auto-generated method stub - - } - - @Override - public void setNetworkTimeout(Executor executor, int milliseconds) throws SQLException { - // Auto-generated method stub - - } - - @Override - public int getNetworkTimeout() throws SQLException { - // Auto-generated method stub - return 0; - } - - public DatabaseChangeRegistration registerDatabaseChangeNotification(@SuppressWarnings("unused") Properties properties) { - return new DatabaseChangeRegistration(); - } - - public void unregisterDatabaseChangeNotification(@SuppressWarnings("unused") DatabaseChangeRegistration databaseChangeRegistration) { - // do nothing - } -} diff --git a/src/main/java/oracle/jdbc/OracleStatement.java b/src/main/java/oracle/jdbc/OracleStatement.java deleted file mode 100644 index ef24dcec056..00000000000 --- a/src/main/java/oracle/jdbc/OracleStatement.java +++ /dev/null @@ -1,13 +0,0 @@ -package oracle.jdbc; - -import oracle.jdbc.dcn.DatabaseChangeRegistration; - -/** - * A mocking class used as a placeholder for the real Oracle JDBC drivers to prevent build errors. - */ -public class OracleStatement { - - public void setDatabaseChangeRegistration(@SuppressWarnings("unused") DatabaseChangeRegistration registration) { - // do nothing - } -} diff --git a/src/main/java/oracle/jdbc/dcn/DatabaseChangeEvent.java b/src/main/java/oracle/jdbc/dcn/DatabaseChangeEvent.java deleted file mode 100644 index 522c1c4e0b2..00000000000 --- a/src/main/java/oracle/jdbc/dcn/DatabaseChangeEvent.java +++ /dev/null @@ -1,8 +0,0 @@ -package oracle.jdbc.dcn; - -/** - * A mocking class used as a placeholder for the real Oracle JDBC drivers to prevent build errors. - */ -public class DatabaseChangeEvent { - // no data -} diff --git a/src/main/java/oracle/jdbc/dcn/DatabaseChangeListener.java b/src/main/java/oracle/jdbc/dcn/DatabaseChangeListener.java deleted file mode 100644 index 7daae7aabfd..00000000000 --- a/src/main/java/oracle/jdbc/dcn/DatabaseChangeListener.java +++ /dev/null @@ -1,9 +0,0 @@ -package oracle.jdbc.dcn; - -/** - * A mocking class used as a placeholder for the real Oracle JDBC drivers to prevent build errors. - */ -public interface DatabaseChangeListener { - - public void onDatabaseChangeNotification(DatabaseChangeEvent event); -} diff --git a/src/main/java/oracle/jdbc/dcn/DatabaseChangeRegistration.java b/src/main/java/oracle/jdbc/dcn/DatabaseChangeRegistration.java deleted file mode 100644 index a0460176be9..00000000000 --- a/src/main/java/oracle/jdbc/dcn/DatabaseChangeRegistration.java +++ /dev/null @@ -1,11 +0,0 @@ -package oracle.jdbc.dcn; - -/** - * A mocking class used as a placeholder for the real Oracle JDBC drivers to prevent build errors. - */ -public class DatabaseChangeRegistration { - - public void addListener(@SuppressWarnings("unused") DatabaseChangeListener listener) { - // do nothing - } -} diff --git a/src/main/java/oracle/jdbc/driver/OracleDriver.java b/src/main/java/oracle/jdbc/driver/OracleDriver.java deleted file mode 100644 index 76851842d97..00000000000 --- a/src/main/java/oracle/jdbc/driver/OracleDriver.java +++ /dev/null @@ -1,8 +0,0 @@ -package oracle.jdbc.driver; - -/** - * A mocking class used as a placeholder for the real Oracle JDBC drivers to prevent build errors. - */ -public class OracleDriver { - // no data -} diff --git a/src/main/java/oracle/jdbc/package-info.java b/src/main/java/oracle/jdbc/package-info.java deleted file mode 100644 index 8683c43eed9..00000000000 --- a/src/main/java/oracle/jdbc/package-info.java +++ /dev/null @@ -1,4 +0,0 @@ -/** - * This package contains stubs for oracle.jdbc to prevent build errors if the non-distributable oraclejdbdc6.jar is unavailable in the classpath - */ -package oracle.jdbc; From ca1df1c16d27dbaf8251a8b9a2ff3ca7f4991c75 Mon Sep 17 00:00:00 2001 From: Oliver Kopp Date: Thu, 7 Nov 2019 23:50:05 +0100 Subject: [PATCH 2/2] Exclude oraclepki --- build.gradle | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 134ba178b68..42447c3d6ea 100644 --- a/build.gradle +++ b/build.gradle @@ -139,7 +139,10 @@ dependencies { compile 'org.postgresql:postgresql:42.2.8' - compile 'com.oracle.ojdbc:ojdbc10:19.3.0.0' + compile ('com.oracle.ojdbc:ojdbc10:19.3.0.0') { + // causing module issues + exclude module: 'oraclepki' + } compile ('com.google.guava:guava:28.1-jre') { // TODO: Remove this as soon as https://github.com/google/guava/issues/2960 is fixed