diff --git a/com.ibm.wala.cast.java.ecj/mvncentral.xml b/com.ibm.wala.cast.java.ecj/mvncentral.xml
index 2ddd5561a..25a53537f 100644
--- a/com.ibm.wala.cast.java.ecj/mvncentral.xml
+++ b/com.ibm.wala.cast.java.ecj/mvncentral.xml
@@ -80,6 +80,27 @@
       <url>https://oss.sonatype.org/content/repositories/snapshots/</url>
     </repository>
   </repositories>  
+
+  <profiles>
+    <profile>
+      <id>jdk17</id>
+      <activation>
+        <jdk>1.7</jdk>
+      </activation>
+      <properties>
+        <javadoc.options></javadoc.options>
+      </properties>
+    </profile>
+    <profile>
+      <id>jdk18</id>
+      <activation>
+        <jdk>1.8</jdk>
+      </activation>
+      <properties>
+        <javadoc.options>-Xdoclint:none</javadoc.options>
+      </properties>
+    </profile>
+  </profiles>
   
   <build>
     <sourceDirectory>${src.dir}</sourceDirectory>
@@ -123,7 +144,7 @@
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-javadoc-plugin</artifactId>
         <configuration>
-          <additionalparam>-Xdoclint:none</additionalparam>
+          <additionalparam>${javadoc.options}</additionalparam>
         </configuration>        
         <version>2.9.1</version>
         <executions>
diff --git a/com.ibm.wala.cast.java/mvncentral.xml b/com.ibm.wala.cast.java/mvncentral.xml
index 360871245..5353d89b1 100644
--- a/com.ibm.wala.cast.java/mvncentral.xml
+++ b/com.ibm.wala.cast.java/mvncentral.xml
@@ -65,6 +65,27 @@
       <url>https://oss.sonatype.org/content/repositories/snapshots/</url>
     </repository>
   </repositories>  
+
+  <profiles>
+    <profile>
+      <id>jdk17</id>
+      <activation>
+        <jdk>1.7</jdk>
+      </activation>
+      <properties>
+        <javadoc.options></javadoc.options>
+      </properties>
+    </profile>
+    <profile>
+      <id>jdk18</id>
+      <activation>
+        <jdk>1.8</jdk>
+      </activation>
+      <properties>
+        <javadoc.options>-Xdoclint:none</javadoc.options>
+      </properties>
+    </profile>
+  </profiles>
   
   <build>
     <sourceDirectory>${src.dir}</sourceDirectory>
@@ -108,7 +129,7 @@
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-javadoc-plugin</artifactId>
         <configuration>
-          <additionalparam>-Xdoclint:none</additionalparam>
+          <additionalparam>${javadoc.options}</additionalparam>
         </configuration>        
         <version>2.9.1</version>
         <executions>
diff --git a/com.ibm.wala.cast.js.rhino/mvncentral.xml b/com.ibm.wala.cast.js.rhino/mvncentral.xml
index 2fc55101b..8a5a60c52 100644
--- a/com.ibm.wala.cast.js.rhino/mvncentral.xml
+++ b/com.ibm.wala.cast.js.rhino/mvncentral.xml
@@ -70,6 +70,27 @@
       <url>https://oss.sonatype.org/content/repositories/snapshots/</url>
     </repository>
   </repositories>  
+
+  <profiles>
+    <profile>
+      <id>jdk17</id>
+      <activation>
+        <jdk>1.7</jdk>
+      </activation>
+      <properties>
+        <javadoc.options></javadoc.options>
+      </properties>
+    </profile>
+    <profile>
+      <id>jdk18</id>
+      <activation>
+        <jdk>1.8</jdk>
+      </activation>
+      <properties>
+        <javadoc.options>-Xdoclint:none</javadoc.options>
+      </properties>
+    </profile>
+  </profiles>
   
   <build>
     <sourceDirectory>${src.dir}</sourceDirectory>
@@ -113,7 +134,7 @@
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-javadoc-plugin</artifactId>
         <configuration>
-          <additionalparam>-Xdoclint:none</additionalparam>
+          <additionalparam>${javadoc.options}</additionalparam>
         </configuration>        
         <version>2.9.1</version>
         <executions>
diff --git a/com.ibm.wala.cast.js/mvncentral.xml b/com.ibm.wala.cast.js/mvncentral.xml
index 531b6c6fc..fb36be4c1 100644
--- a/com.ibm.wala.cast.js/mvncentral.xml
+++ b/com.ibm.wala.cast.js/mvncentral.xml
@@ -75,6 +75,27 @@
       <url>https://oss.sonatype.org/content/repositories/snapshots/</url>
     </repository>
   </repositories>  
+
+  <profiles>
+    <profile>
+      <id>jdk17</id>
+      <activation>
+        <jdk>1.7</jdk>
+      </activation>
+      <properties>
+        <javadoc.options></javadoc.options>
+      </properties>
+    </profile>
+    <profile>
+      <id>jdk18</id>
+      <activation>
+        <jdk>1.8</jdk>
+      </activation>
+      <properties>
+        <javadoc.options>-Xdoclint:none</javadoc.options>
+      </properties>
+    </profile>
+  </profiles>
   
   <build>
     <sourceDirectory>${src.dir}</sourceDirectory>
@@ -118,7 +139,7 @@
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-javadoc-plugin</artifactId>
         <configuration>
-          <additionalparam>-Xdoclint:none</additionalparam>
+          <additionalparam>${javadoc.options}</additionalparam>
         </configuration>        
         <version>2.9.1</version>
         <executions>
diff --git a/com.ibm.wala.cast/mvncentral.xml b/com.ibm.wala.cast/mvncentral.xml
index 0f8f4afdc..a5857220e 100644
--- a/com.ibm.wala.cast/mvncentral.xml
+++ b/com.ibm.wala.cast/mvncentral.xml
@@ -65,6 +65,27 @@
       <url>https://oss.sonatype.org/content/repositories/snapshots/</url>
     </repository>
   </repositories>  
+
+  <profiles>
+    <profile>
+      <id>jdk17</id>
+      <activation>
+        <jdk>1.7</jdk>
+      </activation>
+      <properties>
+        <javadoc.options></javadoc.options>
+      </properties>
+    </profile>
+    <profile>
+      <id>jdk18</id>
+      <activation>
+        <jdk>1.8</jdk>
+      </activation>
+      <properties>
+        <javadoc.options>-Xdoclint:none</javadoc.options>
+      </properties>
+    </profile>
+  </profiles>
   
   <build>
     <sourceDirectory>${src.dir}</sourceDirectory>
@@ -108,7 +129,7 @@
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-javadoc-plugin</artifactId>
         <configuration>
-          <additionalparam>-Xdoclint:none</additionalparam>
+          <additionalparam>${javadoc.options}</additionalparam>
         </configuration>        
         <version>2.9.1</version>
         <executions>
diff --git a/com.ibm.wala.core/mvncentral.xml b/com.ibm.wala.core/mvncentral.xml
index 1b6d390e5..29ea82a4b 100644
--- a/com.ibm.wala.core/mvncentral.xml
+++ b/com.ibm.wala.core/mvncentral.xml
@@ -60,6 +60,27 @@
       <url>https://oss.sonatype.org/content/repositories/snapshots/</url>
     </repository>
   </repositories>  
+
+  <profiles>
+    <profile>
+      <id>jdk17</id>
+      <activation>
+        <jdk>1.7</jdk>
+      </activation>
+      <properties>
+        <javadoc.options></javadoc.options>
+      </properties>
+    </profile>
+    <profile>
+      <id>jdk18</id>
+      <activation>
+        <jdk>1.8</jdk>
+      </activation>
+      <properties>
+        <javadoc.options>-Xdoclint:none</javadoc.options>
+      </properties>
+    </profile>
+  </profiles>
   
   <build>
     <sourceDirectory>${src.dir}</sourceDirectory>
@@ -111,7 +132,7 @@
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-javadoc-plugin</artifactId>
         <configuration>
-          <additionalparam>-Xdoclint:none</additionalparam>
+          <additionalparam>${javadoc.options}</additionalparam>
         </configuration>        
         <version>2.9.1</version>
         <executions>
diff --git a/com.ibm.wala.shrike/mvncentral.xml b/com.ibm.wala.shrike/mvncentral.xml
index b478d1aab..3f0c521b3 100644
--- a/com.ibm.wala.shrike/mvncentral.xml
+++ b/com.ibm.wala.shrike/mvncentral.xml
@@ -55,7 +55,28 @@
       <url>https://oss.sonatype.org/content/repositories/snapshots/</url>
     </repository>
   </repositories>  
-  
+
+  <profiles>
+    <profile>
+      <id>jdk17</id>
+      <activation>
+        <jdk>1.7</jdk>
+      </activation>
+      <properties>
+        <javadoc.options></javadoc.options>
+      </properties>
+    </profile>
+    <profile>
+      <id>jdk18</id>
+      <activation>
+        <jdk>1.8</jdk>
+      </activation>
+      <properties>
+        <javadoc.options>-Xdoclint:none</javadoc.options>
+      </properties>
+    </profile>
+  </profiles>
+
   <build>
     <sourceDirectory>${src.dir}</sourceDirectory>
     <plugins>
@@ -98,7 +119,7 @@
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-javadoc-plugin</artifactId>
         <configuration>
-          <additionalparam>-Xdoclint:none</additionalparam>
+          <additionalparam>${javadoc.options}</additionalparam>
         </configuration>        
         <version>2.9.1</version>
         <executions>
diff --git a/com.ibm.wala.util/mvncentral.xml b/com.ibm.wala.util/mvncentral.xml
index fb940b739..ac84a4bd4 100644
--- a/com.ibm.wala.util/mvncentral.xml
+++ b/com.ibm.wala.util/mvncentral.xml
@@ -42,6 +42,26 @@
     </snapshotRepository>
   </distributionManagement>
 
+  <profiles>
+    <profile>
+      <id>jdk17</id>
+      <activation>
+        <jdk>1.7</jdk>
+      </activation>
+      <properties>
+        <javadoc.options></javadoc.options>
+      </properties>
+    </profile>
+    <profile>
+      <id>jdk18</id>
+      <activation>
+        <jdk>1.8</jdk>
+      </activation>
+      <properties>
+        <javadoc.options>-Xdoclint:none</javadoc.options>
+      </properties>
+    </profile>
+  </profiles>
   
   <build>
     <sourceDirectory>${src.dir}</sourceDirectory>
@@ -85,7 +105,7 @@
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-javadoc-plugin</artifactId>
         <configuration>
-          <additionalparam>-Xdoclint:none</additionalparam>
+          <additionalparam>${javadoc.options}</additionalparam>
         </configuration>        
         <version>2.9.1</version>
         <executions>
@@ -114,5 +134,5 @@
     </plugin>
     
     </plugins>
-  </build>  
+  </build>
 </project>