summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--apiroute/apiroute-service/pom.xml4
-rw-r--r--apiroute/apiroute-standalone/pom.xml30
-rw-r--r--apiroute/pom.xml4
-rw-r--r--build4docker.sh2
-rw-r--r--distributions/msb-apigateway/pom.xml50
-rw-r--r--distributions/pom.xml6
-rw-r--r--openresty-ext/pom.xml4
-rw-r--r--pom.xml2
-rw-r--r--redis-ext/pom.xml46
-rw-r--r--version.properties2
10 files changed, 75 insertions, 75 deletions
diff --git a/apiroute/apiroute-service/pom.xml b/apiroute/apiroute-service/pom.xml
index ca24c9b..c0346a3 100644
--- a/apiroute/apiroute-service/pom.xml
+++ b/apiroute/apiroute-service/pom.xml
@@ -12,14 +12,14 @@
<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>
- <version>1.2.4-SNAPSHOT</version>
+ <version>1.2.5-SNAPSHOT</version>
<dependencies>
diff --git a/apiroute/apiroute-standalone/pom.xml b/apiroute/apiroute-standalone/pom.xml
index a75fed5..7a901e5 100644
--- a/apiroute/apiroute-standalone/pom.xml
+++ b/apiroute/apiroute-standalone/pom.xml
@@ -1,32 +1,32 @@
<?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
-
+
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/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>
- <version>1.2.4-SNAPSHOT</version>
+ <version>1.2.5-SNAPSHOT</version>
<properties>
<packageid>apiroute</packageid>
@@ -40,15 +40,15 @@
<version>${project.version}</version>
<optional>true</optional>
</dependency>
- </dependencies>
+ </dependencies>
<build>
-
- <plugins>
+
+ <plugins>
<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>
@@ -56,14 +56,14 @@
<configuration>
<outputDirectory>${outputdir}</outputDirectory>
<includeEmptyDirs>true</includeEmptyDirs>
- <resources>
+ <resources>
<resource>
<directory>src/assembly/resources/</directory>
<filtering>false</filtering>
<includes>
<include>**/*</include>
</includes>
- </resource>
+ </resource>
</resources>
<overwrite>true</overwrite>
</configuration>
@@ -74,7 +74,7 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
<version>2.8</version>
- <executions>
+ <executions>
<execution>
<id>copy-jar</id>
<goals>
@@ -90,13 +90,13 @@
<overWrite>true</overWrite>
<outputDirectory>${outputdir}/apiroute/</outputDirectory>
<destFileName>apiroute-service.jar</destFileName>
- </artifactItem>
+ </artifactItem>
</artifactItems>
</configuration>
</execution>
</executions>
</plugin>
-
+
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
diff --git a/apiroute/pom.xml b/apiroute/pom.xml
index 8c073c1..f9ec0bd 100644
--- a/apiroute/pom.xml
+++ b/apiroute/pom.xml
@@ -11,14 +11,14 @@
<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>
- <version>1.2.4-SNAPSHOT</version>
+ <version>1.2.5-SNAPSHOT</version>
<modules>
<module>apiroute-service</module>
diff --git a/build4docker.sh b/build4docker.sh
index edcfa65..93b7f86 100644
--- a/build4docker.sh
+++ b/build4docker.sh
@@ -36,7 +36,7 @@ mkdir $RELEASE_DIR -p
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")
diff --git a/distributions/msb-apigateway/pom.xml b/distributions/msb-apigateway/pom.xml
index b34e14b..2a9f2fe 100644
--- a/distributions/msb-apigateway/pom.xml
+++ b/distributions/msb-apigateway/pom.xml
@@ -3,12 +3,12 @@
<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>
- <version>1.2.4-SNAPSHOT</version>
+ <version>1.2.5-SNAPSHOT</version>
<name>onap/msb/apigateway/distributions/msb-apigateway</name>
<packaging>pom</packaging>
@@ -27,7 +27,7 @@
<dependency>
<groupId>org.onap.msb.apigateway.apiroute</groupId>
<artifactId>apiroute-standalone</artifactId>
- <type>zip</type>
+ <type>zip</type>
<version>${project.version}</version>
<optional>true</optional>
</dependency>
@@ -36,7 +36,7 @@
<dependency>
<groupId>org.onap.msb.apigateway</groupId>
<artifactId>redis-ext</artifactId>
- <type>tar.gz</type>
+ <type>tar.gz</type>
<classifier>${classifier.linux64}</classifier>
<version>${project.version}</version>
<optional>true</optional>
@@ -45,7 +45,7 @@
<dependency>
<groupId>org.onap.msb.apigateway</groupId>
<artifactId>openresty-ext</artifactId>
- <type>tar.gz</type>
+ <type>tar.gz</type>
<classifier>${classifier.linux64}</classifier>
<version>${project.version}</version>
<optional>true</optional>
@@ -69,20 +69,20 @@
<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>
- <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>
- <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>
@@ -90,7 +90,7 @@
<overWriteSnapshots>true</overWriteSnapshots>
<outputAbsoluteArtifactFilename>true</outputAbsoluteArtifactFilename>
</configuration>
- </execution>
+ </execution>
</executions>
</plugin>
@@ -98,7 +98,7 @@
<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>
@@ -106,7 +106,7 @@
<configuration>
<outputDirectory>${linux64outputdir}</outputDirectory>
<includeEmptyDirs>true</includeEmptyDirs>
- <resources>
+ <resources>
<resource>
<directory>src/assembly/resources/</directory>
<filtering>false</filtering>
@@ -116,34 +116,34 @@
<excludes>
<exclude>**/*.bat</exclude>
</excludes>
- </resource>
+ </resource>
</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>
- <configuration>
+ <configuration>
<outputDirectory>${version.output}</outputDirectory>
<includeEmptyDirs>true</includeEmptyDirs>
- <resources>
+ <resources>
<resource>
<directory>${dockerFileDir}</directory>
<filtering>false</filtering>
<includes>
<include>**/*</include>
</includes>
- </resource>
+ </resource>
</resources>
<overwrite>true</overwrite>
</configuration>
- </execution>
+ </execution>
</executions>
- </plugin>
+ </plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -178,14 +178,14 @@
</configuration>
</execution>
</executions>
- </plugin>
+ </plugin>
</plugins>
</build>
</profile>
- </profiles>
+ </profiles>
</project>
diff --git a/distributions/pom.xml b/distributions/pom.xml
index a21ca74..5c6fb7b 100644
--- a/distributions/pom.xml
+++ b/distributions/pom.xml
@@ -4,16 +4,16 @@
<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>
- <version>1.2.4-SNAPSHOT</version>
+ <version>1.2.5-SNAPSHOT</version>
<name>onap/msb/apigateway/distributions</name>
<packaging>pom</packaging>
<modules>
- <module>msb-apigateway</module>
+ <module>msb-apigateway</module>
</modules>
diff --git a/openresty-ext/pom.xml b/openresty-ext/pom.xml
index d678287..e1709a3 100644
--- a/openresty-ext/pom.xml
+++ b/openresty-ext/pom.xml
@@ -21,14 +21,14 @@
<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>
- <version>1.2.4-SNAPSHOT</version>
+ <version>1.2.5-SNAPSHOT</version>
<name>onap/msb/apigateway/openresty-ext</name>
<packaging>pom</packaging>
diff --git a/pom.xml b/pom.xml
index 421e261..8d69605 100644
--- a/pom.xml
+++ b/pom.xml
@@ -24,7 +24,7 @@
</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>
diff --git a/redis-ext/pom.xml b/redis-ext/pom.xml
index 227256d..5645d4f 100644
--- a/redis-ext/pom.xml
+++ b/redis-ext/pom.xml
@@ -1,34 +1,34 @@
<?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
-
+
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.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>
- <version>1.2.4-SNAPSHOT</version>
+ <version>1.2.5-SNAPSHOT</version>
<name>onap/msb/apigateway/redis-ext</name>
<packaging>pom</packaging>
@@ -57,11 +57,11 @@
</dependencies>
<build>
<plugins>
- <!--
+ <!--
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
- <executions>
+ <executions>
<execution>
<id>unpack-dependency-file</id>
<goals>
@@ -69,22 +69,22 @@
</goals>
<phase>generate-resources</phase>
<configuration>
- <artifactItems>
+ <artifactItems>
<artifactItem>
<groupId>org.redis.centos.7</groupId>
<artifactId>redis</artifactId>
<type>tar.gz</type>
<outputDirectory>${linux64outputdir}</outputDirectory>
- </artifactItem>
+ </artifactItem>
</artifactItems>
<excludes>**/redis-benchmark**,**/*.pdb,**/*.docx</excludes>
<overWriteReleases>false</overWriteReleases>
<overWriteSnapshots>true</overWriteSnapshots>
<outputAbsoluteArtifactFilename>true</outputAbsoluteArtifactFilename>
</configuration>
- </execution>
+ </execution>
</executions>
- </plugin>
+ </plugin>
<plugin>
<groupId>com.coderplus.maven.plugins</groupId>
@@ -101,11 +101,11 @@
<sourceFile>${linux64outputdir}/redis-${redis.version}</sourceFile>
<destinationFile>${linux64outputdir}/redis</destinationFile>
</configuration>
- </execution>
+ </execution>
</executions>
- </plugin>
+ </plugin>
-->
-
+
<plugin>
<artifactId>maven-resources-plugin</artifactId>
<configuration>
@@ -113,25 +113,25 @@
</configuration>
<executions>
<execution>
- <id>copy-resources</id>
+ <id>copy-resources</id>
<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>
+ </resource>
</resources>
<overwrite>true</overwrite>
</configuration>
- </execution>
+ </execution>
</executions>
</plugin>
@@ -165,7 +165,7 @@
</plugin>
</plugins>
- </build>
+ </build>
</profile>
</profiles>
</project>
diff --git a/version.properties b/version.properties
index 1b6b05f..4fd02cd 100644
--- a/version.properties
+++ b/version.properties
@@ -1,6 +1,6 @@
major=1
minor=2
-patch=4
+patch=5
base_version=${major}.${minor}.${patch}
release_version=${base_version}
snapshot_version=${base_version}-SNAPSHOT