Skip to content

Commit cf725fb

Browse files
jgebaljgebal
authored
Merge pull request #650 from utPLSQL/release/v3.1.0
Release/v3.1.0
2 parents 4ec39b3 + baf8436 commit cf725fb

617 files changed

Lines changed: 19755 additions & 7379 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.gitattributes‎

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,11 @@
1-
* export-ignore
2-
^docs/* linguist-documentation
1+
.gitattributes export-ignore
2+
.gitignore export-ignore
3+
.gitmodules export-ignore
4+
.travis.yml export-ignore
5+
mkdocs.yml export-ignore
6+
.travis export-ignore
7+
sonar-project.properties export-ignore
8+
tests export-ignore
9+
development export-ignore
10+
node_modules export-ignore
11+
^docs/* linguist-documentation

‎.gitattributes.release‎

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

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,3 +15,4 @@ node_modules/
1515
utPLSQL_latest_release/
1616
utPLSQL-cli/
1717
development/env.sh
18+
*.log

‎.travis.yml‎

Lines changed: 25 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ env:
3333
- CURRENT_BRANCH=${TRAVIS_BRANCH}
3434
- UTPLSQL_REPO="utPLSQL/utPLSQL"
3535
- UTPLSQL_BUILD_NO="${TRAVIS_BUILD_NUMBER:-0}"
36-
- UTPLSQL_VERSION_PATTERN='v?([0-9X]+\.){3}[0-9X]+'
36+
- UTPLSQL_VERSION_PATTERN="v?([0-9]+\.){3}[0-9]+[^']*"
3737
- UTPLSQL_VERSION=$(. .travis/get_project_version.sh)
3838
- UTPLSQL_BUILD_VERSION=$(. .travis/get_project_build_version.sh)
3939
- UTPLSQL_SOURCES_DIR='source'
@@ -46,7 +46,10 @@ env:
4646
- DOCKHER_HUB_REPO="${DOCKER_BASE_TAG:-$UT3_DOCKER_REPO}"
4747
#utPLSQL released version directory
4848
- UTPLSQL_DIR="utPLSQL_latest_release"
49-
- UTPLSQL_CLI_FILE="utPLSQL-cli-develop-test3.zip"
49+
- UTPLSQL_CLI_VERSION="3.0.4"
50+
# Maven
51+
- MAVEN_HOME=/usr/local/maven
52+
- MAVEN_CFG=$HOME/.m2
5053
matrix:
5154
- ORACLE_VERSION="${DOCKER_TAG_11G:-11g-r2-xe}" CONNECTION_STR='127.0.0.1:1521/XE' DOCKER_OPTIONS='--shm-size=1g'
5255
- ORACLE_VERSION="${DOCKER_TAG_12C:-12c-r1-se2}" CONNECTION_STR='127.0.0.1:1521/ORCLPDB1' DOCKER_OPTIONS="-v /dev/pdbs:/opt/oracle/oradata/pdbs"
@@ -57,6 +60,7 @@ cache:
5760
directories:
5861
- $CACHE_DIR
5962
- node_modules
63+
- $MAVEN_CFG
6064

6165
before_install:
6266
#The update_project_version is done before deployment to validate that the change of project files does not break installation
@@ -68,32 +72,34 @@ before_install:
6872
# download latest utPLSQL release
6973
#- curl -LOk $(curl --silent https://api.github.com/repos/utPLSQL/utPLSQL/releases/latest | awk '/browser_download_url/ { print $2 }' | grep ".zip" | sed 's/"//g')
7074
- git clone --depth=1 --branch=${SELFTESTING_BRANCH:-master} https://github.com/utPLSQL/utPLSQL.git $UTPLSQL_DIR
71-
# download utPLSQL-cli develop
72-
- curl -Lk -o utPLSQL-cli.zip https://bintray.com/viniciusam/utPLSQL-cli/download_file?file_path=${UTPLSQL_CLI_FILE}
75+
# download latest utPLSQL-cli release
76+
- curl -Lk -o utPLSQL-cli.zip https://github.com/utPLSQL/utPLSQL-cli/releases/download/v${UTPLSQL_CLI_VERSION}/utPLSQL-cli.zip
7377

7478
install:
7579
#- unzip utPLSQL.zip
7680
- unzip utPLSQL-cli.zip && chmod -R u+x utPLSQL-cli
81+
# Get ojdbc via maven
82+
- bash .travis/maven_cfg.sh
7783
- pip install mkdocs
7884
- bash .travis/install_sqlcl.sh
7985
- sudo mkdir -p /dev/pdbs
8086
- sudo chmod -R 777 /dev/pdbs
81-
- if [ "${TRAVIS_TAG}" = "" ]; then bash .travis/start_db.sh; fi
87+
- if [[ ! $TRAVIS_TAG ]]; then bash .travis/start_db.sh; fi
8288
- df -h
8389

8490
before_script:
85-
- if [ "${TRAVIS_TAG}" = "" ]; then bash .travis/install.sh; fi
86-
- if [ "${TRAVIS_TAG}" = "" ]; then bash .travis/install_utplsql_release.sh; fi
87-
- if [ "${TRAVIS_TAG}" = "" ]; then bash .travis/create_additional_grants_for_old_tests.sh; fi
88-
- if [ "${TRAVIS_TAG}" = "" ]; then bash .travis/run_examples.sh; fi
89-
- if [ "${TRAVIS_TAG}" = "" ]; then bash .travis/run_old_tests.sh; fi
91+
- if [[ ! $TRAVIS_TAG ]]; then bash .travis/install.sh; fi
92+
- if [[ ! $TRAVIS_TAG ]]; then bash .travis/install_utplsql_release.sh; fi
93+
- if [[ ! $TRAVIS_TAG ]]; then bash .travis/create_additional_grants_for_old_tests.sh; fi
94+
- if [[ ! $TRAVIS_TAG ]]; then bash .travis/run_examples.sh; fi
95+
- if [[ ! $TRAVIS_TAG ]]; then bash .travis/run_old_tests.sh; fi
9096

9197
script:
92-
- if [ "${TRAVIS_TAG}" = "" ]; then bash test/install_and_run_tests.sh; fi
93-
- if [ "${TRAVIS_TAG}" = "" ] && [ "${TRAVIS_REPO_SLUG}" = "${UTPLSQL_REPO}" ] && [ "$TRAVIS_PULL_REQUEST" == "false" ]; then sonar-scanner; fi
94-
- if [ "${TRAVIS_TAG}" = "" ]; then bash .travis/coveralls_uploader.sh; fi
98+
- if [[ ! $TRAVIS_TAG ]]; then bash test/install_and_run_tests.sh; fi
99+
- if [[ ! $TRAVIS_TAG ]] && [ "${TRAVIS_REPO_SLUG}" = "${UTPLSQL_REPO}" ] && [ "$TRAVIS_PULL_REQUEST" == "false" ]; then sonar-scanner; fi
100+
- if [[ ! $TRAVIS_TAG ]]; then bash .travis/coveralls_uploader.sh; fi
95101
- bash .travis/build_docs.sh
96-
- if [ "${TRAVIS_TAG}" = "" ]; then bash .travis/push_release_version.sh; fi
102+
- if [[ ! $TRAVIS_TAG ]]; then bash .travis/push_release_version.sh; fi
97103
- bash .travis/push_docs_to_gh_pages.sh
98104

99105
before_deploy:
@@ -115,4 +121,8 @@ deploy:
115121
condition: "${TRAVIS_JOB_NUMBER} =~ \\.1$"
116122

117123
notifications:
118-
slack: utplsql:oiMuXO95TvKeAUENuDt4cPrB
124+
slack:
125+
rooms:
126+
- secure: "nemt9n2y5sVCAKqa/s7JDQ8AcM59Xu/XbH/RkMOXvPgc+KtR8lBtVD1LkvJ5BaQhqgjuDT7DNt/uisQJ7k6a2OsrVFbnkypZ1hCvntOBpJyoSpD/YL1X8a9GbGojuJcph0BX76KN21LaOVdyOfY0TSlw53XiYWS8iL5HtjpWCbIwHL1SJ8JT8mhdT4hDoUWZjcZ4s4bLH6BQm4un/bMQOmB4sDoCeg4CllJwxgkswVF7OHpOFjgPetvUp7ps8b/Rj8en6zCj9drb0SVbXFgumo2Wd1bC3HHZB8MAZU0kuEV5VgUdum6EelUL5yfB72hssNQA0+CaT3HjBFkTlqWYJmjC4/xyGN3sseiW82T9FDY0g0GAGayNRW+QSiTQ1hbJEcAnNe0GrBUdRsgXdI6COd76YP5VxzRSF6H7niLfgCZdKbIivKUd1o+wBhuyJmqCFIkRWmT38tMGJqJAzbY1jq5gQXbb6E7gt+KdTjlSjcnJYf7XI7zqm+BRr+fbA0ixfXHvfqOBgZN6g08y9nPlDnIjtSF2NSdrj2zqYQAtKuWSOD1bnTyfDJyrtK7OLffZcMYD5Bcss4c8op8tP7MGTjt1S046SJocboh6H4c/nTokpoMRsWs6MKRdebl8C2RObGf5FebSOJg+oh2ZYS5Z/G9GshiY2BD/81+Hc4Miacc="
127+
on_success: change
128+
on_failure: always

‎.travis/build_release_archive.sh‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ rm -rf docs/*
55
# and replace it with generated html documentation from the ignored site folder
66
cp -r -v site/* docs
77

8-
mv -f .gitattributes.release .gitattributes
98
git add .
109
git commit -m "tmp commit for building a release archive"
1110

‎.travis/coveralls_uploader.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ if (process.env.COVERALLS_URL_BASE) {
99
url = 'https://coveralls.io/api/v1/jobs';
1010
}
1111

12-
fs.readFile('../old_tests/coverage.json',function (err,data) {
12+
fs.readFile('../coverage.json',function (err,data) {
1313
if (err) {
1414
return console.log(err);
1515
}

‎.travis/get_project_version.sh‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,14 @@
11
#!/usr/bin/env bash
2-
#If building a new version from a release branch - then version is taken from release branch name
2+
3+
#When building a new version from a release branch, the version is taken from release branch name
34
if [[ "${CURRENT_BRANCH}" =~ ^release/v[0-9]+\.[0-9]+\.[0-9]+.*$ ]]; then
45
version=${CURRENT_BRANCH#release\/}
5-
elif [[ "${TRAVIS_TAG}" =~ ^v[0-9]+\.[0-9]+\.[0-9]+.*$ ]]; then
6-
version=${TRAVIS_TAG}
76
else
7+
#Otherwise, version is taken from the VERSION file
88
version=`cat VERSION`
9+
#When on develop branch, add "-develop" to the version text
10+
if [[ "${CURRENT_BRANCH}" == "develop" ]]; then
11+
version=`sed -r "s/(v?[0-9]+\.[0-9]+\.[0-9]+).*/\1-develop/" <<< "${version}"`
12+
fi
913
fi
1014
echo ${version}

‎.travis/install.sh‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ set -ev
77
set feedback off
88
set verify off
99
10+
alter session set plsql_warnings = 'ENABLE:ALL', 'DISABLE:(5004,5018,6000,6001,6003,6009,6010,7206)';
1011
@install_headless.sql $UT3_OWNER $UT3_OWNER_PASSWORD
1112
SQL
1213

@@ -20,16 +21,20 @@ grant create any procedure, drop any procedure, execute any procedure to $UT3_OW
2021
2122
conn $UT3_OWNER/$UT3_OWNER_PASSWORD@//$CONNECTION_STR
2223
@../development/utplsql_style_check.sql
23-
exit
2424
SQL
2525

2626
#Create additional users
2727
"$SQLCLI" sys/$ORACLE_PWD@//$CONNECTION_STR AS SYSDBA <<-SQL
2828
set feedback off
2929
@create_utplsql_owner.sql $UT3_TESTER $UT3_TESTER_PASSWORD $UT3_TABLESPACE
3030
31+
--needed for testing distributed transactions
32+
grant create public database link to $UT3_TESTER;
33+
grant drop public database link to $UT3_TESTER;
3134
set feedback on
3235
--Needed for testing coverage outside of main UT3 schema.
3336
grant create any procedure, drop any procedure, execute any procedure, create any type, drop any type, execute any type, under any type, select any table, update any table, insert any table, delete any table, create any table, drop any table, alter any table, select any dictionary to $UT3_TESTER;
37+
revoke execute on dbms_crypto from $UT3_TESTER;
38+
grant create job to $UT3_TESTER;
3439
exit
3540
SQL

‎.travis/install_utplsql_release.sh‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,11 @@ end;
3636
/
3737
SQL
3838

39-
"$SQLCLI" sys/$ORACLE_PWD@//$CONNECTION_STR AS SYSDBA @install_headless.sql ${UT3_RELEASE_VERSION_SCHEMA}
39+
"$SQLCLI" sys/$ORACLE_PWD@//$CONNECTION_STR AS SYSDBA <<SQL
40+
alter session set plsql_warnings = 'ENABLE:ALL', 'DISABLE:(5004,5018,6000,6001,6003,6009,6010,7206)';
41+
@install_headless.sql ${UT3_RELEASE_VERSION_SCHEMA}
42+
exit
43+
SQL
4044

4145
"$SQLCLI" sys/$ORACLE_PWD@//$CONNECTION_STR AS SYSDBA <<SQL
4246
grant select any dictionary to ${UT3_RELEASE_VERSION_SCHEMA};

‎.travis/maven_cfg.sh‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
#!/bin/bash
2+
set -ev
3+
cp .travis/settings.xml $MAVEN_CFG/settings.xml
4+
5+
cd $(dirname $(readlink -f $0))
6+
7+
# Download wagon-http recommended by Oracle.
8+
# On maven latest version this is not needed, but travis doesn't have it.
9+
if [ ! -f $CACHE_DIR/wagon-http-2.8-shaded.jar ]; then
10+
curl -L -O "http://central.maven.org/maven2/org/apache/maven/wagon/wagon-http/2.8/wagon-http-2.8-shaded.jar"
11+
mv wagon-http-2.8-shaded.jar $CACHE_DIR/
12+
sudo cp $CACHE_DIR/wagon-http-2.8-shaded.jar $MAVEN_HOME/lib/ext/
13+
else
14+
echo "Using cached wagon-http..."
15+
sudo cp $CACHE_DIR/wagon-http-2.8-shaded.jar $MAVEN_HOME/lib/ext/
16+
fi
17+
18+
mvn dependency:copy-dependencies -DoutputDirectory=../utPLSQL-cli/lib

0 commit comments

Comments
 (0)