diff options
| author |   James Forsyth <jf2512@att.com> | 2017-08-21 16:24:52 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2017-08-21 16:24:52 +0000 |
| commit | f79d0971dd24b3b4febe2f946a911b837a83624b (patch) | |
| tree | a80702dd69975fb8a61b4e8d62970cfe209edcf7 | |
| parent | 553b604905f2985e3989d837c01dceace991638d (diff) | |
| parent | bd500038b456700b9f0c69e06a02298d9590d16b (diff) | |
Merge "Fix the javadocs error in jenkins"
| -rw-r--r-- | aai-annotations/pom.xml | 33 | ||||
| -rw-r--r-- | aai-core/pom.xml | 32 | ||||
| -rw-r--r-- | aai-core/src/main/java/org/openecomp/aai/util/HttpsAuthClient.java | 5 | ||||
| -rw-r--r-- | pom.xml | 23 |
4 files changed, 12 insertions, 81 deletions
diff --git a/aai-annotations/pom.xml b/aai-annotations/pom.xml index b8351a8f..ccfae3d4 100644 --- a/aai-annotations/pom.xml +++ b/aai-annotations/pom.xml @@ -30,41 +30,8 @@ <build> <pluginManagement> <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-site-plugin</artifactId> - <version>3.6</version> - <dependencies> - <dependency> - <groupId>org.apache.maven.wagon</groupId> - <artifactId>wagon-webdav-jackrabbit</artifactId> - <version>2.10</version> - </dependency> - </dependencies> - </plugin> <!-- Checkstyle plugin - used to report on compliance with --> <!-- the Google style guide. --> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-site-plugin</artifactId> - <version>3.3</version> - <configuration> - <reportPlugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-checkstyle-plugin</artifactId> - <version>2.17</version> - <reportSets> - <reportSet> - <reports> - <report>checkstyle</report> - </reports> - </reportSet> - </reportSets> - </plugin> - </reportPlugins> - </configuration> - </plugin> <plugin> <groupId>org.codehaus.mojo</groupId> diff --git a/aai-core/pom.xml b/aai-core/pom.xml index efbb12d2..01156bf0 100644 --- a/aai-core/pom.xml +++ b/aai-core/pom.xml @@ -500,18 +500,6 @@ </executions> </plugin> <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-site-plugin</artifactId> - <version>3.6</version> - <dependencies> - <dependency> - <groupId>org.apache.maven.wagon</groupId> - <artifactId>wagon-webdav-jackrabbit</artifactId> - <version>2.10</version> - </dependency> - </dependencies> - </plugin> - <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>license-maven-plugin</artifactId> <version>1.12</version> @@ -650,24 +638,4 @@ <url>${nexusproxy}/content/repositories/snapshots/</url> </repository> </repositories> - <reporting> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-javadoc-plugin</artifactId> - <version>2.10.4</version> - <configuration> - <failOnError>false</failOnError> - <doclet>org.umlgraph.doclet.UmlGraphDoc</doclet> - <docletArtifact> - <groupId>org.umlgraph</groupId> - <artifactId>umlgraph</artifactId> - <version>5.6</version> - </docletArtifact> - <additionalparam>-views</additionalparam> - <useStandardDocletOptions>true</useStandardDocletOptions> - </configuration> - </plugin> - </plugins> - </reporting> </project> diff --git a/aai-core/src/main/java/org/openecomp/aai/util/HttpsAuthClient.java b/aai-core/src/main/java/org/openecomp/aai/util/HttpsAuthClient.java index 85225041..664620e2 100644 --- a/aai-core/src/main/java/org/openecomp/aai/util/HttpsAuthClient.java +++ b/aai-core/src/main/java/org/openecomp/aai/util/HttpsAuthClient.java @@ -30,7 +30,6 @@ import javax.net.ssl.KeyManagerFactory; import javax.net.ssl.SSLContext; import javax.net.ssl.SSLSession; -import org.openecomp.aai.domain.yang.Customers; import com.sun.jersey.api.client.Client; import com.sun.jersey.api.client.ClientResponse; import com.sun.jersey.api.client.config.ClientConfig; @@ -62,10 +61,6 @@ public class HttpsAuthClient{ // System.out.println("Jersey result: "); // System.out.println(res.getEntity(String.class).toString()); - Customers customers = res.getEntity(Customers.class); - System.out.println("Jersey result: "); - System.out.println("Number of customers: " + customers.getCustomer().size()); - } catch (KeyManagementException e) { e.printStackTrace(); } catch (Exception e) { @@ -103,16 +103,16 @@ </pluginManagement> <plugins> <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-site-plugin</artifactId> - <version>3.6</version> - <dependencies> - <dependency> - <groupId>org.apache.maven.wagon</groupId> - <artifactId>wagon-webdav-jackrabbit</artifactId> - <version>2.10</version> - </dependency> - </dependencies> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-site-plugin</artifactId> + <version>3.6</version> + <dependencies> + <dependency> + <groupId>org.apache.maven.wagon</groupId> + <artifactId>wagon-webdav-jackrabbit</artifactId> + <version>2.10</version> + </dependency> + </dependencies> </plugin> </plugins> </build> @@ -147,7 +147,8 @@ <artifactId>umlgraph</artifactId> <version>5.6</version> </docletArtifact> - <additionalparam>-views</additionalparam> + <additionalparam>-views -Xdoclint:none </additionalparam> + <excludePackageNames>org.openecomp.aai.domain.yang.*:org.openecomp.aai.util.*</excludePackageNames> <useStandardDocletOptions>true</useStandardDocletOptions> </configuration> </plugin> |