Skip to content

Commit 61f427d

Browse files
Merge pull request #645 from watson-developer-cloud/develop
v3.7.2
2 parents 77f6a21 + ce323d7 commit 61f427d

File tree

93 files changed

+879
-597
lines changed

Some content is hidden

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

93 files changed

+879
-597
lines changed

.travis.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,8 @@ script:
3434
- ./gradlew test
3535
- ./gradlew codeCoverageReport
3636
- ./gradlew docs > /dev/null # build the javadoc
37+
- ./gradlew checkstyleMain
38+
- ./gradlew checkstyleTest
3739

3840
after_success:
3941
- bash <(curl -s https://codecov.io/bash)

CHANGELOG.md

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

4+
## Version 3.7.2
5+
6+
_2017-04-07_
7+
8+
* New: Provide a specific document Id when creating a document d581c3f
9+
* New: NLU: Add model for disambiguation and property in EntitiesResults 8acb411
10+
* New: Add test for disambiguation info 9328c5f
11+
* Fix: Discovery: create or update a document from an InputStream and optionally spec… … ab2f413
12+
* Fix: Add README.md for Natural Language Understanding 4e53c8f
13+
* Fix: 👕 Checkstyle Verified a95c68d
14+
* Fix: TTS Synthesize using POST, fixes #635 and #602 Verified 5ae0d24
15+
* Fix: Language translator, update service name Verified 37abc86
16+
417
## Version 3.7.1
518

619
_2017-03-31_

README.md

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ All the services:
5454
<dependency>
5555
<groupId>com.ibm.watson.developer_cloud</groupId>
5656
<artifactId>java-sdk</artifactId>
57-
<version>3.7.1</version>
57+
<version>3.7.2</version>
5858
</dependency>
5959
```
6060

@@ -63,25 +63,25 @@ Only Retrieve and Rank:
6363
<dependency>
6464
<groupId>com.ibm.watson.developer_cloud</groupId>
6565
<artifactId>retrieve-and-rank</artifactId>
66-
<version>3.7.1</version>
66+
<version>3.7.2</version>
6767
</dependency>
6868
```
6969

7070
##### Gradle
7171

7272
All the services:
7373
```gradle
74-
'com.ibm.watson.developer_cloud:java-sdk:3.7.1'
74+
'com.ibm.watson.developer_cloud:java-sdk:3.7.2'
7575
```
7676

7777
Only Retrieve and Rank:
7878
```gradle
79-
'com.ibm.watson.developer_cloud:retrieve-and-rank:3.7.1'
79+
'com.ibm.watson.developer_cloud:retrieve-and-rank:3.7.2'
8080
```
8181

8282
Only Visual Recognition:
8383
```gradle
84-
'com.ibm.watson.developer_cloud:visual-recognition:3.7.1'
84+
'com.ibm.watson.developer_cloud:visual-recognition:3.7.2'
8585
```
8686

8787
Snapshots of the development version are available in [Sonatype's snapshots repository][sonatype_snapshots].
@@ -286,7 +286,7 @@ Gradle:
286286

287287
```sh
288288
$ cd java-sdk
289-
$ gradle jar # build jar file (build/libs/watson-developer-cloud-3.7.1.jar)
289+
$ gradle jar # build jar file (build/libs/watson-developer-cloud-3.7.2.jar)
290290
$ gradle test # run tests
291291
$ gradle check # performs quality checks on source files and generates reports
292292
$ gradle testReport # run tests and generate the aggregated test report (build/reports/allTests)
@@ -323,4 +323,4 @@ See [CONTRIBUTING.md](.github/CONTRIBUTING.md).
323323
[apache_maven]: http://maven.apache.org/
324324
[sonatype_snapshots]: https://oss.sonatype.org/content/repositories/snapshots/com/ibm/watson/developer_cloud/
325325

326-
[jar]: https://github.com/watson-developer-cloud/java-sdk/releases/download/java-sdk-3.7.1/java-sdk-3.7.1-jar-with-dependencies.jar
326+
[jar]: https://github.com/watson-developer-cloud/java-sdk/releases/download/java-sdk-3.7.2/java-sdk-3.7.2-jar-with-dependencies.jar

alchemy/README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,13 @@
77
<dependency>
88
<groupId>com.ibm.watson.developer_cloud</groupId>
99
<artifactId>alchemy</artifactId>
10-
<version>3.7.1</version>
10+
<version>3.7.2</version>
1111
</dependency>
1212
```
1313

1414
##### Gradle
1515
```gradle
16-
'com.ibm.watson.developer_cloud:alchemy:3.7.1'
16+
'com.ibm.watson.developer_cloud:alchemy:3.7.2'
1717
```
1818

1919
## Alchemy Language

alchemy/build.gradle

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,7 @@ signArchives {
5151

5252
checkstyle {
5353
configFile = rootProject.file('checkstyle.xml')
54+
ignoreFailures = false
5455
}
5556

5657
dependencies {

alchemy/src/test/java/com/ibm/watson/developer_cloud/alchemy/v1/AlchemyLanguageIT.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
import org.junit.Before;
2424
import org.junit.Ignore;
2525
import org.junit.Test;
26+
import org.junit.runner.RunWith;
2627

2728
import com.ibm.watson.developer_cloud.WatsonServiceTest;
2829
import com.ibm.watson.developer_cloud.alchemy.v1.model.CombinedResults;
@@ -45,10 +46,12 @@
4546
import com.ibm.watson.developer_cloud.alchemy.v1.model.TypedEntity;
4647
import com.ibm.watson.developer_cloud.alchemy.v1.model.TypedRelation;
4748
import com.ibm.watson.developer_cloud.alchemy.v1.model.TypedRelations;
49+
import com.ibm.watson.developer_cloud.util.RetryRunner;
4850

4951
/**
5052
* Alchemy Language Integration tests.
5153
*/
54+
@RunWith(RetryRunner.class)
5255
public class AlchemyLanguageIT extends WatsonServiceTest {
5356

5457
private static final String testURL =

alchemy/src/test/java/com/ibm/watson/developer_cloud/alchemy/v1/AlchemyVisionIT.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
import org.junit.Assume;
2020
import org.junit.Before;
2121
import org.junit.Test;
22+
import org.junit.runner.RunWith;
2223

2324
import com.ibm.watson.developer_cloud.WatsonServiceTest;
2425
import com.ibm.watson.developer_cloud.alchemy.v1.model.ImageFaces;
@@ -28,12 +29,14 @@
2829
import com.ibm.watson.developer_cloud.alchemy.v1.model.ImageSceneText;
2930
import com.ibm.watson.developer_cloud.alchemy.v1.model.ImageSceneTextLine;
3031
import com.ibm.watson.developer_cloud.alchemy.v1.model.ImageSceneTextLine.Word;
32+
import com.ibm.watson.developer_cloud.util.RetryRunner;
3133

3234
import okhttp3.HttpUrl;
3335

3436
/**
3537
* The Class AlchemyVisionTest.
3638
*/
39+
@RunWith(RetryRunner.class)
3740
public class AlchemyVisionIT extends WatsonServiceTest {
3841

3942
private static final String IMAGE_OBAMA = "src/test/resources/alchemy/obama.jpg";

build.gradle

Lines changed: 18 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,19 @@ javadoc {
1717
source = 'src/main/java'
1818
}
1919

20+
checkstyle {
21+
ignoreFailures = false
22+
}
23+
24+
checkstyleMain {
25+
ignoreFailures = false
26+
}
27+
28+
checkstyleTest {
29+
ignoreFailures = false
30+
}
31+
32+
2033
task docs(type: Javadoc) {
2134
destinationDir = file("$buildDir/docs/all")
2235
}
@@ -45,8 +58,12 @@ allprojects {
4558

4659
subprojects {
4760

61+
checkstyleMain {
62+
ignoreFailures = false
63+
}
64+
4865
checkstyleTest {
49-
ignoreFailures = true
66+
ignoreFailures = false
5067
}
5168

5269
afterEvaluate {

conversation/README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,13 @@
77
<dependency>
88
<groupId>com.ibm.watson.developer_cloud</groupId>
99
<artifactId>conversation</artifactId>
10-
<version>3.7.1</version>
10+
<version>3.7.2</version>
1111
</dependency>
1212
```
1313

1414
##### Gradle
1515
```gradle
16-
'com.ibm.watson.developer_cloud:conversation:3.7.1'
16+
'com.ibm.watson.developer_cloud:conversation:3.7.2'
1717
```
1818

1919
## Usage

conversation/build.gradle

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,7 @@ signArchives {
5151

5252
checkstyle {
5353
configFile = rootProject.file('checkstyle.xml')
54+
ignoreFailures = false
5455
}
5556

5657
dependencies {

0 commit comments

Comments
 (0)