Update readme

Combine contributing guide with readme and ensure information is up-to-date

Signed-off-by: James Taylor <jamest@uk.ibm.com>

# Conflicts:
#	README.md

Author: jt-nti

CONTRIBUTING.md

@@ -40,57 +40,6 @@ We use our own forks and [Github Flow](https://guides.github.com/introduction/fl
 
 Please to try to be consistent with the rest of the code and conform to checkstyle rules where they are provided.
 
-## Folder structure
-
-The "fabric-chaincode-protos" folder contains the protobuf definition files used by
-Java shim to communicate with Fabric peer.
-
-The "fabric-chaincode-shim" folder contains the java shim classes that define Java
-chaincode API and way to communicate with Fabric peer.
-
-The "fabric-chaincode-docker" folder contains instructions to the build
-`hyperledger/fabric-javaenv` docker image.
-
-The "fabric-chaincode-example-gradle" contains an example java chaincode gradle
-project that includes sample chaincode and basic gradle build instructions.
-
-#### Install prerequisites
-
-Make sure you installed all [fabric prerequisites](https://hyperledger-fabric.readthedocs.io/en/latest/prereqs.html)
-
-Install java shim specific prerequisites:
-* Java 8
-* gradle 4.4
-
-#### Build shim
-
-Clone the fabric shim for java chaincode repo.
-
-```
-git clone https://github.com/hyperledger/fabric-chaincode-java.git
-```
-
-Build java shim jars (proto and shim jars) and install them to local maven repository.
-```
-cd fabric-chaincode-java
-gradle clean build install
-```
-
-Build javaenv docker image, to have it locally.
-```
-gradle buildImage
-```
-
-#### Update your chaincode dependencies
-
-Make your chanincode depend on java shim master version and not on version from maven central
-
-```
-dependencies {
-    compile group: 'org.hyperledger.fabric-chaincode-java', name: 'fabric-chaincode-shim', version: '1.4.2-SNAPSHOT'
-}
-```
-
 ## Code of Conduct Guidelines <a name="conduct"></a>
 
 See our [Code of Conduct Guidelines](../blob/master/CODE_OF_CONDUCT.md).

README.md

@@ -1,19 +1,75 @@
-# Hyperledger Fabric - Java Contract and Chaincode
+# Hyperledger Fabric Chaincode Java
 
-This is a Java implementation of Hyperledger Fabric chaincode shim APIs and contract programming model.  This enables development of using Java language or other JVM based languages
+[![Build Status](https://dev.azure.com/Hyperledger/Fabric-Chaincode-Java/_apis/build/status/Fabric-Chaincode-Java?branchName=release-1.4)](https://dev.azure.com/Hyperledger/Fabric-Chaincode-Java/_build/latest?definitionId=39&branchName=release-1.4)
+[![Maven Central](https://maven-badges.herokuapp.com/maven-central/org.hyperledger.fabric-chaincode-java/fabric-chaincode-shim/badge.svg)](https://maven-badges.herokuapp.com/maven-central/org.hyperledger.fabric-chaincode-java/fabric-chaincode-shim)
+[![Rocket.Chat](https://chat.hyperledger.org/images/join-chat.svg)](https://chat.hyperledger.org/channel/fabric-java-chaincode)
 
-## Developers
+This is a Java based implementation of Hyprledger Fabric chaincode shim APIs, which enables development of smart contracts using the Java language.
 
-Application developers interested in developing smart contracts should read the [introductory tutorial](CONTRACT_TUTORIAL.md) and for a full scenario visit the
-[Commercial Paper](https://hyperledger-fabric.readthedocs.io/en/latest/tutorial/commercial_paper.html) tutorial.
+This project creates `fabric-chaincode-protos` and `fabric-chaincode-shim` jar
+files for developers' consumption and the `hyperledger/fabric-javaenv` docker image
+to run Java chaincode.
 
-We recommend using the IBM Blockchain Platform [VSCode extension](https://marketplace.visualstudio.com/items?itemName=IBMBlockchain.ibm-blockchain-platform) to assist you in developing smart contracts. The extension is able to create sample contracts for you, an example of such a contract is in the [fabric-contract-example](./fabric-contract-example) directory; there are folders for using both gradle and maven.
+## Getting Started
 
-In addition, this has reference to other tutorials to get you started
+Application developers interested in developing Java smart contracts for Hyperledger Fabric should read the [JavaDoc](https://fabric-chaincode-java.github.io/) which inludes download information, and links to documentation and samples.
 
-## Contributors
+## Project structure
 
-Contributors or early adopters who need to be able to build and test recent builds, should reference the [contributing](CONTRIBUTING.md) guide.
+### fabric-chaincode-protos
 
-This project creates `fabric-chaincode-protos` and `fabric-chaincode-shim` jar files for developers consumption and the `hyperledger/fabric-javaenv` docker image to run the Java chaincode and contracts.
+Contains the protobuf definition files used by Java shim to communicate with Fabric peers.
 
+### fabric-chaincode-shim
+
+Contains the java shim classes that define Java chaincode API and way to communicate with Fabric peers.
+
+### fabric-chaincode-docker
+
+Contains instructions to build the `hyperledger/fabric-javaenv` docker image.
+
+### fabric-chaincode-integration-test
+
+Contains higher level tests for Java chaincode.
+
+> **Note:** in the future these should be replaced with a separate suite of [Cucumber](https://cucumber.io) tests which run against all chaincode implementations.
+
+### fabric-chaincode-example-gradle
+
+Contains an example java chaincode gradle project that includes sample chaincode and basic gradle build instructions.
+
+## Building and testing
+
+Make sure you have the following prereqs installed:
+
+- [Docker](https://www.docker.com/get-docker)
+- [Docker Compose](https://docs.docker.com/compose/install/)
+- [Java 8](https://www.java.com)
+
+> **Note:** Java can be installed using [sdkman](https://sdkman.io/).
+
+Clone the repository if you haven't already.
+
+```
+git clone https://github.com/hyperledger/fabric-chaincode-java.git
+```
+
+Build java shim jars (proto and shim jars) and install them to local maven repository.
+
+```
+cd fabric-chaincode-java
+./gradlew clean build install
+```
+
+> **Note:** `./gradlew clean build classes` can be used instead to reduce the binaries that are built. This should be sufficient for using the local repository.
+
+Build javaenv docker image, to have it locally.
+
+```
+./gradlew buildImage
+```
+
+---
+
+[![Creative Commons License](https://i.creativecommons.org/l/by/4.0/88x31.png)](http://creativecommons.org/licenses/by/4.0/)  
+This work is licensed under a [Creative Commons Attribution 4.0 International License](http://creativecommons.org/licenses/by/4.0/)