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
The following commit(s) were added to refs/heads/master by this push:
new 016ebfb Ensure dependency report is included in source distribution
016ebfb is described below
commit 016ebfb1e6fca0fe00fd703ae5b0ee8a824a2984
Author: Antoine Toulme <[email protected]>
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 d978afc..ee82f0c 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: [email protected]
For additional commands, e-mail: [email protected]
