Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit 94f9c43

Browse files
committed
Merge remote-tracking branch 'origin/develop' into feature/unify_cursor_compare_behavior
2 parents 1b0b8f8 + 15d24af commit 94f9c43

23 files changed

Lines changed: 23 additions & 158 deletions

.travis.yml

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -50,10 +50,10 @@ env:
5050
- MAVEN_CFG=$HOME/.m2
5151
matrix:
5252
- ORACLE_VERSION="${DOCKER_TAG_11G:-11g-r2-xe}" CONNECTION_STR='127.0.0.1:1521/XE' DOCKER_OPTIONS='--shm-size=1g'
53-
- ORACLE_VERSION="${DOCKER_TAG_12C:-12c-r1-se2-small}" CONNECTION_STR='127.0.0.1:1521/ORCLCDB' DOCKER_OPTIONS="-v /dev/pdbs:/opt/oracle/oradata/pdbs"
54-
- ORACLE_VERSION="${DOCKER_TAG_12C2:-12c-r2-se2-small}" CONNECTION_STR='127.0.0.1:1521/ORCLCDB' DOCKER_OPTIONS="-v /dev/pdbs:/opt/oracle/oradata/pdbs"
55-
- ORACLE_VERSION="${DOCKER_TAG_18:-18c-se2-small}" CONNECTION_STR='127.0.0.1:1521/ORCLCDB' DOCKER_OPTIONS="-v /dev/pdbs:/opt/oracle/oradata/pdbs"
56-
- ORACLE_VERSION="${DOCKER_TAG_19:-19c-se2-small}" CONNECTION_STR='127.0.0.1:1521/ORCLCDB' DOCKER_OPTIONS="-v /dev/pdbs:/opt/oracle/oradata/pdbs"
53+
- ORACLE_VERSION="${DOCKER_TAG_12C:-12c-r1-se2-small}" CONNECTION_STR='127.0.0.1:1521/ORCLCDB'
54+
- ORACLE_VERSION="${DOCKER_TAG_12C2:-12c-r2-se2-small}" CONNECTION_STR='127.0.0.1:1521/ORCLCDB'
55+
- ORACLE_VERSION="${DOCKER_TAG_18:-18c-se2-small}" CONNECTION_STR='127.0.0.1:1521/ORCLCDB'
56+
- ORACLE_VERSION="${DOCKER_TAG_19:-19c-se2-small}" CONNECTION_STR='127.0.0.1:1521/ORCLCDB'
5757

5858
cache:
5959
pip: true
@@ -80,11 +80,7 @@ before_install:
8080
install:
8181
#- unzip utPLSQL.zip
8282
- unzip utPLSQL-cli.zip && chmod -R u+x utPLSQL-cli
83-
# Get ojdbc via maven
84-
- bash .travis/maven_cfg.sh
8583
- bash .travis/install_sqlcl.sh
86-
- sudo mkdir -p /dev/pdbs
87-
- sudo chmod -R 777 /dev/pdbs
8884
- if [[ ! $TRAVIS_TAG ]]; then bash .travis/start_db.sh; fi
8985

9086
before_script:

.travis/maven_cfg.sh

Lines changed: 0 additions & 18 deletions
This file was deleted.

.travis/pom.xml

Lines changed: 0 additions & 62 deletions
This file was deleted.

.travis/settings.xml

Lines changed: 0 additions & 51 deletions
This file was deleted.

docs/about/authors.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
![version](https://img.shields.io/badge/version-v3.1.10.3319--develop-blue.svg)
1+
![version](https://img.shields.io/badge/version-v3.1.10.3327--develop-blue.svg)
22

33
### utPLSQL v3 Major Contributors
44

docs/about/license.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
![version](https://img.shields.io/badge/version-v3.1.10.3319--develop-blue.svg)
1+
![version](https://img.shields.io/badge/version-v3.1.10.3327--develop-blue.svg)
22

33
# Version Information
44

docs/about/project-details.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
![version](https://img.shields.io/badge/version-v3.1.10.3319--develop-blue.svg)
1+
![version](https://img.shields.io/badge/version-v3.1.10.3327--develop-blue.svg)
22

33
# utPLSQL Project Details
44

docs/about/support.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
![version](https://img.shields.io/badge/version-v3.1.10.3319--develop-blue.svg)
1+
![version](https://img.shields.io/badge/version-v3.1.10.3327--develop-blue.svg)
22

33
# How to get support
44

docs/index.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
![version](https://img.shields.io/badge/version-v3.1.10.3319--develop-blue.svg)
1+
![version](https://img.shields.io/badge/version-v3.1.10.3327--develop-blue.svg)
22

33
# Introduction to utPLSQL
44

docs/userguide/advanced_data_comparison.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
![version](https://img.shields.io/badge/version-v3.1.10.3319--develop-blue.svg)
1+
![version](https://img.shields.io/badge/version-v3.1.10.3327--develop-blue.svg)
22

33
# Advanced data comparison
44

0 commit comments

Comments
 (0)