From 53fab6a1fb7530b564aba856d7a7de4134f35ee6 Mon Sep 17 00:00:00 2001 From: heatherlp <40789053+heatherlp@users.noreply.github.com> Date: Wed, 27 Nov 2019 13:51:27 +0000 Subject: [PATCH] (Master) Remove references to gerrit (#29) Signed-off-by: heatherlp --- .gitignore | 3 ++- MAINTAINERS.md | 26 ++++++++++++-------------- README.md | 2 -- docs/EclipseSetup.md | 21 +++++++++------------ 4 files changed, 23 insertions(+), 29 deletions(-) diff --git a/.gitignore b/.gitignore index f78a3427..9f670f9c 100644 --- a/.gitignore +++ b/.gitignore @@ -7,4 +7,5 @@ target *.resources.prefs .settings .project -.classpath \ No newline at end of file +.classpath +.vscode \ No newline at end of file diff --git a/MAINTAINERS.md b/MAINTAINERS.md index 65603005..242eda5b 100644 --- a/MAINTAINERS.md +++ b/MAINTAINERS.md @@ -1,23 +1,21 @@ ## Maintainers ### Active Maintainers -| Name | GitHub | Gerrit | email | -|---|---|---|---| -| Rick Rineholt | cr22rc | rickr | cr22rc@gmail.com | -| Gari Singh | mastersingh24 | mastersingh24 | gari.r.singh@gmail.com | -| Andrew Coleman| andrew-coleman | andrew-coleman | andrew_coleman@uk.ibm.com | -| Mark Lewis | bestbeforetoday| bestbeforetoday| Mark.S.Lewis@outlook.com | +| Name | GitHub | email | +|---|---|---| +| Rick Rineholt | cr22rc | cr22rc@gmail.com | +| Gari Singh | mastersingh24 | gari.r.singh@gmail.com | +| Andrew Coleman| andrew-coleman | andrew_coleman@uk.ibm.com | +| Mark Lewis | bestbeforetoday| Mark.S.Lewis@outlook.com | ### Retired Maintainers -| Name | GitHub | Gerrit | email | -|---|---|---|---| -| Jim Zhang | jimthematrix | jimthematrix | jim_the_matrix@hotmail.com | -| Muhammad Altaf | malik-altaf | malik-altaf | muhammada@fast.au.fujitsu.com | -| Pardha Vishnumolakala| psaradhi | pardha | psaradhi@gmail.com | -| Satheesh Kathamuthu | xspeedcruiser | satheeshk | satheesh.ceg@gmail.com | - -Also: Please see the Release Manager section here +| Name | GitHub | email | +|---|---|---| +| Jim Zhang | jimthematrix | jim_the_matrix@hotmail.com | +| Muhammad Altaf | malik-altaf | muhammada@fast.au.fujitsu.com | +| Pardha Vishnumolakala| psaradhi | psaradhi@gmail.com | +| Satheesh Kathamuthu | xspeedcruiser | satheesh.ceg@gmail.com | Creative Commons License
This work is licensed under a Creative Commons Attribution 4.0 International License. s diff --git a/README.md b/README.md index 216fdca3..02aa9bba 100644 --- a/README.md +++ b/README.md @@ -91,7 +91,6 @@ You may also need to on your v2.0 Fabric ## Known limitations and restrictions * TCerts are not supported: JIRA FAB-1401 -* HSM not supported. JIRA FAB-3137

@@ -225,7 +224,6 @@ Then run the Integration tests with: ORG_HYPERLEDGER_FABRIC_SDKTEST_INTEGRATIONTESTS_TLS=true mvn clean install -DskipITs=false -Dmaven.test.failure.ignore=false javadoc:javadoc ### Chaincode endorsement policies -Policies are described in the [Fabric Endorsement Policies document](https://gerrit.hyperledger.org/r/gitweb?p=fabric.git;a=blob;f=docs/endorsement-policies.md;h=1eecf359c12c3f7c1ddc63759a0b5f3141b07f13;hb=HEAD). You create a policy using a Fabric tool ( an example is shown in [JIRA issue FAB-2376](https://jira.hyperledger.org/browse/FAB-2376?focusedCommentId=21121&page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel#comment-21121)) and give it to the SDK either as a file or a byte array. The SDK, in turn, will use the policy when it creates chaincode instantiation requests. diff --git a/docs/EclipseSetup.md b/docs/EclipseSetup.md index 63d0584e..40beb458 100644 --- a/docs/EclipseSetup.md +++ b/docs/EclipseSetup.md @@ -13,28 +13,25 @@ Set your JAVA\_HOME points to your installation of JDK 1.8 (or above) and make s 1. Download and install the latest Eclipse client -2. If you want to contribute to the project, you will need to make sure you are logged in to Gerrit and have setup your SSH keys. For more information on this, refer to: http://hyperledger-fabric.readthedocs.io/en/latest/Gerrit/lf-account.html +2. Clone the Java SDK from Github. -3. Clone the Java SDK from Gerrit. Make sure SSH and "Clone with commit-msg hook" are selected before you click on the copy to clipboard icon. Make sure the line you have copied has a: && scp .. errit.hyperledger.org:hooks/commit-msg fabric-sdk-java/.git/hooks/ - * https://gerrit.hyperledger.org/r/#/admin/projects/fabric-sdk-java - -4. Download and Install Maven, if you haven't already. +3. Download and Install Maven, if you haven't already. * https://maven.apache.org/download.cgi -5. Open up Eclipse to import the project. Go to File > Import > Maven > Existing Maven Project. Point to the location where you cloned the SDK in step 3. +4. Open up Eclipse to import the project. Go to File > Import > Maven > Existing Maven Project. Point to the location where you cloned the SDK in step 2. * If you see the error: **Failed to read the project description file (.project) for 'fabric-sdk-java'. The file has been changed on disk, and it now contains invalid information. The project will not function properly until the description file is restored to a valid state.** Remove the comments on top of .project file and .classpath and try importing the project again. -6. Hit Finish. +5. Hit Finish. * If you see error: **No marketplace entries found to handle maven-antrun-plugin:1.4:run in Eclipse. Please see Help for more information.** Continue to hit Finish. We will resolve this later. -7. Download dependencies. Navigate to you fabric-sdk-java folder, and execute the following command: **mvn install -DskipTests** +6. Download dependencies. Navigate to you fabric-sdk-java folder, and execute the following command: **mvn install -DskipTests** -8. After running the command in step 6, you might see the following error in Eclipse: **Plugin execution not covered by lifecycle configuration: org.apache.maven.plugins:maven-antrun-plugin:1.4:run (execution: default, phase: generate-test-resources).** Right click on the error and choose: **Mark goal run as ignored in eclipse.** +7. After running the command in step 6, you might see the following error in Eclipse: **Plugin execution not covered by lifecycle configuration: org.apache.maven.plugins:maven-antrun-plugin:1.4:run (execution: default, phase: generate-test-resources).** Right click on the error and choose: **Mark goal run as ignored in eclipse.** -9. Enable Checkstyle. Go to Project > Properties > Checkstyle. Make sure the “Checkstyle active for this project”, “files outside source directories”, and “derived (generated) files” are all checked. +8. Enable Checkstyle. Go to Project > Properties > Checkstyle. Make sure the “Checkstyle active for this project”, “files outside source directories”, and “derived (generated) files” are all checked. -10. Hit “Local Check Configurations”, then select “New”. Choose “External Configuration File”, hit “Browse” and select “checkstyle-config.xml” from the fabric-sdk-java root directory. +9. Hit “Local Check Configurations”, then select “New”. Choose “External Configuration File”, hit “Browse” and select “checkstyle-config.xml” from the fabric-sdk-java root directory. -11. Hit "Apply and Close", and the checkstyle will be applied. +10. Hit "Apply and Close", and the checkstyle will be applied. Your eclipse environment should be set up now. \ No newline at end of file