Author: btellier
Date: Mon Aug 24 16:26:27 2015
New Revision: 1697452

URL: http://svn.apache.org/r1697452
Log:
MPT-21 Don't use Xdoclint when Java version lesser than 8 - contributed by 
Antoine Duprat

Modified:
    james/mpt/trunk/app/dependency-reduced-pom.xml
    james/mpt/trunk/app/pom.xml
    james/mpt/trunk/core/pom.xml
    james/mpt/trunk/mavenplugin/pom.xml

Modified: james/mpt/trunk/app/dependency-reduced-pom.xml
URL: 
http://svn.apache.org/viewvc/james/mpt/trunk/app/dependency-reduced-pom.xml?rev=1697452&r1=1697451&r2=1697452&view=diff
==============================================================================
--- james/mpt/trunk/app/dependency-reduced-pom.xml (original)
+++ james/mpt/trunk/app/dependency-reduced-pom.xml Mon Aug 24 16:26:27 2015
@@ -70,12 +70,24 @@ interfaces to the MPT library.</descript
             </goals>
           </execution>
         </executions>
-        <configuration>
-          <additionalparam>-Xdoclint:none</additionalparam>
-        </configuration>
       </plugin>
     </plugins>
   </build>
+  <profiles>
+    <profile>
+      <id>doclint-java8-disable</id>
+      <build>
+        <plugins>
+          <plugin>
+            <artifactId>maven-javadoc-plugin</artifactId>
+            <configuration>
+              <additionalparam>-Xdoclint:none</additionalparam>
+            </configuration>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
+  </profiles>
   <dependencies>
     <dependency>
       <groupId>org.apache.james</groupId>

Modified: james/mpt/trunk/app/pom.xml
URL: 
http://svn.apache.org/viewvc/james/mpt/trunk/app/pom.xml?rev=1697452&r1=1697451&r2=1697452&view=diff
==============================================================================
--- james/mpt/trunk/app/pom.xml (original)
+++ james/mpt/trunk/app/pom.xml Mon Aug 24 16:26:27 2015
@@ -133,10 +133,27 @@ interfaces to the MPT library.</descript
                         </goals>
                     </execution>
                 </executions>
-                <configuration>
-                    <additionalparam>-Xdoclint:none</additionalparam>
-                </configuration>
             </plugin>
         </plugins>
     </build>
+
+    <profiles>
+        <profile>
+            <id>doclint-java8-disable</id>
+            <activation>
+                <jdk>[1.8,)</jdk>
+            </activation>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-javadoc-plugin</artifactId>
+                        <configuration>
+                            <additionalparam>-Xdoclint:none</additionalparam>
+                        </configuration>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+    </profiles>
 </project>

Modified: james/mpt/trunk/core/pom.xml
URL: 
http://svn.apache.org/viewvc/james/mpt/trunk/core/pom.xml?rev=1697452&r1=1697451&r2=1697452&view=diff
==============================================================================
--- james/mpt/trunk/core/pom.xml (original)
+++ james/mpt/trunk/core/pom.xml Mon Aug 24 16:26:27 2015
@@ -154,10 +154,27 @@
                         </goals>
                     </execution>
                 </executions>
-                <configuration>
-                    <additionalparam>-Xdoclint:none</additionalparam>
-                </configuration>
             </plugin>
         </plugins>
     </build>
+
+    <profiles>
+       <profile>
+            <id>doclint-java8-disable</id>
+            <activation>
+                <jdk>[1.8,)</jdk>
+            </activation>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-javadoc-plugin</artifactId>
+                        <configuration>
+                            <additionalparam>-Xdoclint:none</additionalparam>
+                        </configuration>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+    </profiles>
 </project>

Modified: james/mpt/trunk/mavenplugin/pom.xml
URL: 
http://svn.apache.org/viewvc/james/mpt/trunk/mavenplugin/pom.xml?rev=1697452&r1=1697451&r2=1697452&view=diff
==============================================================================
--- james/mpt/trunk/mavenplugin/pom.xml (original)
+++ james/mpt/trunk/mavenplugin/pom.xml Mon Aug 24 16:26:27 2015
@@ -133,9 +133,6 @@ to the library requiring no extra coding
                         </goals>
                     </execution>
                 </executions>
-                <configuration>
-                    <additionalparam>-Xdoclint:none</additionalparam>
-                </configuration>
             </plugin>
             <!--
                 <plugin>
@@ -203,5 +200,22 @@ to the library requiring no extra coding
                 </pluginManagement>
             </build>
         </profile>
+        <profile>
+            <id>doclint-java8-disable</id>
+            <activation>
+                <jdk>[1.8,)</jdk>
+            </activation>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-javadoc-plugin</artifactId>
+                        <configuration>
+                            <additionalparam>-Xdoclint:none</additionalparam>
+                        </configuration>
+                    </plugin>
+                </plugins>
+            </build>
+         </profile>
     </profiles>
 </project>



---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org
For additional commands, e-mail: server-dev-h...@james.apache.org

Reply via email to