Skip to content
Permalink
Browse files
Restructure build profiles
The project requires at least JDK version 8. The specification to disable the liniting process in the JavaDoc process as of JDK version 8 is thus doubly specified and fulfilled by default; an explicit specification is no longer required. Version 3 of the JavaDoc plugin removes the "additional param" configuration attribute. The "doclint=false" configuration attribute disables the lint operation of the plugin.

Summary:
- Remove the profile "disable-doclint"
- Bump version of JavaDoc plugin to the latest > 3
- Remove the JavaDoc plugin's declaration from the build plugins used for default builds (building without a profile)
- Bump version of source plugin to latest > 3

- Remove unnecessary profile "doc" from the jclouds pom artifact
  • Loading branch information
markus-gritsch authored and gaul committed Feb 19, 2021
1 parent dec017c commit 6b00731950856e2864cf2158ba26ff4289fa3afd
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 52 deletions.
25 pom.xml
@@ -46,29 +46,4 @@
<module>allloadbalancer</module>
<module>all</module>
</modules>

<profiles>
<profile>
<id>doc</id>
<build>
<plugins>
<plugin>
<artifactId>maven-javadoc-plugin</artifactId>
<configuration>
<additionalparam>${javadoc.opts}</additionalparam>
</configuration>
<executions>
<execution>
<id>javadoc</id>
<phase>package</phase>
<goals>
<goal>aggregate-jar</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>
</profile>
</profiles>
</project>
@@ -861,20 +861,6 @@
<artifactId>emma-maven-plugin</artifactId>
<version>1.2</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<version>2.9</version>
<configuration>
<maxmemory>512m</maxmemory>
<encoding>${project.build.sourceEncoding}</encoding>
<quiet>true</quiet>
<additionalparam>${javadoc.opts}</additionalparam>
<links>
<link>https://download.oracle.com/javase/6/docs/api/</link>
</links>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.rat</groupId>
<artifactId>apache-rat-plugin</artifactId>
@@ -1031,15 +1017,6 @@
</pluginManagement>
</build>
<profiles>
<profile>
<id>disable-doclint</id>
<activation>
<jdk>[1.8,)</jdk>
</activation>
<properties>
<javadoc.opts>-Xdoclint:none</javadoc.opts>
</properties>
</profile>
<profile>
<id>live</id>
<build>
@@ -1179,10 +1156,14 @@
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<version>2.9</version>
<version>3.2.0</version>
<configuration>
<additionalparam>${javadoc.opts}</additionalparam>
<encoding>${project.build.sourceEncoding}</encoding>
<doclint>none</doclint>
<maxmemory>512m</maxmemory>
<quiet>true</quiet>
</configuration>
<executions>
<execution>
@@ -1201,10 +1182,10 @@
<id>src</id>
<build>
<plugins>
<!-- make sure we generate src jars too -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
<version>2.2</version>
<version>3.2.0</version>
<executions>
<execution>
<id>attach-sources</id>

0 comments on commit 6b00731

Please sign in to comment.