Merge pull request #1164 from watson-developer-cloud/maven-transition

Maven transition

Author: kevinkowa

.bumpversion.cfg

@@ -4,12 +4,6 @@ commit = True
 message = Update version numbers from {current_version} -> {new_version}
 search = {current_version}
 replace = {new_version}
-parse = (?P<major>\d+)\.(?P<minor>\d+)\.(?P<patch>\d+)(?P<rc>\-rc\.\d+)?
-serialize = 
-	{major}.{minor}.{patch}{rc}
-	{major}.{minor}.{patch}
-
-[bumpversion:file:gradle.properties]
 
 [bumpversion:file:README.md]
 

.github/CONTRIBUTING.md

@@ -4,23 +4,24 @@ If you encounter an issue with the Java SDK, you are welcome to submit a [bug re
 Before that, please search for similar issues. It's possible somebody has encountered this issue already.
 
 # Building and testing
-This project uses [Gradle] as the build tool (> v1.x). Here are some helpful commands:
+This project uses [Maven] as the build tool (> v1.x). Here are some helpful commands:
 ```sh
 cd java-sdk
-gradle jar  # build jar file (build/libs/watson-developer-cloud-6.14.0.jar)
-gradle test # run tests
-gradle check # performs quality checks on source files and generates reports
-gradle testReport # run tests and generate the aggregated test report (build/reports/allTests)
-gradle codeCoverageReport # run tests and generate the code coverage report (build/reports/jacoco)
+mvn clean  # Delete target directory.
+mvn test # Run tests
+mvn package # Take the compiled code and package it in its distributable format, e.g. JAR.
+mvn verify # Run any checks to verify the MVN package is valid and meets quality criteria.
+mvn verify -fae -DskipITs=false # Run Integration tests to verify the MVN package is valid and meets quality criteria.
+mvn install # Install the package into the local maven repository cache.
 ```
 
 # Pull Requests
 
 If you want to contribute to the repository, here's a quick guide:
   1. Fork the repository
   1. Edit the [`config.properties`](../common/src/test/resources/config.properties) file to add your service credentials to the appropriate fields.
-  2. develop and test your code changes, gradle: `gradle test`.
-    * Run `checkstyle`: `gradle checkstyle`. 🏁
+  2. develop and test your code changes: `mvn verify -fae -DskipITs=false`.
+    * Run `checkstyle`: `mvn checkstyle:check`. 🏁
     * 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

.gitignore

@@ -5,7 +5,6 @@
 .idea
 .project
 .settings
-build
 out
 target
 bin/
@@ -36,3 +35,32 @@ package-lock.json
 *.py
 fix-copyrights.sh
 /.utility/secring.gpg
+# Compiled class file
+*.class
+
+# Log file
+*.log
+
+# BlueJ files
+*.ctxt
+
+# Mobile Tools for Java (J2ME)
+.mtj.tmp/
+
+/**/target/
+/**/test-output/
+.settings/
+.factorypath
+*-apiref.json
+
+# Package Files #
+*.jar
+*.war
+*.nar
+*.ear
+*.zip
+*.tar.gz
+*.rar
+*.key
+
+/node_modules

.releaserc

@@ -1,44 +1,23 @@
 {
-  "branches": [
-    "master",
-    {
-        "name": "rc",
-        "prerelease": true
-    }
-  ],
   "debug": true,
+  "branches": [ "master" ],
+  "tagFormat": "v${version}",
   "plugins": [
     "@semantic-release/commit-analyzer",
     "@semantic-release/release-notes-generator",
     "@semantic-release/changelog",
     [
       "@semantic-release/exec",
       {
-        "prepareCmd": ".utility/bumpversion.sh  ${lastRelease.version} ${nextRelease.version}"
-      }
-    ],
-    [
-      "@semantic-release/exec",
-      {
-        "prepareCmd": "./gradlew clean shadowJar"
+        "prepareCmd": "bump2version --allow-dirty --current-version ${lastRelease.version} --new-version ${nextRelease.version} patch"
       }
     ],
     [
       "@semantic-release/git",
       {
-        "message": "docs(release): Add release notes for ${nextRelease.version}"
+        "message": "chore(release): ${nextRelease.version} release notes\n\n${nextRelease.notes}"
       }
     ],
-    [
-      "@semantic-release/github",
-      {
-        "assets": [
-          {
-            "path": "ibm-watson/build/libs/*.jar",
-            "name": "ibm-watson-${nextRelease.version}-jar-with-dependencies.jar"
-          }
-        ]
-      }
-    ]
+    "@semantic-release/github"
   ]
-}
+}

.travis.yml

@@ -1,55 +1,78 @@
+---
+language: java
 dist: xenial
 os: linux
+
+jdk:
+  - openjdk8
+
+notifications:
+  email: true
+
 branches:
   except:
     - gh-pages
+
+cache:
+  directories:
+    - "$HOME/.m2"
+
+env:
+  global:
+    - MVN_ARGS="--settings build/.travis.settings.xml"
+
 stages:
-  - Build and test
-  - Semantic release
-  - Publish javadoc
-  - Upload Archives
+  - name: Build and test
+  - name: Semantic-Release
+    if: branch = master AND type = push AND fork = false
+  - name: Publish-Release
+    if: tag IS present
 
 jobs:
   include:
     - stage: Build and test
       jdk: openjdk8
       language: java
-      before_install:
-        - .utility/decrypt-service-instance-apikeys.sh
+      install:
+        - curl -s https://codecov.io/bash > $HOME/codecov-bash.sh && chmod +x $HOME/codecov-bash.sh
       script:
-        - ./gradlew checkstyleMain
-        - ./gradlew checkstyleTest
-        - travis_retry .utility/travis-run-tests.sh
+        - build/setMavenVersion.sh
+        - mvn verify -fae -DskipITs $MVN_ARGS
       after_success:
-        - bash <(curl -s https://codecov.io/bash)+++++++
+        - build/publishCodeCoverage.sh
 
-    - stage: Semantic release
-      jdk: openjdk8
-      language: java
-      if: (branch = master OR branch = rc) AND type = push AND fork = false
-      before_install:
-        - pip install --user bumpversion
+    - stage: Semantic-Release
+      install:
+        - sudo apt-get install python
         - nvm install 12
+        - npm install -g npm@6.x
+        - pip install --user bump2version
         - npm install @semantic-release/changelog
         - npm install @semantic-release/exec
         - npm install @semantic-release/git
+        - npm install @semantic-release/github
       script:
         - npx semantic-release
+      after_success:
+        - echo "Semantic release has successfully created a new tagged-release"
 
-    - stage: Publish javadoc
+    - stage: Publish-Release
       jdk: openjdk8
-      language: java
-      if: type = push AND fork = false
+      name: Publish-Javadoc
+      install: true
       script:
-        - ./gradlew docs
-        - .utility/push-javadoc-to-gh-pages.sh
+        - build/setMavenVersion.sh
+        - mvn clean javadoc:aggregate $MVN_ARGS
+        - build/publishJavadoc.sh
+      after_success:
+        - echo "Javadocs successfully published to gh-pages!"
 
-    - stage: Upload Archives
-      jdk: openjdk8
-      language: java
-      if: tag IS present
+    - jdk: openjdk8
+      name: Publish-To-Maven-Central
+      install: true
       script:
-        - .utility/deploy-travis-wrapper.sh
-
-notifications:
-  email: true
+        - build/setupSigning.sh
+        - build/setMavenVersion.sh
+        - mvn deploy $MVN_ARGS -DskipTests -P central
+      after_success:
+        - echo "Maven artifacts successfully published to Maven Central!"