Skip to content

Use new public jdbc driver available one maven central #95

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Oct 20, 2019
Merged

Use new public jdbc driver available one maven central #95

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
aec486e
user new public jdbc driver, remove custom download
Pazus Oct 19, 2019
9a10e16
fix jdk as new Xenial image on Travis doesn't support oraclejdk8. add…
Pazus Oct 19, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ services:
- docker

jdk:
- oraclejdk8
- openjdk8

env:
global:
Expand Down Expand Up @@ -42,6 +42,8 @@ matrix:
jdk: openjdk11
- env: UTPLSQL_VERSION="v3.1.7"
jdk: openjdk12
- env: UTPLSQL_VERSION="v3.1.7"
jdk: openjdk13

before_cache:
- rm -f $HOME/.gradle/caches/modules-2/modules-2.lock
Expand Down
19 changes: 5 additions & 14 deletions CONTRIBUTING.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,20 +8,6 @@ https://maven.apache.org/install.html

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

### Oracle Maven Repository
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:
Create file `gradle.properties` in the root directory of the repository and place OTN credentials there:
```properties
ORACLE_OTN_USER=user@email.com
ORACLE_OTN_PASSWORD=password
```

After configuring your access to Oracle's Maven repository, you will be able to successfully build this API by disabling integration tests.

```bash
./gradlew build -x intTest
```

### Local database with utPLSQL and utPLSQL-demo-project

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).
Expand All @@ -35,6 +21,11 @@ When you have local database set up you can run the complete build including int
./gradlew build
```

To build the project without local database you may disable integration tests.
```bash
./gradlew build -x intTest
```

### Skip the local database part

If you want to skip the local database part, just run ``./gradlew test``.
Expand Down
18 changes: 5 additions & 13 deletions build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ val baseVersion = "3.1.8-SNAPSHOT"
version = if (tag != null && "^[0-9.]+$".toRegex().matches(tag)) tag else baseVersion

val coverageResourcesVersion = "1.0.1"
val ojdbcVersion = "12.2.0.1"
val junitVersion = "5.5.0"
val ojdbcVersion = "19.3.0.0"
val junitVersion = "5.5.2"

val deployerJars by configurations.creating

Expand All @@ -29,14 +29,6 @@ java {

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

// This dependency is used internally, and not exposed to consumers on their own compile classpath.
implementation("org.slf4j:slf4j-api:1.7.26")
implementation("com.oracle.jdbc:ojdbc8:$ojdbcVersion") {
exclude(group = "com.oracle.jdbc")
implementation("com.oracle.ojdbc:ojdbc8:$ojdbcVersion") {
exclude(group = "com.oracle.ojdbc")
}
implementation("com.oracle.jdbc:orai18n:$ojdbcVersion")
implementation("com.oracle.ojdbc:orai18n:$ojdbcVersion")

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