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

update dependencies starting with jakarta.el #1484

Merged
merged 15 commits into from
Oct 7, 2022
Merged

update dependencies starting with jakarta.el #1484

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
07b0221
update version of jakarta.el
macfarla Sep 5, 2022
4e5f150
snake yaml test impl update
macfarla Sep 5, 2022
5301938
update dependency check version
macfarla Sep 5, 2022
e098c73
add constraint for snakeyaml version since it is pulled in as a trans…
macfarla Sep 5, 2022
9e36557
oops
macfarla Sep 5, 2022
619a880
comment
macfarla Sep 5, 2022
fe21241
add CVE to suppression
macfarla Sep 5, 2022
6a0dab2
Merge branch 'master' of github.com:ConsenSys/tessera into uprev-jaka…
macfarla Sep 6, 2022
0609fbb
revert update to dep check plugin
macfarla Sep 7, 2022
45c8411
snakeyaml upgrade
macfarla Sep 14, 2022
27c7258
snakeyaml 1.33
macfarla Oct 4, 2022
3af0b52
jackson.databind 2.13.4
macfarla Oct 5, 2022
3f373bc
databind 2.14.0-rc1
macfarla Oct 5, 2022
60da9c2
add suppression for snakeyaml 1.33
macfarla Oct 6, 2022
a3fa3fe
jackson-databind 2.14.0
macfarla Oct 6, 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
8 changes: 4 additions & 4 deletions build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@ ext {
slf4jVersion = "1.7.36"
logbackVersion = "1.2.11"
hk2Version = "3.0.2"
jacksonVersion = "2.13.3";
jacksonDatabindVersion = "2.13.3";
jacksonVersion = "2.13.4";
jacksonDatabindVersion = "2.14.0-rc1";
}

allprojects {
Expand Down Expand Up @@ -68,7 +68,7 @@ allprojects {
testImplementation "nl.jqno.equalsverifier:equalsverifier:3.7.1"
testImplementation "com.mockrunner:mockrunner-jdbc:2.0.4"

implementation "org.yaml:snakeyaml:1.31" // transitive dependency of jackson-databind:2.13.3
implementation "org.yaml:snakeyaml:1.33" // transitive dependency of jackson-databind:2.13.3

implementation "commons-cli:commons-cli:1.5.0"
implementation "commons-codec:commons-codec:1.15"
Expand Down Expand Up @@ -151,7 +151,7 @@ allprojects {
implementation("org.glassfish:jakarta.json:2.0.1:module")

api "jakarta.el:jakarta.el-api:4.0.0"
implementation "org.glassfish:jakarta.el:4.0.1"
implementation "org.glassfish:jakarta.el:4.0.2"

api "jakarta.validation:jakarta.validation-api:3.0.0"
implementation "org.hibernate.validator:hibernate-validator:7.0.1.Final"
Expand Down
7 changes: 7 additions & 0 deletions cvss-suppressions.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,4 +25,11 @@
<packageUrl regex="true">^pkg:maven/org\.springframework/spring\-.*$</packageUrl>
<cve>CVE-2016-1000027</cve>
</suppress>
<suppress>
<notes><![CDATA[
file name: snakeyaml-1.33.jar
]]></notes>
<packageUrl regex="true">^pkg:maven/org.yaml/snakeyaml@1.33</packageUrl>
<cve>CVE-2022-38752</cve>
</suppress>
</suppressions>
2 changes: 1 addition & 1 deletion tessera-jaxrs/openapi/generate/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ plugins {

configurations.all {
resolutionStrategy {
force 'org.yaml:snakeyaml:1.31', 'com.fasterxml.jackson.core:jackson-databind:2.13.3'
force 'org.yaml:snakeyaml:1.33', 'com.fasterxml.jackson.core:jackson-databind:2.14.0-rc1'
Copy link
Contributor

Choose a reason for hiding this comment

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

Are the rc versions explicitly required?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

2.14.0 hasn't been released yet https://mvnrepository.com/artifact/com.fasterxml.jackson.core/jackson-databind

}
}

Expand Down
2 changes: 1 addition & 1 deletion tessera-jaxrs/sync-jaxrs/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ plugins {

configurations.all {
resolutionStrategy {
force 'org.yaml:snakeyaml:1.31', 'com.fasterxml.jackson.core:jackson-databind:2.13.3'
force 'org.yaml:snakeyaml:1.33', 'com.fasterxml.jackson.core:jackson-databind:2.14.0-rc1'
}
}

Expand Down
2 changes: 1 addition & 1 deletion tessera-jaxrs/thirdparty-jaxrs/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ plugins {

configurations.all {
resolutionStrategy {
force 'org.yaml:snakeyaml:1.31', 'com.fasterxml.jackson.core:jackson-databind:2.13.3'
force 'org.yaml:snakeyaml:1.33', 'com.fasterxml.jackson.core:jackson-databind:2.14.0-rc1'
}
}

Expand Down
2 changes: 1 addition & 1 deletion tessera-jaxrs/transaction-jaxrs/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ plugins {

configurations.all {
resolutionStrategy {
force 'org.yaml:snakeyaml:1.31', 'com.fasterxml.jackson.core:jackson-databind:2.13.3'
force 'org.yaml:snakeyaml:1.33', 'com.fasterxml.jackson.core:jackson-databind:2.14.0-rc1'
}
}

Expand Down
2 changes: 1 addition & 1 deletion tests/acceptance-test/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ dependencies {

testImplementation "org.eclipse.jetty:jetty-servlet"

testImplementation "org.yaml:snakeyaml:1.27"
testImplementation "org.yaml:snakeyaml"

}

Expand Down