diff options
| -rw-r--r-- | esr-parent/esrparent-lite/pom.xml | 120 | ||||
| -rw-r--r-- | esr-parent/esrparent/pom.xml | 118 | ||||
| -rw-r--r-- | esr-parent/pom.xml | 185 | ||||
| -rw-r--r-- | version.properties | 2 |
4 files changed, 178 insertions, 247 deletions
diff --git a/esr-parent/esrparent-lite/pom.xml b/esr-parent/esrparent-lite/pom.xml deleted file mode 100644 index 657abc2..0000000 --- a/esr-parent/esrparent-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.onap.oparent</groupId> - <artifactId>oparent</artifactId> - <version>1.0.0-SNAPSHOT</version> - </parent> - - <modelVersion>4.0.0</modelVersion> - <groupId>org.onap.aai.esr-server</groupId> - <artifactId>esrparent-lite</artifactId> - <version>1.0.0-SNAPSHOT</version> - <name>esr-server/esr-parent/esrparent-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/esr-parent/esrparent/pom.xml b/esr-parent/esrparent/pom.xml deleted file mode 100644 index c60b0d0..0000000 --- a/esr-parent/esrparent/pom.xml +++ /dev/null @@ -1,118 +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.onap.aai.esr-server</groupId> - <artifactId>esrparent-lite</artifactId> - <version>1.0.0-SNAPSHOT</version> - <relativePath>../esrparent-lite</relativePath> - </parent> - - <modelVersion>4.0.0</modelVersion> - <artifactId>esrparent</artifactId> - <name>esr-server/esr-parent/esrparent</name> - <packaging>pom</packaging> - - <properties> - <dropwizard.version>0.8.0</dropwizard.version> - <swagger.version>1.5.3</swagger.version> - <jersey.version>2.16</jersey.version> - <jaxrs.consumer.version>5.0</jaxrs.consumer.version> - <gson.version>2.2.4</gson.version> - <junit.version>4.10</junit.version> - <org.powermock.version>1.4.10</org.powermock.version> - <org.apache.ant.version>1.8.2</org.apache.ant.version> - </properties> - - <dependencyManagement> - <dependencies> - <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.swagger</groupId> - <artifactId>swagger-jersey2-jaxrs</artifactId> - <version>${swagger.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> - <!-- gson --> - <dependency> - <groupId>com.google.code.gson</groupId> - <artifactId>gson</artifactId> - <version>${gson.version}</version> - </dependency> - <!-- UT --> - <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.apache.ant</groupId> - <artifactId>ant</artifactId> - <version>${org.apache.ant.version}</version> - </dependency> - <!-- UT end --> - </dependencies> - </dependencyManagement> -</project> diff --git a/esr-parent/pom.xml b/esr-parent/pom.xml index a1a2f91..40edc02 100644 --- a/esr-parent/pom.xml +++ b/esr-parent/pom.xml @@ -18,20 +18,189 @@ --> <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.onap.aai.esr-server</groupId> - <artifactId>esrparent-lite</artifactId> + <groupId>org.onap.oparent</groupId> + <artifactId>oparent</artifactId> <version>1.0.0-SNAPSHOT</version> - <relativePath>esrparent-lite</relativePath> </parent> - + <modelVersion>4.0.0</modelVersion> <groupId>org.onap.aai.esr-server</groupId> <artifactId>esrparent-aggregator</artifactId> <name>esr-server/esr-parent</name> <packaging>pom</packaging> - <modules> - <module>esrparent</module> - <module>esrparent-lite</module> - </modules> + <properties> + <dropwizard.version>0.8.0</dropwizard.version> + <swagger.version>1.5.3</swagger.version> + <jersey.version>2.16</jersey.version> + <jaxrs.consumer.version>5.0</jaxrs.consumer.version> + <gson.version>2.2.4</gson.version> + <junit.version>4.10</junit.version> + <org.powermock.version>1.4.10</org.powermock.version> + <org.apache.ant.version>1.8.2</org.apache.ant.version> + </properties> + + <dependencyManagement> + <dependencies> + <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.swagger</groupId> + <artifactId>swagger-jersey2-jaxrs</artifactId> + <version>${swagger.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> + <!-- gson --> + <dependency> + <groupId>com.google.code.gson</groupId> + <artifactId>gson</artifactId> + <version>${gson.version}</version> + </dependency> + <!-- UT --> + <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.apache.ant</groupId> + <artifactId>ant</artifactId> + <version>${org.apache.ant.version}</version> + </dependency> + <!-- UT end --> + </dependencies> + </dependencyManagement> + + <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/version.properties b/version.properties index e2595ba..cdcd1e9 100644 --- a/version.properties +++ b/version.properties @@ -3,7 +3,7 @@ # because they are used in Jenkins, whose plug-in doesn't support
major=1
-minor=1
+minor=0
patch=0
base_version=${major}.${minor}.${patch}
|