From 169a896f8fc4db5a0054d31bb5bfd254f2352bb0 Mon Sep 17 00:00:00 2001
From: fujinhua <fu.jinhua@zte.com.cn>
Date: Fri, 18 Aug 2017 15:00:17 +0800
Subject: Remove abandoned codes of catalog

Change-Id: Id258c64b6fbf0e25da8c033991e4a3ba21ad806e
Issue-Id: VFC-107
Signed-off-by: fujinhua <fu.jinhua@zte.com.cn>
---
 catalog-parent/catalogparent-lite/pom.xml | 120 ---------------
 catalog-parent/catalogparent/pom.xml      | 233 ------------------------------
 catalog-parent/pom.xml                    |  37 -----
 3 files changed, 390 deletions(-)
 delete mode 100644 catalog-parent/catalogparent-lite/pom.xml
 delete mode 100644 catalog-parent/catalogparent/pom.xml
 delete mode 100644 catalog-parent/pom.xml

(limited to 'catalog-parent')

diff --git a/catalog-parent/catalogparent-lite/pom.xml b/catalog-parent/catalogparent-lite/pom.xml
deleted file mode 100644
index 36238a3e..00000000
--- a/catalog-parent/catalogparent-lite/pom.xml
+++ /dev/null
@@ -1,120 +0,0 @@
-<?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.oparent</groupId>
-        <artifactId>oparent</artifactId>
-        <version>1.1.0-SNAPSHOT</version>
-        <relativePath>../../../oparent</relativePath>
-    </parent>
-
-    <modelVersion>4.0.0</modelVersion>
-    <groupId>org.openo.common-tosca.catalog</groupId>
-    <artifactId>catalogparent-lite</artifactId>
-    <name>common-tosca-catalog/catalog-parent/catalogparent-lite</name>
-    <packaging>pom</packaging>
-
-    <build>
-        <pluginManagement>
-            <plugins>
-                <plugin>
-                    <groupId>org.eclipse.m2e</groupId>
-                    <artifactId>lifecycle-mapping</artifactId>
-                    <version>1.0.0</version>
-                </plugin>
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-compiler-plugin</artifactId>
-                    <version>3.3</version>
-                    <configuration>
-                        <verbose>true</verbose>
-                        <fork>true</fork>
-                        <compilerVersion>1.7</compilerVersion>
-                        <source>1.7</source>
-                        <target>1.7</target>
-                        <encoding>UTF-8</encoding>
-                        <debug>true</debug>
-                    </configuration>
-                </plugin>
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-jar-plugin</artifactId>
-                    <version>2.6</version>
-                    <configuration>
-                        <archive>
-                            <addMavenDescriptor>false</addMavenDescriptor>
-                        </archive>
-                        <forceCreation>true</forceCreation>
-                    </configuration>
-                </plugin>
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-shade-plugin</artifactId>
-                    <version>2.4</version>
-                </plugin>
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-dependency-plugin</artifactId>
-                    <version>2.10</version>          
-                </plugin>
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-resources-plugin</artifactId>
-                    <version>2.7</version>
-                    <configuration>
-                        <encoding>UTF-8</encoding>
-                        <nonFilteredFileExtensions>
-                            <nonFilteredFileExtension>pdf</nonFilteredFileExtension>
-                            <nonFilteredFileExtension>swf</nonFilteredFileExtension>
-                            <nonFilteredFileExtension>exe</nonFilteredFileExtension>
-                            <nonFilteredFileExtension>png</nonFilteredFileExtension>
-                            <nonFilteredFileExtension>gif</nonFilteredFileExtension>
-                            <nonFilteredFileExtension>jpg</nonFilteredFileExtension>
-                            <nonFilteredFileExtension>jpeg</nonFilteredFileExtension>
-                            <nonFilteredFileExtension>bmp</nonFilteredFileExtension>
-                            <nonFilteredFileExtension>eot</nonFilteredFileExtension>
-                            <nonFilteredFileExtension>ttf</nonFilteredFileExtension>
-                            <nonFilteredFileExtension>svg</nonFilteredFileExtension>
-                            <nonFilteredFileExtension>woff</nonFilteredFileExtension>
-                            <nonFilteredFileExtension>woff2</nonFilteredFileExtension>
-                            <nonFilteredFileExtension>mso</nonFilteredFileExtension>
-                            <nonFilteredFileExtension>wmz</nonFilteredFileExtension>
-                            <nonFilteredFileExtension>emz</nonFilteredFileExtension>
-                            <nonFilteredFileExtension>otf</nonFilteredFileExtension>
-                        </nonFilteredFileExtensions>
-                    </configuration>
-                </plugin>
-                <plugin>
-                    <groupId>org.codehaus.mojo</groupId>
-                    <artifactId>build-helper-maven-plugin</artifactId>
-                    <version>1.10</version>
-                </plugin>
-                <plugin>
-                    <groupId>com.mycila</groupId>
-                    <artifactId>license-maven-plugin</artifactId>
-                    <version>3.0.rc1</version>
-                </plugin>
-                <plugin>
-                    <artifactId>maven-antrun-plugin</artifactId>
-                    <version>1.8</version>
-                </plugin>
-            </plugins>
-        </pluginManagement>
-    </build>
-</project>
diff --git a/catalog-parent/catalogparent/pom.xml b/catalog-parent/catalogparent/pom.xml
deleted file mode 100644
index c87c6559..00000000
--- a/catalog-parent/catalogparent/pom.xml
+++ /dev/null
@@ -1,233 +0,0 @@
-<?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-lite</artifactId>
-        <version>1.1.0-SNAPSHOT</version>
-        <relativePath>../catalogparent-lite</relativePath>
-    </parent>
-
-    <modelVersion>4.0.0</modelVersion>
-    <artifactId>catalogparent</artifactId>
-    <name>common-tosca-catalog/catalog-parent/catalogparent</name>
-    <packaging>pom</packaging>
-
-    <properties>
-        <dropwizard.version>0.8.0</dropwizard.version>
-        <swagger.version>1.5.3</swagger.version>
-        <lombok.version>1.16.4</lombok.version>
-        <jersey.version>2.16</jersey.version>
-        <jaxrs.consumer.version>5.0</jaxrs.consumer.version>
-        <jackson-version>2.5.1</jackson-version>
-        <gson.version>2.2.4</gson.version>
-        <yamlbeans.version>1.08</yamlbeans.version>
-        <dom4j.version>1.6</dom4j.version>
-        <cometd.version>3.0.7</cometd.version>
-        <commons-net.version>3.3</commons-net.version>
-        <mysql-connector-java.version>5.1.18</mysql-connector-java.version>
-        <commons-fileupload.version>1.2.1</commons-fileupload.version>
-        <commons-io.version>1.4</commons-io.version>
-        <junit.version>4.10</junit.version>
-        <org.powermock.version>1.4.10</org.powermock.version>
-        <org.mockito.version>1.9.5</org.mockito.version>
-        <h2database.version>1.4.182</h2database.version>
-        <org.apache.ant.version>1.8.2</org.apache.ant.version>
-        <tomcat.version>8.5.6</tomcat.version>
-    </properties>
-
-    <dependencyManagement>
-        <dependencies>
-            <!-- dropwizard -->
-            <dependency>
-                <groupId>io.dropwizard</groupId>
-                <artifactId>dropwizard-core</artifactId>
-                <version>${dropwizard.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>io.dropwizard</groupId>
-                <artifactId>dropwizard-assets</artifactId>
-                <version>${dropwizard.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>io.dropwizard</groupId>
-                <artifactId>dropwizard-hibernate</artifactId>
-                <version>${dropwizard.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>io.dropwizard</groupId>
-                <artifactId>dropwizard-migrations</artifactId>
-                <version>${dropwizard.version}</version>
-            </dependency>
-            <!-- swagger -->
-            <dependency>
-                <groupId>io.swagger</groupId>
-                <artifactId>swagger-jersey2-jaxrs</artifactId>
-                <version>${swagger.version}</version>
-            </dependency>
-            <!-- lombok -->
-            <dependency>
-                <groupId>org.projectlombok</groupId>
-                <artifactId>lombok</artifactId>
-                <version>${lombok.version}</version>
-            </dependency>
-            <!-- jersey -->
-            <dependency>
-                <groupId>org.glassfish.jersey.core</groupId>
-                <artifactId>jersey-server</artifactId>
-                <version>${jersey.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.glassfish.jersey.media</groupId>
-                <artifactId>jersey-media-multipart</artifactId>
-                <version>${jersey.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.glassfish.jersey.containers</groupId>
-                <artifactId>jersey-container-servlet-core</artifactId>
-                <version>${jersey.version}</version>
-            </dependency>
-            <!-- consumer -->
-            <dependency>
-                <groupId>com.eclipsesource.jaxrs</groupId>
-                <artifactId>consumer</artifactId>
-                <version>${jaxrs.consumer.version}</version>
-            </dependency>
-            <!-- jackson -->
-            <dependency>
-                <groupId>com.fasterxml.jackson.dataformat</groupId>
-                <artifactId>jackson-dataformat-xml</artifactId>
-                <version>${jackson-version}</version>
-            </dependency>
-            <dependency>
-                <groupId>com.fasterxml.jackson.core</groupId>
-                <artifactId>jackson-annotations</artifactId>
-                <version>${jackson-version}</version>
-            </dependency>
-            <!-- gson -->
-            <dependency>
-                <groupId>com.google.code.gson</groupId>
-                <artifactId>gson</artifactId>
-                <version>${gson.version}</version>
-            </dependency>
-            <!-- dom4j -->
-            <dependency>
-                <groupId>dom4j</groupId>
-                <artifactId>dom4j</artifactId>
-                <version>${dom4j.version}</version>
-            </dependency>
-            <!-- cometd -->
-            <dependency>
-                <groupId>org.cometd.java</groupId>
-                <artifactId>bayeux-api</artifactId>
-                <version>${cometd.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.cometd.java</groupId>
-                <artifactId>cometd-java-annotations</artifactId>
-                <version>${cometd.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.cometd.java</groupId>
-                <artifactId>cometd-java-client</artifactId>
-                <version>${cometd.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.cometd.java</groupId>
-                <artifactId>cometd-java-common</artifactId>
-                <version>${cometd.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.cometd.java</groupId>
-                <artifactId>cometd-java-oort</artifactId>
-                <version>${cometd.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.cometd.java</groupId>
-                <artifactId>cometd-java-server</artifactId>
-                <version>${cometd.version}</version>
-            </dependency>
-            <!-- ftp -->
-            <dependency>
-                <groupId>commons-net</groupId>
-                <artifactId>commons-net</artifactId>
-                <version>${commons-net.version}</version>
-            </dependency>
-            <!-- mysql -->
-            <dependency>
-                <groupId>mysql</groupId>
-                <artifactId>mysql-connector-java</artifactId>
-                <version>${mysql-connector-java.version}</version>
-            </dependency>
-            <!-- http server -->
-            <dependency>
-                <groupId>commons-fileupload</groupId>
-                <artifactId>commons-fileupload</artifactId>
-                <version>${commons-fileupload.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>commons-io</groupId>
-                <artifactId>commons-io</artifactId>
-                <version>${commons-io.version}</version>
-            </dependency>
-            <!-- UT -->
-            <dependency>
-                <groupId>io.dropwizard</groupId>
-                <artifactId>dropwizard-testing</artifactId>
-                <version>${dropwizard.version}</version>
-            </dependency>
-            <dependency>  
-                <groupId>junit</groupId>  
-                <artifactId>junit</artifactId>  
-                <version>${junit.version}</version>
-            </dependency> 
-            <dependency> 
-                <groupId>org.powermock</groupId> 
-                <artifactId>powermock-module-junit4</artifactId> 
-                <version>${org.powermock.version}</version>
-            </dependency> 
-            <dependency> 
-                <groupId>org.powermock</groupId> 
-                <artifactId>powermock-api-mockito</artifactId> 
-                <version>${org.powermock.version}</version>
-            </dependency> 
-            <dependency>
-                <groupId>org.mockito</groupId>
-                <artifactId>mockito-all</artifactId>
-                <version>${org.mockito.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>com.h2database</groupId>
-                <artifactId>h2</artifactId>
-                <version>${h2database.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.ant</groupId>
-                <artifactId>ant</artifactId>
-                <version>${org.apache.ant.version}</version>
-            </dependency>
-            <!-- UT end -->
-            <dependency>
-                <groupId>org.apache.tomcat</groupId>
-                <artifactId>tomcat</artifactId>
-                <version>${tomcat.version}</version>
-            </dependency>
-        </dependencies>
-    </dependencyManagement>
-</project>
diff --git a/catalog-parent/pom.xml b/catalog-parent/pom.xml
deleted file mode 100644
index 05146a63..00000000
--- a/catalog-parent/pom.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<?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-lite</artifactId>
-        <version>1.1.0-SNAPSHOT</version>
-        <relativePath>catalogparent-lite</relativePath>
-    </parent>
-
-    <modelVersion>4.0.0</modelVersion>
-    <groupId>org.openo.common-tosca.catalog</groupId>
-    <artifactId>catalogparent-aggregator</artifactId>
-    <name>common-tosca-catalog/catalog-parent</name>
-    <packaging>pom</packaging>
-
-    <modules>
-        <module>catalogparent</module>
-        <module>catalogparent-lite</module>
-    </modules>
-</project>
-- 
cgit 1.2.3-korg