Skip to content

Commit

Permalink
Remove logback completely
Browse files Browse the repository at this point in the history
  • Loading branch information
@Pil0tXia
Pil0tXia committed Apr 18, 2024
1 parent 2fadafd commit be06ef7
Show file tree
Hide file tree
Showing 5 changed files with 6 additions and 39 deletions.
6 changes: 4 additions & 2 deletions build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -141,6 +141,7 @@ tasks.register('dist') {
subprojects.forEach { subProject ->
dependsOn("${subProject.path}:jar")
}
dependsOn('generateDistLicense', 'generateDistNotice')
def includedProjects =
["eventmesh-common",
"eventmesh-meta:eventmesh-meta-api",
Expand Down Expand Up @@ -254,7 +255,6 @@ cyclonedxBom {
includeConfigs = ["runtimeClasspath"]
}

// TODO depend 'dist' on 'generateDistLicense'
tasks.register('generateDistLicense') {
dependsOn('cyclonedxBom') // Task from 'org.cyclonedx.bom' plugin
doLast {
Expand Down Expand Up @@ -326,7 +326,6 @@ tasks.register('generateDistLicense') {
}
}

// TODO depend 'dist' on 'generateDistNotice'
tasks.register('generateDistNotice') {
dependsOn('generateLicenseReport') // Task from 'com.github.jk1.dependency-license-report' plugin
doLast {
Expand Down Expand Up @@ -371,6 +370,9 @@ subprojects {
delete 'dist'
}

// Print all dependencies trees, useful for finding artifacts
tasks.register('printAllDependencyTrees', DependencyReportTask) {}

jacoco {
toolVersion = "0.8.6"
}
Expand Down
5 changes: 2 additions & 3 deletions eventmesh-examples/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,9 @@ dependencies {
implementation project(":eventmesh-common")
implementation project(":eventmesh-storage-plugin:eventmesh-storage-api")
implementation project(":eventmesh-connectors:eventmesh-connector-spring")
implementation('org.springframework.boot:spring-boot-starter') {
exclude module: 'spring-boot-starter-logging'
implementation('org.springframework.boot:spring-boot-starter-web') {
exclude group: 'org.springframework.boot', module: 'spring-boot-starter-logging'
}
implementation 'org.springframework.boot:spring-boot-starter-web'
implementation 'io.netty:netty-all'
implementation "io.cloudevents:cloudevents-core"
implementation "io.cloudevents:cloudevents-json-jackson"
Expand Down
8 changes: 0 additions & 8 deletions tools/dist-license/LICENSE
View file
Original file line number Diff line number Diff line change
Expand Up @@ -367,17 +367,11 @@ json-path 2.7.0 licensed under 'Apache-2.0'. For details see: licenses/Apache-2.
json-smart 2.4.7 licensed under 'Apache-2.0'. For details see: licenses/Apache-2.0.txt
json-utils 2.20.29 licensed under 'Apache-2.0'. For details see: licenses/Apache-2.0.txt
jsr305 3.0.2 licensed under 'Apache-2.0'. For details see: licenses/Apache-2.0.txt
jul-to-slf4j 1.7.33 licensed under 'MIT'. For details see: licenses/MIT.txt
kafka-clients 3.0.0 licensed under 'Apache-2.0'. For details see: licenses/Apache-2.0.txt
listenablefuture 9999.0-empty-to-avoid-conflict-with-guava licensed under 'Apache-2.0'. For details see: licenses/Apache-2.0.txt
log4j-api 2.22.1 licensed under 'Apache-2.0'. For details see: licenses/Apache-2.0.txt
log4j-core 2.22.1 licensed under 'Apache-2.0'. For details see: licenses/Apache-2.0.txt
log4j-slf4j-impl 2.22.1 licensed under 'Apache-2.0'. For details see: licenses/Apache-2.0.txt
log4j-slf4j2-impl 2.22.1 licensed under 'Apache-2.0'. For details see: licenses/Apache-2.0.txt
logback-classic 1.2.10 licensed under 'EPL-1.0'. For details see: licenses/EPL-1.0.txt
logback-classic 1.2.10 licensed under 'GNU Lesser General Public License'. For details see: licenses/GNU Lesser General Public License.txt
logback-core 1.2.10 licensed under 'EPL-1.0'. For details see: licenses/EPL-1.0.txt
logback-core 1.2.10 licensed under 'GNU Lesser General Public License'. For details see: licenses/GNU Lesser General Public License.txt
lz4-java 1.7.1 licensed under 'Apache-2.0'. For details see: licenses/Apache-2.0.txt
lz4-java 1.8.0 licensed under 'Apache-2.0'. For details see: licenses/Apache-2.0.txt
metrics-annotation 4.1.0 licensed under 'Apache-2.0'. For details see: licenses/Apache-2.0.txt
Expand All @@ -388,7 +382,6 @@ metrics-spi 2.20.29 licensed under 'Apache-2.0'. For details see: licenses/Apach
mongodb-driver 3.12.11 licensed under 'Apache-2.0'. For details see: licenses/Apache-2.0.txt
mongodb-driver-core 3.12.11 licensed under 'Apache-2.0'. For details see: licenses/Apache-2.0.txt
mysql-binlog-connector-java 0.28.0 licensed under 'Apache-2.0'. For details see: licenses/Apache-2.0.txt
mysql-connector-j 8.0.32 licensed under 'The GNU General Public License, v2 with Universal FOSS Exception, v1.0'. For details see: licenses/The GNU General Public License, v2 with Universal FOSS Exception, v1.0.txt
nacos-auth-plugin 2.2.1 licensed under 'Apache-2.0'. For details see: licenses/Apache-2.0.txt
nacos-client 2.2.1 licensed under 'Apache-2.0'. For details see: licenses/Apache-2.0.txt
nacos-encryption-plugin 2.2.1 licensed under 'Apache-2.0'. For details see: licenses/Apache-2.0.txt
Expand Down Expand Up @@ -544,7 +537,6 @@ spring-boot-autoconfigure 2.7.10 licensed under 'Apache-2.0'. For details see: l
spring-boot-starter 2.5.9 licensed under 'Apache-2.0'. For details see: licenses/Apache-2.0.txt
spring-boot-starter 2.7.10 licensed under 'Apache-2.0'. For details see: licenses/Apache-2.0.txt
spring-boot-starter-json 2.7.10 licensed under 'Apache-2.0'. For details see: licenses/Apache-2.0.txt
spring-boot-starter-logging 2.5.9 licensed under 'Apache-2.0'. For details see: licenses/Apache-2.0.txt
spring-boot-starter-tomcat 2.7.10 licensed under 'Apache-2.0'. For details see: licenses/Apache-2.0.txt
spring-boot-starter-validation 2.5.9 licensed under 'Apache-2.0'. For details see: licenses/Apache-2.0.txt
spring-boot-starter-web 2.7.10 licensed under 'Apache-2.0'. For details see: licenses/Apache-2.0.txt
Expand Down
25 changes: 0 additions & 25 deletions tools/dist-license/NOTICE
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1027,19 +1027,6 @@ ResolverUtil.java
Copyright 2005-2006 Tim Fennell
=======================================================================

log4j-slf4j-impl-2.22.1 NOTICE

=======================================================================

Apache Log4j SLF4J Binding
Copyright 1999-2023 The Apache Software Foundation


This product includes software developed at
The Apache Software Foundation (http://www.apache.org/).

=======================================================================

log4j-slf4j2-impl-2.22.1 NOTICE

=======================================================================
Expand Down Expand Up @@ -2085,18 +2072,6 @@ This product is licensed to you under the Apache License, Version 2.0
the License.
=======================================================================

spring-boot-starter-logging-2.5.9 NOTICE

=======================================================================

Spring Boot 2.5.9
Copyright (c) 2012-2022 Pivotal, Inc.

This product is licensed to you under the Apache License, Version 2.0
(the "License"). You may not use this product except in compliance with
the License.
=======================================================================

spring-boot-starter-tomcat-2.7.10 NOTICE

=======================================================================
Expand Down
1 change: 0 additions & 1 deletion tools/dist-license/licenses/java/GNU Lesser General Public License.txt
View file

This file was deleted.

0 comments on commit be06ef7

Please sign in to comment.