Skip to content

Commit 030f2f2

Browse files
authored
Merge pull request #36951 from vespa-engine/toregge/avoid-mixing-variants-of-compiler-args-setting-in-pom-files
Avoid mixing variants of compilerArgs settings in pom files.
2 parents 4dbe41b + 3edba93 commit 030f2f2

4 files changed

Lines changed: 12 additions & 4 deletions

File tree

client/pom.xml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,9 @@
3636
<artifactId>maven-compiler-plugin</artifactId>
3737
<configuration>
3838
<release>${vespaClients.jdk.releaseVersion}</release>
39-
<compilerArgs>-Werror</compilerArgs>
39+
<compilerArgs>
40+
<arg>-Werror</arg>
41+
</compilerArgs>
4042
</configuration>
4143
</plugin>
4244
<plugin>

vespa-feed-client-api/pom.xml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,9 @@
4242
<artifactId>maven-compiler-plugin</artifactId>
4343
<configuration>
4444
<release>${vespaClients.jdk.releaseVersion}</release>
45-
<compilerArgs>-Werror</compilerArgs>
45+
<compilerArgs>
46+
<arg>-Werror</arg>
47+
</compilerArgs>
4648
<showDeprecation>true</showDeprecation>
4749
</configuration>
4850
</plugin>

vespa-feed-client-cli/pom.xml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,9 @@
5353
<artifactId>maven-compiler-plugin</artifactId>
5454
<configuration>
5555
<release>${vespaClients.jdk.releaseVersion}</release>
56-
<compilerArgs>-Werror</compilerArgs>
56+
<compilerArgs>
57+
<arg>-Werror</arg>
58+
</compilerArgs>
5759
<showDeprecation>true</showDeprecation>
5860
</configuration>
5961
</plugin>

vespa-feed-client/pom.xml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,9 @@
7373
<configuration>
7474
<release>${vespaClients.jdk.releaseVersion}</release>
7575
<showDeprecation>true</showDeprecation>
76-
<compilerArgs>-Werror</compilerArgs>
76+
<compilerArgs>
77+
<arg>-Werror</arg>
78+
</compilerArgs>
7779
</configuration>
7880
</execution>
7981
</executions>

0 commit comments

Comments
 (0)