Skip to content

Commit

Permalink
Fix licensee checks and uniform dependency imports
Browse files Browse the repository at this point in the history
  • Loading branch information
vogti committed Oct 27, 2023
1 parent 030e0fd commit 2a82c89
Show file tree
Hide file tree
Showing 23 changed files with 79 additions and 100 deletions.
16 changes: 8 additions & 8 deletions core/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -35,10 +35,10 @@ dependencies {

//javacc group: "net.java.dev.javacc", name: "javacc", version: javacc_version // BSD 2-clause

implementation(group: 'org.pf4j', name: 'pf4j', version: pf4j_version) {
implementation(group: "org.pf4j", name: "pf4j", version: pf4j_version) {
exclude group: "org.slf4j"
}
implementation group: 'commons-codec', name: 'commons-codec', version: commons_codec_version // Apache 2.0
implementation group: "commons-codec", name: "commons-codec", version: commons_codec_version // Apache 2.0
api group: "org.apache.commons", name: "commons-lang3", version: commons_lang3_version // Apache 2.0
api group: "org.apache.commons", name: "commons-dbcp2", version: commons_dbcp2_version // Apache 2.0

Expand All @@ -52,15 +52,15 @@ dependencies {
implementation(group: "com.jayway.jsonpath", name: "json-path", version: json_path_version) { exclude(module: "json-smart"); exclude(group: "org.slf4j") } // Apache 2.0
implementation group: "org.codehaus.janino", name: "janino", version: janino_version // BSD
implementation group: "org.codehaus.janino", name: "commons-compiler", version: commons_compiler_version // BSD
implementation group: 'com.j256.simplemagic', name: 'simplemagic', version: simplemagic_version // ISC
implementation group: "com.j256.simplemagic", name: "simplemagic", version: simplemagic_version // ISC

api(group: "org.apache.calcite", name: "calcite-linq4j", version: calcite_linq4j_version) {
exclude(module: 'guava')
exclude(module: 'avatica-core')
exclude(module: "guava")
exclude(module: "avatica-core")
} // Apache 2.0
api(group: "org.polypheny.avatica", name: "avatica-core", version: avatica_core_version) {
exclude(module: "protobuf-java")
exclude group: 'org.apache.calcite', module: 'avatica-core'
exclude group: "org.apache.calcite", module: "avatica-core"
} // Apache 2.0

implementation group: "com.drewnoakes", name: "metadata-extractor", version: metadata_extractor_version // Apache 2.0
Expand All @@ -80,7 +80,7 @@ dependencies {
exclude group: "com.github.spotbugs"
}*/

api group: 'io.activej', name: 'activej-serializer', version: activej_serializer_version // Apache 2.0
api group: "io.activej", name: "activej-serializer", version: activej_serializer_version // Apache 2.0

// --- Test Compile ---
testImplementation group: "junit", name: "junit", version: junit_version
Expand Down Expand Up @@ -193,7 +193,7 @@ task javadocJar(type: Jar, dependsOn: javadoc) {
from javadoc.destinationDir
}
task testJar(type: Jar, dependsOn: testClasses) {
classifier 'tests'
classifier "tests"
from sourceSets.test.output
}
artifacts {
Expand Down
23 changes: 8 additions & 15 deletions dbms/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -40,19 +40,20 @@ dependencies {
implementation group: "org.apache.logging.log4j", name: "log4j-slf4j-impl", version: log4j_slf4j_impl_version // Apache 2.0

////// SLF4J
implementation group: 'org.pf4j', name: 'pf4j', version: pf4j_version // Apache 2.0
implementation(group: "io.javalin", name: "javalin", version: javalin_version)// Apache 2.0
implementation group: "org.pf4j", name: "pf4j", version: pf4j_version // Apache 2.0
implementation group: "io.javalin", name: "javalin", version: javalin_version // Apache 2.0

implementation group: "com.github.rvesse", name: "airline", version: airline_version // Apache 2.0
implementation group: "com.github.oshi", name: "oshi-core", version: oshi_core_version // MIT

implementation group: "com.j256.simplemagic", name: "simplemagic", version: simplemagic_version
implementation group: 'org.jetbrains', name: 'annotations', version: '20.1.0'// ISC
implementation group: "org.jetbrains", name: "annotations", version: jetbrains_annotations_version // ISC

// workaround to fix cottontail todo remove: when grpc-all is same in cottontail and for plugin
implementation group: "io.grpc", name: "grpc-all", version: cottontaildb_grpc_version

implementation group: 'org.ow2.asm', name: 'asm', version: '9.4' // Apache 2.0
implementation group: "org.ow2.asm", name: "asm", version: asm_version // Apache 2.0


// --- Test Compile ---
testImplementation project(path: ":core", configuration: "tests")
Expand All @@ -79,7 +80,6 @@ dependencies {
testImplementation group: "monetdb", name: "monetdb-java-lite", version: embedded_monetdb_version

implementation group: "org.mongodb", name: "mongodb-driver-sync", version: mongodb_driver_sync_version // Apache 2.0

}


Expand Down Expand Up @@ -112,14 +112,11 @@ licensee {
allow('MIT')
allow('BSD-2-Clause')
allow('BSD-3-Clause')
allow('CC0-1.0')
allowUrl('http://opensource.org/licenses/BSD-3-Clause')
allowUrl('http://www.wtfpl.net/')
allowUrl('https://creativecommons.org/publicdomain/zero/1.0/')
allowUrl('http://www.opensource.org/licenses/bsd-license.php') // BSD 2-Clause
allowUrl('http://www.eclipse.org/org/documents/edl-v10.php') // EDL 1.0
allowUrl('http://www.opensource.org/licenses/Apache-2.0') // Apache 2.0
allowUrl('http://www.jcabi.com/LICENSE.txt') // Own license but conforms
allowUrl('https://www.bouncycastle.org/licence.html') //MIT

allowDependency('com.j256.simplemagic', 'simplemagic', '1.16') { because 'ISC license' }
Expand All @@ -142,19 +139,16 @@ licensee {
allowUrl('https://www.eclipse.org/org/documents/epl-v10.php') // EPL 1.0
allowUrl('https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.txt') // EPL 2.0

allowDependency('com.github.jnr', 'jnr-posix', '3.0.50') { because 'Eclipse Public License v. 2.0' }
allowDependency('jakarta.annotation', 'jakarta.annotation-api', '1.3.5') { because 'Eclipse Public License v. 2.0' }
allowDependency('jakarta.ws.rs', 'jakarta.ws.rs-api', '2.1.6') { because 'Eclipse Public License v. 2.0' }
allowDependency('jakarta.activation', 'jakarta.activation-api', '1.2.2') { because 'Eclipse Public License v. 2.0' }
allowDependency('javax.servlet', 'javax.servlet-api', '3.1.0') {
because 'Servlet-api.jar and javax.servlet-*.jar are under the CDDL license, the original source code for this can be found at http://www.eclipse.org/jetty/downloads.php'
}

allowDependency('org.ow2.asm', 'asm-util', '7.1') { because 'BSD 3-Clause' }
allowDependency('org.ow2.asm', 'asm', '9.4') { because 'BSD 3-Clause' }
allowDependency('org.ow2.asm', 'asm-analysis', '9.2') { because 'BSD 3-Clause' }
allowDependency('org.ow2.asm', 'asm-commons', '9.2') { because 'BSD 3-Clause' }
allowDependency('org.ow2.asm', 'asm-tree', '9.2') { because 'BSD 3-Clause' }
allowDependency('org.ow2.asm', 'asm-tree', '9.4') { because 'BSD 3-Clause' }
allowDependency('org.ow2.asm', 'asm-commons', '9.4') { because 'BSD 3-Clause' }

// Glassfish
allowDependency('org.glassfish.jersey.core', 'jersey-common', '2.30.1') { because 'Eclipse Public License v. 2.0' }
Expand All @@ -168,8 +162,7 @@ licensee {
allowDependency('org.glassfish.hk2', 'hk2-locator', '2.6.1') { because 'Eclipse Public License v. 2.0' }
allowDependency('org.glassfish.hk2', 'hk2-utils', '2.6.1') { because 'Eclipse Public License v. 2.0' }

// transitive
allowDependency('org.yaml', 'snakeyaml', '1.15') { because 'Apache 2.0 license' }

}

compileJava {
Expand Down
8 changes: 6 additions & 2 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ org.gradle.jvmargs = -Xmx6g -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-
# Dependency versions
activej_serializer_version = 5.5
airline_version = 2.8.0
asm_version = 9.4
avatica_core_version = 1.17.2-POLYPHENY
avatica_server_version = 1.17.2-POLYPHENY
bouncycastle_version = 1.73
Expand Down Expand Up @@ -58,7 +59,7 @@ google_api_sheets_version = v4-rev20210629-1.32.1
gradle_test_logger_version = 2.1.1
gradle_lint_plugin = 17.7.1
gson_version = 2.8.9
guava_version = 30.1-jre
guava_version = 31.1-jre
hadoop_client_version = 2.7.5
hadoop_common_version = 2.7.5
hamcrest_core_version = 1.3
Expand All @@ -75,11 +76,14 @@ javacc_plugin_version = 3.0.0
javacc_version = 7.0.12
java_docker_version = 3.3.0
joda_time_version = 2.8.1
jetbrains_annotations_version = 20.1.0
jetty_server_api = 9.4.51.v20230217
jetty_websocket_api_version = 9.4.48.v20220622
json_path_version = 2.4.0
jsoup_version = 1.11.3
jsr305_version = 3.0.1
junit_version = 4.12
junit_jupiter_version = 5.7.0
junit_version = 4.13.1
lang_painless_version = 6.2.4
licensee_version = 1.3.1
license_report_version = 0.8.90
Expand Down
11 changes: 5 additions & 6 deletions information/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -3,23 +3,22 @@ group "org.polypheny"

dependencies {
api project(":config")

api group: "org.slf4j", name: "slf4j-api", version: slf4j_api_version // MIT
implementation group: "org.apache.logging.log4j", name: "log4j-slf4j2-impl", version: log4j_slf4j_impl_version // Apache 2.0

implementation(group: "io.javalin", name: "javalin", version: javalin_version) {
exclude(group: "org.slf4j")
exclude group: 'org.eclipse.jetty', module: 'jetty-server'
exclude group: "org.eclipse.jetty", module: "jetty-server"
} // Apache 2.0


implementation group: "com.google.code.gson", name: "gson", version: gson_version // Apache 2.0
implementation group: "org.apache.commons", name: "commons-text", version: commons_text_version // Apache 2.0
implementation group: "org.apache.commons", name: "commons-collections4", version: commons_collections_version // Apache 2.0
implementation group: "com.google.guava", name: "guava", version: guava_version // Apache 2.0
implementation group: 'com.fasterxml.jackson.core', name: 'jackson-core', version: jackson_core_version // Apache 2.0
implementation group: 'com.fasterxml.jackson.core', name: 'jackson-annotations', version: jackson_annotations_version // Apache 2.0
implementation group: 'com.fasterxml.jackson.core', name: 'jackson-databind', version: jackson_databind_version

implementation group: "com.fasterxml.jackson.core", name: "jackson-core", version: jackson_core_version // Apache 2.0
implementation group: "com.fasterxml.jackson.core", name: "jackson-annotations", version: jackson_annotations_version // Apache 2.0
implementation group: "com.fasterxml.jackson.core", name: "jackson-databind", version: jackson_databind_version


// --- Test Compile ---
Expand Down
9 changes: 5 additions & 4 deletions plugins/cql-language/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -24,12 +24,13 @@ dependencies {

javacc group: "net.java.dev.javacc", name: "javacc", version: javacc_version // BSD 2-clause

implementation group: 'org.eclipse.jetty.websocket', name: 'websocket-api', version: jetty_websocket_api_version
implementation group: "org.eclipse.jetty.websocket", name: "websocket-api", version: jetty_websocket_api_version


// --- Test Compile ---
testImplementation project(path: ':dbms', configuration: 'test')
testImplementation project(path: ':dbms')
testImplementation project(path: ':core')
testImplementation project(path: ":dbms", configuration: "test")
testImplementation project(path: ":dbms")
testImplementation project(path: ":core")

// Workaround so org.polypheny.db.docker gets the right protobuf during testing
testImplementation group: "com.google.protobuf", name: "protobuf-java", version: protobuf_version // BSD 3-clause
Expand Down
4 changes: 1 addition & 3 deletions plugins/csv-adapter/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@ dependencies {
compileOnly project(":dbms")
compileOnly project(":plugins:sql-language")


implementation group: "net.sf.opencsv", name: "opencsv", version: opencsv_version // Apache 2.0
implementation group: "commons-io", name: "commons-io", version: commons_io_version // Apache 2.0


// --- Test Compile ---
testImplementation project(path: ":dbms", configuration: "test")
testImplementation project(path: ":core", configuration: "tests")
Expand Down Expand Up @@ -74,5 +74,3 @@ java {
licensee {
allow('Apache-2.0')
}


4 changes: 2 additions & 2 deletions plugins/cypher-language/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,8 @@ dependencies {
javacc group: "net.java.dev.javacc", name: "javacc", version: javacc_version // BSD 2-clause
implementation group: "org.apache.commons", name: "commons-lang3", version: commons_lang3_version // Apache 2.0

implementation group: 'org.eclipse.jetty.websocket', name: 'websocket-api', version: jetty_websocket_api_version
implementation group: "org.eclipse.jetty.websocket", name: "websocket-api", version: jetty_websocket_api_version


// --- Test Compile ---
testImplementation project(path: ":core", configuration: "tests")
Expand Down Expand Up @@ -113,4 +114,3 @@ licensee {
allowUrl('https://www.eclipse.org/org/documents/epl-v10.php') // EPL 1.0

}

8 changes: 1 addition & 7 deletions plugins/ethereum-adapter/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,11 @@ dependencies {
implementation(group: "org.web3j", name: "core", version: web3j_version) {
exclude(group: "org.slf4j")
exclude(group: "com.fasterxml.jackson.core")
} // Apache 2.0
// Apache 2.0
}


// --- Test Compile ---
testImplementation project(path: ":core", configuration: "tests")

// BSD 3-clause
}


Expand Down Expand Up @@ -85,6 +82,3 @@ licensee {
allowDependency('org.ow2.asm', 'asm-commons', '5.0.3') { because 'BSD 3-Clause' }
allowDependency('org.ow2.asm', 'asm-tree', '5.0.3') { because 'BSD 3-Clause' }
}



9 changes: 5 additions & 4 deletions plugins/explore-by-example/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,17 @@ dependencies {
compileOnly project(":core")
compileOnly project(":webui")

implementation group: 'nz.ac.waikato.cms.weka', name: 'weka-stable', version: weka_version // GPL 3.0
compileOnly(group: "io.javalin", name: "javalin", version: javalin_version) {
implementation group: "nz.ac.waikato.cms.weka", name: "weka-stable", version: weka_version // GPL 3.0
compileOnly(group: "io.javalin", name: "javalin", version: javalin_version) { // Apache 2.0
exclude(group: "org.slf4j")
} // Apache 2.0
}


// --- Test Compile ---
testImplementation project(path: ":core", configuration: "tests")
testImplementation project(path: ":core")
testImplementation project(path: ":webui")

testImplementation group: "junit", name: "junit", version: junit_version
}

Expand Down Expand Up @@ -76,4 +78,3 @@ licensee {
}

}

5 changes: 1 addition & 4 deletions plugins/file-adapter/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,12 @@ group "org.polypheny"
dependencies {
compileOnly project(":core")

// Apache 2.0
implementation group: "commons-io", name: "commons-io", version: commons_io_version // Apache 2.0
implementation group: "commons-codec", name: "commons-codec", version: commons_codec_version // Apache 2.0

implementation group: 'commons-codec', name: 'commons-codec', version: commons_codec_version // Apache 2.0

// --- Test Compile ---
testImplementation project(path: ":core", configuration: "tests")

// BSD 3-clause
}


Expand Down
1 change: 0 additions & 1 deletion plugins/hsqldb-adapter/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ dependencies {
// --- Test Compile ---
testImplementation project(path: ":core", configuration: "tests")
testImplementation project(path: ":plugins:sql-language", configuration: "tests")

}


Expand Down
8 changes: 3 additions & 5 deletions plugins/http-interface/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,14 @@ dependencies {
compileOnly project(":core")
compileOnly project(":webui")

implementation(group: "io.javalin", name: "javalin", version: javalin_version) {
implementation(group: "io.javalin", name: "javalin", version: javalin_version) { // Apache 2.0
exclude(group: "org.slf4j")
exclude(module: 'jetty-server')
} // Apache 2.0
exclude(module: "jetty-server")
}


// --- Test Compile ---
testImplementation project(path: ":core", configuration: "tests")
// BSD 3-clause
}


Expand Down Expand Up @@ -66,4 +65,3 @@ licensee {
because 'Servlet-api.jar and javax.servlet-*.jar are under the CDDL license, the original source code for this can be found at http://www.eclipse.org/jetty/downloads.php'
}
}

12 changes: 6 additions & 6 deletions plugins/mapdb-monitoring/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -10,18 +10,20 @@ dependencies {
compileOnly project(":core")
compileOnly project(":monitoring")

implementation group: 'com.google.guava', name: 'guava', version: '31.1-jre'
implementation(group: "org.mapdb", name: "mapdb", version: mapdb_version) {
implementation group: "com.google.guava", name: "guava", version: guava_version
implementation(group: "org.mapdb", name: "mapdb", version: mapdb_version) { // Apache 2.0
exclude group: "com.google.guava"
} // Apache 2.0
}


// --- Test Compile ---
testImplementation project(path: ":core", configuration: "tests")
testImplementation project(path: ":core")
testImplementation project(path: ":monitoring")
testImplementation project(path: ":dbms", configuration: "test")
testImplementation project(path: ":config")
testImplementation group: "org.junit.jupiter", name: "junit-jupiter", version: "5.7.0"// Apache 2.0

testImplementation group: "org.junit.jupiter", name: "junit-jupiter", version: junit_jupiter_version // Apache 2.0

testImplementation group: "org.mockito", name: "mockito-core", version: mockito_core_version // MIT
}
Expand Down Expand Up @@ -84,5 +86,3 @@ licensee {

allowUrl('https://www.eclipse.org/licenses/edl-v10.html') // EDL 1.0
}


4 changes: 1 addition & 3 deletions plugins/monetdb-adapter/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ dependencies {
// JDBC Driver
implementation group: "monetdb", name: "monetdb-jdbc-new", version: monetdb_version


// --- Test Compile ---
testImplementation project(path: ":core", configuration: "tests")
testImplementation project(path: ":plugins:sql-language", configuration: "tests")
Expand Down Expand Up @@ -76,6 +77,3 @@ javadoc {
licensee {
allow('MPL-2.0')
}



Loading

0 comments on commit 2a82c89

Please sign in to comment.