Repair POM files for stage-site jobs

1. Add "dav" protocol provider for site plugin
2. Revise epsdk-app-os to inherit from parent
These changes should repair the failing "site" jobs that publish Javadoc

Issue: PORTAL-89
Change-Id: I04195e621efa3bb4fd20b49eacdf4f491e5bad3a
Signed-off-by: Christopher Lott (cl778h) <clott@research.att.com>

diff --git a/ecomp-sdk/epsdk-app-os/pom.xml b/ecomp-sdk/epsdk-app-os/pom.xml
index 2102719..94530cd 100644 (file)
--- a/ecomp-sdk/epsdk-app-os/pom.xml
+++ b/ecomp-sdk/epsdk-app-os/pom.xml
@@ -4,88 +4,37 @@
 
        <!-- This is the Maven project object model (POM) file for the open-source SDK web app.
                 This is NOT the Portal - but it is developed and supported by the Portal team. -->
-       <groupId>org.onap.portal.sdk</groupId>
-       <artifactId>epsdk-app-os</artifactId>
-       <version>1.3.1</version>
-       <packaging>war</packaging>
-       <name>ECOMP SDK Webapp for OpenSource</name>
-       <description>ECOMP SDK Web Application for public release</description>
+        <parent>
+                <groupId>org.onap.portal.sdk</groupId>
+                <artifactId>epsdk-project</artifactId>
+                <version>1.3.1</version>
+        </parent>
 
-       <properties>
-               <encoding>UTF-8</encoding>
-               <epsdk.version>1.3.1</epsdk.version>
-               <springframework.version>4.2.0.RELEASE</springframework.version>
-               <hibernate.version>4.3.11.Final</hibernate.version>
-               <!-- Skip assembling the zip; assemble via mvn -Dskipassembly=false .. -->
-               <skipassembly>true</skipassembly>
-               <!-- Tests usually require some setup that maven cannot do, so skip. -->
-               <skiptests>true</skiptests>
-               <nexusproxy>https://nexus.onap.org</nexusproxy>
-               <snapshotNexusPath>content/repositories/snapshots/</snapshotNexusPath>
-               <stagingNexusPath>content/repositories/staging/</stagingNexusPath>
-               <releaseNexusPath>content/repositories/releases/</releaseNexusPath>
-       </properties>
+        <!-- GroupId is inherited from parent -->
+        <artifactId>epsdk-app-os</artifactId>
+        <!-- Version is inherited from parent -->
+        <packaging>war</packaging>
+        <name>ECOMP Portal SDK Webapp for OpenSource</name>
+        <description>ECOMP Portal SDK Web Application for public release</description>
 
-       <repositories>
-               <repository>
-                       <id>ecomp-releases</id>
-                       <name>OpenECOMP - Release Repository</name>
-                       <url>${nexusproxy}/${releaseNexusPath}</url>
-               </repository>
-               <repository>
-                       <id>staging</id>
-                       <name>ONAP - Staging Repository</name>
-                       <url>${nexusproxy}/${stagingNexusPath}</url>
-               </repository>
-               <repository>
-                       <id>ecomp-snapshots</id>
-                       <name>OpenECOMP - Snapshot Repository</name>
-                       <url>${nexusproxy}/${snapshotNexusPath}</url>
-               </repository>
-               <repository>
-                       <id>ecomp-public</id>
-                       <name>ecomp onap public Repository</name>
-                       <url>https://nexus.onap.org/content/groups/public</url>
-               </repository>
-       </repositories>
+        <properties>
+                <!-- This determines the EPSDK library versions, helpful for testing -->
+                <epsdk.version>${project.version}</epsdk.version>
+                <!-- Skip assembling the zip; assemble via mvn -Dskipassembly=false .. -->
+                <skipassembly>true</skipassembly>
+                <!-- Tests usually require some setup that maven cannot do, so skip. -->
+                <skiptests>true</skiptests>
+        </properties>
 
-       <profiles>
-               <!-- disable doclint, a new feature in Java 8, when generating javadoc -->
-               <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>
-                                               <version>2.10.4</version>
-                                               <configuration>
-                                                       <additionalparam>-Xdoclint:none</additionalparam>
-                                               </configuration>
-                                       </plugin>
-                               </plugins>
-                       </build>
-               </profile>
-       </profiles>
+        <!-- repositories are inherited from parent -->
+
+        <!-- profiles are inherited from parent -->
 
        <build>
                <!-- The war file name carries no version number -->
                <finalName>${project.artifactId}</finalName>
 
                <plugins>
-                       <!-- Compile to Java 1.8 class output format -->
-                       <plugin>
-                               <groupId>org.apache.maven.plugins</groupId>
-                               <artifactId>maven-compiler-plugin</artifactId>
-                               <version>3.1</version>
-                               <configuration>
-                                       <source>1.8</source>
-                                       <target>1.8</target>
-                               </configuration>
-                       </plugin>
 
                        <plugin>
                                <groupId>org.apache.maven.plugins</groupId>

diff --git a/ecomp-sdk/pom.xml b/ecomp-sdk/pom.xml
index a22b28b..b7801e9 100644 (file)
--- a/ecomp-sdk/pom.xml
+++ b/ecomp-sdk/pom.xml
@@ -171,7 +171,7 @@
                <!-- Javadocs -->
                <site>
                        <id>ecomp-site</id>
-                       <url>dav:${nexusproxy}/content/sites/site/${project.groupId}/${project.artifactId}/${project.version}</url>
+                       <url>dav:${nexusproxy}${sitePath}</url>
                </site>
        </distributionManagement>