Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
70 commits
Select commit Hold shift + click to select a range
3bec20d
feat(generation): api def tag 'sdk-major-release-2020-rc01' gen commi…
kevinkowa Nov 6, 2020
4200eb1
build(org.testng): add gradle dependency for org.testng
kevinkowa Nov 2, 2020
9bf16e1
chore(build.gradle): update core version to 9.5.0
kevinkowa Nov 6, 2020
4e3054e
chore(assistant-v1): manual changes
kevinkowa Nov 5, 2020
622c843
chore(assistant-v2): manual changes
kevinkowa Nov 5, 2020
efd54ed
chore(speech-to-text-v1): manual changes
kevinkowa Nov 5, 2020
d3b7fe9
feat(speech-to-text-v1): add RecognizeWithWebsocketsOptions model
kevinkowa Nov 5, 2020
11d45ba
chore(text-to-speech-v1): manual changes
kevinkowa Nov 5, 2020
3ce031c
chore(visual-recognition-v3): manual changes
kevinkowa Nov 5, 2020
dad6e14
chore(visual-recognition-v4): manual changes
kevinkowa Nov 6, 2020
92627d3
test(testng): add testng xml files for unit tests
kevinkowa Nov 5, 2020
da1aaca
test(integration-tests): update integration tests
kevinkowa Nov 7, 2020
a11ddab
chore(build.gradle): update okhttp3 version to work with new unit tests
kevinkowa Nov 5, 2020
7ef1afa
chore(personality-insights-v3): add deprecation message
kevinkowa Nov 5, 2020
533b631
docs(migration): add migration guide to 9.x.x
kevinkowa Nov 7, 2020
b20d191
chore(java-format): ran java_format_google.sh
kevinkowa Nov 7, 2020
e159c99
chore(copyrights): ran lint-copyrights
kevinkowa Nov 7, 2020
603846a
chore(speech-to-text-v1): manual changes
kevinkowa Nov 7, 2020
452a56f
chore(text-to-speech-v1): manual changes
kevinkowa Nov 7, 2020
4375272
chore(travis): update to openjdk8
kevinkowa Nov 9, 2020
d533904
chore(travis): update travis
kevinkowa Nov 9, 2020
7cad9d7
chore(releaserc): update releaserc to include a prerelease branch
kevinkowa Nov 9, 2020
1126245
chore(releaserc): undo change
kevinkowa Nov 9, 2020
08ac806
test(assistant-v2): manual change on unit tests
kevinkowa Nov 9, 2020
5c1f19b
chore(releaserc): add rc branch for pre-release
kevinkowa Nov 9, 2020
2bd427d
chore(travis): semantic-release adds rc
kevinkowa Nov 9, 2020
ebffd3e
BREAKING CHANGE: generated with 3.18.0 of the IBM openapi sdk generator
kevinkowa Nov 9, 2020
22a7d00
chore: update for semantic-release
kevinkowa Nov 9, 2020
c1b7931
Merge branch 'rc' of https://github.com/watson-developer-cloud/java-s…
kevinkowa Nov 9, 2020
fcf41e2
chore(travis): update decrypt script
kevinkowa Nov 10, 2020
3f3cbf3
Update version numbers from 8.6.3 -> 9.0.0-rc.1
semantic-release-bot Nov 10, 2020
5095e42
docs(release): Add release notes for 9.0.0-rc.1
semantic-release-bot Nov 10, 2020
b794bb6
feat: add bumpversion release candidate support
germanattanasio Nov 10, 2020
ca0e9be
Update version numbers from 9.0.0 -> 9.0.0-rc.2
germanattanasio Nov 10, 2020
984a350
fix: typo in migration guide
germanattanasio Nov 10, 2020
ab57379
fix: update version to 9.0.0-rc.2
germanattanasio Nov 11, 2020
e103098
Update version numbers from 9.0.0-rc.1 -> 9.0.0-rc.2
semantic-release-bot Nov 11, 2020
c740bc7
docs(release): Add release notes for 9.0.0-rc.2
semantic-release-bot Nov 11, 2020
5568bf9
fix(visual-recognition-v4): remove trainingStatus as a parameter for …
kevinkowa Nov 17, 2020
843b622
test(visual-recognition-v4-tests): update tests using trainingStatus
kevinkowa Nov 17, 2020
22b4473
Merge pull request #1140 from watson-developer-cloud/update-visual-rec
germanattanasio Nov 17, 2020
3414833
feat(generation): api def tag 'sdk-major-release-2020' gen tag 3.19.0
kevinkowa Dec 1, 2020
c8f9131
chore(assistant-v1): manual changes
kevinkowa Nov 5, 2020
dc53a78
chore(assistant-v2): manual changes
kevinkowa Nov 5, 2020
629cfc8
chore(speech-to-text-v1): manual changes
kevinkowa Nov 5, 2020
73286e5
chore(text-to-speech-v1): manual changes
kevinkowa Nov 5, 2020
7b1d74a
chore(visual-recognition-v3): manual changes
kevinkowa Nov 5, 2020
b0184ac
chore(visual-recognition-v4): manual changes
kevinkowa Nov 6, 2020
d4e8aa8
chore(personality-insights-v3): add deprecation message
kevinkowa Dec 1, 2020
02e3dfd
fix(visual-recognition-v4): remove trainingStatus as a parameter for …
kevinkowa Nov 17, 2020
a00e2f7
test(visual-recognition-v4-tests): update tests using trainingStatus
kevinkowa Nov 17, 2020
d35c0b5
chore(java-format): ran java_format_google.sh
kevinkowa Dec 1, 2020
2d553a7
chore(copyrights): ran lint-copyrights
kevinkowa Dec 1, 2020
337ceb6
chore(visual-recognition): add deprecation message
kevinkowa Dec 1, 2020
cc70d12
chore(java-format): ran java_format_google.sh
kevinkowa Dec 1, 2020
687c661
chore(build.gradle): update java version to 8
kevinkowa Dec 1, 2020
b52246e
test(discovery-v1): clean collections
kevinkowa Dec 1, 2020
02d78b2
chore(build.gradle): update core from 9.5.0 to 9.5.4
kevinkowa Dec 1, 2020
f6a2e27
chore(merge): pull changes from master
kevinkowa Dec 1, 2020
3e0e774
chore(java-format): ran java_format_google.sh
kevinkowa Dec 1, 2020
cde7e20
test(speech-to-text-v1): fix mock response body
kevinkowa Dec 2, 2020
b4cf28f
test(discovery-v1): fix cleanup method to be called after the tests a…
kevinkowa Dec 2, 2020
1f5e1ec
chore(java-format): ran java_format_google.sh
kevinkowa Dec 2, 2020
3c58ef9
test(discovery-v1): ignore old unit tests
kevinkowa Dec 2, 2020
2218ced
Merge pull request #1143 from watson-developer-cloud/sdk-major-releas…
kevinkowa Dec 3, 2020
0386d74
Update version numbers from 9.0.0-rc.2 -> 9.0.0-rc.3
semantic-release-bot Dec 3, 2020
7dba52f
docs(release): Add release notes for 9.0.0-rc.3
semantic-release-bot Dec 3, 2020
53c7257
chore(speech-to-text-v1): fix imports
kevinkowa Dec 3, 2020
88b5a48
docs(migration-guide): update migration guide
kevinkowa Dec 3, 2020
7a1049a
docs(changelog): update changelog
kevinkowa Dec 3, 2020
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
10 changes: 7 additions & 3 deletions .bumpversion.cfg
Original file line number Diff line number Diff line change
@@ -1,7 +1,13 @@
[bumpversion]
current_version = 8.6.3
current_version = 9.0.0-rc.3
commit = True
message = Update version numbers from {current_version} -> {new_version}
search = {current_version}
replace = {new_version}
parse = (?P<major>\d+)\.(?P<minor>\d+)\.(?P<patch>\d+)(?P<rc>\-rc\.\d+)?
serialize =
{major}.{minor}.{patch}{rc}
{major}.{minor}.{patch}

[bumpversion:file:gradle.properties]

Expand Down Expand Up @@ -32,6 +38,4 @@ message = Update version numbers from {current_version} -> {new_version}
[bumpversion:file:docker/pom.xml]

[bumpversion:file:examples/build.gradle]
search = {current_version}
replace = {new_version}

10 changes: 8 additions & 2 deletions .releaserc
Original file line number Diff line number Diff line change
@@ -1,5 +1,11 @@
{
"branch": "master",
"branches": [
"master",
{
"name": "rc",
"prerelease": true
}
],
"debug": true,
"plugins": [
"@semantic-release/commit-analyzer",
Expand All @@ -8,7 +14,7 @@
[
"@semantic-release/exec",
{
"prepareCmd": "bumpversion --current-version ${lastRelease.version} --new-version ${nextRelease.version} --allow-dirty patch"
"prepareCmd": ".utility/bumpversion.sh ${lastRelease.version} ${nextRelease.version}"
}
],
[
Expand Down
23 changes: 7 additions & 16 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
dist: trusty
dist: xenial
os: linux
branches:
except:
Expand All @@ -12,7 +12,7 @@ stages:
jobs:
include:
- stage: Build and test
jdk: oraclejdk8
jdk: openjdk8
language: java
before_install:
- .utility/decrypt-service-instance-apikeys.sh
Expand All @@ -21,21 +21,12 @@ jobs:
- ./gradlew checkstyleTest
- travis_retry .utility/travis-run-tests.sh
after_success:
- bash <(curl -s https://codecov.io/bash)
- jdk: openjdk7
language: java
before_install:
- .utility/patch-openjdk7.sh
- .utility/decrypt-service-instance-apikeys.sh
script:
- travis_retry .utility/travis-run-tests.sh
after_success:
- bash <(curl -s https://codecov.io/bash)
- bash <(curl -s https://codecov.io/bash)+++++++

- stage: Semantic release
jdk: openjdk7
jdk: openjdk8
language: java
if: branch = master AND type = push AND fork = false
if: (branch = master OR branch = rc) AND type = push AND fork = false
before_install:
- pip install --user bumpversion
- nvm install 12
Expand All @@ -46,15 +37,15 @@ jobs:
- npx semantic-release

- stage: Publish javadoc
jdk: openjdk7
jdk: openjdk8
language: java
if: type = push AND fork = false
script:
- ./gradlew docs
- .utility/push-javadoc-to-gh-pages.sh

- stage: Release to bintray
jdk: openjdk7
jdk: openjdk8
language: java
if: tag IS present
script:
Expand Down
11 changes: 11 additions & 0 deletions .utility/bumpversion.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
#!/bin/bash

set -e

VERSION="patch"

if [ "${TRAVIS_BRANCH}" != "master" ]; then
VERSION="rc"
fi

bumpversion --current-version $1 --new-version $2 --allow-dirty $VERSION --verbose
2 changes: 1 addition & 1 deletion .utility/decrypt-service-instance-apikeys.sh
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/bin/bash
if [ "$TRAVIS_PULL_REQUEST" == "false" ]; then
echo -e "Decrypt service instance apikeys for branch $TRAVIS_BRANCH.\n"
openssl aes-256-cbc -K $encrypted_75da58c42a01_key -iv $encrypted_75da58c42a01_iv \
openssl aes-256-cbc -K $encrypted_79638a2d7865_key -iv $encrypted_79638a2d7865_iv \
-in config.properties.enc -out common/src/test/resources/config.properties -d
else
echo -e "Not Decrypt service instance apikeys for branch $TRAVIS_BRANCH.\n"
Expand Down
43 changes: 43 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,46 @@
# [9.0.0-rc.3](https://github.com/watson-developer-cloud/java-sdk/compare/v9.0.0-rc.2...v9.0.0-rc.3) (2020-12-03)


### Features

* **generation:** api def tag 'sdk-major-release-2020' gen tag 3.19.0 ([3414833](https://github.com/watson-developer-cloud/java-sdk/commit/3414833807abe8534e6daf838500a5426e9e4e04))


### BREAKING CHANGES

* **generation:** api def tag 'sdk-major-release-2020' gen tag 3.19.0

# [9.0.0-rc.2](https://github.com/watson-developer-cloud/java-sdk/compare/v9.0.0-rc.1...v9.0.0-rc.2) (2020-11-11)


### Bug Fixes

* typo in migration guide ([984a350](https://github.com/watson-developer-cloud/java-sdk/commit/984a3503502a7867470b3e342fe959643ae0a561))
* update version to 9.0.0-rc.2 ([ab57379](https://github.com/watson-developer-cloud/java-sdk/commit/ab573794f351e00f6fb97e3fed0e7d3ad20fb824))


### Features

* add bumpversion release candidate support ([b794bb6](https://github.com/watson-developer-cloud/java-sdk/commit/b794bb6407e461af0edd99952e08b98e8d4a95e2))

# [9.0.0-rc.1](https://github.com/watson-developer-cloud/java-sdk/compare/v8.6.3...v9.0.0-rc.1) (2020-11-10)


### chore

* update for semantic-release ([22a7d00](https://github.com/watson-developer-cloud/java-sdk/commit/22a7d008c6e333a944c3b0f6a96f142f587e5aed))


### Features

* **generation:** api def tag 'sdk-major-release-2020-rc01' gen commit '7cc0550' ([3bec20d](https://github.com/watson-developer-cloud/java-sdk/commit/3bec20d5ccae38ba2a1f1d8adf6cf16cdc2c6a18))
* **speech-to-text-v1:** add RecognizeWithWebsocketsOptions model ([d3b7fe9](https://github.com/watson-developer-cloud/java-sdk/commit/d3b7fe91fad17fa6ef6dd00a5ecc38b689dfd016))


### BREAKING CHANGES

* generated with 3.18.0 of the IBM openapi sdk generator

## [8.6.3](https://github.com/watson-developer-cloud/java-sdk/compare/v8.6.2...v8.6.3) (2020-10-26)


Expand Down
Loading