Skip to content

Commit

Permalink
Fix licenses
Browse files Browse the repository at this point in the history
  • Loading branch information
ppkarwasz committed Jan 4, 2024
1 parent 103daac commit 6b0c122
Show file tree
Hide file tree
Showing 7 changed files with 39 additions and 73 deletions.
4 changes: 2 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ node_modules
h2/db.mv.db

# license check tmp file
all-dependencies.txt
/tools/dependency-check/all-dependencies.txt
self-modules.txt
third-party-dependencies.txt

Expand All @@ -51,4 +51,4 @@ bld/
**/org/apache/eventmesh/connector/jdbc/antlr4/autogeneration/*

#rust
Cargo.lock
Cargo.lock
6 changes: 5 additions & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -215,6 +215,7 @@ tasks.register('dist') {
copy {
from project.configurations.runtimeClasspath
into 'dist/lib'
exclude 'eventmesh*'
}
}
copy {
Expand Down Expand Up @@ -587,7 +588,10 @@ subprojects {

dependency "com.alibaba.nacos:nacos-client:2.2.1"

dependency 'org.apache.zookeeper:zookeeper:3.7.1'
dependency('org.apache.zookeeper:zookeeper:3.7.1') {
exclude group: 'ch.qos.logback', name: 'logback-core'
exclude group: 'ch.qos.logback', name: 'logback-classic'
}
dependency 'org.apache.curator:curator-client:5.4.0'
dependency 'org.apache.curator:curator-framework:5.4.0'
dependency 'org.apache.curator:curator-recipes:5.4.0'
Expand Down
8 changes: 4 additions & 4 deletions tools/dependency-check/check-dependencies.sh
100644 → 100755
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/usr/bin bash
#!/bin/bash
#
# Licensed to the Apache Software Foundation (ASF) under one or more
# contributor license agreements. See the NOTICE file distributed with
Expand Down Expand Up @@ -34,14 +34,14 @@ self_modules_txt='tools/dependency-check/self-modules.txt'
# store all third part dependencies
third_party_dependencies_txt='tools/dependency-check/third-party-dependencies.txt'

mkdir $decompress_conf || true
mkdir -p $decompress_conf
tar -zxf build/eventmesh*.tar.gz -C $decompress_conf

./gradlew printProjects | grep '.jar' > "$self_modules_txt"

find "$decompress_conf" -name "*.jar" -exec basename {} \; | uniq | sort > "$all_dependencies_txt"
find "$decompress_conf" -name "*.jar" -exec basename {} \; | sort | uniq > "$all_dependencies_txt"

grep -wvf "$self_modules_txt" "$all_dependencies_txt" | uniq | sort > "$third_party_dependencies_txt"
grep -wvf "$self_modules_txt" "$all_dependencies_txt" | sort | uniq > "$third_party_dependencies_txt"

# If the check is success it will return 0
sort "$known_third_party_dependencies_txt" | diff - "$third_party_dependencies_txt"
Expand Down
59 changes: 28 additions & 31 deletions tools/dependency-check/known-dependencies.txt
Original file line number Diff line number Diff line change
@@ -1,13 +1,12 @@
ST4-4.3.4.jar
accessors-smart-2.4.7.jar
alibabacloud-gateway-spi-0.0.1.jar
amqp-client-5.16.0.jar
animal-sniffer-annotations-1.19.jar
annotations-2.20.29.jar
annotations-4.1.1.4.jar
antlr-runtime-3.5.3.jar
antlr4-4.13.0.jar
antlr4-runtime-4.13.0.jar
antlr-runtime-3.5.3.jar
aopalliance-1.0.jar
apache-client-2.20.29.jar
arns-2.20.29.jar
Expand Down Expand Up @@ -69,8 +68,8 @@ dingtalk-2.0.61.jar
disruptor-3.4.2.jar
dledger-0.3.1.2.jar
dom4j-2.0.3.jar
endpoint-util-0.0.7.jar
endpoints-spi-2.20.29.jar
endpoint-util-0.0.7.jar
error_prone_annotations-2.9.0.jar
eventstream-1.0.1.jar
failureaccess-1.0.1.jar
Expand All @@ -93,10 +92,10 @@ gson-2.8.2.jar
guava-31.0.1-jre.jar
guava-retrying-2.0.0.jar
guice-4.2.2.jar
hibernate-validator-6.2.0.Final.jar
http-client-spi-2.20.29.jar
hibernate-validator-6.2.5.Final.jar
httpasyncclient-4.1.3.jar
httpclient-4.5.13.jar
http-client-spi-2.20.29.jar
httpcore-4.4.13.jar
httpcore-nio-4.4.6.jar
httpmime-4.5.13.jar
Expand Down Expand Up @@ -139,15 +138,12 @@ json-path-2.7.0.jar
json-smart-2.4.7.jar
json-utils-2.20.29.jar
jsr305-3.0.2.jar
jul-to-slf4j-1.7.33.jar
kafka-clients-3.0.0.jar
listenablefuture-9999.0-empty-to-avoid-conflict-with-guava.jar
log4j-api-2.17.1.jar
log4j-core-2.17.1.jar
log4j-slf4j-impl-2.17.1.jar
log4j-to-slf4j-2.17.1.jar
logback-classic-1.2.10.jar
logback-core-1.2.10.jar
log4j-api-2.22.1.jar
log4j-core-2.22.1.jar
log4j-jul-2.22.1.jar
log4j-slf4j-impl-2.22.1.jar
lz4-java-1.7.1.jar
lz4-java-1.8.0.jar
metrics-annotation-4.1.0.jar
Expand All @@ -173,12 +169,12 @@ netty-codec-4.1.86.Final.jar
netty-codec-dns-4.1.100.Final.jar
netty-codec-dns-4.1.79.Final.jar
netty-codec-haproxy-4.1.79.Final.jar
netty-codec-http-4.1.100.Final.jar
netty-codec-http-4.1.79.Final.jar
netty-codec-http-4.1.86.Final.jar
netty-codec-http2-4.1.100.Final.jar
netty-codec-http2-4.1.79.Final.jar
netty-codec-http2-4.1.86.Final.jar
netty-codec-http-4.1.100.Final.jar
netty-codec-http-4.1.79.Final.jar
netty-codec-http-4.1.86.Final.jar
netty-codec-memcache-4.1.79.Final.jar
netty-codec-mqtt-4.1.79.Final.jar
netty-codec-redis-4.1.79.Final.jar
Expand Down Expand Up @@ -215,9 +211,9 @@ netty-transport-4.1.86.Final.jar
netty-transport-classes-epoll-4.1.79.Final.jar
netty-transport-classes-epoll-4.1.86.Final.jar
netty-transport-classes-kqueue-4.1.79.Final.jar
netty-transport-native-epoll-4.1.79.Final.jar
netty-transport-native-epoll-4.1.79.Final-linux-aarch_64.jar
netty-transport-native-epoll-4.1.79.Final-linux-x86_64.jar
netty-transport-native-epoll-4.1.79.Final.jar
netty-transport-native-kqueue-4.1.79.Final-osx-aarch_64.jar
netty-transport-native-kqueue-4.1.79.Final-osx-x86_64.jar
netty-transport-native-unix-common-4.1.100.Final.jar
Expand Down Expand Up @@ -261,7 +257,6 @@ pravega-shared-controller-api-0.11.0.jar
pravega-shared-protocol-0.11.0.jar
pravega-shared-security-0.11.0.jar
profiles-2.20.29.jar
proto-google-common-protos-2.0.1.jar
protobuf-java-3.19.2.jar
protobuf-java-3.21.5.jar
protobuf-java-3.21.9.jar
Expand All @@ -270,6 +265,7 @@ protobuf-java-util-3.17.2.jar
protobuf-java-util-3.21.5.jar
protobuf-java-util-3.5.1.jar
protocol-core-2.20.29.jar
proto-google-common-protos-2.0.1.jar
pull-parser-2.jar
pulsar-client-2.10.1.jar
pulsar-client-2.11.1.jar
Expand Down Expand Up @@ -303,27 +299,28 @@ slack-api-client-1.1.6.jar
slack-api-model-1.1.6.jar
slack-app-backend-1.1.6.jar
slf4j-api-1.7.30.jar
slf4j-api-1.7.36.jar
snakeyaml-1.30.jar
snappy-java-1.1.8.1.jar
spring-aop-5.3.15.jar
spring-beans-5.3.20.jar
spring-boot-2.5.9.jar
spring-boot-autoconfigure-2.5.9.jar
spring-boot-starter-2.5.9.jar
spring-boot-starter-logging-2.5.9.jar
spring-boot-starter-validation-2.5.9.jar
spring-context-5.3.15.jar
spring-core-5.3.20.jar
spring-expression-5.3.15.jar
spring-jcl-5.3.20.jar
spring-messaging-5.3.20.jar
spring-aop-5.3.26.jar
spring-beans-5.3.26.jar
spring-boot-2.7.10.jar
spring-boot-autoconfigure-2.7.10.jar
spring-boot-starter-2.7.10.jar
spring-boot-starter-validation-2.7.10.jar
spring-context-5.3.26.jar
spring-core-5.3.26.jar
spring-expression-5.3.26.jar
spring-jcl-5.3.26.jar
spring-messaging-5.3.26.jar
ST4-4.3.4.jar
stax-api-1.0-2.jar
tea-1.2.7.jar
tea-openapi-0.2.8.jar
tea-util-0.2.21.jar
tea-xml-0.1.5.jar
third-party-jackson-core-2.20.29.jar
tomcat-embed-el-9.0.56.jar
tomcat-embed-el-9.0.73.jar
utils-2.20.29.jar
validation-api-1.1.0.Final.jar
vertx-auth-common-4.4.6.jar
Expand All @@ -340,4 +337,4 @@ zipkin-sender-okhttp3-2.16.3.jar
zookeeper-3.7.1.jar
zookeeper-jute-3.7.1.jar
zstd-jni-1.5.0-2.jar
zstd-jni-1.5.2-2.jar
zstd-jni-1.5.2-2.jar
14 changes: 0 additions & 14 deletions tools/third-party-licenses/licenses/java/LICENSE-logback-core.txt

This file was deleted.

21 changes: 0 additions & 21 deletions tools/third-party-licenses/licenses/java/LICENSE-slf4j-simple.txt

This file was deleted.

0 comments on commit 6b0c122

Please sign in to comment.