You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuweni.apache.org by to...@apache.org on 2019/05/20 03:49:12 UTC
[incubator-tuweni] branch 0.7 updated (367c9d0 -> a8d55b7)
This is an automated email from the ASF dual-hosted git repository.
toulmean pushed a change to branch 0.7
in repository https://gitbox.apache.org/repos/asf/incubator-tuweni.git.
from 367c9d0 Make sure all artifacts are signed
new 0526a7b Make sure the test doesn't fail if the file doesn't exist yet
new 6c4d4b7 Specify copyright ownership in NOTICE file
new de07dfd Add AL header to gradlew script
new 7447ee6 Add MIT license header to toml spec files
new 62a59a6 Make sure a flaky test behaves according to the Java version it is tested against
new 62adc43 Make sure source distro contains license
new 74596e1 Add to NOTICE the two checkouts of Ethereum tests that are distributed with sources
new 6b0c6e3 Ensure dependency report is included in source distribution
new a8d55b7 Add instructions to perform checksums
The 9 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
NOTICE | 22 +++++++++++++---------
RELEASE.md | 12 +++++++++++-
build.gradle | 4 ++--
dist/build.gradle | 20 ++++++++++++++++++--
.../tuweni/gossip/GossipIntegrationTest.java | 7 +++++--
...{spotless.license.java => spotless.license.txt} | 0
gradlew | 11 +++++++++++
.../java/org/apache/tuweni/io/ResourcesTest.java | 8 +++++++-
.../org/apache/tuweni/toml/example-v0.4.0.toml | 1 +
.../org/apache/tuweni/toml/hard_example.toml | 1 +
.../apache/tuweni/toml/hard_example_unicode.toml | 1 +
.../tuweni/toml/toml-v0.5.0-spec-example.toml | 1 +
12 files changed, 71 insertions(+), 17 deletions(-)
rename gradle/{spotless.license.java => spotless.license.txt} (100%)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@tuweni.apache.org
For additional commands, e-mail: commits-help@tuweni.apache.org
[incubator-tuweni] 06/09: Make sure source distro contains license
Posted by to...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
toulmean pushed a commit to branch 0.7
in repository https://gitbox.apache.org/repos/asf/incubator-tuweni.git
commit 62adc43f538d3e421b0235928220af5c2a8c94f9
Author: Antoine Toulme <an...@lunar-ocean.com>
AuthorDate: Sun May 19 12:34:14 2019 -0400
Make sure source distro contains license
---
dist/build.gradle | 12 ++++++++++--
1 file changed, 10 insertions(+), 2 deletions(-)
diff --git a/dist/build.gradle b/dist/build.gradle
index d51ce64..62e90e6 100644
--- a/dist/build.gradle
+++ b/dist/build.gradle
@@ -61,8 +61,16 @@ distributions {
sources {
baseName = 'tuweni-src'
contents {
- from rootProject.projectDir
- include 'LICENCE', '*.md', 'NOTICE', '*.gradle', 'DISCLAIMER', 'gradle/**', 'gradlew', 'gradle.properties'
+ into('') {
+ from ".."
+ include '*.md'
+ include 'NOTICE'
+ include '*.gradle'
+ include 'gradle/**'
+ include 'gradlew'
+ include 'gradle.properties'
+ include 'LICENSE'
+ }
rootProject.subprojects.each {
include it.projectDir.name + '/src/**'
include it.projectDir.name + '/build.gradle'
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@tuweni.apache.org
For additional commands, e-mail: commits-help@tuweni.apache.org
[incubator-tuweni] 04/09: Add MIT license header to toml spec files
Posted by to...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
toulmean pushed a commit to branch 0.7
in repository https://gitbox.apache.org/repos/asf/incubator-tuweni.git
commit 7447ee61f8e6f07054a4d484a7448e2dc6a02a89
Author: Antoine Toulme <an...@lunar-ocean.com>
AuthorDate: Fri May 17 15:38:44 2019 -0400
Add MIT license header to toml spec files
---
toml/src/test/resources/org/apache/tuweni/toml/example-v0.4.0.toml | 1 +
toml/src/test/resources/org/apache/tuweni/toml/hard_example.toml | 1 +
toml/src/test/resources/org/apache/tuweni/toml/hard_example_unicode.toml | 1 +
.../test/resources/org/apache/tuweni/toml/toml-v0.5.0-spec-example.toml | 1 +
4 files changed, 4 insertions(+)
diff --git a/toml/src/test/resources/org/apache/tuweni/toml/example-v0.4.0.toml b/toml/src/test/resources/org/apache/tuweni/toml/example-v0.4.0.toml
index 6c207b7..27f5704 100644
--- a/toml/src/test/resources/org/apache/tuweni/toml/example-v0.4.0.toml
+++ b/toml/src/test/resources/org/apache/tuweni/toml/example-v0.4.0.toml
@@ -1,3 +1,4 @@
+# File imported from https://github.com/toml-lang/toml, under MIT license.
################################################################################
## Comment
diff --git a/toml/src/test/resources/org/apache/tuweni/toml/hard_example.toml b/toml/src/test/resources/org/apache/tuweni/toml/hard_example.toml
index 6abe76d..0ea3872 100644
--- a/toml/src/test/resources/org/apache/tuweni/toml/hard_example.toml
+++ b/toml/src/test/resources/org/apache/tuweni/toml/hard_example.toml
@@ -1,3 +1,4 @@
+# File imported from https://github.com/toml-lang/toml, under MIT license.
# Test file for TOML
# Only this one tries to emulate a TOML file written by a user of the kind of parser writers probably hate
# This part you'll really hate
diff --git a/toml/src/test/resources/org/apache/tuweni/toml/hard_example_unicode.toml b/toml/src/test/resources/org/apache/tuweni/toml/hard_example_unicode.toml
index 6173ce3..898a164 100644
--- a/toml/src/test/resources/org/apache/tuweni/toml/hard_example_unicode.toml
+++ b/toml/src/test/resources/org/apache/tuweni/toml/hard_example_unicode.toml
@@ -1,3 +1,4 @@
+# File imported from https://github.com/toml-lang/toml, under MIT license.
# Tèƨƭ ƒïℓè ƒôř TÓM£
# Óñℓ¥ ƭλïƨ ôñè ƭřïèƨ ƭô è₥úℓáƭè á TÓM£ ƒïℓè ωřïƭƭèñ β¥ á úƨèř ôƒ ƭλè ƙïñδ ôƒ ƥářƨèř ωřïƭèřƨ ƥřôβáβℓ¥ λáƭè
diff --git a/toml/src/test/resources/org/apache/tuweni/toml/toml-v0.5.0-spec-example.toml b/toml/src/test/resources/org/apache/tuweni/toml/toml-v0.5.0-spec-example.toml
index 21895a2..c8105a7 100644
--- a/toml/src/test/resources/org/apache/tuweni/toml/toml-v0.5.0-spec-example.toml
+++ b/toml/src/test/resources/org/apache/tuweni/toml/toml-v0.5.0-spec-example.toml
@@ -1,3 +1,4 @@
+# File imported from https://github.com/toml-lang/toml, under MIT license.
# This is a TOML document.
title = "TOML Example"
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@tuweni.apache.org
For additional commands, e-mail: commits-help@tuweni.apache.org
[incubator-tuweni] 01/09: Make sure the test doesn't fail if the
file doesn't exist yet
Posted by to...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
toulmean pushed a commit to branch 0.7
in repository https://gitbox.apache.org/repos/asf/incubator-tuweni.git
commit 0526a7b256147a79e88e32d7a1022146099c6ef4
Author: Antoine Toulme <an...@lunar-ocean.com>
AuthorDate: Fri May 10 11:14:53 2019 -0700
Make sure the test doesn't fail if the file doesn't exist yet
---
.../test/java/org/apache/tuweni/gossip/GossipIntegrationTest.java | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/gossip/src/test/java/org/apache/tuweni/gossip/GossipIntegrationTest.java b/gossip/src/test/java/org/apache/tuweni/gossip/GossipIntegrationTest.java
index 7ff14d0..8a0e31f 100644
--- a/gossip/src/test/java/org/apache/tuweni/gossip/GossipIntegrationTest.java
+++ b/gossip/src/test/java/org/apache/tuweni/gossip/GossipIntegrationTest.java
@@ -22,6 +22,7 @@ import org.apache.tuweni.junit.*;
import java.nio.charset.StandardCharsets;
import java.nio.file.Files;
import java.nio.file.Path;
+import java.util.Collections;
import java.util.List;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
@@ -103,13 +104,15 @@ class GossipIntegrationTest {
}).end(Buffer.buffer(Bytes32.rightPad(Bytes.ofUnsignedInt(i)).toHexString().getBytes(StandardCharsets.UTF_8)));
}
- List<String> receiver1 = null;
+ List<String> receiver1 = Collections.emptyList();
int counter = 0;
do {
Thread.sleep(1000);
counter++;
- receiver1 = Files.readAllLines(tempDir.resolve("log2.log"));
+ if (Files.exists(tempDir.resolve("log2.log"))) {
+ receiver1 = Files.readAllLines(tempDir.resolve("log2.log"));
+ }
} while (receiver1.size() < 20 && counter < 20);
client.close();
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@tuweni.apache.org
For additional commands, e-mail: commits-help@tuweni.apache.org
[incubator-tuweni] 02/09: Specify copyright ownership in NOTICE file
Posted by to...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
toulmean pushed a commit to branch 0.7
in repository https://gitbox.apache.org/repos/asf/incubator-tuweni.git
commit 6c4d4b72277948f6c0ec0e2b308a8e9dbc6f9848
Author: Antoine Toulme <an...@lunar-ocean.com>
AuthorDate: Tue May 14 09:26:24 2019 -0700
Specify copyright ownership in NOTICE file
---
NOTICE | 16 ++++++----------
1 file changed, 6 insertions(+), 10 deletions(-)
diff --git a/NOTICE b/NOTICE
index 607b484..e627b55 100644
--- a/NOTICE
+++ b/NOTICE
@@ -1,12 +1,8 @@
+Apache Tuweni
+Copyright 2019 The Apache Software Foundation
- =========================================================================
- == NOTICE file corresponding to the section 4 d of ==
- == the Apache License, Version 2.0, ==
- == in this case for the Apache Tuweni distribution. ==
- =========================================================================
+This product includes software developed at
+The Apache Software Foundation (http://www.apache.org/).
- This product includes software developed by
- The Apache Software Foundation (http://www.apache.org/).
-
- Please read the different LICENSE files present in the licenses directory of
- this distribution.
\ No newline at end of file
+In addition, this product includes software developed by
+Copyright 2018-2019 ConsenSys, Inc.
\ No newline at end of file
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@tuweni.apache.org
For additional commands, e-mail: commits-help@tuweni.apache.org
[incubator-tuweni] 05/09: Make sure a flaky test behaves according
to the Java version it is tested against
Posted by to...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
toulmean pushed a commit to branch 0.7
in repository https://gitbox.apache.org/repos/asf/incubator-tuweni.git
commit 62a59a62efde46053c4ac7186f866eaa5cd1e515
Author: Antoine Toulme <an...@lunar-ocean.com>
AuthorDate: Sat May 18 19:56:05 2019 -0400
Make sure a flaky test behaves according to the Java version it is tested against
---
io/src/test/java/org/apache/tuweni/io/ResourcesTest.java | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/io/src/test/java/org/apache/tuweni/io/ResourcesTest.java b/io/src/test/java/org/apache/tuweni/io/ResourcesTest.java
index b0075d1..76cbfeb 100644
--- a/io/src/test/java/org/apache/tuweni/io/ResourcesTest.java
+++ b/io/src/test/java/org/apache/tuweni/io/ResourcesTest.java
@@ -41,7 +41,13 @@ class ResourcesTest {
@SuppressWarnings("MustBeClosedChecker")
void shouldIterateResourcesOnFileSystemAndInJars() throws Exception {
List<URL> all = Resources.find("org/apache/tuweni/io/file/resourceresolver/**").collect(Collectors.toList());
- assertEquals(12, all.size(), () -> describeExpectation(12, all));
+ String version = System.getProperty("java.version");
+ // Java 8 captures the root entry of the folder in the jar.
+ if (version.startsWith("1.")) {
+ assertEquals(13, all.size(), () -> describeExpectation(13, all));
+ } else {
+ assertEquals(12, all.size(), () -> describeExpectation(12, all));
+ }
List<URL> txtFiles = Resources.find("org/**/test*.txt").collect(Collectors.toList());
assertEquals(6, txtFiles.size(), () -> describeExpectation(6, txtFiles));
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@tuweni.apache.org
For additional commands, e-mail: commits-help@tuweni.apache.org
[incubator-tuweni] 03/09: Add AL header to gradlew script
Posted by to...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
toulmean pushed a commit to branch 0.7
in repository https://gitbox.apache.org/repos/asf/incubator-tuweni.git
commit de07dfd8181fb0aecc6899946b8eab6322818962
Author: Antoine Toulme <an...@lunar-ocean.com>
AuthorDate: Fri May 17 15:38:16 2019 -0400
Add AL header to gradlew script
---
gradlew | 11 +++++++++++
1 file changed, 11 insertions(+)
diff --git a/gradlew b/gradlew
index cccdd3d..c697137 100755
--- a/gradlew
+++ b/gradlew
@@ -2,6 +2,17 @@
##############################################################################
##
+## Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE
+## file distributed with this work for additional information regarding copyright ownership. The ASF licenses this file
+## to You 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.
+##
## Gradle start up script for UN*X
##
##############################################################################
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@tuweni.apache.org
For additional commands, e-mail: commits-help@tuweni.apache.org
[incubator-tuweni] 09/09: Add instructions to perform checksums
Posted by to...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
toulmean pushed a commit to branch 0.7
in repository https://gitbox.apache.org/repos/asf/incubator-tuweni.git
commit a8d55b7cd9196895a1b44be58cc33ef9d999c10b
Author: Antoine Toulme <an...@lunar-ocean.com>
AuthorDate: Sun May 19 23:44:13 2019 -0400
Add instructions to perform checksums
---
RELEASE.md | 12 +++++++++++-
1 file changed, 11 insertions(+), 1 deletion(-)
diff --git a/RELEASE.md b/RELEASE.md
index 16cdc8b..dee74f9 100644
--- a/RELEASE.md
+++ b/RELEASE.md
@@ -45,7 +45,17 @@ export BUILD_RELEASE=true
Build the artifacts
```
-./gradlew assemble
+./gradlew build
+```
+
+Check the sha512 signatures match
+```
+shasum -a 512 dist/build/distributions/tuweni-bin-${RELEASE VERSION}.tgz
+shasum -a 512 dist/build/distributions/tuweni-bin-${RELEASE VERSION}.zip
+shasum -a 512 dist/build/distributions/tuweni-src-${RELEASE VERSION}.tgz
+shasum -a 512 dist/build/distributions/tuweni-src-${RELEASE VERSION}.zip
+shasum -a 512 dist/build/distributions/tuweni-gossip-${RELEASE VERSION}.tgz
+shasum -a 512 dist/build/distributions/tuweni-gossip-${RELEASE VERSION}.zip
```
Sign and publish
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@tuweni.apache.org
For additional commands, e-mail: commits-help@tuweni.apache.org
[incubator-tuweni] 08/09: Ensure dependency report is included in
source distribution
Posted by to...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
toulmean pushed a commit to branch 0.7
in repository https://gitbox.apache.org/repos/asf/incubator-tuweni.git
commit 6b0c6e3ca1eb2b3ef31d970e54b9cc067c6e38df
Author: Antoine Toulme <an...@lunar-ocean.com>
AuthorDate: Sun May 19 23:30:34 2019 -0400
Ensure dependency report is included in source distribution
---
NOTICE | 2 ++
build.gradle | 4 ++--
dist/build.gradle | 10 +++++++++-
gradle/{spotless.license.java => spotless.license.txt} | 0
4 files changed, 13 insertions(+), 3 deletions(-)
diff --git a/NOTICE b/NOTICE
index 3d6c8d0..4a8e77a 100644
--- a/NOTICE
+++ b/NOTICE
@@ -12,3 +12,5 @@ License: Creative Commons Legal Code (https://creativecommons.org/publicdomain/z
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/build.gradle b/build.gradle
index 8df560c..66ef43b 100644
--- a/build.gradle
+++ b/build.gradle
@@ -102,13 +102,13 @@ subprojects {
exclude '**/generated-src/**/*.*'
}
removeUnusedImports()
- licenseHeaderFile rootProject.file('gradle/spotless.license.java')
+ licenseHeaderFile rootProject.file('gradle/spotless.license.txt')
eclipse().configFile(rootProject.file('gradle/eclipse-java-consensys-style.xml'))
importOrder 'org.apache', 'java', ''
endWithNewline()
}
kotlin {
- licenseHeaderFile rootProject.file('gradle/spotless.license.java')
+ licenseHeaderFile rootProject.file('gradle/spotless.license.txt')
ktlint().userData(['indent_size': '2', 'continuation_indent_size' : '2', 'max_line_length': '120'])
endWithNewline()
}
diff --git a/dist/build.gradle b/dist/build.gradle
index 62e90e6..cfc240b 100644
--- a/dist/build.gradle
+++ b/dist/build.gradle
@@ -29,6 +29,7 @@ distributions {
include 'LICENSE'
include 'NOTICE'
}
+ into('licenses') { from '../build/reports/license' }
def docs = []
def libs = []
def sources = []
@@ -61,11 +62,17 @@ distributions {
sources {
baseName = 'tuweni-src'
contents {
+ into('licenses') {
+ from '../build/reports/license'
+ include '*'
+ }
into('') {
from ".."
include '*.md'
include 'NOTICE'
- include '*.gradle'
+ include 'build.gradle'
+ include 'dependency-versions.gradle'
+ include 'settings.gradle'
include 'gradle/**'
include 'gradlew'
include 'gradle.properties'
@@ -87,6 +94,7 @@ distributions {
include 'LICENSE'
include 'NOTICE'
}
+ into('licenses') { from '../build/reports/license' }
into('bin') {
from { project(':gossip').startScripts.outputs.files }
fileMode = 0755
diff --git a/gradle/spotless.license.java b/gradle/spotless.license.txt
similarity index 100%
rename from gradle/spotless.license.java
rename to gradle/spotless.license.txt
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@tuweni.apache.org
For additional commands, e-mail: commits-help@tuweni.apache.org
[incubator-tuweni] 07/09: Add to NOTICE the two checkouts of
Ethereum tests that are distributed with sources
Posted by to...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
toulmean pushed a commit to branch 0.7
in repository https://gitbox.apache.org/repos/asf/incubator-tuweni.git
commit 74596e13e737169957000a3c9c2bff4930d7df51
Author: Antoine Toulme <an...@lunar-ocean.com>
AuthorDate: Sun May 19 12:42:26 2019 -0400
Add to NOTICE the two checkouts of Ethereum tests that are distributed with sources
---
NOTICE | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/NOTICE b/NOTICE
index e627b55..3d6c8d0 100644
--- a/NOTICE
+++ b/NOTICE
@@ -5,4 +5,10 @@ This product includes software developed at
The Apache Software Foundation (http://www.apache.org/).
In addition, this product includes software developed by
-Copyright 2018-2019 ConsenSys, Inc.
\ No newline at end of file
+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)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@tuweni.apache.org
For additional commands, e-mail: commits-help@tuweni.apache.org