diff --git a/dependencies/install-jars/pom.xml b/dependencies/install-jars/pom.xml index 93b02aceaf..72512fb990 100644 --- a/dependencies/install-jars/pom.xml +++ b/dependencies/install-jars/pom.xml @@ -14,48 +14,8 @@ like install the ojdbc jar with the pbraw/pom.xml: maven-install-plugin:2.5.2:install-file (install-jar-lib) @ install-jars - Installing dependencies/install-jars/lib/ojdbc/ojdbc8-12.2.0.1.jar to .m2/repository/com/oracle/jdbc/ojdbc8/12.2.0.1/ojdbc8-12.2.0.1.jar Installing dependencies/install-jars/lib/pbraw/pom.xml to .m2/repository/com/oracle/jdbc/ojdbc8/12.2.0.1/ojdbc8-12.2.0.1.pom --> - - - - - - ${basedir}/lib/ojdbc/ojdbc8-12.2.0.1.jar - - - - - - org.apache.maven.plugins - maven-install-plugin - 2.5.2 - - - install-oracle - - com.oracle.jdbc - ojdbc8 - 12.2.0.1 - jar - ${basedir}/lib/ojdbc/ojdbc8-12.2.0.1.jar - true - - - install-file - - validate - - - - - - - diff --git a/dependencies/phoebus-target/pom.xml b/dependencies/phoebus-target/pom.xml index aad27455f0..63ba3145da 100644 --- a/dependencies/phoebus-target/pom.xml +++ b/dependencies/phoebus-target/pom.xml @@ -13,21 +13,6 @@ - - - - - ${basedir}/../install-jars/lib/ojdbc/ojdbc8-12.2.0.1.jar - - - - - com.oracle.jdbc - ojdbc8 - 12.2.0.1 - - - @@ -156,7 +141,38 @@ py4j 0.10.2.1 - + + + com.oracle.database.jdbc + ojdbc8 + 12.2.0.1 + + + com.oracle.database.jdbc + ucp + + + com.oracle.database.security + oraclepki + + + com.oracle.database.security + osdt_cert + + + com.oracle.database.security + osdt_core + + + com.oracle.database.ha + simplefan + + + com.oracle.database.ha + ons + + + com.mysql mysql-connector-j diff --git a/services/archive-engine/pom.xml b/services/archive-engine/pom.xml index 8940f0aabd..0fa16d2038 100644 --- a/services/archive-engine/pom.xml +++ b/services/archive-engine/pom.xml @@ -7,26 +7,6 @@ service-archive-engine ${project.groupId}:${project.artifactId} - - - - - - env.ORACLE_JDBC_JAR - - - - - com.oracle.jdbc - ojdbc8 - 12.2.0.1 - system - ${env.ORACLE_JDBC_JAR} - - - - - org.junit.jupiter @@ -68,6 +48,37 @@ ${jackson.version} + + com.oracle.database.jdbc + ojdbc8 + 12.2.0.1 + + + com.oracle.database.jdbc + ucp + + + com.oracle.database.security + oraclepki + + + com.oracle.database.security + osdt_cert + + + com.oracle.database.security + osdt_core + + + com.oracle.database.ha + simplefan + + + com.oracle.database.ha + ons + + + com.mysql mysql-connector-j