Skip to content

Commit 36d98ef

Browse files
germanattanasiogermanattanasio
authored
separate the SDK in maven modules (#446)
1 parent 552a4ea commit 36d98ef

File tree

478 files changed

+7730
-8222
lines changed

Some content is hidden

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

478 files changed

+7730
-8222
lines changed

‎.config.properties.enc‎

-1.31 KB
Binary file not shown.

‎.github/CONTRIBUTING.md‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ Before that, please search for similar issues. It's possible somebody has encoun
1313
If you want to contribute to the repository, here's a quick guide:
1414
1. Fork the repository
1515
2. develop and test your code changes, maven: `mvn test` or gradle: `gradle test`.
16-
* Respect the original code [style guide][styleguide].
16+
* Run `checkstyle`: `mvn checkstyle:checkstyle`. 🏁
1717
* Create minimal diffs - disable on save actions like reformat source code or organize imports. If you feel the source code should be reformatted create a separate PR for this change.
1818
* Check for unnecessary whitespace with git diff --check before committing.
1919
3. Make the test pass
@@ -51,7 +51,7 @@ By making a contribution to this project, I certify that:
5151

5252
## Emoji Cheatsheet
5353

54-
When creating creating commits or updating the CHANGELOG, please **start** the commit message or update with one of the following applicable Emoji. Emoji should not be used at the start of issue or pull request titles.
54+
When creating creating commits or updating the `CHANGELOG`, please **start** the commit message or update with one of the following applicable Emoji. Emoji should not be used at the start of issue or pull request titles.
5555

5656
* :new: `:new:` when adding new functionality
5757
* :bug: `:bug:` when fixing a bug
@@ -73,6 +73,5 @@ When creating creating commits or updating the CHANGELOG, please **start** the c
7373

7474
[dw]: https://developer.ibm.com/answers/questions/ask/?topics=watson
7575
[stackoverflow]: http://stackoverflow.com/questions/ask?tags=ibm-watson
76-
[styleguide]: https://google.github.io/styleguide/javaguide.html
7776
[Maven]: https://maven.apache.org/guides/getting-started/maven-in-five-minutes.html
7877
[Gradle]: https://docs.gradle.org/current/userguide/installation.html

‎.gitignore‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,11 @@ build
99
gradle
1010
gradlew
1111
gradlew.bat
12+
out
1213
target
1314
bin/
1415
*.iml
1516
*.ipr
1617
*.iws
17-
src/test/resources/.config.properties
18+
.config.properties
19+
.checkstyle

‎.travis.yml‎

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,27 @@
1-
sudo: false
21
language: java
3-
install: /bin/true
4-
script: ./.utility/travis.sh
2+
sudo: false
53
jdk:
64
- oraclejdk8
75
- oraclejdk7
6+
branches:
7+
except:
8+
- gh-pages
89
cache:
910
directories:
10-
- $HOME/.m2/repository
11+
- $HOME/.m2
1112
env:
1213
global:
1314
- secure: S2KIWOJX35j1FczyV7JRFrFpTftb8Hmkf6C50bJh8E03IbPu7tnX2znPKBbRWcIQndO6qd5dL7+BqtXabByOzd5Slj5/NBdXPcGffsO7B0cpFQS8ngpIMAGReCXQ12PbOiO8CIk2f/20lU3L0kqcP1TaPyZYIlSwkUg98ls8p90=
1415
- secure: eLv41LVZoRCqQehOM29RLodZ6NZhrIdLWklAkMdLGlFDEiVY5f0shaPLffpUiuv/3pg+CuQk9ffBc72m8lwTsimex9unC/WVsqQJhqQEWJEaPGL0UamV/HqHMeBQEpKiCcKHaBRHFGk7QQJVtiXvVvlbwk7Jks5giUR7+s/Q6iI=
1516
- secure: l0dde5NSGedD6fny5aMr1ll90FYVd7IKDsZ0Kd1GWnB+iDd3rjDBwz5q6NUwN2LTqw3jWFqmqdEnGUGO3Er0rdfdtPh3K194sTK3XuCZz8GEjFvYAEDRQ59oyK8fhw60c86cWppBQ4gluLKLstm12DLkARTUvJiIsTQTnuc2YGg=
1617
before_install:
1718
- pip install --user codecov
19+
- sed -i.bak -e 's|https://nexus.codehaus.org/snapshots/|https://oss.sonatype.org/content/repositories/codehaus-snapshots/|g'
20+
~/.m2/settings.xml
21+
script:
22+
- ./.utility/travis.sh
1823
after_success:
1924
- codecov
20-
- mvn javadoc:javadoc
2125
- .utility/push-javadoc-to-gh-pages.sh
2226
- .utility/deploy_snapshot.sh
2327
notifications:

‎.utility/generate_index_html.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ echo '<!DOCTYPE html>
2020
<p><a href="http://www.ibm.com/watson/developercloud/">Info</a>
2121
| <a href="http://www.ibm.com/watson/developercloud/doc/">Documentation</a>
2222
| <a href="https://github.com/watson-developer-cloud/java-sdk">GitHub</a>
23-
| <a href="http://search.maven.org/#search%7Cga%7C1%7Cg%3A%22com.ibm.watson.developer_cloud%22%20a%3A%22java-sdk%22">Maven</a>
23+
| <a href="http://search.maven.org/#search%7Cga%7C1%7Cg%3A%22com.ibm.watson.watson.developer_cloud%22%20a%3A%22java-sdk%22">Maven</a>
2424
</p>
2525
2626
<p>Javadoc by branch/tag:</p>

‎.utility/travis.sh‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,14 @@
22

33
set -e # enforces the script to fail as soon as one command fails
44

5-
mvn javadoc:javadoc > /dev/null
5+
mvn clean install -Dmaven.test.skip=true
6+
mvn javadoc:aggregate > /dev/null
67

78
if [ "${TRAVIS_PULL_REQUEST}" = "false" ]; then
89
echo '$TRAVIS_PULL_REQUEST is false, running all tests'
9-
openssl aes-256-cbc -K $encrypted_a973fe4f8e79_key -iv $encrypted_a973fe4f8e79_iv -in .config.properties.enc -out src/test/resources/.config.properties -d
10-
mvn clean cobertura:cobertura-integration-test
10+
openssl aes-256-cbc -K $encrypted_a973fe4f8e79_key -iv $encrypted_a973fe4f8e79_iv -in .config.properties.enc -out tests/src/test/resources/.config.properties -d
11+
mvn cobertura:cobertura-integration-test
1112
else
1213
echo '$TRAVIS_PULL_REQUEST is not false ($TRAVIS_PULL_REQUEST), running unit tests'
13-
mvn clean test
14+
mvn test
1415
fi

‎CHANGELOG.md‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,22 @@
11
Change Log
22
==========
33

4+
## Version 3.4.0
5+
6+
_2016-09-07_
7+
8+
The SDK 3.4.0 is the first step into moving from one maven module into a multi-module project.
9+
This change will allow users to specify the service they want to use skipping the other services.
10+
For example, in order to use Retrieve and Rank in Gradle you need:
11+
12+
```gradle
13+
'com.ibm.watson.developer_cloud:retrieve-and-rank:3.3.1'
14+
```
15+
16+
* New: Move to a maven multi-module project
17+
* Fix: Send default headers in WebSocket connections #422
18+
* Fix: Skip token creation if `skipAuthentication=true` #440
19+
420
## Version 3.3.1
521

622
_2016-09-07_

0 commit comments

Comments
 (0)