This is an automated email from the ASF dual-hosted git repository. toulmean pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/incubator-tuweni.git
commit fa12f390165559a4afaf522c02672adbcd9dfb67 Author: Antoine Toulme <[email protected]> AuthorDate: Sun Jun 2 13:57:53 2019 -0700 Release review fixes --- LICENSE | 15 +++++++++++++++ NOTICE | 6 ------ .../scuttlebutt/rpc/mux/PatchworkIntegrationTest.java | 12 ------------ 3 files changed, 15 insertions(+), 18 deletions(-) diff --git a/LICENSE b/LICENSE index 8dada3e..be9bc4e 100644 --- a/LICENSE +++ b/LICENSE @@ -199,3 +199,18 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. + +This product includes code (eth-reference-tests/src/test/resources/eth2.0-tests) from Ethereum 2.0 reference tests: https://github.com/ethereum/eth2.0-tests +License: Creative Commons Legal Code (https://creativecommons.org/publicdomain/zero/1.0/) + +This product includes code (eth-reference-tests/src/test/resources/tests) from Ethereum reference tests: https://github.com/ethereum/tests +License: MIT License (https://opensource.org/licenses/MIT) + +This product implements the ProgPoW algorithm (https://github.com/ifdefelse/ProgPOW). +License: CC0 1.0 Universal (CC0 1.0) Public Domain Dedication (https://creativecommons.org/publicdomain/zero/1.0/) + +This product contains a modified part of Bouncy Castle (https://www.bouncycastle.org/), distributed by the Legion of the Bouncy Castle: +License: MIT License (https://opensource.org/licenses/MIT) + +This product includes test code (toml/src/test/resources/org/apache/tuweni/toml) from Tom's Obvious, Minimal Language (https://github.com/toml-lang/toml). +License: MIT License (https://opensource.org/licenses/MIT) diff --git a/NOTICE b/NOTICE index 4a8e77a..7f21273 100644 --- a/NOTICE +++ b/NOTICE @@ -7,10 +7,4 @@ The Apache Software Foundation (http://www.apache.org/). In addition, this product includes software developed by Copyright 2018-2019 ConsenSys, Inc. -This product includes code (eth-reference-tests/src/test/resources/eth2.0-tests) from Ethereum 2.0 reference tests: https://github.com/ethereum/eth2.0-tests -License: Creative Commons Legal Code (https://creativecommons.org/publicdomain/zero/1.0/) - -This product includes code (eth-reference-tests/src/test/resources/tests) from Ethereum reference tests: https://github.com/ethereum/tests -License: MIT License (https://opensource.org/licenses/MIT) - Please consult the list of dependencies under the dependency report under the licenses folder. \ No newline at end of file diff --git a/scuttlebutt-rpc/src/test/java/org/apache/tuweni/scuttlebutt/rpc/mux/PatchworkIntegrationTest.java b/scuttlebutt-rpc/src/test/java/org/apache/tuweni/scuttlebutt/rpc/mux/PatchworkIntegrationTest.java index 6581b40..df9a620 100644 --- a/scuttlebutt-rpc/src/test/java/org/apache/tuweni/scuttlebutt/rpc/mux/PatchworkIntegrationTest.java +++ b/scuttlebutt-rpc/src/test/java/org/apache/tuweni/scuttlebutt/rpc/mux/PatchworkIntegrationTest.java @@ -12,18 +12,6 @@ */ package org.apache.tuweni.scuttlebutt.rpc.mux; -/* - * Copyright 2019 ConsenSys AG. - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on - * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the - * specific language governing permissions and limitations under the License. - */ import static java.nio.charset.StandardCharsets.UTF_8; import static org.junit.jupiter.api.Assertions.assertEquals; --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
