Merge pull request #1052 from watson-developer-cloud/post-release-fixes

Post release fixes

Author: lpatino10

.bumpversion.cfg

@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 6.14.0
+current_version = 7.0.0
 commit = True
 message = Update version numbers from {current_version} -> {new_version}
 

.gitignore

@@ -28,4 +28,5 @@ secrets.tar
 package-lock.json
 *.mlmodel
 .openapi-generator-ignore
-.openapi-generator/
+.openapi-generator/
+package-lock.json

.travis.yml

@@ -52,7 +52,7 @@ after_success:
 deploy:
 - provider: script
   skip_cleanup: true
-  script: "./gradlew bintrayUpload"
+  script: "travis_wait 30 ./gradlew bintrayUpload"
   on:
     tags: true
     jdk: openjdk7

README.md

@@ -2,7 +2,7 @@
 
 [![Build Status](https://travis-ci.org/watson-developer-cloud/java-sdk.svg?branch=master)](https://travis-ci.org/watson-developer-cloud/java-sdk)
 [![Slack](https://wdc-slack-inviter.mybluemix.net/badge.svg)](https://wdc-slack-inviter.mybluemix.net)
-[![Maven Central](https://maven-badges.herokuapp.com/maven-central/com.ibm.watson.developer_cloud/java-sdk/badge.svg)](https://maven-badges.herokuapp.com/maven-central/com.ibm.watson.developer_cloud/java-sdk)
+[![Maven Central](https://maven-badges.herokuapp.com/maven-central/com.ibm.watson/java-sdk/badge.svg)](https://maven-badges.herokuapp.com/maven-central/com.ibm.watson.developer_cloud/java-sdk)
 [![CLA assistant](https://cla-assistant.io/readme/badge/watson-developer-cloud/java-sdk)](https://cla-assistant.io/watson-developer-cloud/java-sdk)
 
 Java client library to use the [Watson APIs][wdc].
@@ -59,14 +59,68 @@ Java client library to use the [Watson APIs][wdc].
 ## Installation
 
 ##### Maven
+First, you'll need to edit your `settings.xml` file to target the right repository. Here's an example file configured to use the library:
+```xml
+<settings xmlns='http://maven.apache.org/SETTINGS/1.0.0' xsi:schemaLocation='http://maven.apache.org/SETTINGS/1.0.0 http://maven.apache.org/xsd/settings-1.0.0.xsd' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'>
+  <profiles>
+    <profile>
+      <repositories>
+        <repository>
+          <snapshots>
+            <enabled>
+              false
+            </enabled>
+          </snapshots>
+          <id>
+            bintray-ibm-cloud-sdks-ibm-cloud-sdk-repo
+          </id>
+          <name>
+            bintray
+          </name>
+          <url>
+            https://dl.bintray.com/ibm-cloud-sdks/ibm-cloud-sdk-repo
+          </url>
+        </repository>
+      </repositories>
+      <pluginRepositories>
+        <pluginRepository>
+          <snapshots>
+            <enabled>
+              false
+            </enabled>
+          </snapshots>
+          <id>
+            bintray-ibm-cloud-sdks-ibm-cloud-sdk-repo
+          </id>
+          <name>
+            bintray-plugins
+          </name>
+          <url>
+            https://dl.bintray.com/ibm-cloud-sdks/ibm-cloud-sdk-repo
+          </url>
+        </pluginRepository>
+      </pluginRepositories>
+      <id>
+        bintray
+      </id>
+    </profile>
+  </profiles>
+  <activeProfiles>
+    <activeProfile>
+      bintray
+    </activeProfile>
+  </activeProfiles>
+</settings>
+```
+Then, you can add the dependencies in your project POM.
 
 All the services:
 
 ```xml
 <dependency>
 	<groupId>com.ibm.watson</groupId>
 	<artifactId>ibm-watson</artifactId>
-	<version>6.14.0</version>
+	<version>7.0.0</version>
 </dependency>
 ```
 
@@ -76,22 +130,32 @@ Only Discovery:
 <dependency>
 	<groupId>com.ibm.watson</groupId>
 	<artifactId>discovery</artifactId>
-	<version>6.14.0</version>
+	<version>7.0.0</version>
 </dependency>
 ```
 
 ##### Gradle
+First, edit your repositories in your `build.gradle` file to target the right repository:
+```gradle
+repositories {
+	maven {
+		url  "https://dl.bintray.com/ibm-cloud-sdks/ibm-cloud-sdk-repo"
+	}
+}
+```
+
+Then, you can add the actual dependencies.
 
 All the services:
 
 ```gradle
-'com.ibm.watson:ibm-watson:6.14.0'
+'com.ibm.watson:ibm-watson:7.0.0'
 ```
 
 Only Assistant:
 
 ```gradle
-'com.ibm.watson:assistant:6.14.0'
+'com.ibm.watson:assistant:7.0.0'
 ```
 
 ##### JAR
@@ -401,4 +465,4 @@ We do :sunglasses:  http://ibm.github.io/
 [ibm-cloud-onboarding]: http://cloud.ibm.com/registration?target=/developer/watson&cm_sp=WatsonPlatform-WatsonServices-_-OnPageNavLink-IBMWatson_SDKs-_-Java
 
 
-[jar]: https://github.com/watson-developer-cloud/java-sdk/releases/download/java-sdk-6.14.0/java-sdk-6.14.0-jar-with-dependencies.jar
+[jar]: https://github.com/watson-developer-cloud/java-sdk/releases/download/java-sdk-7.0.0/java-sdk-7.0.0-jar-with-dependencies.jar

assistant/README.md

@@ -7,13 +7,13 @@
 <dependency>
   <groupId>com.ibm.watson</groupId>
   <artifactId>assistant</artifactId>
-  <version>6.14.0</version>
+  <version>7.0.0</version>
 </dependency>
 ```
 
 ##### Gradle
 ```gradle
-'com.ibm.watson:assistant:6.14.0'
+'com.ibm.watson:assistant:7.0.0'
 ```
 
 ## Usage

assistant/build.gradle

@@ -14,6 +14,8 @@ apply plugin: 'signing'
 apply plugin: 'checkstyle'
 apply plugin: 'eclipse'
 
+project.tasks.assemble.dependsOn project.tasks.shadowJar
+
 task javadocJar(type: Jar) {
     classifier = 'javadoc'
     from javadoc

build.gradle

@@ -60,17 +60,21 @@ task signJars(type: Copy) {
 allprojects {
   apply plugin: 'java' // *Compatibility has no effect before the 'java' plug-in is applied
   apply plugin: 'jacoco'
+  apply plugin: 'com.github.johnrengelman.shadow'
 
   sourceCompatibility = JavaVersion.VERSION_1_7
   targetCompatibility = JavaVersion.VERSION_1_7
 
   repositories {
       maven { url = "http://repo.maven.apache.org/maven2" }
   }
+
+  shadowJar {
+      classifier = 'jar-with-dependencies'
+  }
 }
 
 subprojects {
-
   dependencies {
     testCompile group: 'com.squareup.okhttp3', name: 'mockwebserver', version: '3.11.0'
     testCompile group: 'ch.qos.logback', name: 'logback-classic', version: '1.2.3'

common/build.gradle

@@ -1,21 +1,71 @@
+plugins {
+    id 'ru.vyarus.animalsniffer' version '1.3.0'
+}
+
+defaultTasks 'clean'
+
+apply from: '../utils.gradle'
 import org.apache.tools.ant.filters.*
 
-apply plugin: 'checkstyle'
 apply plugin: 'java'
+apply plugin: 'ru.vyarus.animalsniffer'
+apply plugin: 'maven'
+apply plugin: 'signing'
+apply plugin: 'checkstyle'
+apply plugin: 'eclipse'
 
-checkstyle {
-    configFile = rootProject.file('checkstyle.xml')
-    ignoreFailures = false
+project.tasks.assemble.dependsOn project.tasks.shadowJar
+
+task javadocJar(type: Jar) {
+    classifier = 'javadoc'
+    from javadoc
+}
+
+task sourcesJar(type: Jar) {
+    classifier = 'sources'
+    from sourceSets.main.allSource
 }
 
 repositories {
-    mavenCentral()
+    maven { url = "http://repo.maven.apache.org/maven2" }
+}
+
+artifacts {
+    archives sourcesJar
+    archives javadocJar
+}
+
+signing {
+    sign configurations.archives
+}
+
+signArchives {
+    onlyIf { Task task ->
+        def shouldExec = false
+        for (myArg in project.gradle.startParameter.taskRequests[0].args) {
+            if (myArg.toLowerCase().contains('signjars') || myArg.toLowerCase().contains('uploadarchives')) {
+                shouldExec = true
+            }
+        }
+        return shouldExec
+    }
+}
+
+checkstyle {
+    configFile = rootProject.file('checkstyle.xml')
+    ignoreFailures = false
 }
 
 dependencies {
     compile 'com.ibm.cloud:sdk-core:3.0.2'
+    signature 'org.codehaus.mojo.signature:java17:1.0@signature'
 }
 
 processResources {
-    filter ReplaceTokens, tokens: ["pom.version": project.version]
+    filter ReplaceTokens, tokens: [
+            "pom.version": project.version,
+            "build.date" : getDate()
+    ]
 }
+
+apply from: rootProject.file('.utility/bintray-properties.gradle')

common/gradle.properties

@@ -0,0 +1,4 @@
+PACKAGE_NAME=com.ibm.watson:common
+ARTIFACT_ID=common
+NAME=IBM Watson Java SDK - Common
+DESCRIPTION=Classes common to the rest of the wrapper libraries in the Watson Java SDK

compare-comply/README.md

@@ -7,13 +7,13 @@
 <dependency>
   <groupId>com.ibm.watson</groupId>
   <artifactId>compare-comply</artifactId>
-  <version>6.14.0</version>
+  <version>7.0.0</version>
 </dependency>
 ```
 
 ##### Gradle
 ```gradle
-'com.ibm.watson.developer_cloud:compare-comply:6.14.0'
+'com.ibm.watson.developer_cloud:compare-comply:7.0.0'
 ```
 
 ## Usage