Merge pull request #32535 from vespa-engine/toregge/adjust-java-compi…

…le-flags-based-on-jdk-version Adjust java compiler arguments based on jdk version.
vespa-engine · Oct 7, 2024 · 5b4f200 · 5b4f200
2 parents a114749 + b181b6b
commit 5b4f200
Show file tree

Hide file tree

Showing 13 changed files with 31 additions and 13 deletions.
diff --git a/clustercontroller-core/pom.xml b/clustercontroller-core/pom.xml
@@ -126,7 +126,7 @@
                 <configuration>
                   <compilerArgs>
                     <!-- Turn off classfile warnings where spotbugs is pulled in transitively. -->
-                    <arg>-Xlint:all</arg>
+                    <arg>${vespaCompilerArgs.xlint}</arg>
                     <arg>-Xlint:-classfile</arg>
                     <arg>-Xlint:-serial</arg>
                     <arg>-Werror</arg>

diff --git a/config-model/pom.xml b/config-model/pom.xml
@@ -306,7 +306,7 @@
         <artifactId>maven-compiler-plugin</artifactId>
         <configuration>
           <compilerArgs>
-            <arg>-Xlint:all</arg>
+            <arg>${vespaCompilerArgs.xlint}</arg>
             <arg>-Xlint:-rawtypes</arg>
             <arg>-Xlint:-unchecked</arg>
             <arg>-Xlint:-serial</arg>

diff --git a/container-core/pom.xml b/container-core/pom.xml
@@ -444,7 +444,7 @@
         <artifactId>maven-compiler-plugin</artifactId>
         <configuration>
           <compilerArgs>
-            <arg>-Xlint:all</arg>
+            <arg>${vespaCompilerArgs.xlint}</arg>
             <arg>-Xlint:-rawtypes</arg>
             <arg>-Xlint:-unchecked</arg>
             <arg>-Xlint:-serial</arg>

diff --git a/container-search/pom.xml b/container-search/pom.xml
@@ -241,7 +241,7 @@
         <artifactId>maven-compiler-plugin</artifactId>
         <configuration>
           <compilerArgs>
-            <arg>-Xlint:all</arg>
+            <arg>${vespaCompilerArgs.xlint}</arg>
             <arg>-Xlint:-rawtypes</arg>
             <arg>-Xlint:-unchecked</arg>
             <arg>-Xlint:-serial</arg>

diff --git a/document/pom.xml b/document/pom.xml
@@ -102,7 +102,7 @@
                 <artifactId>maven-compiler-plugin</artifactId>
                 <configuration>
                     <compilerArgs>
-                        <arg>-Xlint:all</arg>
+                        <arg>${vespaCompilerArgs.xlint}</arg>
                         <arg>-Xlint:-serial</arg>
                         <arg>-Xlint:-rawtypes</arg>
                         <arg>-Xlint:-unchecked</arg>

diff --git a/documentgen-test/pom.xml b/documentgen-test/pom.xml
@@ -64,7 +64,7 @@
         <artifactId>maven-compiler-plugin</artifactId>
         <configuration>
           <compilerArgs>
-            <arg>-Xlint:all</arg>
+            <arg>${vespaCompilerArgs.xlint}</arg>
             <arg>-Xlint:-unchecked</arg>
             <arg>-Xlint:-serial</arg>
             <arg>-Werror</arg>

diff --git a/hosted-tenant-base/pom.xml b/hosted-tenant-base/pom.xml
@@ -535,7 +535,7 @@
                     <showWarnings>true</showWarnings>
                     <showDeprecation>true</showDeprecation>
                     <compilerArgs>
-                        <arg>-Xlint:all</arg>
+                        <arg>${vespaCompilerArgs.xlint}</arg>
                         <arg>-Werror</arg>
                     </compilerArgs>
                 </configuration>

diff --git a/integration/schema-language-server/language-server/pom.xml b/integration/schema-language-server/language-server/pom.xml
@@ -76,7 +76,7 @@
         <artifactId>maven-compiler-plugin</artifactId>
         <configuration>
           <compilerArgs>
-            <arg>-Xlint:all</arg>
+            <arg>${vespaCompilerArgs.xlint}</arg>
             <arg>-Xlint:-deprecation</arg>
             <arg>-Xlint:-unchecked</arg>
             <arg>-Xlint:-rawtypes</arg>

diff --git a/parent/pom.xml b/parent/pom.xml
@@ -86,7 +86,7 @@
                         <showWarnings>true</showWarnings>
                         <showDeprecation>false</showDeprecation>
                         <compilerArgs>
-                            <arg>-Xlint:all</arg>
+                            <arg>${vespaCompilerArgs.xlint}</arg>
                             <arg>-Xlint:-serial</arg>
                             <arg>-Xlint:-try</arg>
                             <arg>-Xlint:-processing</arg>
@@ -455,6 +455,24 @@
                 </plugins>
             </build>
         </profile>
+	<profile>
+	    <id>java17VespaCompilerArgs</id>
+	    <activation>
+		<jdk>[1,21)</jdk>
+	    </activation>
+	    <properties>
+		<vespaCompilerArgs.xlint>-Xlint:all</vespaCompilerArgs.xlint>
+	    </properties>
+	</profile>
+	<profile>
+	    <id>java21VespaCompilerArgs</id>
+	    <activation>
+		<jdk>[21,25)</jdk>
+	    </activation>
+	    <properties>
+		<vespaCompilerArgs.xlint>-Xlint:all,-this-escape</vespaCompilerArgs.xlint>
+	    </properties>
+	</profile>
     </profiles>
 
     <dependencyManagement>

diff --git a/vespa-documentgen-plugin/pom.xml b/vespa-documentgen-plugin/pom.xml
@@ -82,7 +82,7 @@
         <artifactId>maven-compiler-plugin</artifactId>
         <configuration>
           <compilerArgs>
-            <arg>-Xlint:all</arg>
+            <arg>${vespaCompilerArgs.xlint}</arg>
             <arg>-Xlint:-unchecked</arg>
             <arg>-Xlint:-processing</arg>
             <arg>-Werror</arg>

diff --git a/zkfacade/pom.xml b/zkfacade/pom.xml
@@ -77,7 +77,7 @@
         <configuration>
           <compilerArgs>
             <!-- Turn off classfile warnings where spotbugs is pulled in transitively. -->
-            <arg>-Xlint:all</arg>
+            <arg>${vespaCompilerArgs.xlint}</arg>
             <arg>-Xlint:-classfile</arg>
             <arg>-Xlint:-serial</arg>
             <arg>-Xlint:-try</arg>

diff --git a/zookeeper-command-line-client/pom.xml b/zookeeper-command-line-client/pom.xml
@@ -84,7 +84,7 @@
         <configuration>
           <compilerArgs>
             <!-- Turn off classfile warnings where spotbugs is pulled in transitively. -->
-            <arg>-Xlint:all</arg>
+            <arg>${vespaCompilerArgs.xlint}</arg>
             <arg>-Xlint:-classfile</arg>
             <arg>-Werror</arg>
           </compilerArgs>

diff --git a/zookeeper-server/zookeeper-server/pom.xml b/zookeeper-server/zookeeper-server/pom.xml
@@ -75,7 +75,7 @@
         <configuration>
           <compilerArgs>
             <!-- Turn off classfile warnings where spotbugs is pulled in transitively. -->
-            <arg>-Xlint:all</arg>
+            <arg>${vespaCompilerArgs.xlint}</arg>
             <arg>-Xlint:-classfile</arg>
             <arg>-Werror</arg>
           </compilerArgs>