Skip to content

Commit 1495e90

Browse files
Merge branch 'itzg:master' into prefix
2 parents f8840db + 9a7e0b1 commit 1495e90

File tree

2 files changed

+3
-2
lines changed

2 files changed

+3
-2
lines changed

build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ dependencies {
9898
implementation 'com.jayway.jsonpath:json-path:2.9.0'
9999
implementation 'org.apache.httpcomponents.client5:httpclient5:5.5'
100100
implementation 'io.projectreactor.netty:reactor-netty-http:1.2.6'
101-
implementation 'org.apache.maven:maven-artifact:3.9.9'
101+
implementation 'org.apache.maven:maven-artifact:3.9.10'
102102
implementation 'commons-codec:commons-codec:1.18.0'
103103
// for RFC5987 parsing of content-disposition filename*
104104
// 3.5.x is last of Java8 compatible: https://cxf.apache.org/download.html

src/main/java/me/itzg/helpers/patch/PatchCommand.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,8 @@ public Integer call() throws Exception {
6868
new Interpolator(
6969
new StandardEnvironmentVariablesProvider(),
7070
envPrefix
71-
)
71+
),
72+
jsonAllowComments
7273
);
7374

7475
patchSetProcessor.process(patchSet);

0 commit comments

Comments
 (0)