diff --git a/.gitignore b/.gitignore index 4be6aeb4..eabe7352 100644 --- a/.gitignore +++ b/.gitignore @@ -6,16 +6,12 @@ target .classpath .project .settings -.gitignore~ hs_err_*.log src/test/resources/foo.json src/test/resources/freeformatter-out.json - -boon/build/* - machines/machine3/log machines/machine1/log @@ -40,40 +36,11 @@ machines/machine3/conf machines/machine3/snapshot/29_30007.ss -.gradle/2.1/taskArtifacts/cache.properties - -.gradle/2.1/taskArtifacts/cache.properties.lock - -.gradle/2.1/taskArtifacts/fileHashes.bin - -.gradle/2.1/taskArtifacts/fileSnapshots.bin - -.gradle/2.1/taskArtifacts/outputFileStates.bin - -.gradle/2.1/taskArtifacts/taskArtifacts.bin +.gradle/ *.class *.jar +!gradle-wrapper.jar -*.MF - -boon/build/poms/pom-default.xml - -etcd/build/poms/pom-default.xml - -bnsf/build/poms/pom-default.xml - -etcd/etcd-client/build/poms/pom-default.xml - -slumberdb/build/poms/pom-default.xml - -slumberdb/slumberdb-core/build/poms/pom-default.xml - -slumberdb/slumberdb-leveldb/build/poms/pom-default.xml - -slumberdb/slumberdb-mysql/build/poms/pom-default.xml - -slumberdb/slumberdb-service-model/build/poms/pom-default.xml - -build/poms/pom-default.xml +build/ diff --git a/.gradle/2.3/taskArtifacts/cache.properties b/.gradle/2.3/taskArtifacts/cache.properties deleted file mode 100644 index 26323731..00000000 --- a/.gradle/2.3/taskArtifacts/cache.properties +++ /dev/null @@ -1 +0,0 @@ -#Tue Jun 02 13:35:50 PDT 2015 diff --git a/.gradle/2.3/taskArtifacts/cache.properties.lock b/.gradle/2.3/taskArtifacts/cache.properties.lock deleted file mode 100644 index 1052bf64..00000000 Binary files a/.gradle/2.3/taskArtifacts/cache.properties.lock and /dev/null differ diff --git a/.gradle/2.3/taskArtifacts/fileHashes.bin b/.gradle/2.3/taskArtifacts/fileHashes.bin deleted file mode 100644 index 25850c23..00000000 Binary files a/.gradle/2.3/taskArtifacts/fileHashes.bin and /dev/null differ diff --git a/.gradle/2.3/taskArtifacts/fileSnapshots.bin b/.gradle/2.3/taskArtifacts/fileSnapshots.bin deleted file mode 100644 index 0dbd6fb8..00000000 Binary files a/.gradle/2.3/taskArtifacts/fileSnapshots.bin and /dev/null differ diff --git a/.gradle/2.3/taskArtifacts/outputFileStates.bin b/.gradle/2.3/taskArtifacts/outputFileStates.bin deleted file mode 100644 index d7d1075c..00000000 Binary files a/.gradle/2.3/taskArtifacts/outputFileStates.bin and /dev/null differ diff --git a/.gradle/2.3/taskArtifacts/taskArtifacts.bin b/.gradle/2.3/taskArtifacts/taskArtifacts.bin deleted file mode 100644 index d4ffab9d..00000000 Binary files a/.gradle/2.3/taskArtifacts/taskArtifacts.bin and /dev/null differ diff --git a/.travis.yml b/.travis.yml index 4ddd19ca..35668651 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,4 +1,8 @@ language: java +before_install: + - chmod +x gradlew +install: true +script: + - ./gradlew build jdk: - - oraclejdk7 - + - oraclejdk8 diff --git a/etcd/etcd-client/build/reports/tests/classes/org.boon.etcd.RequestTest.html b/etcd/etcd-client/build/reports/tests/classes/org.boon.etcd.RequestTest.html deleted file mode 100644 index 4b8164ee..00000000 --- a/etcd/etcd-client/build/reports/tests/classes/org.boon.etcd.RequestTest.html +++ /dev/null @@ -1,173 +0,0 @@ - - - - - -Test results - Class org.boon.etcd.RequestTest - - - - - -
-

Class org.boon.etcd.RequestTest

-
-all > -org.boon.etcd > RequestTest
-
- - - - - -
-
- - - - - - - -
-
-
2
-

tests

-
-		 -
-
1
-

failures

-
-		 -
-
0
-

ignored

-
-		 -
-
0.018s
-

duration

-
-
-
-		 -
-
50%
-

successful

-
-
-
-
- -
-

Failed tests

-
- -

testDelete

- -
org.boon.Exceptions$SoftenedException: died
-	at org.boon.Exceptions.die(Exceptions.java:83)
-	at org.boon.etcd.RequestTest.testDelete(RequestTest.java:33)
-	at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
-	at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62)
-	at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
-	at java.lang.reflect.Method.invoke(Method.java:497)
-	at org.junit.runners.model.FrameworkMethod$1.runReflectiveCall(FrameworkMethod.java:47)
-	at org.junit.internal.runners.model.ReflectiveCallable.run(ReflectiveCallable.java:12)
-	at org.junit.runners.model.FrameworkMethod.invokeExplosively(FrameworkMethod.java:44)
-	at org.junit.internal.runners.statements.InvokeMethod.evaluate(InvokeMethod.java:17)
-	at org.junit.internal.runners.statements.RunBefores.evaluate(RunBefores.java:26)
-	at org.junit.runners.ParentRunner.runLeaf(ParentRunner.java:271)
-	at org.junit.runners.BlockJUnit4ClassRunner.runChild(BlockJUnit4ClassRunner.java:70)
-	at org.junit.runners.BlockJUnit4ClassRunner.runChild(BlockJUnit4ClassRunner.java:50)
-	at org.junit.runners.ParentRunner$3.run(ParentRunner.java:238)
-	at org.junit.runners.ParentRunner$1.schedule(ParentRunner.java:63)
-	at org.junit.runners.ParentRunner.runChildren(ParentRunner.java:236)
-	at org.junit.runners.ParentRunner.access$000(ParentRunner.java:53)
-	at org.junit.runners.ParentRunner$2.evaluate(ParentRunner.java:229)
-	at org.junit.runners.ParentRunner.run(ParentRunner.java:309)
-	at org.gradle.api.internal.tasks.testing.junit.JUnitTestClassExecuter.runTestClass(JUnitTestClassExecuter.java:86)
-	at org.gradle.api.internal.tasks.testing.junit.JUnitTestClassExecuter.execute(JUnitTestClassExecuter.java:49)
-	at org.gradle.api.internal.tasks.testing.junit.JUnitTestClassProcessor.processTestClass(JUnitTestClassProcessor.java:64)
-	at org.gradle.api.internal.tasks.testing.SuiteTestClassProcessor.processTestClass(SuiteTestClassProcessor.java:50)
-	at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
-	at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62)
-	at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
-	at java.lang.reflect.Method.invoke(Method.java:497)
-	at org.gradle.messaging.dispatch.ReflectionDispatch.dispatch(ReflectionDispatch.java:35)
-	at org.gradle.messaging.dispatch.ReflectionDispatch.dispatch(ReflectionDispatch.java:24)
-	at org.gradle.messaging.dispatch.ContextClassLoaderDispatch.dispatch(ContextClassLoaderDispatch.java:32)
-	at org.gradle.messaging.dispatch.ProxyDispatchAdapter$DispatchingInvocationHandler.invoke(ProxyDispatchAdapter.java:93)
-	at com.sun.proxy.$Proxy2.processTestClass(Unknown Source)
-	at org.gradle.api.internal.tasks.testing.worker.TestWorker.processTestClass(TestWorker.java:106)
-	at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
-	at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62)
-	at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
-	at java.lang.reflect.Method.invoke(Method.java:497)
-	at org.gradle.messaging.dispatch.ReflectionDispatch.dispatch(ReflectionDispatch.java:35)
-	at org.gradle.messaging.dispatch.ReflectionDispatch.dispatch(ReflectionDispatch.java:24)
-	at org.gradle.messaging.remote.internal.hub.MessageHub$Handler.run(MessageHub.java:360)
-	at org.gradle.internal.concurrent.DefaultExecutorFactory$StoppableExecutorImpl$1.run(DefaultExecutorFactory.java:64)
-	at java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1142)
-	at java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:617)
-	at java.lang.Thread.run(Thread.java:745)
-
- -
-
-
-

Tests

- - - - - - - - - - - - - - - - - - -
TestDurationResult
testDelete0.003sfailed
testGet0.015spassed
-
-
-

Standard output

- -
http://localhost:8080/v2/keys/mykey?prevValue=prevValue&value=value&prevIndex=99&wait=true&recursive=true&prevExist=true&dir=true 
-http://localhost:8080::DELETE/v2/keys/mykey?recursive=true&dir=true
-REQUEST_BODY
-	recursive=true&dir=true 
-
- -
-
- -
- - diff --git a/etcd/etcd-client/build/reports/tests/css/base-style.css b/etcd/etcd-client/build/reports/tests/css/base-style.css deleted file mode 100644 index 4afa73e3..00000000 --- a/etcd/etcd-client/build/reports/tests/css/base-style.css +++ /dev/null @@ -1,179 +0,0 @@ - -body { - margin: 0; - padding: 0; - font-family: sans-serif; - font-size: 12pt; -} - -body, a, a:visited { - color: #303030; -} - -#content { - padding-left: 50px; - padding-right: 50px; - padding-top: 30px; - padding-bottom: 30px; -} - -#content h1 { - font-size: 160%; - margin-bottom: 10px; -} - -#footer { - margin-top: 100px; - font-size: 80%; - white-space: nowrap; -} - -#footer, #footer a { - color: #a0a0a0; -} - -#line-wrapping-toggle { - vertical-align: middle; -} - -#label-for-line-wrapping-toggle { - vertical-align: middle; -} - -ul { - margin-left: 0; -} - -h1, h2, h3 { - white-space: nowrap; -} - -h2 { - font-size: 120%; -} - -ul.tabLinks { - padding-left: 0; - padding-top: 10px; - padding-bottom: 10px; - overflow: auto; - min-width: 800px; - width: auto !important; - width: 800px; -} - -ul.tabLinks li { - float: left; - height: 100%; - list-style: none; - padding-left: 10px; - padding-right: 10px; - padding-top: 5px; - padding-bottom: 5px; - margin-bottom: 0; - -moz-border-radius: 7px; - border-radius: 7px; - margin-right: 25px; - border: solid 1px #d4d4d4; - background-color: #f0f0f0; -} - -ul.tabLinks li:hover { - background-color: #fafafa; -} - -ul.tabLinks li.selected { - background-color: #c5f0f5; - border-color: #c5f0f5; -} - -ul.tabLinks a { - font-size: 120%; - display: block; - outline: none; - text-decoration: none; - margin: 0; - padding: 0; -} - -ul.tabLinks li h2 { - margin: 0; - padding: 0; -} - -div.tab { -} - -div.selected { - display: block; -} - -div.deselected { - display: none; -} - -div.tab table { - min-width: 350px; - width: auto !important; - width: 350px; - border-collapse: collapse; -} - -div.tab th, div.tab table { - border-bottom: solid #d0d0d0 1px; -} - -div.tab th { - text-align: left; - white-space: nowrap; - padding-left: 6em; -} - -div.tab th:first-child { - padding-left: 0; -} - -div.tab td { - white-space: nowrap; - padding-left: 6em; - padding-top: 5px; - padding-bottom: 5px; -} - -div.tab td:first-child { - padding-left: 0; -} - -div.tab td.numeric, div.tab th.numeric { - text-align: right; -} - -span.code { - display: inline-block; - margin-top: 0em; - margin-bottom: 1em; -} - -span.code pre { - font-size: 11pt; - padding-top: 10px; - padding-bottom: 10px; - padding-left: 10px; - padding-right: 10px; - margin: 0; - background-color: #f7f7f7; - border: solid 1px #d0d0d0; - min-width: 700px; - width: auto !important; - width: 700px; -} - -span.wrapped pre { - word-wrap: break-word; - white-space: pre-wrap; - word-break: break-all; -} - -label.hidden { - display: none; -} \ No newline at end of file diff --git a/etcd/etcd-client/build/reports/tests/css/style.css b/etcd/etcd-client/build/reports/tests/css/style.css deleted file mode 100644 index 3dc4913e..00000000 --- a/etcd/etcd-client/build/reports/tests/css/style.css +++ /dev/null @@ -1,84 +0,0 @@ - -#summary { - margin-top: 30px; - margin-bottom: 40px; -} - -#summary table { - border-collapse: collapse; -} - -#summary td { - vertical-align: top; -} - -.breadcrumbs, .breadcrumbs a { - color: #606060; -} - -.infoBox { - width: 110px; - padding-top: 15px; - padding-bottom: 15px; - text-align: center; -} - -.infoBox p { - margin: 0; -} - -.counter, .percent { - font-size: 120%; - font-weight: bold; - margin-bottom: 8px; -} - -#duration { - width: 125px; -} - -#successRate, .summaryGroup { - border: solid 2px #d0d0d0; - -moz-border-radius: 10px; - border-radius: 10px; -} - -#successRate { - width: 140px; - margin-left: 35px; -} - -#successRate .percent { - font-size: 180%; -} - -.success, .success a { - color: #008000; -} - -div.success, #successRate.success { - background-color: #bbd9bb; - border-color: #008000; -} - -.failures, .failures a { - color: #b60808; -} - -.skipped, .skipped a { - color: #c09853; -} - -div.failures, #successRate.failures { - background-color: #ecdada; - border-color: #b60808; -} - -ul.linkList { - padding-left: 0; -} - -ul.linkList li { - list-style: none; - margin-bottom: 5px; -} diff --git a/etcd/etcd-client/build/reports/tests/index.html b/etcd/etcd-client/build/reports/tests/index.html deleted file mode 100644 index 1a8d9a51..00000000 --- a/etcd/etcd-client/build/reports/tests/index.html +++ /dev/null @@ -1,144 +0,0 @@ - - - - - -Test results - Test Summary - - - - - -
-

Test Summary

-
- - - - - -
-
- - - - - - - -
-
-
2
-

tests

-
-		 -
-
1
-

failures

-
-		 -
-
0
-

ignored

-
-		 -
-
0.018s
-

duration

-
-
-
-		 -
-
50%
-

successful

-
-
-
-
- -
-

Failed tests

- -
-
-

Packages

- - - - - - - - - - - - - - - - - - - - - -
PackageTestsFailuresIgnoredDurationSuccess rate
-org.boon.etcd -2100.018s50%
-
-
-

Classes

- - - - - - - - - - - - - - - - - - - - -
ClassTestsFailuresIgnoredDurationSuccess rate
-org.boon.etcd.RequestTest -2100.018s50%
-
-
- -
- - diff --git a/etcd/etcd-client/build/reports/tests/js/report.js b/etcd/etcd-client/build/reports/tests/js/report.js deleted file mode 100644 index 83bab4a1..00000000 --- a/etcd/etcd-client/build/reports/tests/js/report.js +++ /dev/null @@ -1,194 +0,0 @@ -(function (window, document) { - "use strict"; - - var tabs = {}; - - function changeElementClass(element, classValue) { - if (element.getAttribute("className")) { - element.setAttribute("className", classValue); - } else { - element.setAttribute("class", classValue); - } - } - - function getClassAttribute(element) { - if (element.getAttribute("className")) { - return element.getAttribute("className"); - } else { - return element.getAttribute("class"); - } - } - - function addClass(element, classValue) { - changeElementClass(element, getClassAttribute(element) + " " + classValue); - } - - function removeClass(element, classValue) { - changeElementClass(element, getClassAttribute(element).replace(classValue, "")); - } - - function initTabs() { - var container = document.getElementById("tabs"); - - tabs.tabs = findTabs(container); - tabs.titles = findTitles(tabs.tabs); - tabs.headers = findHeaders(container); - tabs.select = select; - tabs.deselectAll = deselectAll; - tabs.select(0); - - return true; - } - - function getCheckBox() { - return document.getElementById("line-wrapping-toggle"); - } - - function getLabelForCheckBox() { - return document.getElementById("label-for-line-wrapping-toggle"); - } - - function findCodeBlocks() { - var spans = document.getElementById("tabs").getElementsByTagName("span"); - var codeBlocks = []; - for (var i = 0; i < spans.length; ++i) { - if (spans[i].className.indexOf("code") >= 0) { - codeBlocks.push(spans[i]); - } - } - return codeBlocks; - } - - function forAllCodeBlocks(operation) { - var codeBlocks = findCodeBlocks(); - - for (var i = 0; i < codeBlocks.length; ++i) { - operation(codeBlocks[i], "wrapped"); - } - } - - function toggleLineWrapping() { - var checkBox = getCheckBox(); - - if (checkBox.checked) { - forAllCodeBlocks(addClass); - } else { - forAllCodeBlocks(removeClass); - } - } - - function initControls() { - if (findCodeBlocks().length > 0) { - var checkBox = getCheckBox(); - var label = getLabelForCheckBox(); - - checkBox.onclick = toggleLineWrapping; - checkBox.checked = false; - - removeClass(label, "hidden"); - } - } - - function switchTab() { - var id = this.id.substr(1); - - for (var i = 0; i < tabs.tabs.length; i++) { - if (tabs.tabs[i].id === id) { - tabs.select(i); - break; - } - } - - return false; - } - - function select(i) { - this.deselectAll(); - - changeElementClass(this.tabs[i], "tab selected"); - changeElementClass(this.headers[i], "selected"); - - while (this.headers[i].firstChild) { - this.headers[i].removeChild(this.headers[i].firstChild); - } - - var h2 = document.createElement("H2"); - - h2.appendChild(document.createTextNode(this.titles[i])); - this.headers[i].appendChild(h2); - } - - function deselectAll() { - for (var i = 0; i < this.tabs.length; i++) { - changeElementClass(this.tabs[i], "tab deselected"); - changeElementClass(this.headers[i], "deselected"); - - while (this.headers[i].firstChild) { - this.headers[i].removeChild(this.headers[i].firstChild); - } - - var a = document.createElement("A"); - - a.setAttribute("id", "ltab" + i); - a.setAttribute("href", "#tab" + i); - a.onclick = switchTab; - a.appendChild(document.createTextNode(this.titles[i])); - - this.headers[i].appendChild(a); - } - } - - function findTabs(container) { - return findChildElements(container, "DIV", "tab"); - } - - function findHeaders(container) { - var owner = findChildElements(container, "UL", "tabLinks"); - return findChildElements(owner[0], "LI", null); - } - - function findTitles(tabs) { - var titles = []; - - for (var i = 0; i < tabs.length; i++) { - var tab = tabs[i]; - var header = findChildElements(tab, "H2", null)[0]; - - header.parentNode.removeChild(header); - - if (header.innerText) { - titles.push(header.innerText); - } else { - titles.push(header.textContent); - } - } - - return titles; - } - - function findChildElements(container, name, targetClass) { - var elements = []; - var children = container.childNodes; - - for (var i = 0; i < children.length; i++) { - var child = children.item(i); - - if (child.nodeType === 1 && child.nodeName === name) { - if (targetClass && child.className.indexOf(targetClass) < 0) { - continue; - } - - elements.push(child); - } - } - - return elements; - } - - // Entry point. - - window.onload = function() { - initTabs(); - initControls(); - }; -} (window, window.document)); \ No newline at end of file diff --git a/etcd/etcd-client/build/reports/tests/packages/org.boon.etcd.html b/etcd/etcd-client/build/reports/tests/packages/org.boon.etcd.html deleted file mode 100644 index 0b6eb774..00000000 --- a/etcd/etcd-client/build/reports/tests/packages/org.boon.etcd.html +++ /dev/null @@ -1,115 +0,0 @@ - - - - - -Test results - Package org.boon.etcd - - - - - -
-

Package org.boon.etcd

-
-all > org.boon.etcd
-
- - - - - -
-
- - - - - - - -
-
-
2
-

tests

-
-		 -
-
1
-

failures

-
-		 -
-
0
-

ignored

-
-		 -
-
0.018s
-

duration

-
-
-
-		 -
-
50%
-

successful

-
-
-
-
- -
-

Failed tests

- -
-
-

Classes

- - - - - - - - - - - - - - - - - - - -
ClassTestsFailuresIgnoredDurationSuccess rate
-RequestTest -2100.018s50%
-
-
- -
- - diff --git a/etcd/etcd-client/build/test-results/TEST-org.boon.etcd.RequestTest.xml b/etcd/etcd-client/build/test-results/TEST-org.boon.etcd.RequestTest.xml deleted file mode 100644 index 4289c7ed..00000000 --- a/etcd/etcd-client/build/test-results/TEST-org.boon.etcd.RequestTest.xml +++ /dev/null @@ -1,60 +0,0 @@ - - - - - - org.boon.Exceptions$SoftenedException: died - at org.boon.Exceptions.die(Exceptions.java:83) - at org.boon.etcd.RequestTest.testDelete(RequestTest.java:33) - at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method) - at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62) - at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43) - at java.lang.reflect.Method.invoke(Method.java:497) - at org.junit.runners.model.FrameworkMethod$1.runReflectiveCall(FrameworkMethod.java:47) - at org.junit.internal.runners.model.ReflectiveCallable.run(ReflectiveCallable.java:12) - at org.junit.runners.model.FrameworkMethod.invokeExplosively(FrameworkMethod.java:44) - at org.junit.internal.runners.statements.InvokeMethod.evaluate(InvokeMethod.java:17) - at org.junit.internal.runners.statements.RunBefores.evaluate(RunBefores.java:26) - at org.junit.runners.ParentRunner.runLeaf(ParentRunner.java:271) - at org.junit.runners.BlockJUnit4ClassRunner.runChild(BlockJUnit4ClassRunner.java:70) - at org.junit.runners.BlockJUnit4ClassRunner.runChild(BlockJUnit4ClassRunner.java:50) - at org.junit.runners.ParentRunner$3.run(ParentRunner.java:238) - at org.junit.runners.ParentRunner$1.schedule(ParentRunner.java:63) - at org.junit.runners.ParentRunner.runChildren(ParentRunner.java:236) - at org.junit.runners.ParentRunner.access$000(ParentRunner.java:53) - at org.junit.runners.ParentRunner$2.evaluate(ParentRunner.java:229) - at org.junit.runners.ParentRunner.run(ParentRunner.java:309) - at org.gradle.api.internal.tasks.testing.junit.JUnitTestClassExecuter.runTestClass(JUnitTestClassExecuter.java:86) - at org.gradle.api.internal.tasks.testing.junit.JUnitTestClassExecuter.execute(JUnitTestClassExecuter.java:49) - at org.gradle.api.internal.tasks.testing.junit.JUnitTestClassProcessor.processTestClass(JUnitTestClassProcessor.java:64) - at org.gradle.api.internal.tasks.testing.SuiteTestClassProcessor.processTestClass(SuiteTestClassProcessor.java:50) - at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method) - at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62) - at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43) - at java.lang.reflect.Method.invoke(Method.java:497) - at org.gradle.messaging.dispatch.ReflectionDispatch.dispatch(ReflectionDispatch.java:35) - at org.gradle.messaging.dispatch.ReflectionDispatch.dispatch(ReflectionDispatch.java:24) - at org.gradle.messaging.dispatch.ContextClassLoaderDispatch.dispatch(ContextClassLoaderDispatch.java:32) - at org.gradle.messaging.dispatch.ProxyDispatchAdapter$DispatchingInvocationHandler.invoke(ProxyDispatchAdapter.java:93) - at com.sun.proxy.$Proxy2.processTestClass(Unknown Source) - at org.gradle.api.internal.tasks.testing.worker.TestWorker.processTestClass(TestWorker.java:106) - at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method) - at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62) - at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43) - at java.lang.reflect.Method.invoke(Method.java:497) - at org.gradle.messaging.dispatch.ReflectionDispatch.dispatch(ReflectionDispatch.java:35) - at org.gradle.messaging.dispatch.ReflectionDispatch.dispatch(ReflectionDispatch.java:24) - at org.gradle.messaging.remote.internal.hub.MessageHub$Handler.run(MessageHub.java:360) - at org.gradle.internal.concurrent.DefaultExecutorFactory$StoppableExecutorImpl$1.run(DefaultExecutorFactory.java:64) - at java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1142) - at java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:617) - at java.lang.Thread.run(Thread.java:745) - - - - - diff --git a/etcd/etcd-client/build/test-results/binary/test/output.bin b/etcd/etcd-client/build/test-results/binary/test/output.bin deleted file mode 100644 index c8bba114..00000000 --- a/etcd/etcd-client/build/test-results/binary/test/output.bin +++ /dev/null @@ -1,4 +0,0 @@ -ƒhttp://localhost:8080/v2/keys/mykey?prevValue=prevValue&value=value&prevIndex=99&wait=true&recursive=true&prevExist=true&dir=true -Dhttp://localhost:8080::DELETE/v2/keys/mykey?recursive=true&dir=true - REQUEST_BODY - recursive=true&dir=true diff --git a/etcd/etcd-client/build/test-results/binary/test/output.bin.idx b/etcd/etcd-client/build/test-results/binary/test/output.bin.idx deleted file mode 100644 index 9aec0f75..00000000 Binary files a/etcd/etcd-client/build/test-results/binary/test/output.bin.idx and /dev/null differ diff --git a/etcd/etcd-client/build/test-results/binary/test/results.bin b/etcd/etcd-client/build/test-results/binary/test/results.bin deleted file mode 100644 index e5b30496..00000000 Binary files a/etcd/etcd-client/build/test-results/binary/test/results.bin and /dev/null differ diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 00000000..6ffa2378 Binary files /dev/null and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index fb6fc6e3..e8691b89 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Tue Oct 28 12:52:46 PDT 2014 +#Fri Oct 07 09:33:02 MSK 2016 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-2.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-3.1-bin.zip diff --git a/gradlew b/gradlew index 91a7e269..9aa616c2 100755 --- a/gradlew +++ b/gradlew @@ -6,12 +6,30 @@ ## ############################################################################## -# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -DEFAULT_JVM_OPTS="" +# Attempt to set APP_HOME +# Resolve links: $0 may be a link +PRG="$0" +# Need this for relative symlinks. +while [ -h "$PRG" ] ; do + ls=`ls -ld "$PRG"` + link=`expr "$ls" : '.*-> \(.*\)$'` + if expr "$link" : '/.*' > /dev/null; then + PRG="$link" + else + PRG=`dirname "$PRG"`"/$link" + fi +done +SAVED="`pwd`" +cd "`dirname \"$PRG\"`/" >/dev/null +APP_HOME="`pwd -P`" +cd "$SAVED" >/dev/null APP_NAME="Gradle" APP_BASE_NAME=`basename "$0"` +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS="" + # Use the maximum available, or set MAX_FD != -1 to use that value. MAX_FD="maximum" @@ -30,6 +48,7 @@ die ( ) { cygwin=false msys=false darwin=false +nonstop=false case "`uname`" in CYGWIN* ) cygwin=true @@ -40,31 +59,11 @@ case "`uname`" in MINGW* ) msys=true ;; + NONSTOP* ) + nonstop=true + ;; esac -# For Cygwin, ensure paths are in UNIX format before anything is touched. -if $cygwin ; then - [ -n "$JAVA_HOME" ] && JAVA_HOME=`cygpath --unix "$JAVA_HOME"` -fi - -# Attempt to set APP_HOME -# Resolve links: $0 may be a link -PRG="$0" -# Need this for relative symlinks. -while [ -h "$PRG" ] ; do - ls=`ls -ld "$PRG"` - link=`expr "$ls" : '.*-> \(.*\)$'` - if expr "$link" : '/.*' > /dev/null; then - PRG="$link" - else - PRG=`dirname "$PRG"`"/$link" - fi -done -SAVED="`pwd`" -cd "`dirname \"$PRG\"`/" >&- -APP_HOME="`pwd -P`" -cd "$SAVED" >&- - CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar # Determine the Java command to use to start the JVM. @@ -90,7 +89,7 @@ location of your Java installation." fi # Increase the maximum file descriptors if we can. -if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then +if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then MAX_FD_LIMIT=`ulimit -H -n` if [ $? -eq 0 ] ; then if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then @@ -114,6 +113,7 @@ fi if $cygwin ; then APP_HOME=`cygpath --path --mixed "$APP_HOME"` CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` + JAVACMD=`cygpath --unix "$JAVACMD"` # We build the pattern for arguments to be converted via cygpath ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` @@ -161,4 +161,9 @@ function splitJvmOpts() { eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME" +# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong +if [[ "$(uname)" == "Darwin" ]] && [[ "$HOME" == "$PWD" ]]; then + cd "$(dirname "$0")" +fi + exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@" diff --git a/gradlew.bat b/gradlew.bat index aec99730..e95643d6 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -8,14 +8,14 @@ @rem Set local scope for the variables with windows NT shell if "%OS%"=="Windows_NT" setlocal -@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -set DEFAULT_JVM_OPTS= - set DIRNAME=%~dp0 if "%DIRNAME%" == "" set DIRNAME=. set APP_BASE_NAME=%~n0 set APP_HOME=%DIRNAME% +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS= + @rem Find java.exe if defined JAVA_HOME goto findJavaFromJavaHome @@ -46,10 +46,9 @@ echo location of your Java installation. goto fail :init -@rem Get command-line arguments, handling Windowz variants +@rem Get command-line arguments, handling Windows variants if not "%OS%" == "Windows_NT" goto win9xME_args -if "%@eval[2+2]" == "4" goto 4NT_args :win9xME_args @rem Slurp the command line arguments. @@ -60,11 +59,6 @@ set _SKIP=2 if "x%~1" == "x" goto execute set CMD_LINE_ARGS=%* -goto execute - -:4NT_args -@rem Get arguments from the 4NT Shell from JP Software -set CMD_LINE_ARGS=%$ :execute @rem Setup the command line