From 7154ed862950b27b4dbb4cec519029316ecb2fff Mon Sep 17 00:00:00 2001
From: James Taylor <jt-nti@users.noreply.github.com>
Date: Wed, 1 Jul 2020 17:12:11 +0100
Subject: [PATCH] Update fabcar java sample build (#219)

- Update gradle version
- Switch to application plugin
  (cc is started as an app not a lib, and java-library-distribution
  is still incubating)
- make sure tests and coverage checks are run before installDist

Signed-off-by: James Taylor <jamest@uk.ibm.com>
---
 chaincode/fabcar/java/build.gradle             | 18 ++++++++++--------
 .../gradle/wrapper/gradle-wrapper.properties   |  2 +-
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/chaincode/fabcar/java/build.gradle b/chaincode/fabcar/java/build.gradle
index d2c257cc..32a6525a 100644
--- a/chaincode/fabcar/java/build.gradle
+++ b/chaincode/fabcar/java/build.gradle
@@ -3,8 +3,8 @@
  */
 
 plugins {
+    id 'application'
     id 'checkstyle'
-    id 'java-library-distribution'
     id 'jacoco'
 }
 
@@ -30,6 +30,10 @@ repositories {
     }
 }
 
+application {
+    mainClass = 'org.hyperledger.fabric.contract.ContractRouter'
+}
+
 checkstyle {
     toolVersion '8.21'
     configFile file("config/checkstyle/checkstyle.xml")
@@ -43,14 +47,11 @@ checkstyleTest {
     source ='src/test/java'
 }
 
+jacocoTestReport {
+    dependsOn test
+}
+
 jacocoTestCoverageVerification {
-    afterEvaluate {
-        classDirectories = files(classDirectories.files.collect {
-            fileTree(dir: it, exclude:  [
-                    'org/hyperledger/fabric/samples/fabcar/Start.*'
-            ])
-        })
-    }
     violationRules {
         rule {
             limit {
@@ -70,3 +71,4 @@ test {
 }
 
 check.dependsOn jacocoTestCoverageVerification
+installDist.dependsOn check
diff --git a/chaincode/fabcar/java/gradle/wrapper/gradle-wrapper.properties b/chaincode/fabcar/java/gradle/wrapper/gradle-wrapper.properties
index 7c4388a9..bb8b2fc2 100644
--- a/chaincode/fabcar/java/gradle/wrapper/gradle-wrapper.properties
+++ b/chaincode/fabcar/java/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.5.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists