This reverts commit 562a35fd, reversing
changes made to 4a78b412.  This was
done because we inadvertently merged a good chunk of master when
patch a96b9edc was submitted to the v0.6 branch.  We will
cherry-pick a96b9edc

 in a later patch to restore the fix
in the proper way.

Change-Id: Ib16c0220e65697a68a5140960b82780c175d9fa2
Signed-off-by: Greg Haskins <gregory.haskins@gmail.com>

This release fixes issue #28 and is required for supporting
the power platform.

https://github.com/hyperledger/fabric-chaintool/issues/28



Change-Id: I6d43cda5dcd88f26d4502b600adaf423d4df0cda
Signed-off-by: Gregory Haskins <gregory.haskins@gmail.com>

We now have baseimage in its own repository.  We also
bake a lot more of the image in during baseimage
creation, so we can relax some of the logic here.

Fixes FAB-284

Change-Id: I489004800635a126cff78dab79134fac9ae24722
Signed-off-by: Gregory Haskins <gregory.haskins@gmail.com>

Change-Id: I6ea4e0ecfbd5961aaaad1f9384b3959cf56ad412
Signed-off-by: Gregory Haskins <gregory.haskins@gmail.com>

This patch fixes two problems in commit e5a81bb6

.

1) There was a problem where the #comment after the IS_RELEASE
variable was casuing the conditional logic to assume this was
a -snapshot release.

2) We collectively agreed that -developer-preview is a bit
of a mouthful for the release taxonomy and this should be
shortened to -preview

This has been confirmed to now drive the proper conditional
generation of a release tag and use the desired "-preview".

Change-Id: I58f2d68862aca34ae0181fe35c2f503e7f5d522a
Signed-off-by: Gregory Haskins <gregory.haskins@gmail.com>

A tag should be created against this commit

Change-Id: I442b12f0812f753a6042510a679961a4b0a96451
Signed-off-by: Gregory Haskins <gregory.haskins@gmail.com>

This will fix issue FAB-215
https://jira.hyperledger.org/browse/FAB-215



Change-Id: I2599ba09f81ae44f9e6f28b53917300d2922a897
Signed-off-by: Satheesh Kathamuthu <satheesh.ceg@gmail.com>

Revert commit 84d1234e

 which was
inadvertently merged despite there being outstanding concerns.

Change-Id: Idbe47347e1008da28cd7730947c7225e74a12c5b
Signed-off-by: Christopher Ferris <chrisfer@us.ibm.com>

Change-Id: Id812afcac32d08cff4403e52445469dbf2b91428
Signed-off-by: Gregory Haskins <gregory.haskins@gmail.com>

Added logic to run node sdk tests in jenkins. Jenkins doesn't support sudo
so, checking whether required softwares installed in machine, if installed
skipping the installation step.

Change-Id: I07d4e68c95b5c8801fb11b156c649ad5d561873b
Signed-off-by: rameshthoomu <rameshbabu.thoomu@gmail.com>

This test was disabled as part of
https://gerrit.hyperledger.org/r/#/c/365/
while the fabric-chaintool repo did not support the
ChaincodeStubInterface.

This was resolved in fabric-chaintool as part of the 0.9.0 release
https://github.com/hyperledger/fabric-chaintool/pull/25
https://github.com/hyperledger/fabric-chaintool/releases/tag/v0.9.0



Change-Id: I9524d12665bf1183561e51f52ad12833eb67b514
Signed-off-by: Bradley Gorman <bgorman@au1.ibm.com>

Jenkins build runs 'make dist-clean' before it begins the build
process. This has the unfortunate side effect of deleting the
fabric-baseimage docker image in the local repository. Hence,
while we enhanced the make targets so that we could leverage
a baseimage previously built, it is not benefiting CI.

Added a 'scrub' target that does clean the baseimage, and
removed 'base' from the set of image targets cleaned, normally.

Fixes FAB-255

Change-Id: Ib9087211e30e2cf74c8a69caf26370c9fc57e60d
Signed-off-by: Christopher Ferris <chrisfer@us.ibm.com>

This reverts commit a98c59a1

.

We are experiencing several failures related to this merge, so lets
revert it for now and re-group

Change-Id: Ia476f7247a6ac68aacd34a609d79d3556260e0b0
Signed-off-by: Greg Haskins <gregory.haskins@gmail.com>

The protobuf files now are compiled when you run "make protos", or when they change.

https://jira.hyperledger.org/browse/FAB-108
https://jira.hyperledger.org/browse/FAB-109



Change-Id: I5bfabac127f5a4095f4bca826f245c0139b28efd
Signed-off-by: Yacov Manevich <yacovm@il.ibm.com>

This patch introduces a more robust versioning mechanism, summarized
as follows:

1) The top-level makefile defines $PROJECT_VERSION which is intended
   to be consumed throughout (though some places are left for a
   future patch)
2) The variable is expected to use Semantic Versioning with X.Y.Z for
   releases, and X.Y.Z-SNAPSHOT for intermediate development builds.
3) We bake the $PROJECT_VERSION into the binaries (peer and membersrvc)
   at compile time and remove the yaml configuration that attempted to
   provide competing versioning.
4) We tag our docker images (except for baseimage, that will be
   addressed later) with :$(ARCH)-$(PROJECT_VERSION), suitable for
   unambiguous long term hosting on something like dockerhub.
5) We add support for dynamically parsing yaml-based Dockerfile
   definitions to support variable subsitution.  This allows the yaml
   to set a Dockerfile definition with something like
   "FROM foo:$(ARCH)-$(PROJECT_VERSION)" and the variables will
   resolve at runtime based on the context it runs under.

This is all as a first step in supporting a more reasonable release
mechanism in general, and a docker-based release mechanism in particular.

Change-Id: Ic6df02be4046ca5dbb256f26658a4c393da55c0f
Signed-off-by: Greg Haskins <gregory.haskins@gmail.com>

Some objects such as build/docker/bin/peer end up being classified
as .INTERMEDIATE objects because of the way we use wildcarding.  The
side effect is that these artifacts may be implicitly deleted in
many/most circumstances, the result of which is that they then
need to be recompiled _every_ time rather than taking advantage
of build-caching.  We can fix this by marking them explicitly
as .SECONDARY artifacts

Fixes FAB-243

Change-Id: If45b0f5c7863d26a061831373187895069573fbb
Signed-off-by: Greg Haskins <gregory.haskins@gmail.com>

It was inadvertently placed in build/docker/bin even though
docker workflows were not consuming it.  Lets make it a
first class binary.

Change-Id: I3b21a5ee38834e6a5f27c64b059a2447fb253d27
Signed-off-by: Gregory Haskins <gregory.haskins@gmail.com>

Fixes the following issues
https://github.com/hyperledger/fabric/issues/2146
https://github.com/hyperledger/fabric/issues/2139



 1. Separate java docker image
 2. Added java package info to proto files
 3. Removed duplicate .proto files checked into java shim project, and copy it as part of build process
 4. Modified java unit test to refer to new path
 5. Updated JAVAChaincode documentation to reflect new changes and added instructions for developing new chaincode
 6. Split java chaincode examples from java shim project

Change-Id: I7cbe92449c30700f17949b03f8fc7c06e0c7efb6
Signed-off-by: Satheesh Kathamuthu <satheesh.ceg@gmail.com>

We remove the locally cached ./devenv/tools/chaintool binary and instead
download the package from the latest github release.

Change-Id: I36a0e8a9db40c89f0641cda2905e617c0ea41720
Signed-off-by: Gregory Haskins <gregory.haskins@gmail.com>

Copied from commit sha 346f9fb448140e931fed73b46f528de6dacbc0d0
to Gerrit. Verified that all DCO signoff received or IBM
contribution.

Change-Id: I812a2f48382a3cd37e153cd056d0ea94b7f416a0
Signed-off-by: Christopher Ferris <chrisfer@us.ibm.com>