Skip to content

Commit aa4893b

Browse files
committed
fix: create valid poms when using eslint styleguides
(and enable the missed and disabled xo test in maven part)
1 parent 3577f4e commit aa4893b

File tree

2 files changed

+2
-4
lines changed

2 files changed

+2
-4
lines changed

plugin-maven/src/test/java/com/diffplug/spotless/maven/typescript/TypescriptFormatStepTest.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919

2020
import java.io.IOException;
2121

22-
import org.junit.jupiter.api.Disabled;
2322
import org.junit.jupiter.api.Test;
2423

2524
import com.diffplug.spotless.ProcessRunner;
@@ -211,7 +210,6 @@ void eslintStyleguideStandardWithTypescript() throws Exception {
211210
}
212211

213212
@Test
214-
@Disabled("https://github.com/diffplug/spotless/issues/1756")
215213
void eslintStyleguideXo() throws Exception {
216214
writePomWithTypescriptSteps(
217215
TEST_FILE_PATH,

testlib/src/main/java/com/diffplug/spotless/npm/EslintStyleGuide.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -115,8 +115,8 @@ public String asGradleMapStringMergedWith(Map<String, String> devDependencies) {
115115

116116
public String asMavenXmlStringMergedWith(Map<String, String> devDependencies) {
117117
return mergedWith(devDependencies).entrySet().stream()
118-
.map(entry -> "<" + entry.getKey() + ">" + entry.getValue() + "</" + entry.getKey() + ">")
119-
.collect(Collectors.joining("", "<devDependencies>", "</devDependencies>"));
118+
.map(entry -> String.format("<property><name>%s</name><value>%s</value></property>", entry.getKey(), entry.getValue()))
119+
.collect(Collectors.joining("", "<devDependencyProperties>", "</devDependencyProperties>"));
120120
}
121121

122122
}

0 commit comments

Comments
 (0)