Issue-ID: MSB-334
Change-Id: I7518924a0481c2dc6c6846bfac06454888f3a342
Signed-off-by: Huabing Zhao <zhaohuabing@gmail.com>
<parent>
<groupId>org.onap.msb.apigateway.apiroute</groupId>
<artifactId>apiroute-parent</artifactId>
<parent>
<groupId>org.onap.msb.apigateway.apiroute</groupId>
<artifactId>apiroute-parent</artifactId>
- <version>1.2.4-SNAPSHOT</version>
+ <version>1.2.5-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.onap.msb.apigateway.apiroute</groupId>
<artifactId>apiroute-service</artifactId>
<name>onap/msb/apigateway/apiroute/apiroute-service</name>
<packaging>jar</packaging>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.onap.msb.apigateway.apiroute</groupId>
<artifactId>apiroute-service</artifactId>
<name>onap/msb/apigateway/apiroute/apiroute-service</name>
<packaging>jar</packaging>
- <version>1.2.4-SNAPSHOT</version>
+ <version>1.2.5-SNAPSHOT</version>
<?xml version="1.0" encoding="UTF-8"?>
<!--
Copyright (C) 2016 ZTE, Inc. and others. All rights reserved. (ZTE)
<?xml version="1.0" encoding="UTF-8"?>
<!--
Copyright (C) 2016 ZTE, Inc. and others. All rights reserved. (ZTE)
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
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
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.
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/maven-v4_0_0.xsd">
<parent>
<groupId>org.onap.msb.apigateway.apiroute</groupId>
<artifactId>apiroute-parent</artifactId>
-->
<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>
<groupId>org.onap.msb.apigateway.apiroute</groupId>
<artifactId>apiroute-parent</artifactId>
- <version>1.2.4-SNAPSHOT</version>
+ <version>1.2.5-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.onap.msb.apigateway.apiroute</groupId>
<artifactId>apiroute-standalone</artifactId>
<name>onap/msb/apigateway/apiroute/apiroute-standalone</name>
<packaging>pom</packaging>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.onap.msb.apigateway.apiroute</groupId>
<artifactId>apiroute-standalone</artifactId>
<name>onap/msb/apigateway/apiroute/apiroute-standalone</name>
<packaging>pom</packaging>
- <version>1.2.4-SNAPSHOT</version>
+ <version>1.2.5-SNAPSHOT</version>
<properties>
<packageid>apiroute</packageid>
<properties>
<packageid>apiroute</packageid>
<version>${project.version}</version>
<optional>true</optional>
</dependency>
<version>${project.version}</version>
<optional>true</optional>
</dependency>
<plugin>
<artifactId>maven-resources-plugin</artifactId>
<executions>
<execution>
<plugin>
<artifactId>maven-resources-plugin</artifactId>
<executions>
<execution>
- <id>copy-resources</id>
+ <id>copy-resources</id>
<phase>process-resources</phase>
<goals>
<goal>copy-resources</goal>
<phase>process-resources</phase>
<goals>
<goal>copy-resources</goal>
<configuration>
<outputDirectory>${outputdir}</outputDirectory>
<includeEmptyDirs>true</includeEmptyDirs>
<configuration>
<outputDirectory>${outputdir}</outputDirectory>
<includeEmptyDirs>true</includeEmptyDirs>
<resource>
<directory>src/assembly/resources/</directory>
<filtering>false</filtering>
<includes>
<include>**/*</include>
</includes>
<resource>
<directory>src/assembly/resources/</directory>
<filtering>false</filtering>
<includes>
<include>**/*</include>
</includes>
</resources>
<overwrite>true</overwrite>
</configuration>
</resources>
<overwrite>true</overwrite>
</configuration>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
<version>2.8</version>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
<version>2.8</version>
<execution>
<id>copy-jar</id>
<goals>
<execution>
<id>copy-jar</id>
<goals>
<overWrite>true</overWrite>
<outputDirectory>${outputdir}/apiroute/</outputDirectory>
<destFileName>apiroute-service.jar</destFileName>
<overWrite>true</overWrite>
<outputDirectory>${outputdir}/apiroute/</outputDirectory>
<destFileName>apiroute-service.jar</destFileName>
</artifactItems>
</configuration>
</execution>
</executions>
</plugin>
</artifactItems>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
<parent>
<groupId>org.onap.msb.apigateway</groupId>
<artifactId>msb-apigateway-parent</artifactId>
<parent>
<groupId>org.onap.msb.apigateway</groupId>
<artifactId>msb-apigateway-parent</artifactId>
- <version>1.2.4-SNAPSHOT</version>
+ <version>1.2.5-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.onap.msb.apigateway.apiroute</groupId>
<artifactId>apiroute-parent</artifactId>
<name>onap/msb/apigateway/apiroute</name>
<packaging>pom</packaging>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.onap.msb.apigateway.apiroute</groupId>
<artifactId>apiroute-parent</artifactId>
<name>onap/msb/apigateway/apiroute</name>
<packaging>pom</packaging>
- <version>1.2.4-SNAPSHOT</version>
+ <version>1.2.5-SNAPSHOT</version>
<modules>
<module>apiroute-service</module>
<modules>
<module>apiroute-service</module>
DOCKER_RUN_NAME=msb_apigateway
DOCKER_IMAGE_NAME=msb_apigateway
DOCKER_LATEST_VERSION=latest
DOCKER_RUN_NAME=msb_apigateway
DOCKER_IMAGE_NAME=msb_apigateway
DOCKER_LATEST_VERSION=latest
-DOCKER_RELEASE_VERSION=1.2.4
+DOCKER_RELEASE_VERSION=1.2.5
DOCKER_REPOSITORY=nexus3.onap.org:10003
TIMESTAMP=$(date +"%Y%m%dT%H%M%SZ")
DOCKER_REPOSITORY=nexus3.onap.org:10003
TIMESTAMP=$(date +"%Y%m%dT%H%M%SZ")
<parent>
<groupId>org.onap.msb.apigateway.distributions</groupId>
<artifactId>distributions-parent</artifactId>
<parent>
<groupId>org.onap.msb.apigateway.distributions</groupId>
<artifactId>distributions-parent</artifactId>
- <version>1.2.4-SNAPSHOT</version>
+ <version>1.2.5-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.onap.msb.apigateway.distributions</groupId>
<artifactId>msb-apigateway</artifactId>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.onap.msb.apigateway.distributions</groupId>
<artifactId>msb-apigateway</artifactId>
- <version>1.2.4-SNAPSHOT</version>
+ <version>1.2.5-SNAPSHOT</version>
<name>onap/msb/apigateway/distributions/msb-apigateway</name>
<packaging>pom</packaging>
<name>onap/msb/apigateway/distributions/msb-apigateway</name>
<packaging>pom</packaging>
<dependency>
<groupId>org.onap.msb.apigateway.apiroute</groupId>
<artifactId>apiroute-standalone</artifactId>
<dependency>
<groupId>org.onap.msb.apigateway.apiroute</groupId>
<artifactId>apiroute-standalone</artifactId>
<version>${project.version}</version>
<optional>true</optional>
</dependency>
<version>${project.version}</version>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.onap.msb.apigateway</groupId>
<artifactId>redis-ext</artifactId>
<dependency>
<groupId>org.onap.msb.apigateway</groupId>
<artifactId>redis-ext</artifactId>
<classifier>${classifier.linux64}</classifier>
<version>${project.version}</version>
<optional>true</optional>
<classifier>${classifier.linux64}</classifier>
<version>${project.version}</version>
<optional>true</optional>
<dependency>
<groupId>org.onap.msb.apigateway</groupId>
<artifactId>openresty-ext</artifactId>
<dependency>
<groupId>org.onap.msb.apigateway</groupId>
<artifactId>openresty-ext</artifactId>
<classifier>${classifier.linux64}</classifier>
<version>${project.version}</version>
<optional>true</optional>
<classifier>${classifier.linux64}</classifier>
<version>${project.version}</version>
<optional>true</optional>
<artifactItem>
<groupId>org.onap.msb.apigateway.apiroute</groupId>
<artifactId>apiroute-standalone</artifactId>
<artifactItem>
<groupId>org.onap.msb.apigateway.apiroute</groupId>
<artifactId>apiroute-standalone</artifactId>
- <type>zip</type>
- </artifactItem>
+ <type>zip</type>
+ </artifactItem>
<artifactItem>
<groupId>org.onap.msb.apigateway</groupId>
<artifactId>redis-ext</artifactId>
<artifactItem>
<groupId>org.onap.msb.apigateway</groupId>
<artifactId>redis-ext</artifactId>
- <type>tar.gz</type>
- <classifier>${classifier.linux64}</classifier>
- </artifactItem>
+ <type>tar.gz</type>
+ <classifier>${classifier.linux64}</classifier>
+ </artifactItem>
<artifactItem>
<groupId>org.onap.msb.apigateway</groupId>
<artifactId>openresty-ext</artifactId>
<artifactItem>
<groupId>org.onap.msb.apigateway</groupId>
<artifactId>openresty-ext</artifactId>
- <type>tar.gz</type>
- <classifier>${classifier.linux64}</classifier>
- </artifactItem>
+ <type>tar.gz</type>
+ <classifier>${classifier.linux64}</classifier>
+ </artifactItem>
</artifactItems>
<excludes>**/*.bat,**/*.cmd,**/*.exe</excludes>
<outputDirectory>${linux64outputdir}</outputDirectory>
</artifactItems>
<excludes>**/*.bat,**/*.cmd,**/*.exe</excludes>
<outputDirectory>${linux64outputdir}</outputDirectory>
<overWriteSnapshots>true</overWriteSnapshots>
<outputAbsoluteArtifactFilename>true</outputAbsoluteArtifactFilename>
</configuration>
<overWriteSnapshots>true</overWriteSnapshots>
<outputAbsoluteArtifactFilename>true</outputAbsoluteArtifactFilename>
</configuration>
<artifactId>maven-resources-plugin</artifactId>
<executions>
<execution>
<artifactId>maven-resources-plugin</artifactId>
<executions>
<execution>
- <id>copy-msb-resources-linux</id>
+ <id>copy-msb-resources-linux</id>
<phase>prepare-package</phase>
<goals>
<goal>copy-resources</goal>
<phase>prepare-package</phase>
<goals>
<goal>copy-resources</goal>
<configuration>
<outputDirectory>${linux64outputdir}</outputDirectory>
<includeEmptyDirs>true</includeEmptyDirs>
<configuration>
<outputDirectory>${linux64outputdir}</outputDirectory>
<includeEmptyDirs>true</includeEmptyDirs>
<resource>
<directory>src/assembly/resources/</directory>
<filtering>false</filtering>
<resource>
<directory>src/assembly/resources/</directory>
<filtering>false</filtering>
<excludes>
<exclude>**/*.bat</exclude>
</excludes>
<excludes>
<exclude>**/*.bat</exclude>
</excludes>
</resources>
<overwrite>true</overwrite>
</configuration>
</execution>
<execution>
</resources>
<overwrite>true</overwrite>
</configuration>
</execution>
<execution>
- <id>copy-resources-dockerfile</id>
+ <id>copy-resources-dockerfile</id>
<phase>process-resources</phase>
<goals>
<goal>copy-resources</goal>
</goals>
<phase>process-resources</phase>
<goals>
<goal>copy-resources</goal>
</goals>
<outputDirectory>${version.output}</outputDirectory>
<includeEmptyDirs>true</includeEmptyDirs>
<outputDirectory>${version.output}</outputDirectory>
<includeEmptyDirs>true</includeEmptyDirs>
<resource>
<directory>${dockerFileDir}</directory>
<filtering>false</filtering>
<includes>
<include>**/*</include>
</includes>
<resource>
<directory>${dockerFileDir}</directory>
<filtering>false</filtering>
<includes>
<include>**/*</include>
</includes>
</resources>
<overwrite>true</overwrite>
</configuration>
</resources>
<overwrite>true</overwrite>
</configuration>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
</configuration>
</execution>
</executions>
</configuration>
</execution>
</executions>
</plugins>
</build>
</profile>
</plugins>
</build>
</profile>
<parent>
<groupId>org.onap.msb.apigateway</groupId>
<artifactId>msb-apigateway-parent</artifactId>
<parent>
<groupId>org.onap.msb.apigateway</groupId>
<artifactId>msb-apigateway-parent</artifactId>
- <version>1.2.4-SNAPSHOT</version>
+ <version>1.2.5-SNAPSHOT</version>
</parent>
<groupId>org.onap.msb.apigateway.distributions</groupId>
<artifactId>distributions-parent</artifactId>
</parent>
<groupId>org.onap.msb.apigateway.distributions</groupId>
<artifactId>distributions-parent</artifactId>
- <version>1.2.4-SNAPSHOT</version>
+ <version>1.2.5-SNAPSHOT</version>
<name>onap/msb/apigateway/distributions</name>
<packaging>pom</packaging>
<modules>
<name>onap/msb/apigateway/distributions</name>
<packaging>pom</packaging>
<modules>
- <module>msb-apigateway</module>
+ <module>msb-apigateway</module>
<parent>
<groupId>org.onap.msb.apigateway</groupId>
<artifactId>msb-apigateway-parent</artifactId>
<parent>
<groupId>org.onap.msb.apigateway</groupId>
<artifactId>msb-apigateway-parent</artifactId>
- <version>1.2.4-SNAPSHOT</version>
+ <version>1.2.5-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.onap.msb.apigateway</groupId>
<artifactId>openresty-ext</artifactId>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.onap.msb.apigateway</groupId>
<artifactId>openresty-ext</artifactId>
- <version>1.2.4-SNAPSHOT</version>
+ <version>1.2.5-SNAPSHOT</version>
<name>onap/msb/apigateway/openresty-ext</name>
<packaging>pom</packaging>
<name>onap/msb/apigateway/openresty-ext</name>
<packaging>pom</packaging>
</parent>
<groupId>org.onap.msb.apigateway</groupId>
<artifactId>msb-apigateway-parent</artifactId>
</parent>
<groupId>org.onap.msb.apigateway</groupId>
<artifactId>msb-apigateway-parent</artifactId>
- <version>1.2.4-SNAPSHOT</version>
+ <version>1.2.5-SNAPSHOT</version>
<packaging>pom</packaging>
<name>msb-apigateway</name>
<properties>
<packaging>pom</packaging>
<name>msb-apigateway</name>
<properties>
<?xml version="1.0" encoding="UTF-8"?>
<!--
<?xml version="1.0" encoding="UTF-8"?>
<!--
Copyright (C) 2016 ZTE, Inc. and others. All rights reserved. (ZTE)
Copyright (C) 2016 ZTE, Inc. and others. All rights reserved. (ZTE)
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
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
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.
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.msb.apigateway</groupId>
<artifactId>msb-apigateway-parent</artifactId>
-->
<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.msb.apigateway</groupId>
<artifactId>msb-apigateway-parent</artifactId>
- <version>1.2.4-SNAPSHOT</version>
+ <version>1.2.5-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.onap.msb.apigateway</groupId>
<artifactId>redis-ext</artifactId>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.onap.msb.apigateway</groupId>
<artifactId>redis-ext</artifactId>
- <version>1.2.4-SNAPSHOT</version>
+ <version>1.2.5-SNAPSHOT</version>
<name>onap/msb/apigateway/redis-ext</name>
<packaging>pom</packaging>
<name>onap/msb/apigateway/redis-ext</name>
<packaging>pom</packaging>
</dependencies>
<build>
<plugins>
</dependencies>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
<execution>
<id>unpack-dependency-file</id>
<goals>
<execution>
<id>unpack-dependency-file</id>
<goals>
</goals>
<phase>generate-resources</phase>
<configuration>
</goals>
<phase>generate-resources</phase>
<configuration>
<artifactItem>
<groupId>org.redis.centos.7</groupId>
<artifactId>redis</artifactId>
<type>tar.gz</type>
<outputDirectory>${linux64outputdir}</outputDirectory>
<artifactItem>
<groupId>org.redis.centos.7</groupId>
<artifactId>redis</artifactId>
<type>tar.gz</type>
<outputDirectory>${linux64outputdir}</outputDirectory>
</artifactItems>
<excludes>**/redis-benchmark**,**/*.pdb,**/*.docx</excludes>
<overWriteReleases>false</overWriteReleases>
<overWriteSnapshots>true</overWriteSnapshots>
<outputAbsoluteArtifactFilename>true</outputAbsoluteArtifactFilename>
</configuration>
</artifactItems>
<excludes>**/redis-benchmark**,**/*.pdb,**/*.docx</excludes>
<overWriteReleases>false</overWriteReleases>
<overWriteSnapshots>true</overWriteSnapshots>
<outputAbsoluteArtifactFilename>true</outputAbsoluteArtifactFilename>
</configuration>
<plugin>
<groupId>com.coderplus.maven.plugins</groupId>
<plugin>
<groupId>com.coderplus.maven.plugins</groupId>
<sourceFile>${linux64outputdir}/redis-${redis.version}</sourceFile>
<destinationFile>${linux64outputdir}/redis</destinationFile>
</configuration>
<sourceFile>${linux64outputdir}/redis-${redis.version}</sourceFile>
<destinationFile>${linux64outputdir}/redis</destinationFile>
</configuration>
<plugin>
<artifactId>maven-resources-plugin</artifactId>
<configuration>
<plugin>
<artifactId>maven-resources-plugin</artifactId>
<configuration>
</configuration>
<executions>
<execution>
</configuration>
<executions>
<execution>
- <id>copy-resources</id>
+ <id>copy-resources</id>
<phase>process-resources</phase>
<goals>
<goal>copy-resources</goal>
</goals>
<phase>process-resources</phase>
<goals>
<goal>copy-resources</goal>
</goals>
- <configuration>
- <outputDirectory>${linux64outputdir}</outputDirectory>
- <resources>
+ <configuration>
+ <outputDirectory>${linux64outputdir}</outputDirectory>
+ <resources>
<resource>
<directory>src/assembly/resources/linux</directory>
<filtering>false</filtering>
<includes>
<include>**/*</include>
</includes>
<resource>
<directory>src/assembly/resources/linux</directory>
<filtering>false</filtering>
<includes>
<include>**/*</include>
</includes>
</resources>
<overwrite>true</overwrite>
</configuration>
</resources>
<overwrite>true</overwrite>
</configuration>
</profile>
</profiles>
</project>
</profile>
</profiles>
</project>
base_version=${major}.${minor}.${patch}
release_version=${base_version}
snapshot_version=${base_version}-SNAPSHOT
base_version=${major}.${minor}.${patch}
release_version=${base_version}
snapshot_version=${base_version}-SNAPSHOT