Merge pull request #897 from watson-developer-cloud/develop

Release v5.1.0

Author: lpatino10

RELEASE.md

@@ -39,4 +39,28 @@ If you are not familiar with Sonatype and/or the maven release process please re
 
      You will have to answer prompts for versions and tags. That will tag and commit a new version into your repository automatically.
 
-[bumpversion]: https://pypi.python.org/pypi/bumpversion
+[bumpversion]: https://pypi.python.org/pypi/bumpversion
+
+### Manually releasing
+
+The above steps should work, but we've run into situations where the archive uploading through CI has failed because IP changes caused multiple staging repositories to be created in Sonatype, each with different pieces of the full set of artifacts. If this happens, the repositories won't be able to be closed and released on the Sonatype website.
+
+Uploading the archives locally with the following command solves this problem:
+
+```bash
+./gradlew uploadArchives -Psigning.keyId=<keyId> -Psigning.password=<keyPassword> -Psigning.secretKeyRingFile=<pathToKeyRingFile> -PossrhUsername=<sonatypeUsername> -PossrhPassword=<sonatypePassword>
+```
+
+The arguments should be populated with the following:
+- `-Psigning.keyId`: The ID of your public key you created after following the link in the prerequisites
+- `-Psigning.password`: Your password you created for making public GPG keys
+- `-Psigning.secretKeyRingFile`: After creating your public key, you create your keyring file with the following command and use the absolute path to your new file:
+
+```bash
+gpg --export-secret-keys -o <outputFilename>.gpg
+```
+
+- `-PossrhUsername`: Your Sonatype username
+- `-PossrhPassword`: Your Sonatype password
+
+Assuming this command works properly, you should be able to then log into Sonatype and close and release the repository as usual.

assistant/README.md

@@ -0,0 +1,59 @@
+# Assistant
+
+## Installation
+
+##### Maven
+```xml
+<dependency>
+	<groupId>com.ibm.watson.developer_cloud</groupId>
+	<artifactId>assistant</artifactId>
+	<version>5.0.0</version>
+</dependency>
+```
+
+##### Gradle
+```gradle
+'com.ibm.watson.developer_cloud:assistant:5.0.0'
+```
+
+## Usage
+
+Use the [Assistant][assistant] service to identify intents, entities, and conduct conversations.
+
+```java
+Assistant service = new Assistant("2018-02-16");
+service.setUsernameAndPassword("<username>", "<password>");
+
+InputData input = new InputData.Builder("Hi").build();
+MessageOptions options = new MessageOptions.Builder(workspaceId).input(input).build();
+MessageResponse response = service.message(options).execute();
+System.out.println(response);
+```
+
+Moving from Node 1 to Node 2.
+
+```java
+Context context = null;
+
+// first message
+MessageOptions newMessageOptions = new MessageOptions.Builder()
+    .workspaceId("<workspace-id>")
+    .input(new InputData.Builder("First message").build())
+    .context(context)
+    .build();
+
+MessageResponse response = service.message(newMessageOptions).execute();
+
+// second message
+newMessageOptions = new MessageOptions.Builder()
+    .workspaceId("<workspace-id>")
+    .input(new InputData.Builder("Second message").build())
+    .context(response.getContext()) // output context from the first message
+    .build();
+
+response = service.message(newMessageOptions).execute();
+
+System.out.println(response);
+```
+
+[assistant]: https://console.bluemix.net/docs/services/assistant/index.html

assistant/build.gradle

@@ -0,0 +1,112 @@
+plugins {
+    id 'ru.vyarus.animalsniffer' version '1.3.0'
+}
+
+defaultTasks 'clean'
+
+apply from: '../utils.gradle'
+import org.apache.tools.ant.filters.*
+
+apply plugin: 'java'
+apply plugin: 'ru.vyarus.animalsniffer'
+apply plugin: 'maven'
+apply plugin: 'signing'
+apply plugin: 'checkstyle'
+apply plugin: 'eclipse'
+
+task javadocJar(type: Jar) {
+    classifier = 'javadoc'
+    from javadoc
+}
+
+task sourcesJar(type: Jar) {
+    classifier = 'sources'
+    from sourceSets.main.allSource
+}
+
+repositories {
+    mavenCentral()
+}
+
+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 project(':core')
+
+    testCompile project(path: ':core', configuration: 'tests')
+    signature 'org.codehaus.mojo.signature:java17:1.0@signature'
+}
+
+processResources {
+    filter ReplaceTokens, tokens: [
+            "pom.version": project.version,
+            "build.date" : getDate()
+    ]
+}
+
+uploadArchives {
+    repositories {
+        mavenDeployer {
+            beforeDeployment { MavenDeployment deployment -> signing.signPom(deployment) }
+
+            repository(url: "http://oss.sonatype.org/service/local/staging/deploy/maven2/") {
+                authentication(userName: System.env.CI_DEPLOY_USERNAME, password: System.env.CI_DEPLOY_PASSWORD)
+            }
+            snapshotRepository(url: "https://oss.sonatype.org/content/repositories/snapshots/"){
+                authentication(userName: System.env.CI_DEPLOY_USERNAME, password: System.env.CI_DEPLOY_PASSWORD)
+            }
+            pom.project {
+                name 'conversation'
+                packaging 'jar'
+                // optionally artifactId can be defined here
+                description 'Client library to use the IBM Watson Assistant Service'
+                url 'https://console.bluemix.net/docs/services/assistant/index.html'
+
+                scm {
+                    connection 'scm:git:[email protected]:watson-developer-cloud/java-sdk.git'
+                    developerConnection 'scm:git:[email protected]:watson-developer-cloud/java-sdk.git'
+                    url 'https://github.com/watson-developer-cloud/java-sdk'
+                }
+
+                licenses {
+                    license {
+                        name 'The Apache License, Version 2.0'
+                        url 'http://www.apache.org/licenses/LICENSE-2.0.txt'
+                    }
+                }
+
+                developers {
+                    developer {
+                        id 'german'
+                        name 'German Attanasio'
+                        email '[email protected]'
+                    }
+                }
+            }
+        }
+    }
+}