Skip to content

Commit 41f7bcb

Browse files
shroffkshroffk
authored
Merge pull request #3644 from ControlSystemStudio/oracle_jdbc
Use Oracle JDBC from maven central
2 parents 4f3790e + 00c5b3b commit 41f7bcb

File tree

3 files changed

+63
-76
lines changed

3 files changed

+63
-76
lines changed

‎dependencies/install-jars/pom.xml‎

Lines changed: 0 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -14,48 +14,8 @@
1414
like install the ojdbc jar with the pbraw/pom.xml:
1515
1616
maven-install-plugin:2.5.2:install-file (install-jar-lib) @ install-jars
17-
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
1817
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
1918
-->
20-
<profiles>
21-
<!-- Oracle JDBC is only available from an Oracle.
22-
If your site uses it, copy it into ${basedir}/lib/ojdbc/ojdbc8-12.2.0.1.jar,
23-
from which it will be installed into local maven repo
24-
-->
25-
<profile>
26-
<activation>
27-
<file>
28-
<exists>${basedir}/lib/ojdbc/ojdbc8-12.2.0.1.jar</exists>
29-
</file>
30-
</activation>
31-
<build>
32-
<plugins>
33-
<plugin>
34-
<groupId>org.apache.maven.plugins</groupId>
35-
<artifactId>maven-install-plugin</artifactId>
36-
<version>2.5.2</version>
37-
<executions>
38-
<execution>
39-
<id>install-oracle</id>
40-
<configuration>
41-
<groupId>com.oracle.jdbc</groupId>
42-
<artifactId>ojdbc8</artifactId>
43-
<version>12.2.0.1</version>
44-
<packaging>jar</packaging>
45-
<file>${basedir}/lib/ojdbc/ojdbc8-12.2.0.1.jar</file>
46-
<generatePom>true</generatePom>
47-
</configuration>
48-
<goals>
49-
<goal>install-file</goal>
50-
</goals>
51-
<phase>validate</phase>
52-
</execution>
53-
</executions>
54-
</plugin>
55-
</plugins>
56-
</build>
57-
</profile>
58-
</profiles>
5919

6020
<build>
6121
<plugins>

‎dependencies/phoebus-target/pom.xml‎

Lines changed: 32 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -13,21 +13,6 @@
1313
</properties>
1414

1515
<profiles>
16-
<!-- Oracle JDBC is conditionally installed by install-jars -->
17-
<profile>
18-
<activation>
19-
<file>
20-
<exists>${basedir}/../install-jars/lib/ojdbc/ojdbc8-12.2.0.1.jar</exists>
21-
</file>
22-
</activation>
23-
<dependencies>
24-
<dependency>
25-
<groupId>com.oracle.jdbc</groupId>
26-
<artifactId>ojdbc8</artifactId>
27-
<version>12.2.0.1</version>
28-
</dependency>
29-
</dependencies>
30-
</profile>
3116
<!-- Overriding the default release profile to run the pre release script
3217
with makes the required modification to .classpath and other manually maintained
3318
files -->
@@ -156,7 +141,38 @@
156141
<artifactId>py4j</artifactId>
157142
<version>0.10.2.1</version>
158143
</dependency>
159-
<!-- JDBC connectors For Oracle, see ORACLE_JDBC_JAR -->
144+
<!-- JDBC connectors For Oracle, MySQL, Postgres -->
145+
<dependency>
146+
<groupId>com.oracle.database.jdbc</groupId>
147+
<artifactId>ojdbc8</artifactId>
148+
<version>12.2.0.1</version>
149+
<exclusions>
150+
<exclusion>
151+
<groupId>com.oracle.database.jdbc</groupId>
152+
<artifactId>ucp</artifactId>
153+
</exclusion>
154+
<exclusion>
155+
<groupId>com.oracle.database.security</groupId>
156+
<artifactId>oraclepki</artifactId>
157+
</exclusion>
158+
<exclusion>
159+
<groupId>com.oracle.database.security</groupId>
160+
<artifactId>osdt_cert</artifactId>
161+
</exclusion>
162+
<exclusion>
163+
<groupId>com.oracle.database.security</groupId>
164+
<artifactId>osdt_core</artifactId>
165+
</exclusion>
166+
<exclusion>
167+
<groupId>com.oracle.database.ha</groupId>
168+
<artifactId>simplefan</artifactId>
169+
</exclusion>
170+
<exclusion>
171+
<groupId>com.oracle.database.ha</groupId>
172+
<artifactId>ons</artifactId>
173+
</exclusion>
174+
</exclusions>
175+
</dependency>
160176
<dependency>
161177
<groupId>com.mysql</groupId>
162178
<artifactId>mysql-connector-j</artifactId>

‎services/archive-engine/pom.xml‎

Lines changed: 31 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -7,26 +7,6 @@
77
</parent>
88
<artifactId>service-archive-engine</artifactId>
99
<name>${project.groupId}:${project.artifactId}</name>
10-
<profiles>
11-
<!-- When Oracle support is needed, set environment variable ORACLE_JDBC_JAR=/path/to/ojdbc8-12.2.0.1.jar -->
12-
<profile>
13-
<activation>
14-
<property>
15-
<name>env.ORACLE_JDBC_JAR</name>
16-
</property>
17-
</activation>
18-
<dependencies>
19-
<dependency>
20-
<groupId>com.oracle.jdbc</groupId>
21-
<artifactId>ojdbc8</artifactId>
22-
<version>12.2.0.1</version>
23-
<scope>system</scope>
24-
<systemPath>${env.ORACLE_JDBC_JAR}</systemPath>
25-
</dependency>
26-
</dependencies>
27-
</profile>
28-
</profiles>
29-
3010
<dependencies>
3111
<dependency>
3212
<groupId>org.junit.jupiter</groupId>
@@ -68,6 +48,37 @@
6848
<version>${jackson.version}</version>
6949
</dependency>
7050

51+
<dependency>
52+
<groupId>com.oracle.database.jdbc</groupId>
53+
<artifactId>ojdbc8</artifactId>
54+
<version>12.2.0.1</version>
55+
<exclusions>
56+
<exclusion>
57+
<groupId>com.oracle.database.jdbc</groupId>
58+
<artifactId>ucp</artifactId>
59+
</exclusion>
60+
<exclusion>
61+
<groupId>com.oracle.database.security</groupId>
62+
<artifactId>oraclepki</artifactId>
63+
</exclusion>
64+
<exclusion>
65+
<groupId>com.oracle.database.security</groupId>
66+
<artifactId>osdt_cert</artifactId>
67+
</exclusion>
68+
<exclusion>
69+
<groupId>com.oracle.database.security</groupId>
70+
<artifactId>osdt_core</artifactId>
71+
</exclusion>
72+
<exclusion>
73+
<groupId>com.oracle.database.ha</groupId>
74+
<artifactId>simplefan</artifactId>
75+
</exclusion>
76+
<exclusion>
77+
<groupId>com.oracle.database.ha</groupId>
78+
<artifactId>ons</artifactId>
79+
</exclusion>
80+
</exclusions>
81+
</dependency>
7182
<dependency>
7283
<groupId>com.mysql</groupId>
7384
<artifactId>mysql-connector-j</artifactId>

0 commit comments

Comments
 (0)