Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[ISSUE #4864] Remove artifacts with incompatible licenses from jdbc-connector #4863

Merged
merged 2 commits into from
May 7, 2024
Merged

[ISSUE #4864] Remove artifacts with incompatible licenses from jdbc-connector #4863

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9c77d67
rebase branch
mxsm May 5, 2024
05e76a6
fix ci error
mxsm May 6, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -411,7 +411,7 @@ tasks.register('checkDeniedLicense') {
"BSD-4-Clause", "BSD-4-Clause-UC", "NPL-1.0", "NPL-1.1", "JSON"
]
// Update exemptions according to https://github.com/apache/eventmesh/issues/4842
def allowedArtifacts = ["amqp-client", "stax-api", "javassist", "hibernate-core", "hibernate-commons-annotations", "ST4", "xsdlib"]
def allowedArtifacts = ["amqp-client", "stax-api", "javassist", "ST4", "xsdlib"]

def licenseFile = file('tools/dist-license/LICENSE')
def lines = licenseFile.readLines()
Expand Down
4 changes: 2 additions & 2 deletions eventmesh-connectors/eventmesh-connector-jdbc/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,12 +37,12 @@ dependencies {
antlr("org.antlr:antlr4:4.13.0")
implementation 'org.antlr:antlr4-runtime:4.13.0'
implementation 'com.alibaba:druid:1.2.20'
implementation 'org.hibernate:hibernate-core:5.6.15.Final'
compileOnly 'org.hibernate:hibernate-core:5.6.15.Final'
implementation project(":eventmesh-common")
implementation project(":eventmesh-openconnect:eventmesh-openconnect-java")
implementation project(":eventmesh-spi")
implementation 'com.zendesk:mysql-binlog-connector-java:0.28.0'
implementation 'mysql:mysql-connector-java:8.0.32'
compileOnly 'mysql:mysql-connector-java:8.0.32'

Comment on lines 39 to 46
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

mysql-connector-java has been redirected to mysql-connector-j.

Although switching to compileOnly scope, its artifact jar package will still be bundled in our binary distribution. Therefore we will have to remove it manually before releasing, inform users to download its jar package, and put the jar file into the lib directory.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This conversation is a inform and no changes are requested.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sorry I mistook it as runtimeOnly. It do remove artifacts from classpath, and no more manual operation is needed. Users will still have to download and put jar file by themselves.

compileOnly 'org.projectlombok:lombok'
annotationProcessor 'org.projectlombok:lombok'
Expand Down
17 changes: 0 additions & 17 deletions tools/dependency-check/known-dependencies.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
FastInfoset-1.2.15.jar
ST4-4.3.4.jar
accessors-smart-2.4.7.jar
adapter-rxjava2-2.9.0.jar
Pil0tXia marked this conversation as resolved.
Show resolved Hide resolved
Expand All @@ -7,7 +6,6 @@ amqp-client-5.16.0.jar
animal-sniffer-annotations-1.19.jar
annotations-2.20.29.jar
annotations-4.1.1.4.jar
antlr-2.7.7.jar
antlr-runtime-3.5.3.jar
antlr4-4.13.0.jar
antlr4-runtime-4.13.0.jar
Expand Down Expand Up @@ -42,7 +40,6 @@ bouncy-castle-bc-2.10.1-pkg.jar
bouncy-castle-bc-2.11.1-pkg.jar
bson-3.12.11.jar
byte-buddy-1.11.0.jar
byte-buddy-1.12.18.jar
cache-api-1.1.1.jar
checker-qual-3.12.0.jar
classgraph-4.8.21.jar
Expand Down Expand Up @@ -103,8 +100,6 @@ gson-2.8.2.jar
guava-31.0.1-jre.jar
guava-retrying-2.0.0.jar
guice-4.2.2.jar
hibernate-commons-annotations-5.1.2.Final.jar
hibernate-core-5.6.15.Final.jar
hibernate-validator-6.2.0.Final.jar
http-client-spi-2.20.29.jar
httpasyncclient-4.1.3.jar
Expand All @@ -115,7 +110,6 @@ httpmime-4.5.13.jar
icu4j-72.1.jar
ini4j-0.5.4.jar
ipaddress-5.3.3.jar
istack-commons-runtime-3.0.7.jar
j2objc-annotations-1.3.jar
jackson-annotations-2.13.0.jar
jackson-core-2.13.0.jar
Expand All @@ -125,25 +119,18 @@ jackson-datatype-jsr310-2.13.0.jar
jackson-jr-objects-2.16.1.jar
jakarta.annotation-api-1.3.5.jar
jakarta.validation-api-2.0.2.jar
jandex-2.4.2.Final.jar
javassist-3.24.0-GA.jar
javax.activation-1.2.0.jar
javax.activation-api-1.2.0.jar
javax.annotation-api-1.3.2.jar
javax.inject-1.jar
javax.persistence-api-2.2.jar
javax.ws.rs-api-2.1.jar
jaxb-api-2.3.0.jar
jaxb-api-2.3.1.jar
jaxb-core-2.3.0.jar
jaxb-impl-2.3.0.jar
jaxb-runtime-2.3.1.jar
jaxen-1.1.6.jar
jboss-logging-3.4.1.Final.jar
jboss-logging-3.4.3.Final.jar
jboss-marshalling-2.0.11.Final.jar
jboss-marshalling-river-2.0.11.Final.jar
jboss-transaction-api_1.2_spec-1.1.1.Final.jar
jcip-annotations-1.0.jar
jcommander-1.78.jar
jcommander-1.82.jar
Expand Down Expand Up @@ -177,7 +164,6 @@ metrics-spi-2.20.29.jar
mongodb-driver-3.12.11.jar
mongodb-driver-core-3.12.11.jar
mysql-binlog-connector-java-0.28.0.jar
mysql-connector-j-8.0.32.jar
nacos-auth-plugin-2.2.1.jar
nacos-client-2.2.1.jar
nacos-encryption-plugin-2.2.1.jar
Expand Down Expand Up @@ -296,7 +282,6 @@ prometheus-metrics-shaded-protobuf-1.1.0.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
protobuf-java-util-3.15.0.jar
protobuf-java-util-3.21.5.jar
protobuf-java-util-3.5.1.jar
Expand Down Expand Up @@ -353,14 +338,12 @@ spring-expression-5.3.15.jar
spring-jcl-5.3.20.jar
spring-messaging-5.3.20.jar
stax-api-1.0-2.jar
stax-ex-1.8.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
txw2-2.3.1.jar
utils-2.20.29.jar
validation-api-1.1.0.Final.jar
validation-api-2.0.1.Final.jar
Expand Down
80 changes: 44 additions & 36 deletions tools/dist-license/LICENSE
View file
Open in desktop

Large diffs are not rendered by default.

Loading
Loading