-
Notifications
You must be signed in to change notification settings - Fork 185
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #650 from utPLSQL/release/v3.1.0
Release/v3.1.0
- Loading branch information
Showing
617 changed files
with
19,755 additions
and
7,379 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,2 +1,11 @@ | ||
| * export-ignore | ||
| ^docs/* linguist-documentation | ||
| .gitattributes export-ignore | ||
| .gitignore export-ignore | ||
| .gitmodules export-ignore | ||
| .travis.yml export-ignore | ||
| mkdocs.yml export-ignore | ||
| .travis export-ignore | ||
| sonar-project.properties export-ignore | ||
| tests export-ignore | ||
| development export-ignore | ||
| node_modules export-ignore | ||
| ^docs/* linguist-documentation |
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -15,3 +15,4 @@ node_modules/ | |
| utPLSQL_latest_release/ | ||
| utPLSQL-cli/ | ||
| development/env.sh | ||
| *.log | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,10 +1,14 @@ | ||
| #!/usr/bin/env bash | ||
| #If building a new version from a release branch - then version is taken from release branch name | ||
|
|
||
| #When building a new version from a release branch, the version is taken from release branch name | ||
| if [[ "${CURRENT_BRANCH}" =~ ^release/v[0-9]+\.[0-9]+\.[0-9]+.*$ ]]; then | ||
| version=${CURRENT_BRANCH#release\/} | ||
| elif [[ "${TRAVIS_TAG}" =~ ^v[0-9]+\.[0-9]+\.[0-9]+.*$ ]]; then | ||
| version=${TRAVIS_TAG} | ||
| else | ||
| #Otherwise, version is taken from the VERSION file | ||
| version=`cat VERSION` | ||
| #When on develop branch, add "-develop" to the version text | ||
| if [[ "${CURRENT_BRANCH}" == "develop" ]]; then | ||
| version=`sed -r "s/(v?[0-9]+\.[0-9]+\.[0-9]+).*/\1-develop/" <<< "${version}"` | ||
| fi | ||
| fi | ||
| echo ${version} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,18 @@ | ||
| #!/bin/bash | ||
| set -ev | ||
| cp .travis/settings.xml $MAVEN_CFG/settings.xml | ||
|
|
||
| cd $(dirname $(readlink -f $0)) | ||
|
|
||
| # Download wagon-http recommended by Oracle. | ||
| # On maven latest version this is not needed, but travis doesn't have it. | ||
| if [ ! -f $CACHE_DIR/wagon-http-2.8-shaded.jar ]; then | ||
| curl -L -O "http://central.maven.org/maven2/org/apache/maven/wagon/wagon-http/2.8/wagon-http-2.8-shaded.jar" | ||
| mv wagon-http-2.8-shaded.jar $CACHE_DIR/ | ||
| sudo cp $CACHE_DIR/wagon-http-2.8-shaded.jar $MAVEN_HOME/lib/ext/ | ||
| else | ||
| echo "Using cached wagon-http..." | ||
| sudo cp $CACHE_DIR/wagon-http-2.8-shaded.jar $MAVEN_HOME/lib/ext/ | ||
| fi | ||
|
|
||
| mvn dependency:copy-dependencies -DoutputDirectory=../utPLSQL-cli/lib |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,62 @@ | ||
| <!--Used to obtain ojdbc8 and orai18n files that are needed for client--> | ||
| <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" | ||
| xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> | ||
| <modelVersion>4.0.0</modelVersion> | ||
| <groupId>org.utplsql</groupId> | ||
| <artifactId>utplsql</artifactId> | ||
| <version>3.0.4-SNAPSHOT</version> | ||
| <packaging>jar</packaging> | ||
|
|
||
| <name>utPLSQL</name> | ||
| <url>https://github.com/utPLSQL/utPLSQL</url> | ||
|
|
||
| <properties> | ||
| <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> | ||
| </properties> | ||
|
|
||
| <dependencies> | ||
| <dependency> | ||
| <groupId>com.oracle.jdbc</groupId> | ||
| <artifactId>ojdbc8</artifactId> | ||
| <version>12.2.0.1</version> | ||
| <scope>compile</scope> | ||
| </dependency> | ||
| <dependency> | ||
| <groupId>com.oracle.jdbc</groupId> | ||
| <artifactId>orai18n</artifactId> | ||
| <version>12.2.0.1</version> | ||
| <scope>compile</scope> | ||
| </dependency> | ||
| </dependencies> | ||
|
|
||
| <repositories> | ||
| <repository> | ||
| <id>maven.oracle.com</id> | ||
| <releases> | ||
| <enabled>true</enabled> | ||
| </releases> | ||
| <snapshots> | ||
| <enabled>false</enabled> | ||
| </snapshots> | ||
| <url>https://maven.oracle.com</url> | ||
| <layout>default</layout> | ||
| </repository> | ||
| </repositories> | ||
|
|
||
| <pluginRepositories> | ||
| <pluginRepository> | ||
| <id>maven.oracle.com</id> | ||
| <url>https://maven.oracle.com</url> | ||
| </pluginRepository> | ||
| </pluginRepositories> | ||
|
|
||
| <build> | ||
| <extensions> | ||
| <extension> | ||
| <groupId>io.packagecloud.maven.wagon</groupId> | ||
| <artifactId>maven-packagecloud-wagon</artifactId> | ||
| <version>0.0.6</version> | ||
| </extension> | ||
| </extensions> | ||
| </build> | ||
| </project> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,20 +1,23 @@ | ||
| #!/usr/bin/env bash | ||
|
|
||
| echo Current branch is "${CURRENT_BRANCH}" | ||
| if [[ "${CURRENT_BRANCH}" =~ ^release/v[0-9]+\.[0-9]+\.[0-9]+.*$ ]]; then | ||
|
|
||
| # We are updating version number only when: | ||
| # - not a pull request | ||
| # - branch name is = develop or branch name is like release/vX.X.X... | ||
| if [ "${TRAVIS_REPO_SLUG}" = "${UTPLSQL_REPO}" ] && [ "$TRAVIS_PULL_REQUEST" == "false" ] && [[ "${CURRENT_BRANCH}" =~ ^(release/v[0-9]+\.[0-9]+\.[0-9]+.*|develop)$ ]]; then | ||
| echo Current branch is "${CURRENT_BRANCH}" | ||
| echo Current job number is "${TRAVIS_JOB_NUMBER}" | ||
| #The publishing is done only once (for first job on a build matrix) | ||
| if [[ "${TRAVIS_JOB_NUMBER}" =~ \.1$ ]]; then | ||
| echo Publishing will be done for a job no. "${TRAVIS_JOB_NUMBER}" | ||
| echo "Committing version & buildNo into branch (${CURRENT_BRANCH})" | ||
| git add sonar-project.properties | ||
| git add VERSION | ||
| git commit -m 'Updated project version after building a release [skip ci]' | ||
|
|
||
| echo Pushing to origin | ||
| git add source/* | ||
| git commit -m 'Updated project version after build [skip ci]' | ||
| echo "Pushing to origin" | ||
| git push --quiet origin HEAD:${CURRENT_BRANCH} | ||
| else | ||
| echo Publishing will not be done for a job no.: "${TRAVIS_JOB_NUMBER}" | ||
| echo "Publishing of version skipped for job No.: ${TRAVIS_JOB_NUMBER}" | ||
| fi | ||
| else | ||
| echo Not on a release branch - skipping publishing of version | ||
| echo "Publishing of version skipped for branch ${CURRENT_BRANCH}, pull request ${TRAVIS_PULL_REQUEST}" | ||
| fi |
Oops, something went wrong.