diff options
author | Lvbo163 <lv.bo163@zte.com.cn> | 2018-10-25 15:37:23 +0800 |
---|---|---|
committer | Lvbo163 <lv.bo163@zte.com.cn> | 2018-10-25 16:18:30 +0800 |
commit | 5e13c9268f18a4ee9b3c3a57b058c700d7c78e5a (patch) | |
tree | b29c1d3b659bc9673eb2338f8e53a5ccd41475ef /esr-mgr | |
parent | 712de659de9112449f7ba6e5298bde6aba69b425 (diff) |
Update aai-esr-server repo version3.0.0-ONAP1.2.1
Issue-ID: AAI-1767
Change-Id: I5b06941e6cb70c1113ccb4b831b7c6db3af36433
Signed-off-by: Lvbo163 <lv.bo163@zte.com.cn>
Diffstat (limited to 'esr-mgr')
-rw-r--r-- | esr-mgr/dependency-reduced-pom.xml | 437 | ||||
-rw-r--r-- | esr-mgr/pom.xml | 3 |
2 files changed, 219 insertions, 221 deletions
diff --git a/esr-mgr/dependency-reduced-pom.xml b/esr-mgr/dependency-reduced-pom.xml index baf06ac..67c922b 100644 --- a/esr-mgr/dependency-reduced-pom.xml +++ b/esr-mgr/dependency-reduced-pom.xml @@ -1,219 +1,218 @@ -<?xml version="1.0" encoding="UTF-8"?> -<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"> - <parent> - <artifactId>aai-esr-server</artifactId> - <groupId>org.onap.aai.esr-server</groupId> - <version>1.1.0-SNAPSHOT</version> - </parent> - <modelVersion>4.0.0</modelVersion> - <artifactId>esr-mgr</artifactId> - <name>esr-server/esr-mgr</name> - <version>1.1.0-SNAPSHOT</version> - <build> - <plugins> - <plugin> - <groupId>org.eclipse.m2e</groupId> - <artifactId>lifecycle-mapping</artifactId> - <configuration> - <lifecycleMappingMetadata> - <pluginExecutions> - <pluginExecution> - <pluginExecutionFilter> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-dependency-plugin</artifactId> - <versionRange>[2.0,)</versionRange> - <goals> - <goal>copy-dependencies</goal> - </goals> - </pluginExecutionFilter> - <action> - <ignore /> - </action> - </pluginExecution> - </pluginExecutions> - </lifecycleMappingMetadata> - </configuration> - </plugin> - <plugin> - <artifactId>maven-jar-plugin</artifactId> - <configuration> - <archive> - <manifest> - <addDefaultImplementationEntries>true</addDefaultImplementationEntries> - </manifest> - </archive> - </configuration> - </plugin> - <plugin> - <artifactId>maven-shade-plugin</artifactId> - <executions> - <execution> - <phase>package</phase> - <goals> - <goal>shade</goal> - </goals> - <configuration> - <transformers> - <transformer /> - <transformer> - <mainClass>org.onap.aai.esr.extsysApp</mainClass> - </transformer> - </transformers> - </configuration> - </execution> - </executions> - <configuration> - <createDependencyReducedPom>true</createDependencyReducedPom> - <filters> - <filter> - <artifact>*:*</artifact> - <excludes> - <exclude>META-INF/*.SF</exclude> - <exclude>META-INF/*.DSA</exclude> - <exclude>META-INF/*.RSA</exclude> - </excludes> - </filter> - </filters> - </configuration> - </plugin> - <plugin> - <artifactId>maven-dependency-plugin</artifactId> - <executions> - <execution> - <id>copy-dependencies</id> - <phase>package</phase> - <goals> - <goal>copy-dependencies</goal> - </goals> - <configuration> - <artifactItems> - <artifactItem> - <groupId>io.dropwizard</groupId> - <artifactId>dropwizard-core</artifactId> - <version>${dropwizard.version}</version> - <overWrite>true</overWrite> - </artifactItem> - </artifactItems> - </configuration> - </execution> - </executions> - </plugin> - </plugins> - </build> - <profiles> - <profile> - <id>swagger</id> - <build> - <plugins> - <plugin> - <groupId>com.github.kongchen</groupId> - <artifactId>swagger-maven-plugin</artifactId> - <version>3.1.1</version> - <executions> - <execution> - <phase>compile</phase> - <goals> - <goal>generate</goal> - </goals> - </execution> - </executions> - <dependencies> - <dependency> - <groupId>io.swagger</groupId> - <artifactId>swagger-hibernate-validations</artifactId> - <version>1.5.6</version> - </dependency> - </dependencies> - <configuration> - <apiSources> - <apiSource> - <springmvc>false</springmvc> - <locations>org.onap.aai.esr.resource</locations> - <basePath>/api/aai-esr-server/v1/</basePath> - <info> - <title>API Descriptions for External System Management</title> - <version>v1</version> - <description>This page shows all the APIs available in the ESR server module.</description> - <termsOfService>http://www.github.com/kongchen/swagger-maven-plugin</termsOfService> - <contact> - <email>li.zi30@zte.com.cn</email> - <name>Zi Li</name> - </contact> - <license> - <url>http://www.apache.org/licenses/LICENSE-2.0.html</url> - <name>Apache 2.0</name> - </license> - </info> - <securityDefinitions /> - <swaggerDirectory>${basedir}/src/main/resources</swaggerDirectory> - </apiSource> - </apiSources> - </configuration> - </plugin> - </plugins> - </build> - <dependencies> - <dependency> - <groupId>io.swagger</groupId> - <artifactId>swagger-jersey2-jaxrs</artifactId> - <version>1.5.0</version> - </dependency> - </dependencies> - </profile> - </profiles> - <dependencies> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <version>4.10</version> - <scope>test</scope> - <exclusions> - <exclusion> - <artifactId>hamcrest-core</artifactId> - <groupId>org.hamcrest</groupId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>org.powermock</groupId> - <artifactId>powermock-module-junit4</artifactId> - <version>1.4.10</version> - <scope>test</scope> - <exclusions> - <exclusion> - <artifactId>powermock-module-junit4-common</artifactId> - <groupId>org.powermock</groupId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>org.powermock</groupId> - <artifactId>powermock-api-mockito</artifactId> - <version>1.4.10</version> - <scope>test</scope> - <exclusions> - <exclusion> - <artifactId>mockito-all</artifactId> - <groupId>org.mockito</groupId> - </exclusion> - <exclusion> - <artifactId>powermock-api-support</artifactId> - <groupId>org.powermock</groupId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>org.apache.ant</groupId> - <artifactId>ant</artifactId> - <version>1.8.2</version> - <scope>test</scope> - <exclusions> - <exclusion> - <artifactId>ant-launcher</artifactId> - <groupId>org.apache.ant</groupId> - </exclusion> - </exclusions> - </dependency> - </dependencies> -</project> - +<?xml version="1.0" encoding="UTF-8"?>
+<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">
+ <parent>
+ <artifactId>aai-esr-server</artifactId>
+ <groupId>org.onap.aai.esr-server</groupId>
+ <version>1.2.1-SNAPSHOT</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>esr-mgr</artifactId>
+ <name>esr-server/esr-mgr</name>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.eclipse.m2e</groupId>
+ <artifactId>lifecycle-mapping</artifactId>
+ <configuration>
+ <lifecycleMappingMetadata>
+ <pluginExecutions>
+ <pluginExecution>
+ <pluginExecutionFilter>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <versionRange>[2.0,)</versionRange>
+ <goals>
+ <goal>copy-dependencies</goal>
+ </goals>
+ </pluginExecutionFilter>
+ <action>
+ <ignore />
+ </action>
+ </pluginExecution>
+ </pluginExecutions>
+ </lifecycleMappingMetadata>
+ </configuration>
+ </plugin>
+ <plugin>
+ <artifactId>maven-jar-plugin</artifactId>
+ <configuration>
+ <archive>
+ <manifest>
+ <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
+ </manifest>
+ </archive>
+ </configuration>
+ </plugin>
+ <plugin>
+ <artifactId>maven-shade-plugin</artifactId>
+ <executions>
+ <execution>
+ <phase>package</phase>
+ <goals>
+ <goal>shade</goal>
+ </goals>
+ <configuration>
+ <transformers>
+ <transformer />
+ <transformer>
+ <mainClass>org.onap.aai.esr.extsysApp</mainClass>
+ </transformer>
+ </transformers>
+ </configuration>
+ </execution>
+ </executions>
+ <configuration>
+ <createDependencyReducedPom>true</createDependencyReducedPom>
+ <filters>
+ <filter>
+ <artifact>*:*</artifact>
+ <excludes>
+ <exclude>META-INF/*.SF</exclude>
+ <exclude>META-INF/*.DSA</exclude>
+ <exclude>META-INF/*.RSA</exclude>
+ </excludes>
+ </filter>
+ </filters>
+ </configuration>
+ </plugin>
+ <plugin>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>copy-dependencies</id>
+ <phase>package</phase>
+ <goals>
+ <goal>copy-dependencies</goal>
+ </goals>
+ <configuration>
+ <artifactItems>
+ <artifactItem>
+ <groupId>io.dropwizard</groupId>
+ <artifactId>dropwizard-core</artifactId>
+ <version>${dropwizard.version}</version>
+ <overWrite>true</overWrite>
+ </artifactItem>
+ </artifactItems>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ <profiles>
+ <profile>
+ <id>swagger</id>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>com.github.kongchen</groupId>
+ <artifactId>swagger-maven-plugin</artifactId>
+ <version>3.1.1</version>
+ <executions>
+ <execution>
+ <phase>compile</phase>
+ <goals>
+ <goal>generate</goal>
+ </goals>
+ </execution>
+ </executions>
+ <dependencies>
+ <dependency>
+ <groupId>io.swagger</groupId>
+ <artifactId>swagger-hibernate-validations</artifactId>
+ <version>1.5.6</version>
+ </dependency>
+ </dependencies>
+ <configuration>
+ <apiSources>
+ <apiSource>
+ <springmvc>false</springmvc>
+ <locations>org.onap.aai.esr.resource</locations>
+ <basePath>/api/aai-esr-server/v1/</basePath>
+ <info>
+ <title>API Descriptions for External System Management</title>
+ <version>v1</version>
+ <description>This page shows all the APIs available in the ESR server module.</description>
+ <termsOfService>http://www.github.com/kongchen/swagger-maven-plugin</termsOfService>
+ <contact>
+ <email>li.zi30@zte.com.cn</email>
+ <name>Zi Li</name>
+ </contact>
+ <license>
+ <url>http://www.apache.org/licenses/LICENSE-2.0.html</url>
+ <name>Apache 2.0</name>
+ </license>
+ </info>
+ <securityDefinitions />
+ <swaggerDirectory>${basedir}/src/main/resources</swaggerDirectory>
+ </apiSource>
+ </apiSources>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ <dependencies>
+ <dependency>
+ <groupId>io.swagger</groupId>
+ <artifactId>swagger-jersey2-jaxrs</artifactId>
+ <version>1.5.0</version>
+ </dependency>
+ </dependencies>
+ </profile>
+ </profiles>
+ <dependencies>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>4.10</version>
+ <scope>test</scope>
+ <exclusions>
+ <exclusion>
+ <artifactId>hamcrest-core</artifactId>
+ <groupId>org.hamcrest</groupId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.powermock</groupId>
+ <artifactId>powermock-module-junit4</artifactId>
+ <version>1.4.10</version>
+ <scope>test</scope>
+ <exclusions>
+ <exclusion>
+ <artifactId>powermock-module-junit4-common</artifactId>
+ <groupId>org.powermock</groupId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.powermock</groupId>
+ <artifactId>powermock-api-mockito</artifactId>
+ <version>1.4.10</version>
+ <scope>test</scope>
+ <exclusions>
+ <exclusion>
+ <artifactId>mockito-all</artifactId>
+ <groupId>org.mockito</groupId>
+ </exclusion>
+ <exclusion>
+ <artifactId>powermock-api-support</artifactId>
+ <groupId>org.powermock</groupId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.ant</groupId>
+ <artifactId>ant</artifactId>
+ <version>1.8.2</version>
+ <scope>test</scope>
+ <exclusions>
+ <exclusion>
+ <artifactId>ant-launcher</artifactId>
+ <groupId>org.apache.ant</groupId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ </dependencies>
+</project>
+
diff --git a/esr-mgr/pom.xml b/esr-mgr/pom.xml index 6439e91..3c331ad 100644 --- a/esr-mgr/pom.xml +++ b/esr-mgr/pom.xml @@ -21,13 +21,12 @@ <parent> <groupId>org.onap.aai.esr-server</groupId> <artifactId>aai-esr-server</artifactId> - <version>1.2.0-SNAPSHOT</version> + <version>1.2.1-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>esr-mgr</artifactId> <name>esr-server/esr-mgr</name> - <version>1.2.0-SNAPSHOT</version> <packaging>jar</packaging> <build> |