Merge pull request #5 from watson-developer-cloud/gradle-release

Setup gradle releases to maven central

Author: germanattanasio

.bumpversion.cfg

@@ -0,0 +1,10 @@
+[bumpversion]
+current_version = 0.0.1
+commit = True
+tag = True
+
+[bumpversion:file:README.md]
+[bumpversion:file:gradle.properties]
+
+search = {current_version}
+replace = {new_version}

.github/CONTRIBUTING.md

@@ -6,7 +6,7 @@ please ask a question on [dW Answers][dw] or [Stack Overflow][stackoverflow].
 # Issues
 
 If you encounter an issue with the Watson Spring Boot support, you are welcome to submit a
-[bug report](https://github.com/watson-developer-cloud/watson-spring/issues).
+[bug report](https://github.com/watson-developer-cloud/spring-boot-starter/issues).
 Before that, please search for similar issues. It's possible somebody has encountered this issue already.
 
 # Pull Requests
@@ -19,7 +19,7 @@ If you want to contribute to the repository, here's a quick guide:
     * 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.
     * Check for unnecessary whitespace with git diff --check before committing.
   3. Make the test pass
-  4. Commit your changes:   
+  4. Commit your changes:  
     * Use the present tense (`"Add feature"` not `"Added Feature"`)
     * Use the imperative mood (`"Move cursor to…"` not `"Moves cursor to…"`)
     * Include relevant Emoji from our [Emoji cheatsheet](#emoji-cheatsheet)

.gitignore

@@ -27,3 +27,5 @@ target
 *.ipr
 *.iws
 
+/bin/
+scripts/secring.gpg

.travis.yml

@@ -2,6 +2,20 @@ language: java
 jdk:
   - oraclejdk8
 
+
+before_cache:
+  - rm -f  $HOME/.gradle/caches/modules-2/modules-2.lock
+  - rm -fr $HOME/.gradle/caches/*/plugin-resolution/
+
+cache:
+  directories:
+    - $HOME/.m2
+    - $HOME/.gradle/caches/
+    - $HOME/.gradle/wrapper/
+
+before_install:
+  - sed -i.bak -e 's|https://nexus.codehaus.org/snapshots/|https://oss.sonatype.org/content/repositories/codehaus-snapshots/|g' ~/.m2/settings.xml
+
 script:
   - ./gradlew check
   - ./gradlew install -x check
@@ -10,5 +24,23 @@ script:
 after_success:
   - bash <(curl -s https://codecov.io/bash)
 
+deploy:
+  - provider: script
+    script: scripts/deploy.sh
+    skip_cleanup: true
+    on:
+      repo: watson-developer-cloud/spring-boot-starter
+      jdk: oraclejdk8
+      tags: true
+
+  - provider: releases
+    api_key: ${GITHUB_TOKEN}
+    file: spring-boot-starter/build/libs/watson-spring-boot-starter-${TRAVIS_BRANCH}-jar-with-dependencies.jar
+    skip_cleanup: true
+    on:
+      repo: watson-developer-cloud/spring-boot-starter
+      jdk: oraclejdk8
+      tags: true
+
 notifications:
   email: true

README.md

@@ -1,8 +1,8 @@
 # Watson Spring Boot
 
-[![Build Status](https://travis-ci.org/watson-developer-cloud/watson-spring.svg?branch=master)](https://travis-ci.org/watson-developer-cloud/watson-spring)
-[![Maven Central](https://maven-badges.herokuapp.com/maven-central/com.ibm.watson.developer_cloud/watson-spring/badge.svg)](https://maven-badges.herokuapp.com/maven-central/com.ibm.watson.developer_cloud/watson-spring)
-[![CLA assistant](https://cla-assistant.io/readme/badge/watson-developer-cloud/watson-spring)](https://cla-assistant.io/watson-developer-cloud/watson-spring)
+[![Build Status](https://travis-ci.org/watson-developer-cloud/spring-boot-starter.svg?branch=master)](https://travis-ci.org/watson-developer-cloud/spring-boot-starter)
+[![Maven Central](https://maven-badges.herokuapp.com/maven-central/com.ibm.watson.developer_cloud/watson-spring-boot-starter/badge.svg)](https://maven-badges.herokuapp.com/maven-central/com.ibm.watson.developer_cloud/watson-spring-boot-starter)
+[![CLA assistant](https://cla-assistant.io/readme/badge/watson-developer-cloud/spring-boot-starter)](https://cla-assistant.io/watson-developer-cloud/spring-boot-starter)
 
 This project adds Spring Boot support for the Watson services.
 
@@ -13,20 +13,20 @@ using the standard Spring autoconfiguration framework.
 
 All you need to do is:
 
-1. Add the Watson spring-boot-starter dependency to your Spring Boot app:
+1. Add the Watson `watson-spring-boot-starter` dependency to your Spring Boot app:
 
     In your maven `pom.xml`
     ```
     <dependency>
       <groupId>com.ibm.watson.developer_cloud</groupId>
-      <artifactId>spring-boot-starter</artifactId>
-      <version>4.2.1</version>
+      <artifactId>watson-spring-boot-starter</artifactId>
+      <version>0.0.1</version>
     </dependency>
     ```
 
     or in your gradle `build.gradle`, in the dependencies stanza, add
     ```
-    compile 'com.ibm.watson.developer_cloud:spring-boot-starter:4.2.1'
+    compile 'com.ibm.watson.developer_cloud:watson-spring-boot-starter:0.0.1'
     ```
 
 2. Add your Watson service(s) credentials and version info to your application

RELEASES.md

@@ -0,0 +1,42 @@
+# Release Process
+
+* code: https://github.com/watson-developer-cloud/spring-boot-starter
+* maven: http://search.maven.org/#search%7Cga%7C1%7Ca%3A%22watson-spring-boot-starter%22
+
+## Guide to uploading artifacts to the Central Repository
+
+We use Sonatype as repository manager, it's used as the input channel for the Central Repository running the Sonatype Open Source Repository Hosting(OSSRH) service.
+
+### Prerequisites
+
+If you are not familiar with Sonatype and/or the maven release process please read the following material:
+
+* Releasing artifacts to Sonatype using Gradle: http://central.sonatype.org/pages/gradle.html
+* Install GPG, and create a public key. More info: http://central.sonatype.org/pages/working-with-pgp-signatures.html
+
+### Release steps
+
+  1. Update all READMEs to include the new version number
+
+     This can be done using [bumpversion]. If necessary, it can be installed with the following command:
+
+     ```bash
+     pip install bumpversion
+     ```
+
+     To then update all version numbers, simply run:
+
+     ```bash
+     bumpversion major|minor|patch
+     ```
+
+### Travis setup
+
+Travis should have the following environment variables setup:
+ * `CI_DEPLOY_USERNAME`: JIRA username with write permission
+ * `CI_DEPLOY_PASSWORD`: JIRA password for the username above
+ * `SIGNING_KEY`: PGP public key id
+ * `SIGNING_PASSWORD`: PGP public key password
+ * `SIGNING_KEYRING_PATH`: Relative path to the public key
+ * `GITHUB_TOKEN`: Github token
+[bumpversion]: https://pypi.python.org/pypi/bumpversion

VERSION

@@ -22,26 +22,47 @@ buildscript {
 }
 
 plugins {
-    id 'net.researchgate.release' version '2.6.0'
+    id 'com.github.johnrengelman.shadow' version '1.2.4'
+    id 'io.codearte.nexus-staging' version '0.11.0'
 }
 
 apply plugin: 'java'
 apply plugin: 'checkstyle'
+apply plugin: 'signing'
+apply plugin: 'maven'
+
 apply plugin: 'eclipse'
 apply plugin: 'idea'
 
 apply plugin: 'propdeps'
 apply plugin: 'propdeps-maven'
 
-archivesBaseName = 'spring-boot-starter'
+import org.apache.tools.ant.filters.*
 
+archivesBaseName = 'watson-spring-boot-starter'
 description = 'Spring Boot Starter for the IBM Watson Services'
 
-group = 'com.ibm.watson.developer_cloud'
-version = new File(rootDir, 'VERSION').text.trim()
+task sourcesJar(type: Jar) {
+    classifier = 'sources'
+    from sourceSets.main.allSource
+}
+
+task javadocJar(type: Jar) {
+    classifier = 'javadoc'
+    from javadoc
+}
 
-// If the version says "snapshot" anywhere assume it is not a release
-ext.isReleaseVersion = !version.toUpperCase(Locale.ENGLISH).contains("SNAPSHOT")
+shadowJar {
+   classifier = 'jar-with-dependencies'
+}
+
+artifacts {
+    archives sourcesJar
+    archives javadocJar
+    archives shadowJar
+}
+
+project.tasks.assemble.dependsOn project.tasks.shadowJar
 
 checkstyle {
     configFile = rootProject.file('checkstyle.xml')
@@ -56,26 +77,19 @@ checkstyleTest {
     ignoreFailures = false
 }
 
-task copyJars(type: Copy) {
-    from subprojects.collect { it.tasks.withType(Jar) }
-    into "$buildDir/allJars"
-}
-
-task signJars(type: Copy) {
-    from subprojects.collect { it.tasks.withType(Sign) }
-    into "$buildDir/allJars"
-}
-
 sourceCompatibility = 1.8
 targetCompatibility = 1.8
 
 repositories {
     mavenCentral()
 }
 
-ext.watsonVersion = '4.2.1'
-ext.springVersion = '4.3.12.RELEASE'
-ext.springBootVersion = '1.5.9.RELEASE'
+processResources {
+    filter ReplaceTokens, tokens: [
+            'pom.version': project.version,
+            'build.date' : getDate()
+    ]
+}
 
 dependencies {
     // Watson Java SDK
@@ -99,8 +113,8 @@ compileJava.dependsOn(processResources)
 
 test {
     testLogging {
-        events "failed"
-        exceptionFormat "full"
+        events 'failed'
+        exceptionFormat 'full'
     }
 }
 
@@ -118,7 +132,70 @@ task codeCoverageReport(type: JacocoReport, dependsOn: test) {
     }
 }
 
-release {
-    tagTemplate = 'watson-spring-boot-$version'
+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
+    }
+}
+
+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 'IBM Watson Spring boot starter'
+                packaging 'jar'
+                description 'Spring Boot Starter for the IBM Watson Services'
+                url 'https://www.ibm.com/watson/developer'
+
+                scm {
+                    connection 'scm:git:[email protected]:watson-developer-cloud/spring-boot-starter.git'
+                    developerConnection 'scm:git:[email protected]:watson-developer-cloud/spring-boot-starter.git'
+                    url 'https://github.com/watson-developer-cloud/spring-boot-starter'
+                }
+
+                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]'
+                    }
+                }
+            }
+        }
+    }
+}
+
+def getDate() {
+    def date = new Date()
+    def formattedDate = date.format('yyyyMMddHHmmss')
+    return formattedDate
 }
 
+ext {
+    getDate = this.&getDate
+}

build.gradle

@@ -0,0 +1,5 @@
+version=0.0.1
+group = com.ibm.watson.developer_cloud
+watsonVersion = 4.2.1
+springVersion = 4.3.12.RELEASE
+springBootVersion = 1.5.9.RELEASE

gradle.properties

@@ -0,0 +1,5 @@
+#!/usr/bin/env bash
+
+openssl aes-256-cbc -K $encrypted_c32defe8b915_key -iv $encrypted_c32defe8b915_iv -in scripts/secring.gpg.enc -out scripts/secring.gpg -d
+./gradlew uploadArchives -Psigning.keyId=$SIGNING_KEY -Psigning.password=$SIGNING_PASSWORD -Psigning.secretKeyRingFile=./scripts/secring.gpg
+./gradlew closeAndReleaseRepository -PnexusUsername=$CI_DEPLOY_USERNAME -PnexusPassword=$CI_DEPLOY_PASSWORD