Skip to content

Commit

Permalink
update postgresql jdbc driver #781 (#805)
Browse files Browse the repository at this point in the history
* Revert "update jdbc driver #781 (#799)"

This reverts commit 929b592.

* update postgresql jdbc driver #781
  • Loading branch information
btkobayashirun authored and btyanagawamg committed Apr 9, 2019
1 parent 929b592 commit 7d1b076
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 10 deletions.
10 changes: 5 additions & 5 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -237,10 +237,10 @@
<version>${postgresql.version}</version>
</dependency>
<dependency>
<!-- ojdbc8.jar must be pre-installed in local repository. -->
<!-- ojdbc7.jar must be pre-installed in local repository. -->
<groupId>com.oracle.jdbc</groupId>
<artifactId>ojdbc8</artifactId>
<version>${ojdbc8.version}</version>
<artifactId>ojdbc7</artifactId>
<version>${ojdbc7.version}</version>
</dependency>
<dependency>
<!-- db2jcc4.jar must be pre-installed in local repository. -->
Expand All @@ -262,8 +262,8 @@
<xml-maven-plugin.version>1.0.1</xml-maven-plugin.version>
<com.google.code.maven-license-plugin.version>1.4.0</com.google.code.maven-license-plugin.version>
<!-- == Dependency Versions == -->
<postgresql.version>9.4.1212.jre7</postgresql.version>
<ojdbc8.version>12.2.0.1.0</ojdbc8.version>
<postgresql.version>42.2.5.jre7</postgresql.version>
<ojdbc7.version>12.1.0.2</ojdbc7.version>
<db2jcc4.version>4.21.29</db2jcc4.version>
<selenium.version>2.46.0</selenium.version>
<!-- == Project Properties == -->
Expand Down
4 changes: 2 additions & 2 deletions terasoluna-gfw-functionaltest-domain/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -59,10 +59,10 @@
<scope>provided</scope>
<optional>true</optional>
</dependency>
<!-- Once you have installed ojdbc8.jar into local repository, please remove this comment out. -->
<!-- Once you have installed ojdbc7.jar into local repository, please remove this comment out. -->
<!-- <dependency> -->
<!-- <groupId>com.oracle.jdbc</groupId> -->
<!-- <artifactId>ojdbc8</artifactId> -->
<!-- <artifactId>ojdbc7</artifactId> -->
<!-- <scope>provided</scope> -->
<!-- <optional>true</optional> -->
<!-- </dependency> -->
Expand Down
6 changes: 3 additions & 3 deletions terasoluna-gfw-functionaltest-initdb/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
</properties>
</profile>
<profile>
<!-- ojdbc8.jar must be pre-installed in local repository. -->
<!-- ojdbc7.jar must be pre-installed in local repository. -->
<id>oracle</id>
<properties>
<db.encoding>UTF8</db.encoding>
Expand All @@ -45,8 +45,8 @@
<db.password>gfw</db.password>
<db.driver>oracle.jdbc.OracleDriver</db.driver>
<db.groupId>com.oracle.jdbc</db.groupId>
<db.artifactId>ojdbc8</db.artifactId>
<db.version>${ojdbc8.version}</db.version>
<db.artifactId>ojdbc7</db.artifactId>
<db.version>${ojdbc7.version}</db.version>
<db.delimiterType>row</db.delimiterType>
</properties>
</profile>
Expand Down

0 comments on commit 7d1b076

Please sign in to comment.