Fix usecase-ui code merge failure

Change-Id: Iee81af3982a9720c60f9bf191f8b84ced341a636
Issue-ID: USECASEUI-269
Signed-off-by: guochuyicmri <guochuyi@chinamobile.com>

diff --git a/distribution/pom.xml b/distribution/pom.xml
index 1e0b371..cdbb19b 100644 (file)
--- a/distribution/pom.xml
+++ b/distribution/pom.xml
@@ -15,13 +15,14 @@
     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/maven-v4_0_0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
     <parent>
         <groupId>org.onap.usecase-ui</groupId>
         <artifactId>usecase-ui</artifactId>
         <version>2.0.0</version>
     </parent>
 
-    <modelVersion>4.0.0</modelVersion>
     <artifactId>distribution</artifactId>
     <packaging>pom</packaging>
     <name>usecase-ui/distribution</name>

diff --git a/pom.xml b/pom.xml
index 430d160..ac40ddf 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -15,6 +15,7 @@
     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">
+    <modelVersion>4.0.0</modelVersion>
 
     <parent>
         <groupId>org.onap.oparent</groupId>
@@ -22,13 +23,90 @@
         <version>2.0.0</version>
     </parent>
 
-    <modelVersion>4.0.0</modelVersion>
     <groupId>org.onap.usecase-ui</groupId>
     <artifactId>usecase-ui</artifactId>
     <version>2.0.0</version>
     <packaging>pom</packaging>
     <name>usecase-ui</name>
 
+    <properties>
+        <sonar.projectVersion>${project.version}</sonar.projectVersion>
+        <maven.build.timestamp.format>yyyyMMdd'T'HHmm</maven.build.timestamp.format>
+        <nexusproxy>https://nexus.onap.org</nexusproxy>
+        <releaseNexusPath>content/repositories/releases/</releaseNexusPath>
+        <snapshotNexusPath>content/repositories/snapshots/</snapshotNexusPath>
+        <publicNexusPath>content/repositories/public/</publicNexusPath>
+        <siteNexusPath>content/sites/site/${project.groupId}/${project.artifactId}/${project.version}/</siteNexusPath>
+        <tomcat.version>9.0.19</tomcat.version>
+    </properties>
+
+    <distributionManagement>
+        <repository>
+            <id>onap-releases</id>
+            <url>${nexusproxy}/${releaseNexusPath}</url>
+        </repository>
+        <snapshotRepository>
+            <id>onap-snapshots</id>
+            <url>${nexusproxy}/${snapshotNexusPath}</url>
+        </snapshotRepository>
+        <site>
+            <id>onap-site</id>
+            <url>dav:${nexusproxy}${siteNexusPath}</url>
+        </site>
+    </distributionManagement>
+
+    <!-- Specify the repositories here to avoid coordination of ~/.m2/settings.xml 
+        files among developers. Use values (not properties) so oparent can be resolved. -->
+    <repositories>
+        <repository>
+            <id>onap-public</id>
+            <url>${nexusproxy}/${publicNexusPath}</url>
+            <snapshots>
+                <enabled>false</enabled>
+            </snapshots>
+        </repository>
+        <repository>
+            <id>onap-releases</id>
+            <url>${nexusproxy}/${releaseNexusPath}</url>
+            <snapshots>
+                <enabled>false</enabled>
+            </snapshots>
+        </repository>
+        <repository>
+            <id>onap-snapshots</id>
+            <url>${nexusproxy}/${snapshotNexusPath}</url>
+            <releases>
+                <enabled>false</enabled>
+            </releases>
+        </repository>
+    </repositories>
+
+    <!-- Specify the repositories here to avoid coordination of ~/.m2/settings.xml 
+        files among all developers. -->
+    <pluginRepositories>
+        <pluginRepository>
+            <id>onap-plugin-public</id>
+            <url>${nexusproxy}/${publicNexusPath}</url>
+            <snapshots>
+                <enabled>false</enabled>
+            </snapshots>
+        </pluginRepository>
+        <pluginRepository>
+            <id>onap-plugin-release</id>
+            <url>${nexusproxy}/${releaseNexusPath}</url>
+            <snapshots>
+                <enabled>false</enabled>
+            </snapshots>
+        </pluginRepository>
+        <pluginRepository>
+            <id>onap-plugin-snapshots</id>
+            <url>${nexusproxy}/${snapshotNexusPath}</url>
+            <releases>
+                <enabled>false</enabled>
+            </releases>
+        </pluginRepository>
+    </pluginRepositories>
+
     <modules>
         <!--
         <module>usecaseui-common</module>
@@ -39,34 +117,49 @@
         <module>distribution</module>
     </modules>
 
-    <properties>
-      <tomcat.version>9.0.16</tomcat.version>
-    </properties>
-
     <dependencyManagement>
-      <dependencies>
-        <dependency>
-          <groupId>org.apache.tomcat</groupId>
-          <artifactId>tomcat</artifactId>
-          <version>${tomcat.version}</version>
-          <type>zip</type>
-        </dependency>
-      </dependencies>
+        <dependencies>
+            <dependency>
+            <groupId>org.apache.tomcat</groupId>
+            <artifactId>tomcat</artifactId>
+            <version>${tomcat.version}</version>
+            <type>zip</type>
+            </dependency>
+        </dependencies>
     </dependencyManagement>
 
     <build>
-      <pluginManagement>
+        <pluginManagement>
+            <plugins>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-dependency-plugin</artifactId>
+                    <version>2.10</version>
+                </plugin>
+                <plugin>
+                    <artifactId>maven-antrun-plugin</artifactId>
+                    <version>1.8</version>
+                </plugin>
+            </plugins>
+        </pluginManagement>
         <plugins>
-          <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-dependency-plugin</artifactId>
-            <version>2.10</version>
-          </plugin>
-          <plugin>
-            <artifactId>maven-antrun-plugin</artifactId>
-            <version>1.8</version>
-          </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <version>3.3</version>
+                <configuration>
+                    <source>1.8</source>
+                    <target>1.8</target>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-deploy-plugin</artifactId>
+                <!-- version managed by oparent <version>2.8</version> -->
+                <configuration>
+                    <skip>true</skip>
+                </configuration>
+            </plugin>
         </plugins>
-      </pluginManagement>
     </build>
 </project>

diff --git a/usecaseui-portal/pom.xml b/usecaseui-portal/pom.xml
index 7f28062..58e9986 100644 (file)
--- a/usecaseui-portal/pom.xml
+++ b/usecaseui-portal/pom.xml
@@ -17,13 +17,13 @@
 <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.usecase-ui</groupId>
     <artifactId>usecase-ui</artifactId>
     <version>2.0.0</version>
   </parent>
 
-  <modelVersion>4.0.0</modelVersion>
   <artifactId>usecaseui-portal</artifactId>
   <packaging>pom</packaging>
   <name>usecase-ui</name>