Skip to content

Commit 4ff9838

Browse files
authored
bump oracle version (#391)
* bump oracle version Attempt to speed up build by changing oracle version At present talks 11 minutes to run all oracle tests * Update connection details and driver version
1 parent 1a5c79e commit 4ff9838

File tree

4 files changed

+9
-6
lines changed

4 files changed

+9
-6
lines changed

.circleci/config.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -230,7 +230,7 @@ jobs:
230230
working_directory: ~/querydsl
231231
docker:
232232
- image: velo/toolchains-4-ci-builds:with-21
233-
- image: gvenzl/oracle-xe:11
233+
- image: gvenzl/oracle-xe:slim-faststart
234234
environment:
235235
- ORACLE_PASSWORD=querydsl
236236
- APP_USER=querydsl

docker-compose.yml

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,11 +31,14 @@ services:
3131
- POSTGRES_DB=querydsl
3232

3333
oracle:
34-
image: wnameless/oracle-xe-11g-r2:latest
34+
image: gvenzl/oracle-xe:slim-faststart
3535
ports:
3636
- "1521:1521"
37-
volumes:
38-
- "./devops/sql-snippets/oracle.sql:/docker-entrypoint-initdb.d/oracle.sql"
37+
environment:
38+
- ORACLE_PASSWORD=querydsl
39+
- APP_USER=querydsl
40+
- APP_USER_PASSWORD=querydsl
41+
- TZ=UTC
3942

4043
cubrid:
4144
image: cubrid/cubrid:11.3

querydsl-libraries/querydsl-sql/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@
9292
</dependency>
9393
<dependency>
9494
<groupId>com.oracle.database.jdbc</groupId>
95-
<artifactId>ojdbc8</artifactId>
95+
<artifactId>ojdbc11</artifactId>
9696
<version>${oracle.version}</version>
9797
<scope>test</scope>
9898
</dependency>

querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/Connections.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,7 @@ private static Connection getMySQL() throws SQLException, ClassNotFoundException
135135

136136
private static Connection getOracle() throws SQLException, ClassNotFoundException {
137137
Class.forName("oracle.jdbc.driver.OracleDriver");
138-
String url = "jdbc:oracle:thin:@localhost:1521:xe";
138+
String url = "jdbc:oracle:thin:@localhost:1521/XEPDB1";
139139
return DriverManager.getConnection(url, "querydsl", "querydsl");
140140
}
141141

0 commit comments

Comments
 (0)