diff options
| author |   Huabing Zhao <zhaohuabing@gmail.com> | 2019-05-09 02:15:53 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2019-05-09 02:15:53 +0000 |
| commit | 7ee2dcca7bf6ed1aa30a7dfb9ab04f540730644d (patch) | |
| tree | b140dc78ee89786443505c4de6ed1d67108aa93d /distributions | |
| parent | ad380db9da867dc872310df6b1fe47230c22d12c (diff) | |
| parent | 0087d0334b0c8decc4bec40e69fcb2af04345800 (diff) | |
Merge "bump version to 1.2.5"
Diffstat (limited to 'distributions')
| -rw-r--r-- | distributions/msb-apigateway/pom.xml | 50 | ||||
| -rw-r--r-- | distributions/pom.xml | 6 |
2 files changed, 28 insertions, 28 deletions
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> |