fix jenkins msb-apigateway-master-stage-site-java

Change-Id: Id1551b1de44b4f9cdbd90bb6cc7b1a6debe7fc5c
Signed-off-by: HuabingZhao <zhao.huabing@zte.com.cn>

diff --git a/.gitignore b/.gitignore
index c6355b1..45e67f4 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,7 @@
 .project
 .classpath
 .settings/
+.vscode/
 target/
 .vagrant
 /archives/

diff --git a/pom.xml b/pom.xml
index fb83789..4fe6fcc 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -15,117 +15,72 @@
     limitations under the License.
  
 -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project 
+  xmlns="http://maven.apache.org/POM/4.0.0" 
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
-
   <parent>
     <groupId>org.onap.oparent</groupId>
     <artifactId>oparent</artifactId>
     <version>1.0.0-SNAPSHOT</version>
   </parent>
-    
   <groupId>org.onap.msb.apigateway</groupId>
   <artifactId>msb-apigateway-parent</artifactId>
   <version>1.0.0-SNAPSHOT</version>
   <packaging>pom</packaging>
-  <name>onap/msb/msb-apigateway-parent</name> 
-
+  <name>onap/msb/msb-apigateway-parent</name>
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
     <maven.surefire.version>2.18.1</maven.surefire.version>
-
     <openresty.version>1.11.2.2</openresty.version>
     <openresty-windows.version>1.11.9.1001</openresty-windows.version>
-
     <redis.version>3.2.6</redis.version>
     <redis-windows.version>3.2.100</redis-windows.version>
-
     <classifier.win32>windows_386</classifier.win32>
     <classifier.win64>windows_amd64</classifier.win64>
     <classifier.linux64>linux_amd64</classifier.linux64>
-
     <linux64outputdir>target/assembly/${classifier.linux64}/</linux64outputdir>
     <win32outputdir>target/assembly/${classifier.win32}/</win32outputdir>
     <win64outputdir>target/assembly/${classifier.win64}/</win64outputdir>
-
     <dockerFileDir>src/main/docker</dockerFileDir>
     <blueprintFileDir>src/main/blueprint</blueprintFileDir>
     <version.output>target/version</version.output>
-
+    <onap.nexus.host>nexus.onap.org</onap.nexus.host>
+    <onap.nexus.url>https://${onap.nexus.host}/content</onap.nexus.url>
+    <onap.nexus.snapshot-url>${onap.nexus.url}/repositories/snapshots/</onap.nexus.snapshot-url>
+    <onap.nexus.release-url>${onap.nexus.url}/repositories/releases/</onap.nexus.release-url>
+    <onap.nexus.javadocs-url>dav:${onap.nexus.url}/sites/site/org/onap/msb/apigateway/${project.version}</onap.nexus.javadocs-url>
   </properties>
-
+  <distributionManagement>
+    <site>
+      <id>onap-site</id>
+      <url>${onap.nexus.javadocs-url}</url>
+    </site>         
+  </distributionManagement>
   <modules>
     <module>apiroute</module>
     <module>openresty-ext</module>
     <module>redis-ext</module>
     <module>distributions</module>
   </modules>
-
-<!--   <distributionManagement>
-    <repository>
-      <id>releases</id>
-      <url>${nexus.repository.release}</url>
-    </repository>
-    <snapshotRepository>
-      <id>snapshots</id>
-      <url>${nexus.repository.snapshot}</url>
-    </snapshotRepository>
-  </distributionManagement> -->
-
-<!--   <profiles>  
-      <profile>  
-          <id>linux</id>  
-          <properties>  
-              <env.separator>:</env.separator>  
-          </properties>  
-          <activation>  
-              <activeByDefault>true</activeByDefault>  
-          </activation>
-      </profile>  
-      <profile>  
-          <id>windows</id>  
-          <properties>  
-              <env.separator>;</env.separator>   
-          </properties>   
-      </profile> 
-  </profiles>   -->
-
   <build>
-<!--     <extensions>
-        <extension>
-            <groupId>org.apache.maven.wagon</groupId>
-            <artifactId>wagon-ssh</artifactId>
-            <version>2.10</version>
-        </extension>
-        <extension>
-            <groupId>org.apache.maven.wagon</groupId>
-            <artifactId>wagon-ftp</artifactId>
-            <version>2.10</version>
-        </extension>
-        <extension>
-            <groupId>org.apache.maven.wagon</groupId>
-            <artifactId>wagon-webdav-jackrabbit</artifactId>
-            <version>2.10</version>
-        </extension>
-    </extensions> -->
     <resources>
-        <resource>
-            <filtering>false</filtering>
-            <directory>src/main/resources</directory>
-            <includes>
-                <include>**/*</include>
-            </includes>
-        </resource>
-        <resource>
-            <filtering>true</filtering>
-            <directory>src/main/filters</directory>
-            <includes>
-                <include>**/*</include>
-            </includes>
-        </resource>
+      <resource>
+        <filtering>false</filtering>
+        <directory>src/main/resources</directory>
+        <includes>
+          <include>**/*</include>
+        </includes>
+      </resource>
+      <resource>
+        <filtering>true</filtering>
+        <directory>src/main/filters</directory>
+        <includes>
+          <include>**/*</include>
+        </includes>
+      </resource>
     </resources>
-
     <pluginManagement>
       <plugins>
         <!-- Official maven plugins, alpha-sorted by artifactId.
@@ -134,7 +89,6 @@
           <artifactId>maven-antrun-plugin</artifactId>
           <version>1.8</version>
         </plugin>
-        
         <plugin>
           <artifactId>maven-clean-plugin</artifactId>
           <version>2.6.1</version>
@@ -147,31 +101,20 @@
           <artifactId>maven-deploy-plugin</artifactId>
           <version>2.8.2</version>
         </plugin>
-
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-dependency-plugin</artifactId>
-          <version>2.10</version>          
+          <version>2.10</version>
         </plugin>
-
-
-<!--         <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-plugin-plugin</artifactId>
-          <version>${maven.plugin.version}</version>
-        </plugin> -->
-
         <plugin>
           <artifactId>maven-resources-plugin</artifactId>
           <version>2.7</version>
         </plugin>
-
         <plugin>
           <groupId>org.codehaus.mojo</groupId>
           <artifactId>build-helper-maven-plugin</artifactId>
           <version>1.9.1</version>
         </plugin>
-        
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-surefire-plugin</artifactId>
@@ -182,13 +125,40 @@
             <argLine>-Xmx1024m -XX:MaxPermSize=256m</argLine>
           </configuration>
         </plugin>
-       
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-site-plugin</artifactId>
+          <version>3.6</version>
+          <configuration>
+            <reportPlugins>
+              <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-project-info-reports-plugin</artifactId>
+                <version>2.4</version>
+                <configuration>
+                  <dependencyDetailsEnabled>false</dependencyDetailsEnabled>
+                  <dependencyLocationsEnabled>false</dependencyLocationsEnabled>
+                </configuration>
+                <reports>
+                  <report>dependencies</report>
+                </reports>
+              </plugin>
+              <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-javadoc-plugin</artifactId>
+                <version>2.8</version>
+              </plugin>
+            </reportPlugins>
+          </configuration>
+          <dependencies>
+            <dependency>
+              <groupId>org.apache.maven.wagon</groupId>
+              <artifactId>wagon-webdav-jackrabbit</artifactId>
+              <version>2.10</version>
+            </dependency>
+          </dependencies>
+        </plugin>
       </plugins>
     </pluginManagement>
-  </build> 
- 
-
-
-</project>
-
-
+  </build>
+</project>
\ No newline at end of file