Skip to content

[Fix-4143][jar upgrade]upgrade quartz version to 2.3.0#4150

Merged
davidzollo merged 11 commits intoapache:devfrom
karlsun2010:dev
Dec 6, 2020
Merged

[Fix-4143][jar upgrade]upgrade quartz version to 2.3.0#4150
davidzollo merged 11 commits intoapache:devfrom
karlsun2010:dev

Conversation

@karlsun2010
Copy link
Copy Markdown

What is the purpose of the pull request

4143
There is a vulnerability in Quartz Enterprise Job Scheduler 2.2.3 ,upgrade recommended
(For example: This pull request adds checkstyle plugin.)

Brief change log

Modify the corresponding jar version in the incubator-dolphinscheduler/pom.xml.
Modify the version of the corresponding jar in tools/dependencies/known-dependencies.txt.
Modify the relevant jar version in the dolphinscheduler-dist/release-docs/LICENSE file.

@CalvinKirs CalvinKirs added the first time contributor First-time contributor label Dec 3, 2020
Copy link
Copy Markdown
Member

@CalvinKirs CalvinKirs left a comment

Choose a reason for hiding this comment

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

good job!

Copy link
Copy Markdown
Member

@CalvinKirs CalvinKirs left a comment

Choose a reason for hiding this comment

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

+1

Copy link
Copy Markdown
Contributor

@davidzollo davidzollo left a comment

Choose a reason for hiding this comment

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

+1
good job

oshi-core 3.5.0: https://mvnrepository.com/artifact/com.github.oshi/oshi-core/3.5.0, EPL 1.0
junit 4.12: https://mvnrepository.com/artifact/junit/junit/4.12, EPL 1.0
h2-1.4.200 https://github.com/h2database/h2database/blob/master/LICENSE.txt, MPL 2.0 or EPL 1.0
mchange-commons-java 0.2.11: https://mvnrepository.com/artifact/com.mchange/mchange-commons-java/0.2.11, EPL 1.0
Copy link
Copy Markdown
Contributor

@lgcareer lgcareer Dec 4, 2020

Choose a reason for hiding this comment

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

Hi,.I saw it's license[1] is LGPL or EPL,whether you can remove this jar?
1.https://github.com/swaldman/mchange-commons-java/blob/mchange-commons-java-0.2.11/LICENSE

junit 4.12: https://mvnrepository.com/artifact/junit/junit/4.12, EPL 1.0
h2-1.4.200 https://github.com/h2database/h2database/blob/master/LICENSE.txt, MPL 2.0 or EPL 1.0
mchange-commons-java 0.2.11: https://mvnrepository.com/artifact/com.mchange/mchange-commons-java/0.2.11, EPL 1.0
c3p0 0.9.5.2: https://mvnrepository.com/artifact/com.mchange/c3p0/0.9.5.2, EPL 1.0
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Hi,.I saw license[1] of c3p0 is LGPL or EPL,whether you can remove this jar?
[1]https://github.com/swaldman/c3p0/blob/c3p0-0.9.5.2/LICENSE

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

hi, this is relatively difficult because Quartz relies on it. Type B licenses can also be introduced, but we need to be relatively cautious. What do you think?

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

hi, this is relatively difficult because Quartz relies on it. Type B licenses can also be introduced, but we need to be relatively cautious. What do you think?

I think we don't use directly that can be removed , take c3po as an example, we don't use c3p0, we use Druid as database connection pool, so I think it could be removed, but I'm not sure, just try?

Copy link
Copy Markdown
Contributor

@lgcareer lgcareer Dec 4, 2020

Choose a reason for hiding this comment

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

Over the past couple of releases,I excluded c3p0 in the module service and api.Such as the following.
image

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

@kevinsun2010 Sorry, I may have misled you, you can try as @lgcareer said.

Copy link
Copy Markdown
Author

Choose a reason for hiding this comment

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

@kevinsun2010 Sorry, I may have misled you, you can try as @lgcareer said.

i see ,i will try.ths

Copy link
Copy Markdown
Author

Choose a reason for hiding this comment

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

i try as @lgcareer said. but Compile-check fail. about +c3p0-0.9.5.2.jar
2020-12-05_100700

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

I commit some code to this PR,now it’s OK

@codecov-io
Copy link
Copy Markdown

codecov-io commented Dec 5, 2020

Codecov Report

Merging #4150 (99e516b) into dev (aa0974f) will decrease coverage by 0.03%.
The diff coverage is n/a.

Impacted file tree graph

@@             Coverage Diff              @@
##                dev    #4150      +/-   ##
============================================
- Coverage     41.37%   41.34%   -0.04%     
+ Complexity     3116     3112       -4     
============================================
  Files           467      467              
  Lines         22168    22168              
  Branches       2720     2720              
============================================
- Hits           9173     9166       -7     
- Misses        12113    12117       +4     
- Partials        882      885       +3     
Impacted Files Coverage Δ Complexity Δ
...er/master/dispatch/host/assign/RandomSelector.java 77.77% <0.00%> (-5.56%) 3.00% <0.00%> (-1.00%)
...inscheduler/service/zk/CuratorZookeeperClient.java 60.97% <0.00%> (-4.88%) 7.00% <0.00%> (-1.00%)
...e/dolphinscheduler/remote/NettyRemotingClient.java 50.00% <0.00%> (-2.78%) 9.00% <0.00%> (-2.00%)

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update aa0974f...99e516b. Read the comment docs.

@sonarqubecloud
Copy link
Copy Markdown

sonarqubecloud bot commented Dec 6, 2020

Kudos, SonarCloud Quality Gate passed!

Bug A 0 Bugs
Vulnerability A 0 Vulnerabilities
Security Hotspot A 0 Security Hotspots
Code Smell A 0 Code Smells

No Coverage information No Coverage information
0.0% 0.0% Duplication

@davidzollo davidzollo added this to the 1.3.4-release milestone Dec 6, 2020
@davidzollo davidzollo merged commit 966600c into apache:dev Dec 6, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

first time contributor First-time contributor

Projects

None yet

Development

Successfully merging this pull request may close these issues.

There is a vulnerability in Quartz Enterprise Job Scheduler 2.2.3 ,upgrade recommended

5 participants