Skip to content

Commit 34e7d43

Browse files
authored
Merge pull request #95 from utPLSQL/new-public-jdbc-driver
Use new public jdbc driver available one maven central
2 parents 2f784b7 + 9a10e16 commit 34e7d43

File tree

3 files changed

+13
-28
lines changed

3 files changed

+13
-28
lines changed

Diff for: .travis.yml

+3-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ services:
44
- docker
55

66
jdk:
7-
- oraclejdk8
7+
- openjdk8
88

99
env:
1010
global:
@@ -42,6 +42,8 @@ matrix:
4242
jdk: openjdk11
4343
- env: UTPLSQL_VERSION="v3.1.7"
4444
jdk: openjdk12
45+
- env: UTPLSQL_VERSION="v3.1.7"
46+
jdk: openjdk13
4547

4648
before_cache:
4749
- rm -f $HOME/.gradle/caches/modules-2/modules-2.lock

Diff for: CONTRIBUTING.md

+5-14
Original file line numberDiff line numberDiff line change
@@ -8,20 +8,6 @@ https://maven.apache.org/install.html
88

99
*Don't forget to configure your JAVA_HOME environment variable.*
1010

11-
### Oracle Maven Repository
12-
The library uses OJDBC Driver to connect to the database, it's added as a maven dependency. To be able to download the Oracle dependencies, you need to configure your access to Oracle's Maven Repository:
13-
Create file `gradle.properties` in the root directory of the repository and place OTN credentials there:
14-
```properties
15-
ORACLE_OTN_USER[email protected]
16-
ORACLE_OTN_PASSWORD=password
17-
```
18-
19-
After configuring your access to Oracle's Maven repository, you will be able to successfully build this API by disabling integration tests.
20-
21-
```bash
22-
./gradlew build -x intTest
23-
```
24-
2511
### Local database with utPLSQL and utPLSQL-demo-project
2612

2713
To usefully contribute you'll have to setup a local database with installed [latest utPLSQL v3](https://github.com/utPLSQL/utPLSQL) and [utPLSQL-demo-project](https://github.com/utPLSQL/utPLSQL-demo-project).
@@ -35,6 +21,11 @@ When you have local database set up you can run the complete build including int
3521
./gradlew build
3622
```
3723

24+
To build the project without local database you may disable integration tests.
25+
```bash
26+
./gradlew build -x intTest
27+
```
28+
3829
### Skip the local database part
3930

4031
If you want to skip the local database part, just run ``./gradlew test``.

Diff for: build.gradle.kts

+5-13
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ val baseVersion = "3.1.8-SNAPSHOT"
1010
version = if (tag != null && "^[0-9.]+$".toRegex().matches(tag)) tag else baseVersion
1111

1212
val coverageResourcesVersion = "1.0.1"
13-
val ojdbcVersion = "12.2.0.1"
14-
val junitVersion = "5.5.0"
13+
val ojdbcVersion = "19.3.0.0"
14+
val junitVersion = "5.5.2"
1515

1616
val deployerJars by configurations.creating
1717

@@ -29,14 +29,6 @@ java {
2929

3030
// In this section you declare where to find the dependencies of your project
3131
repositories {
32-
maven {
33-
url = uri("https://www.oracle.com/content/secure/maven/content")
34-
credentials {
35-
// you may set this properties using gradle.properties file in the root of the project or in your GRADLE_HOME
36-
username = (project.findProperty("ORACLE_OTN_USER") as String?) ?: System.getenv("ORACLE_OTN_USER")
37-
password = (project.findProperty("ORACLE_OTN_PASSWORD") as String?) ?: System.getenv("ORACLE_OTN_PASSWORD")
38-
}
39-
}
4032
mavenCentral()
4133
jcenter()
4234
}
@@ -47,10 +39,10 @@ dependencies {
4739

4840
// This dependency is used internally, and not exposed to consumers on their own compile classpath.
4941
implementation("org.slf4j:slf4j-api:1.7.26")
50-
implementation("com.oracle.jdbc:ojdbc8:$ojdbcVersion") {
51-
exclude(group = "com.oracle.jdbc")
42+
implementation("com.oracle.ojdbc:ojdbc8:$ojdbcVersion") {
43+
exclude(group = "com.oracle.ojdbc")
5244
}
53-
implementation("com.oracle.jdbc:orai18n:$ojdbcVersion")
45+
implementation("com.oracle.ojdbc:orai18n:$ojdbcVersion")
5446

5547
// Use Jupiter test framework
5648
testImplementation("org.junit.jupiter:junit-jupiter:$junitVersion")

0 commit comments

Comments
 (0)