seg_yinzy
/
che-server
mirror of https://github.com/eclipse-che/che-server.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

chore: CRW-3802 CRW-3803 update to com.fasterxml.jackson 2.14.1 to fix CVEs (#415) 

* chore: CRW-3802 CRW-3803 udpate to com.fasterxml.jackson 2.14.1 to fix CVEs

Change-Id: I4b146c16536741751146a9700eea1027064015f0
Signed-off-by: Nick Boldt <nboldt@redhat.com>

* add missing version for junit:junit:jar ==> 4.12

Change-Id: I21c6b53f6df37e684659e9d9604bc15271bc7e3a
Signed-off-by: Nick Boldt <nboldt@redhat.com>

* use eq(DevfileImpl.class); update copyright date; thanks to @vinokurig for the fix!

Change-Id: I436df0c7f9e9557d348fc7faab44379fe510d643
Signed-off-by: Nick Boldt <nboldt@redhat.com>

* fix junit dependency issue

Change-Id: Iec554595866649c7480209463eaa64c12a2f6e96
Signed-off-by: Nick Boldt <nboldt@redhat.com>

* ridiculous pom sorting rules

Change-Id: I6d72fc133bbedb99875051041e221af5892f3323
Signed-off-by: Nick Boldt <nboldt@redhat.com>

* remove junit version

Change-Id: I9bfa72bec71c5b8a009f4a4ac22012aa4b47038d
Signed-off-by: Nick Boldt <nboldt@redhat.com>

Signed-off-by: Nick Boldt <nboldt@redhat.com>
pull/398/head
Nick Boldt 2023-01-11 15:04:36 -04:00 committed by GitHub
parent 13a84d2943
commit 0337316203
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pom.xml
View File

@ -50,7 +50,7 @@
<aopalliance.version>1.0</aopalliance.version>
<ch.qos.logback.version>1.2.9</ch.qos.logback.version>
<com.auth0.jwks-rsa.version>0.20.0</com.auth0.jwks-rsa.version>
<com.fasterxml.jackson.version>2.11.2</com.fasterxml.jackson.version>
<com.fasterxml.jackson.version>2.14.1</com.fasterxml.jackson.version>
<com.github.kirviq.dumbster.version>1.7.1</com.github.kirviq.dumbster.version>
<com.github.tomakehurst.wiremock-jre8-standalone.version>2.32.0</com.github.tomakehurst.wiremock-jre8-standalone.version>
<com.google.code.guice.version>5.0.1</com.google.code.guice.version>
@ -96,6 +96,7 @@
<jakarta.ws.rs.version>3.0.0</jakarta.ws.rs.version>
<java.target.version>11</java.target.version>
<jdk.min.version>${java.target.version}</jdk.min.version>
<junit.junit.version>4.12</junit.junit.version>
<license_contributor>Red Hat, Inc. - initial API and implementation</license_contributor>
<?SORTPOM IGNORE?>
<build.info>${project.version}</build.info>
@ -1392,6 +1393,13 @@
<version>${com.github.kirviq.dumbster.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>${junit.junit.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.maven.plugin-testing</groupId>
<artifactId>maven-plugin-testing-harness</artifactId>

4
wsmaster/che-core-api-workspace/src/test/java/org/eclipse/che/api/workspace/server/devfile/DevfileParserTest.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2012-2021 Red Hat, Inc.
* Copyright (c) 2012-2023 Red Hat, Inc.
* This program and the accompanying materials are made
* available under the terms of the Eclipse Public License 2.0
* which is available at https://www.eclipse.org/legal/epl-2.0/
@ -194,7 +194,7 @@ public class DevfileParserTest {
JsonProcessingException jsonException = mock(JsonProcessingException.class);
when(jsonException.getMessage()).thenReturn("non valid");
when(jsonMapper.readTree(anyString())).thenReturn(devfileJsonNode);
doThrow(jsonException).when(jsonMapper).treeToValue(any(), any());
doThrow(jsonException).when(jsonMapper).treeToValue(any(), eq(DevfileImpl.class));
// when
devfileParser.parseJson(DEVFILE_YAML_CONTENT);