Move to use Maven Wrapper

Update the versions of Gradle and Maven
Move to use the Maven wrapper for all new builds

Signed-off-by: Matthew B White <[email protected]>

Author: mbwhite

fabric-chaincode-docker/Dockerfile

@@ -59,16 +59,13 @@ RUN rm -rf shim-src
 #Gradle doesn't run without settings.gradle file, so create one
 RUN touch settings.gradle
 RUN gradle wrapper
+RUN mvn -N io.takari:maven:wrapper
 
 # Creating final javaenv image which will include all required
 # dependencies to build and compile java chaincode
 FROM adoptopenjdk/openjdk11:jdk-11.0.4_11-alpine
 RUN apk add --no-cache bash
 
-COPY --from=dependencies /root/chaincode-java/gradle /root/chaincode-java/
-COPY --from=dependencies /root/chaincode-java/gradlew /root/chaincode-java/gradlew
-COPY --from=builder /root/.sdkman/candidates/maven/current /usr/bin/maven
-
 SHELL ["/bin/bash", "-c"]
 ENV PATH="/usr/bin/maven/bin:/usr/bin/maven/:/usr/bin/gradle:/usr/bin/gradle/bin:${PATH}"
 

fabric-chaincode-docker/build.sh

@@ -38,7 +38,9 @@ buildMaven() {
     tar cf - . | (cd ${TMP_DIR}; tar xf -)
     cd ${TMP_DIR}
     echo "Maven build"
-    mvn compile package -DskipTests -Dmaven.test.skip=true
+
+    ./mvnw compile package -DskipTests -Dmaven.test.skip=true
+    
     retval=$?
     if [ $retval -ne 0 ]; then
       exit $retval