This is an automated email from the ASF dual-hosted git repository. gaul pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/jclouds.git
commit 6b00731950856e2864cf2158ba26ff4289fa3afd Author: gurkerl83 <[email protected]> AuthorDate: Mon Dec 14 11:17:46 2020 +0100 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 --- pom.xml | 25 ------------------------- project/pom.xml | 35 ++++++++--------------------------- 2 files changed, 8 insertions(+), 52 deletions(-) diff --git a/pom.xml b/pom.xml index 994a07a..5f423cd 100644 --- a/pom.xml +++ b/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> diff --git a/project/pom.xml b/project/pom.xml index 1c8de38..2ec2c94 100644 --- a/project/pom.xml +++ b/project/pom.xml @@ -862,20 +862,6 @@ <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> <configuration> @@ -1032,15 +1018,6 @@ </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> <plugins> @@ -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>
