Skip to content

Commit 9770944

Browse files
Merge pull request #12 from gravity9-tech/fix/cve-vulnerabilities
Fixed most CVE vulnerabilities
2 parents 77f789c + 8791bc0 commit 9770944

File tree

4 files changed

+14
-9
lines changed

4 files changed

+14
-9
lines changed

.gitignore

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,4 @@ META-INF
55
out
66
build
77
.gradle
8-
8+
.sdkmanrc

build.gradle

+6-2
Original file line numberDiff line numberDiff line change
@@ -23,11 +23,15 @@ buildscript {
2323
mavenCentral()
2424
maven {
2525
url "https://repo.spring.io/plugins-snapshot";
26+
content {
27+
includeGroupByRegex "io\\.spring\\.gradle\\.*"
28+
}
2629
}
2730
}
2831
dependencies {
2932
classpath 'biz.aQute.bnd:biz.aQute.bnd.gradle:4.2.0'
3033
classpath 'io.spring.gradle:propdeps-plugin:0.0.8-SNAPSHOT'
34+
classpath 'org.owasp:dependency-check-gradle:8.2.1'
3135
}
3236
};
3337

@@ -51,7 +55,7 @@ apply(plugin: "biz.aQute.bnd.builder");
5155
apply(plugin: "idea");
5256
apply(plugin: "eclipse");
5357
apply(plugin: "net.ltgt.errorprone");
54-
58+
apply(plugin: 'org.owasp.dependencycheck');
5559
apply(from: "project.gradle");
5660

5761
group = "com.github.java-json-tools";
@@ -70,7 +74,7 @@ repositories {
7074
* Add errorprone checking.
7175
*/
7276
dependencies {
73-
errorprone('com.google.errorprone:error_prone_core:2.18.0')
77+
errorprone('com.google.errorprone:error_prone_core:2.20.0')
7478
errorproneJavac("com.google.errorprone:javac:9+181-r4173-1")
7579
}
7680

project.gradle

+2-2
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@ project.ext.description = "JSON Patch (RFC 6902) and JSON Merge Patch (RFC 7386)
3030
*/
3131
dependencies {
3232
provided(group: "com.google.code.findbugs", name: "jsr305", version: "3.0.2");
33-
compile(group: "com.fasterxml.jackson.core", name: "jackson-databind", version: "2.11.0");
34-
compile(group: 'com.jayway.jsonpath', name: 'json-path', version: '2.6.0')
33+
compile(group: "com.fasterxml.jackson.core", name: "jackson-databind", version: "2.15.2");
34+
compile(group: 'com.jayway.jsonpath', name: 'json-path', version: '2.8.0')
3535
compile(group: "com.github.java-json-tools", name: "msg-simple", version: "1.2");
3636
compile(group: "com.github.java-json-tools", name: "jackson-coreutils", version: "2.0");
3737
testCompile(group: "org.testng", name: "testng", version: "7.1.0") {

src/main/java/com/github/fge/jsonpatch/JsonPatchOperation.java

+5-4
Original file line numberDiff line numberDiff line change
@@ -33,12 +33,12 @@
3333
import com.jayway.jsonpath.spi.json.JsonProvider;
3434
import com.jayway.jsonpath.spi.mapper.JacksonMappingProvider;
3535
import com.jayway.jsonpath.spi.mapper.MappingProvider;
36-
3736
import java.util.EnumSet;
3837
import java.util.Set;
3938

40-
import static com.fasterxml.jackson.annotation.JsonSubTypes.*;
41-
import static com.fasterxml.jackson.annotation.JsonTypeInfo.*;
39+
import static com.fasterxml.jackson.annotation.JsonSubTypes.Type;
40+
import static com.fasterxml.jackson.annotation.JsonTypeInfo.As;
41+
import static com.fasterxml.jackson.annotation.JsonTypeInfo.Id;
4242

4343
@JsonTypeInfo(use = Id.NAME, include = As.PROPERTY, property = "op")
4444

@@ -51,7 +51,7 @@
5151
@Type(name = "test", value = TestOperation.class)
5252
})
5353

54-
/**
54+
/*
5555
* Base abstract class for one patch operation
5656
*
5757
* <p>Two more abstract classes extend this one according to the arguments of
@@ -63,6 +63,7 @@
6363
* <li>{@link PathValueOperation} for operations taking a value as an
6464
* argument ({@code add}, {@code replace} and {@code test}).</li>
6565
* </ul>
66+
*
6667
*/
6768
@JsonIgnoreProperties(ignoreUnknown = true)
6869
public abstract class JsonPatchOperation implements JsonSerializable {

0 commit comments

Comments
 (0)