Skip to content

fix BUG #1398,fix bsh,xml-resolver default version cannot access #1399

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

Merged
FlechazoW merged 3 commits into from
Nov 18, 2022
Merged

fix BUG #1398,fix bsh,xml-resolver default version cannot access #1399

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
abc2566
fix BUG #1398,fix bsh,xml-resolver default version cannot access
zhengchaoken Nov 16, 2022
eefae73
fix BUG #1400,fix multiple SLF4J bindings & no log logged in standalo…
zhengchaoken Nov 16, 2022
e63192c
Merge branch 'master' into master
FlechazoW Nov 18, 2022
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
4 changes: 2 additions & 2 deletions bin/submit.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,9 +46,9 @@ fi
# 1.In yarn-session case, JAR_DIR can not be found
# 2.In other cases, JAR_DIR can be found
if [ $CHUNJUN_DEPLOY_MODE -eq 1 ]; then
JAR_DIR=$CHUNJUN_HOME/lib/*
JAR_DIR=$CHUNJUN_HOME/lib/chunjun-clients.jar:$CHUNJUN_HOME/lib/*
else
JAR_DIR=$CHUNJUN_HOME/../lib/*
JAR_DIR=$CHUNJUN_HOME/../lib/chunjun-clients.jar:$CHUNJUN_HOME/../lib/*
fi

CLASS_NAME=com.dtstack.chunjun.client.Launcher
Expand Down
37 changes: 36 additions & 1 deletion chunjun-assembly/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,15 +33,50 @@
<packaging>pom</packaging>
<name>ChunJun : Assembly</name>


<properties>
<skipTests>true</skipTests>
<!--version same as flink-1.12.7-bin-scala_2.12.tgz/lib/log4j-* -->
<log4j2.version>2.16.0</log4j2.version>
Comment thread
FlechazoW marked this conversation as resolved.
<main.basedir>${project.parent.basedir}</main.basedir>
<sbt.project.name>assembly</sbt.project.name>
<build.testJarPhase>none</build.testJarPhase>
<build.copyDependenciesPhase>package</build.copyDependenciesPhase>
</properties>

<dependencies>
<!--add log4j-*jars to package to tar.gz/lib -->
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-1.2-api</artifactId>
<version>${log4j2.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-api</artifactId>
<version>${log4j2.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-core</artifactId>
<version>${log4j2.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-slf4j-impl</artifactId>
<version>${log4j2.version}</version>
<scope>provided</scope>
<exclusions>
<exclusion>
<artifactId>slf4j-api</artifactId>
<groupId>org.slf4j</groupId>
</exclusion>
</exclusions>
</dependency>
</dependencies>

<build>
<plugins>
<plugin>
Expand Down
6 changes: 5 additions & 1 deletion chunjun-assembly/src/main/assembly/assembly.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,8 +59,12 @@
<outputDirectory>lib</outputDirectory>
<useTransitiveDependencies>true</useTransitiveDependencies>
<unpack>false</unpack>
<scope>package</scope>
<scope>provided</scope>
<useProjectArtifact>false</useProjectArtifact>
<!-- only include log4j-*.jars -->
<includes>
<include>org.apache.logging.log4j:*</include>
</includes>
</dependencySet>
</dependencySets>
</assembly>
11 changes: 11 additions & 0 deletions chunjun-clients/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -233,6 +233,17 @@
<goal>shade</goal>
</goals>
<configuration>
<!--exclude all log api and impls -->
<artifactSet>
<excludes>
<exclude>org.slf4j:*</exclude>
<exclude>org.apache.logging.log4j:*</exclude>
<exclude>ch.qos.logback:*</exclude>
<exclude>ch.qos.reload4j:*</exclude>
<exclude>commons-logging:*</exclude>
<exclude>log4j:log4j</exclude>
</excludes>
</artifactSet>
<createDependencyReducedPom>false</createDependencyReducedPom>
<transformers>

Expand Down
8 changes: 6 additions & 2 deletions chunjun-connectors/chunjun-connector-hdfs/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -228,10 +228,14 @@
</goals>
<configuration>
<artifactSet>
<!--exclude all log api and impls -->
<excludes>
<exclude>org.slf4j:slf4j-api</exclude>
<exclude>log4j:log4j</exclude>
<exclude>org.slf4j:*</exclude>
<exclude>org.apache.logging.log4j:*</exclude>
<exclude>ch.qos.logback:*</exclude>
<exclude>ch.qos.reload4j:*</exclude>
<exclude>commons-logging:*</exclude>
<exclude>log4j:log4j</exclude>
</excludes>
</artifactSet>
<filters>
Expand Down
11 changes: 11 additions & 0 deletions chunjun-connectors/chunjun-connector-hive/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -285,6 +285,17 @@
</goals>
<configuration>
<createDependencyReducedPom>false</createDependencyReducedPom>
<!--exclude all log api and impls -->
<artifactSet>
<excludes>
<exclude>org.slf4j:*</exclude>
<exclude>org.apache.logging.log4j:*</exclude>
<exclude>ch.qos.logback:*</exclude>
<exclude>ch.qos.reload4j:*</exclude>
<exclude>commons-logging:*</exclude>
<exclude>log4j:log4j</exclude>
</excludes>
</artifactSet>
<filters>
<filter>
<artifact>*:*</artifact>
Expand Down
8 changes: 4 additions & 4 deletions chunjun-core/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -451,10 +451,10 @@
</transformers>
<artifactSet>
<includes>
<!--only include slf4j api , exclude other log api & impls -->
<include>org.slf4j:slf4j-api</include>
<include>com.google.guava:*</include>
<include>com.google.code.gson:*</include>
<include>ch.qos.logback:*</include>
<include>org.slf4j:*</include>
<include>org.apache.httpcomponents:*</include>
<include>io.prometheus:*</include>
<include>org.apache.avro:*</include>
Expand Down Expand Up @@ -508,10 +508,10 @@
</transformers>
<artifactSet>
<includes>
<!--only include slf4j api -->
<include>org.slf4j:slf4j-api</include>
<include>com.google.guava:*</include>
<include>com.google.code.gson:*</include>
<include>ch.qos.logback:*</include>
<include>org.slf4j:*</include>
<include>org.apache.httpcomponents:*</include>
<include>io.prometheus:*</include>
<include>org.apache.avro:*</include>
Expand Down
18 changes: 16 additions & 2 deletions chunjun-ddl/chunjun-ddl-mysql/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,6 +130,16 @@
<artifactId>freemarker</artifactId>
<version>2.3.28</version>
</dependency>
<dependency>
<groupId>org.beanshell</groupId>
<artifactId>bsh</artifactId>
<version>2.0b5</version>
</dependency>
<dependency>
<groupId>xml-resolver</groupId>
<artifactId>xml-resolver</artifactId>
<version>1.2</version>
</dependency>
</dependencies>
<executions>
<execution>
Expand Down Expand Up @@ -184,9 +194,13 @@
<configuration>
<artifactSet>
<excludes>
<exclude>org.slf4j:slf4j-api</exclude>
<exclude>log4j:log4j</exclude>
<!--exclude all log api and impls -->
<exclude>org.slf4j:*</exclude>
<exclude>org.apache.logging.log4j:*</exclude>
<exclude>ch.qos.logback:*</exclude>
<exclude>ch.qos.reload4j:*</exclude>
<exclude>commons-logging:*</exclude>
<exclude>log4j:log4j</exclude>
</excludes>
</artifactSet>
<filters>
Expand Down
8 changes: 6 additions & 2 deletions chunjun-restore/chunjun-restore-mysql/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,9 +83,13 @@
<configuration>
<artifactSet>
<excludes>
<exclude>org.slf4j:slf4j-api</exclude>
<exclude>log4j:log4j</exclude>
<!--exclude all log api and impls -->
<exclude>org.slf4j:*</exclude>
<exclude>org.apache.logging.log4j:*</exclude>
<exclude>ch.qos.logback:*</exclude>
<exclude>ch.qos.reload4j:*</exclude>
<exclude>commons-logging:*</exclude>
<exclude>log4j:log4j</exclude>
</excludes>
</artifactSet>
<filters>
Expand Down