Merge "Fix the bug "Repeat upload package has logic error"."

[vfc/nfvo/catalog.git] / pom.xml

diff --git a/pom.xml b/pom.xml
index bc86b28..a079246 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -1,38 +1,45 @@
-<!--\r
-\r
-        Copyright (C) 2016 ZTE, Inc. and others. All rights reserved. (ZTE)\r
-\r
-        Licensed under the Apache License, Version 2.0 (the "License");\r
-        you may not use this file except in compliance with the License.\r
-        You may obtain a copy of the License at\r
-\r
-                http://www.apache.org/licenses/LICENSE-2.0\r
-\r
-        Unless required by applicable law or agreed to in writing, software\r
-        distributed under the License is distributed on an "AS IS" BASIS,\r
-        WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\r
-        See the License for the specific language governing permissions and\r
-        limitations under the License.\r
-\r
--->\r
-<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">\r
-    <parent>\r
-        <groupId>org.openo.orchestrator</groupId>\r
-        <artifactId>openoparentpom</artifactId>\r
-        <version>0.0.1-SNAPSHOT</version>\r
-    </parent>  \r
-\r
-    <modelVersion>4.0.0</modelVersion>\r
-    <groupId>org.openo.orchestrator.nfv.catalog</groupId>\r
-    <artifactId>catalog-parent</artifactId>\r
-    <name>openo/catalog</name>\r
-    <packaging>pom</packaging>\r
-    <build/>\r
-       \r
-    <modules>\r
-        <module>catalog</module>\r
-        <module>catalog-standalone</module>\r
-               <module>httpserver-standalone</module>\r
-               <module>catalog-all</module>\r
-    </modules>\r
-</project>\r
+<?xml version="1.0"?>
+<!--
+
+    Copyright 2016 ZTE Corporation.
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    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">
+    <parent>
+        <groupId>org.openo.common-tosca.catalog</groupId>
+        <artifactId>catalogparent</artifactId>
+        <version>1.1.0-SNAPSHOT</version>
+        <relativePath>catalog-parent/catalogparent</relativePath>
+    </parent>  
+
+    <modelVersion>4.0.0</modelVersion>
+    <artifactId>catalog-root</artifactId>
+    <name>openo/commontosca/catalog/catalog-root</name>
+    <packaging>pom</packaging>
+
+    <modules>
+        <module>catalog-parent</module>
+        <module>catalog-core</module>
+    </modules>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>com.mycila</groupId>
+                <artifactId>license-maven-plugin</artifactId>
+            </plugin>
+        </plugins>
+    </build>
+</project>