104 Commits

Author SHA1 Message Date
Wolf Posdorfer
f2ac02f2e2 Revert "Merge branch 'master' into release/0.15"
This reverts commit 340d9f7687538918722b4906f74ca5bb976453fd, reversing
changes made to a90bb33e9019d6f4506db2f4fb04c956161c89a2.
2018-01-30 12:38:37 +01:00
Wolf
340d9f7687
Merge branch 'master' into release/0.15 2018-01-30 12:06:32 +01:00
Wolf Posdorfer
a90bb33e90 Merge branch 'circleci' into release/0.15
# Conflicts:
#	circle.yml
2018-01-30 11:59:41 +01:00
Wolf Posdorfer
5aa9233321 version bump 2018-01-30 11:56:58 +01:00
Wolf Posdorfer
f92dea6d4e revert java counter to base 2018-01-30 11:53:56 +01:00
Wolf Posdorfer
4db95fac8d tm 0.15 updates 2018-01-30 11:44:26 +01:00
srmo
10a95d75b9 fix maven warning about wrong version name 2017-12-10 18:53:50 +01:00
srmo
42942990d6 Add missing GoGoProtos types. Though I'm not really sure what I'm doing here - had to manually adjust the import in Types
Also, add custom CodeType type as it was removed in 0.13.
2017-12-10 18:51:11 +01:00
srmo
68eb051982 Initial commit for new types from tendermint-0.13 - BROKEN as I have no idea where the new codetypes live :( 2017-12-10 18:34:18 +01:00
Wolf Posdorfer
b6fde85085 move settings.xml 2017-12-01 11:04:26 +01:00
Wolf Posdorfer
2db4a8ff49 updating readme 2017-12-01 11:02:53 +01:00
Wolf Posdorfer
36685080ec Merge branch 'release/0.12.0.2' 2017-12-01 11:00:56 +01:00
Wolf Posdorfer
7456f6be00 Merge branch 'circleci' into release/0.12.0.2 2017-12-01 10:58:59 +01:00
Wolf
19d3f573e1
Merge pull request #29 from jTendermint/Issue-27
Issue 27
2017-12-01 10:52:23 +01:00
Wolf
5957b03584
Merge pull request #25 from paulrd/patch-4
Fixed bug in reporting app data 'hash' on commit
2017-11-29 14:37:23 +01:00
posdorfer
da9b638b01 #27 make sockettimeout configurable 2017-11-23 16:26:40 +01:00
posdorfer
daf8f0b6df #27 socket.accept() block indefinately, preventing while loop from
exiting, preventing serversocket from ever reaching finally
2017-11-23 16:20:24 +01:00
Wolf Posdorfer
7ef2e0c9a2 Merge branch 'release/0.12.0.1'
# Conflicts:
#	.circleci.settings.xml
#	circle.yml
#	pom.xml
2017-11-14 14:49:08 +01:00
Wolf Posdorfer
88afdde49d creating 0.12.0.1 release 2017-11-14 14:37:31 +01:00
Wolf Posdorfer
1eb109c038 CircleCI branch 2017-11-14 14:36:39 +01:00
Wolf Posdorfer
9f6c61ab7a Circle-CI -Only branch 2017-11-14 14:32:29 +01:00
Wolf Posdorfer
9cbb406485 Version bump 2017-11-14 14:27:13 +01:00
Wolf Posdorfer
c0346319e0 make counting of open sockets possible + last time a socket was opened 2017-11-14 13:30:06 +01:00
Paul
bd1e6c7e4c
Fixed bug in reporting app data 'hash' on commit
We allocate 4 bytes not 32. `rewind()` is required because `copyFrom` copies from current position in ByteBuffer to end of ByteBuffer. Current position points to the end of the last 'put' so we rewind to point to the beginning.
2017-11-13 09:30:49 -04:00
Stephan Müller
a8f9ee0d28 fix README 2017-11-09 18:40:45 +01:00
Stephan Müller
0a6301f24a provide pubkey for gpg (this should be removed and a sign-only key should be used instead) 2017-11-09 18:18:18 +01:00
Stephan Müller
4ea222902a cleanup the mess 2017-11-09 18:13:57 +01:00
Stephan Müller
6997b44c88 cleanup the mess 2017-11-09 18:03:28 +01:00
Stephan Müller
129a5aff2c cleanup: change develop version to be SNAPSHOT and streamline pom with master 2017-11-09 16:49:57 +01:00
Stephan Müller
0fd6b4c0b3 circleCi: run tests immediately 2017-11-09 16:34:49 +01:00
Stephan Müller
7facc3b0e2 circleCi: do not use surefire goal 2017-11-09 16:31:25 +01:00
Stephan Müller
a6df8ce377 circleCi: try something else. Maybe this works out of the box 2017-11-09 16:28:10 +01:00
Stephan Müller
6c5f35474e try to enable deployment 2017-11-09 16:22:43 +01:00
Stephan Müller
e86b81da99 try to enable deployment 2017-11-09 16:19:53 +01:00
Stephan Müller
01080dfea0 prepare release 2017-11-09 16:07:50 +01:00
Stephan Müller
c079dfd11c provide circleCi maven settings 2017-11-09 15:25:59 +01:00
Stephan Müller
c10ce99055 remove bamboo reference 2017-11-09 15:17:55 +01:00
Stephan Müller
8ffbeb8a29 Bump version 2017-11-09 15:13:55 +01:00
Wolf
780753f290 Merge pull request #20 from jTendermint/circleci
Circleci
2017-10-25 16:09:46 +02:00
Wolf
6a275592ab Update Readme.md 2017-10-25 15:30:13 +02:00
Wolf Posdorfer
db566c54ca CircleCI? 2017-10-25 15:20:09 +02:00
srmo
e7fc876130 fix gitignore for intellij setups 2017-10-23 20:58:53 +02:00
Wolf
7446254749 Merge pull request #19 from jTendermint/develop
updating protofile for tm 0.11.0
v0.11.0
2017-10-23 14:27:55 +02:00
Wolf Posdorfer
7b388b78a4 updating protofile for tm 0.11.0
-recompiled types.proto
-updated to protobuf 3.4
2017-10-09 12:12:55 +02:00
srmo
56f9ab8aff Update Readme.md to reflect current release 2017-08-06 15:31:03 +02:00
Wolf
004dec293d Merge pull request #15 from jTendermint/develop
Develop
2017-06-30 11:56:13 +02:00
Ich
dfaa50885c updating dependencies and tm compatibility with 0.10 v0.10.0 2017-06-30 11:51:29 +02:00
Stephan Müller
027acf1c02 JavaCounter: quick fixes
-  some encoding issues so we always interpret everything in UTF-8
- take note of the current issue with invoking threads in a constructor, quick fixed by finalizing JavaCounter
2017-06-08 14:23:06 +02:00
Ich
f81e092a0d protobuf update for 0.9.1 2017-05-03 11:29:05 +02:00
srmo
b5b2c6e3a3 Update Readme.md
We now have an official release in maven central
2017-05-02 19:46:02 +02:00