Commit 3727de73 authored by lichenchong's avatar lichenchong
Browse files

1. modify pom.xml javadoc tag to work with java8. 

2. add a @retrun tag in Boundary test to clean a javadoc warning.
parent a94b50b8

kinetic-client/pom.xml

+30 −32
Original line number Diff line number Diff line
@@ -67,16 +67,6 @@ 
					</execution>

				</executions>

			</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>
@@ -94,7 +84,6 @@ 
							<outputDirectory>${basedir}/doc/kinetic-client-javadoc</outputDirectory>

							<jarOutputDirectory>${basedir}/doc</jarOutputDirectory>

							<sourcepath>${basedir}/src/main/java</sourcepath>

									<additionalparam>-Xdoclint:none</additionalparam>

							<subpackages>kinetic.client:kinetic.admin</subpackages>

						</configuration>

						<id>client-javadocs</id>
@@ -107,6 +96,15 @@ 
			</plugin>

		</plugins>

	</build>

	<profiles>

		<profile>

			<id>doclint-java8-disable</id>

			<activation>

				<jdk>[1.8,</jdk>

			</activation>

			<properties>

				<additionalparam>-Xdoclint:none</additionalparam>

			</properties>

		</profile>

	</profiles>

	<dependencies>

kinetic-simulator/pom.xml

+30 −32
Original line number Diff line number Diff line
@@ -78,16 +78,6 @@ 
					</execution>

				</executions>

			</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>
@@ -105,7 +95,6 @@ 
							<outputDirectory>${basedir}/doc/kinetic-simulator-javadoc</outputDirectory>

							<jarOutputDirectory>${basedir}/doc</jarOutputDirectory>

							<sourcepath>${basedir}/src/main/java</sourcepath>

									<additionalparam>-Xdoclint:none</additionalparam>

							<subpackages>kinetic.simulator</subpackages>

						</configuration>

						<id>simulator-javadocs</id>
@@ -118,6 +107,15 @@ 
			</plugin>

		</plugins>

	</build>

	<profiles>

		<profile>

			<id>doclint-java8-disable</id>

			<activation>

				<jdk>[1.8,</jdk>

			</activation>

			<properties>

				<additionalparam>-Xdoclint:none</additionalparam>

			</properties>

		</profile>

	</profiles>

	<dependencies>

kinetic-test/pom.xml

+31 −33
Original line number Diff line number Diff line
@@ -95,16 +95,6 @@ 
					</execution>

				</executions>

			</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>
@@ -123,7 +113,6 @@ 
							<jarOutputDirectory>${basedir}/doc</jarOutputDirectory>

							<finalName>Kinetic-test-${project.version}</finalName>

							<sourcepath>${basedir}/src/test/java</sourcepath>

									<additionalparam>-Xdoclint:none</additionalparam>

							<subpackages>com.seagate.kinetic.adminAPI:com.seagate.kinetic.advancedAPI:com.seagate.kinetic.allTests:com.seagate.kinetic.asyncAPI:com.seagate.kinetic.basicAPI:com.seagate.kinetic.boundary:com.seagate.kinetic.concurrent:com.seagate.kinetic.performance:com.seagate.kinetic.monitor:com.seagate.kinetic.duriablity:com.seagate.kinetic.stress</subpackages>

						</configuration>

						<id>test-javadocs</id>
@@ -136,6 +125,15 @@ 
			</plugin>

		</plugins>

	</build>

	<profiles>

		<profile>

			<id>doclint-java8-disable</id>

			<activation>

				<jdk>[1.8,</jdk>

			</activation>

			<properties>

				<additionalparam>-Xdoclint:none</additionalparam>

			</properties>

		</profile>

	</profiles>

	<dependencies>

kinetic-test/src/test/java/com/seagate/kinetic/boundary/KineticBoundaryTest.java

+1 −1
Original line number Diff line number Diff line
@@ -2281,7 +2281,7 @@ public class KineticBoundaryTest extends IntegrationTestCase { 
     *            A map of List of entries (to put) to the List of roles to set

     *            for the client on those entries

     *

     * @return

     * @return DefaultKineticClient

     * @throws KineticException

     */

    private DefaultKineticClient createClientWithSpecifiedRolesForEntries(