Skip to content

Commit d1c8030

Browse files
mbwhitembwhite
committed
Port of the udpate to use MavenWrapper
- Ported the ability to use the MavenWrapper in the docker image - Replaced the integration tests with ones from main - that actually test different packagings of contracts Signed-off-by: Matthew B White <[email protected]>
1 parent 0af15db commit d1c8030

File tree

49 files changed

+1894
-653
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

49 files changed

+1894
-653
lines changed

‎fabric-chaincode-docker/Dockerfile‎

Lines changed: 8 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ RUN curl -s "https://get.sdkman.io" | bash
66
SHELL ["/bin/bash", "-c"]
77

88
RUN source /root/.sdkman/bin/sdkman-init.sh; sdk install gradle 5.6.2
9-
RUN source /root/.sdkman/bin/sdkman-init.sh; sdk install maven 3.6.2
9+
RUN source /root/.sdkman/bin/sdkman-init.sh; sdk install maven 3.8.1
1010

1111
FROM adoptopenjdk/openjdk11:jdk-11.0.4_11-alpine as dependencies
1212
RUN apk add --no-cache bash wget
@@ -33,10 +33,8 @@ WORKDIR /root/chaincode-java/shim-src
3333
RUN gradle \
3434
clean \
3535
fabric-chaincode-protos:build \
36-
fabric-chaincode-protos:install \
3736
fabric-chaincode-protos:publishToMavenLocal \
3837
fabric-chaincode-shim:build \
39-
fabric-chaincode-shim:install \
4038
fabric-chaincode-shim:publishToMavenLocal \
4139
-x javadoc \
4240
-x test \
@@ -52,24 +50,22 @@ RUN mvn -f pom-default.xml compile
5250
WORKDIR /root/chaincode-java/shim-src/fabric-chaincode-shim/build/publications/shimJar/
5351
RUN mvn -f pom-default.xml compile
5452

55-
#Removing non-needed sources
56-
WORKDIR /root/chaincode-java
57-
RUN rm -rf shim-src
58-
53+
WORKDIR /root/chaincode-java
54+
# Run the Gradle and Maven commands to generate the wrapper variants
55+
# of each tool
56+
#Gradle doesn't run without settings.gradle file, so create one
57+
RUN touch settings.gradle
5958
RUN gradle wrapper
59+
RUN mvn -N io.takari:maven:wrapper
6060

6161
# Creating final javaenv image which will include all required
6262
# dependencies to build and compile java chaincode
6363
FROM adoptopenjdk/openjdk11:jdk-11.0.4_11-alpine
6464
RUN apk add --no-cache bash
6565

66-
COPY --from=dependencies /root/chaincode-java/gradle /root/chaincode-java/
67-
COPY --from=dependencies /root/chaincode-java/gradlew /root/chaincode-java/gradlew
68-
COPY --from=builder /root/.sdkman/candidates/maven/current /usr/bin/maven
69-
7066
SHELL ["/bin/bash", "-c"]
71-
ENV PATH="/usr/bin/maven/bin:/usr/bin/maven/:/usr/bin/gradle:/usr/bin/gradle/bin:${PATH}"
7267

68+
# Copy setup scripts, and the cached dependeices
7369
COPY --from=dependencies /root/chaincode-java /root/chaincode-java
7470
COPY --from=dependencies /root/.m2 /root/.m2
7571

‎fabric-chaincode-docker/build.sh‎

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,15 @@ buildMaven() {
3838
tar cf - . | (cd ${TMP_DIR}; tar xf -)
3939
cd ${TMP_DIR}
4040
echo "Maven build"
41-
mvn compile package -DskipTests -Dmaven.test.skip=true
41+
42+
if [ -f ./mvnw ]; then
43+
chmod +x ./mvnw
44+
else
45+
cp -r /root/chaincode-java/.mvn .
46+
cp /root/chaincode-java/mvnw .
47+
fi
48+
./mvnw compile package -DskipTests -Dmaven.test.skip=true
49+
4250
retval=$?
4351
if [ $retval -ne 0 ]; then
4452
exit $retval
@@ -69,4 +77,4 @@ if [ ${NUM_JARS} -eq 0 ]; then
6977
exit 255
7078
else
7179
cd ${INPUT_DIR} && tar cf - $(find . -name "*.jar") | (cd ${OUTPUT_DIR} && tar xvf -)
72-
fi
80+
fi

‎fabric-chaincode-integration-test/src/contracts/bare-gradle/build.gradle‎

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
plugins {
2+
id 'com.github.johnrengelman.shadow' version '5.1.0'
3+
id 'java'
4+
}
5+
6+
group 'org.hyperledger.fabric-chaincode-java'
7+
version '1.0-SNAPSHOT'
8+
9+
sourceCompatibility = 1.8
10+
11+
repositories {
12+
mavenLocal()
13+
mavenCentral()
14+
maven { url = "https://www.jitpack.io" }
15+
}
16+
17+
dependencies {
18+
implementation group: 'org.hyperledger.fabric-chaincode-java', name: 'fabric-chaincode-shim', version: '2.2.2'
19+
implementation group: 'org.hyperledger.fabric-chaincode-java', name: 'fabric-chaincode-protos', version: '2.2.2'
20+
testImplementation group: 'junit', name: 'junit', version: '4.12'
21+
implementation group: 'commons-logging', name: 'commons-logging', version: '1.2'
22+
implementation group: 'com.google.code.gson', name: 'gson', version: '2.8.6'
23+
implementation group: 'com.google.protobuf', name: 'protobuf-java', version: '3.4.0'
24+
}
25+
26+
shadowJar {
27+
baseName = 'chaincode'
28+
version = null
29+
classifier = null
30+
31+
manifest {
32+
attributes 'Main-Class': 'org.hyperledger.fabric.contract.ContractRouter'
33+
}
34+
}

‎fabric-chaincode-integration-test/src/contracts/bare-gradle/src/main/java/org/hyperledger/fabric/example/BareGradle.java‎

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
/*
2+
* SPDX-License-Identifier: Apache-2.0
3+
*/
4+
package org.hyperledger.fabric.example;
5+
6+
import org.hyperledger.fabric.contract.Context;
7+
import org.hyperledger.fabric.contract.ContractInterface;
8+
import org.hyperledger.fabric.contract.annotation.*;
9+
import org.hyperledger.fabric.metrics.Metrics;
10+
import org.hyperledger.fabric.metrics.MetricsProvider;
11+
import org.hyperledger.fabric.shim.ledger.*;
12+
import org.hyperledger.fabric.shim.*;
13+
14+
import java.util.*;
15+
import static java.nio.charset.StandardCharsets.UTF_8;
16+
17+
@Contract(name = "BareGradle",
18+
info = @Info(title = "BareGradle contract",
19+
description = "Contract but using all the APIs",
20+
version = "0.0.1",
21+
license =
22+
@License(name = "SPDX-License-Identifier: Apache-2.0",
23+
url = ""),
24+
contact = @Contact(email = "[email protected]",
25+
name = "fred",
26+
url = "http://fred.example.com")))
27+
@Default
28+
public class BareGradle implements ContractInterface {
29+
public BareGradle() {
30+
31+
}
32+
33+
@Transaction()
34+
public String whoami(Context ctx){
35+
return this.getClass().getSimpleName();
36+
}
37+
}

fabric-chaincode-integration-test/src/contracts/fabric-chaincode-example-sacc/src/main/resources/config.props renamed to fabric-chaincode-integration-test/src/contracts/bare-gradle/src/main/resources/config.props

File renamed without changes.

‎fabric-chaincode-integration-test/src/contracts/bare-maven/.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
target

‎fabric-chaincode-integration-test/src/contracts/bare-maven/.mvn/wrapper/MavenWrapperDownloader.java‎

Lines changed: 117 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,117 @@
1+
/*
2+
* Copyright 2007-present the original author or authors.
3+
*
4+
* Licensed under the Apache License, Version 2.0 (the "License");
5+
* you may not use this file except in compliance with the License.
6+
* You may obtain a copy of the License at
7+
*
8+
* http://www.apache.org/licenses/LICENSE-2.0
9+
*
10+
* Unless required by applicable law or agreed to in writing, software
11+
* distributed under the License is distributed on an "AS IS" BASIS,
12+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
* See the License for the specific language governing permissions and
14+
* limitations under the License.
15+
*/
16+
import java.net.*;
17+
import java.io.*;
18+
import java.nio.channels.*;
19+
import java.util.Properties;
20+
21+
public class MavenWrapperDownloader {
22+
23+
private static final String WRAPPER_VERSION = "0.5.6";
24+
/**
25+
* Default URL to download the maven-wrapper.jar from, if no 'downloadUrl' is provided.
26+
*/
27+
private static final String DEFAULT_DOWNLOAD_URL = "https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/"
28+
+ WRAPPER_VERSION + "/maven-wrapper-" + WRAPPER_VERSION + ".jar";
29+
30+
/**
31+
* Path to the maven-wrapper.properties file, which might contain a downloadUrl property to
32+
* use instead of the default one.
33+
*/
34+
private static final String MAVEN_WRAPPER_PROPERTIES_PATH =
35+
".mvn/wrapper/maven-wrapper.properties";
36+
37+
/**
38+
* Path where the maven-wrapper.jar will be saved to.
39+
*/
40+
private static final String MAVEN_WRAPPER_JAR_PATH =
41+
".mvn/wrapper/maven-wrapper.jar";
42+
43+
/**
44+
* Name of the property which should be used to override the default download url for the wrapper.
45+
*/
46+
private static final String PROPERTY_NAME_WRAPPER_URL = "wrapperUrl";
47+
48+
public static void main(String args[]) {
49+
System.out.println("- Downloader started");
50+
File baseDirectory = new File(args[0]);
51+
System.out.println("- Using base directory: " + baseDirectory.getAbsolutePath());
52+
53+
// If the maven-wrapper.properties exists, read it and check if it contains a custom
54+
// wrapperUrl parameter.
55+
File mavenWrapperPropertyFile = new File(baseDirectory, MAVEN_WRAPPER_PROPERTIES_PATH);
56+
String url = DEFAULT_DOWNLOAD_URL;
57+
if(mavenWrapperPropertyFile.exists()) {
58+
FileInputStream mavenWrapperPropertyFileInputStream = null;
59+
try {
60+
mavenWrapperPropertyFileInputStream = new FileInputStream(mavenWrapperPropertyFile);
61+
Properties mavenWrapperProperties = new Properties();
62+
mavenWrapperProperties.load(mavenWrapperPropertyFileInputStream);
63+
url = mavenWrapperProperties.getProperty(PROPERTY_NAME_WRAPPER_URL, url);
64+
} catch (IOException e) {
65+
System.out.println("- ERROR loading '" + MAVEN_WRAPPER_PROPERTIES_PATH + "'");
66+
} finally {
67+
try {
68+
if(mavenWrapperPropertyFileInputStream != null) {
69+
mavenWrapperPropertyFileInputStream.close();
70+
}
71+
} catch (IOException e) {
72+
// Ignore ...
73+
}
74+
}
75+
}
76+
System.out.println("- Downloading from: " + url);
77+
78+
File outputFile = new File(baseDirectory.getAbsolutePath(), MAVEN_WRAPPER_JAR_PATH);
79+
if(!outputFile.getParentFile().exists()) {
80+
if(!outputFile.getParentFile().mkdirs()) {
81+
System.out.println(
82+
"- ERROR creating output directory '" + outputFile.getParentFile().getAbsolutePath() + "'");
83+
}
84+
}
85+
System.out.println("- Downloading to: " + outputFile.getAbsolutePath());
86+
try {
87+
downloadFileFromURL(url, outputFile);
88+
System.out.println("Done");
89+
System.exit(0);
90+
} catch (Throwable e) {
91+
System.out.println("- Error downloading");
92+
e.printStackTrace();
93+
System.exit(1);
94+
}
95+
}
96+
97+
private static void downloadFileFromURL(String urlString, File destination) throws Exception {
98+
if (System.getenv("MVNW_USERNAME") != null && System.getenv("MVNW_PASSWORD") != null) {
99+
String username = System.getenv("MVNW_USERNAME");
100+
char[] password = System.getenv("MVNW_PASSWORD").toCharArray();
101+
Authenticator.setDefault(new Authenticator() {
102+
@Override
103+
protected PasswordAuthentication getPasswordAuthentication() {
104+
return new PasswordAuthentication(username, password);
105+
}
106+
});
107+
}
108+
URL website = new URL(urlString);
109+
ReadableByteChannel rbc;
110+
rbc = Channels.newChannel(website.openStream());
111+
FileOutputStream fos = new FileOutputStream(destination);
112+
fos.getChannel().transferFrom(rbc, 0, Long.MAX_VALUE);
113+
fos.close();
114+
rbc.close();
115+
}
116+
117+
}

‎fabric-chaincode-integration-test/src/contracts/bare-maven/.mvn/wrapper/maven-wrapper.jar‎

49.5 KB
Binary file not shown.

‎fabric-chaincode-integration-test/src/contracts/bare-maven/.mvn/wrapper/maven-wrapper.properties‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.6.3/apache-maven-3.6.3-bin.zip
2+
wrapperUrl=https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar

0 commit comments

Comments
 (0)