summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGuangrongFu <fu.guangrong@zte.com.cn>2018-08-22 09:54:48 +0800
committerGuangrongFu <fu.guangrong@zte.com.cn>2018-08-22 09:57:57 +0800
commit5e597c793b223af4e78869a9d122dc1c2f30444b (patch)
treed55ed3ec83054bec35fe02425592bc625f19120d
parent60604fc38e3e1547c8fbec3378a9f38eb9f2896f (diff)
Updated the version to 1.2.0-SNAPSHOT
Change-Id: I7548aaca3bf561b8e0aa1bc824f575106d0e34e1 Issue-ID: HOLMES-161 Signed-off-by: GuangrongFu <fu.guangrong@zte.com.cn>
-rw-r--r--dmaap-dsa-standalone/pom.xml2
-rw-r--r--dmaap-dsa/pom.xml2
-rw-r--r--pom.xml298
-rw-r--r--version.properties2
4 files changed, 152 insertions, 152 deletions
diff --git a/dmaap-dsa-standalone/pom.xml b/dmaap-dsa-standalone/pom.xml
index 41e8891..7a37414 100644
--- a/dmaap-dsa-standalone/pom.xml
+++ b/dmaap-dsa-standalone/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.onap.holmes.dsa</groupId>
<artifactId>holmes-dsa-parent</artifactId>
- <version>1.1.0-SNAPSHOT</version>
+ <version>1.2.0-SNAPSHOT</version>
</parent>
<artifactId>holmes-dmaap-dsa-standalone</artifactId>
diff --git a/dmaap-dsa/pom.xml b/dmaap-dsa/pom.xml
index 2eea070..f6a8762 100644
--- a/dmaap-dsa/pom.xml
+++ b/dmaap-dsa/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.onap.holmes.dsa</groupId>
<artifactId>holmes-dsa-parent</artifactId>
- <version>1.1.0-SNAPSHOT</version>
+ <version>1.2.0-SNAPSHOT</version>
</parent>
<artifactId>dmaap-dsa</artifactId>
diff --git a/pom.xml b/pom.xml
index 55257d1..c66d8a4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,149 +1,149 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!--
- ~ Copyright 2017 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">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.onap.oparent</groupId>
- <artifactId>oparent</artifactId>
- <version>0.1.1</version>
- </parent>
-
- <groupId>org.onap.holmes.dsa</groupId>
- <artifactId>holmes-dsa-parent</artifactId>
- <version>1.1.0-SNAPSHOT</version>
- <packaging>pom</packaging>
- <name>holmes-dsa</name>
- <modules>
- <module>dmaap-dsa</module>
- <module>dmaap-dsa-standalone</module>
- </modules>
-
- <properties>
- <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
- <maven.test.skip>false</maven.test.skip>
- <maven.test.failure.ignore>false</maven.test.failure.ignore>
- <finalName>${project.artifactId}-${project.version}</finalName>
- <release.dir>${basedir}/target</release.dir>
- <bundle.name>${project.artifactId}-${project.version}</bundle.name>
- <pkgzip.dir>${basedir}/../release/pkgzip</pkgzip.dir>
- <excludesFile>**/*$*</excludesFile>
- <nexusproxy>https://nexus.open-o.org/content</nexusproxy>
- <powermock.version>1.6.5</powermock.version>
-
-
- <stringtemplate.version>3.2.1</stringtemplate.version>
- <mysql.connector.version>5.1.38</mysql.connector.version>
- <dropwizard.version>1.3.0</dropwizard.version>
- <swagger.version>1.5.3</swagger.version>
- <lombok.version>1.16.8</lombok.version>
- <jersey.version>2.22.2</jersey.version>
- <jaxrs.consumer.version>5.0</jaxrs.consumer.version>
- <slf4j.version>1.7.25</slf4j.version>
- <quartz.version>2.2.1</quartz.version>
-
-
- <packagename>onap-holmes-rulemgt</packagename>
- <linux64id>linux64</linux64id>
- <win64id>win64</win64id>
- <linux64outputdir>target/assembly/${linux64id}</linux64outputdir>
- <win64outputdir>target/assembly/${win64id}</win64outputdir>
- <version.output>target/version</version.output>
- </properties>
- <dependencyManagement>
- <dependencies>
- <dependency>
- <groupId>org.onap.msb.java-sdk</groupId>
- <artifactId>msb-java-sdk</artifactId>
- <version>1.1.1</version>
- </dependency>
- <dependency>
- <groupId>org.easymock</groupId>
- <artifactId>easymock</artifactId>
- <version>3.0</version>
- </dependency>
- <dependency>
- <groupId>org.onap.holmes.common</groupId>
- <artifactId>holmes-actions</artifactId>
- <version>1.1.0-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>io.dropwizard</groupId>
- <artifactId>dropwizard-core</artifactId>
- <version>${dropwizard.version}</version>
- </dependency>
- <dependency>
- <groupId>io.dropwizard</groupId>
- <artifactId>dropwizard-db</artifactId>
- <version>${dropwizard.version}</version>
- </dependency>
- <dependency>
- <groupId>io.swagger</groupId>
- <artifactId>swagger-jersey2-jaxrs</artifactId>
- <version>${swagger.version}</version>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
- <groupId>org.projectlombok</groupId>
- <artifactId>lombok</artifactId>
- <version>${lombok.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- <version>${slf4j.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.antlr</groupId>
- <artifactId>stringtemplate</artifactId>
- <version>${stringtemplate.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.quartz-scheduler</groupId>
- <artifactId>quartz</artifactId>
- <version>${quartz.version}</version>
- </dependency>
-
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.8.2</version>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>org.hamcrest</groupId>
- <artifactId>hamcrest-core</artifactId>
- <version>1.3</version>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>org.powermock</groupId>
- <artifactId>powermock-module-junit4</artifactId>
- <version>1.6.5</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
- </dependencyManagement>
-</project>
-
+<?xml version="1.0" encoding="UTF-8" ?>
+<!--
+ ~ Copyright 2017 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">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.onap.oparent</groupId>
+ <artifactId>oparent</artifactId>
+ <version>0.1.1</version>
+ </parent>
+
+ <groupId>org.onap.holmes.dsa</groupId>
+ <artifactId>holmes-dsa-parent</artifactId>
+ <version>1.2.0-SNAPSHOT</version>
+ <packaging>pom</packaging>
+ <name>holmes-dsa</name>
+ <modules>
+ <module>dmaap-dsa</module>
+ <module>dmaap-dsa-standalone</module>
+ </modules>
+
+ <properties>
+ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
+ <maven.test.skip>false</maven.test.skip>
+ <maven.test.failure.ignore>false</maven.test.failure.ignore>
+ <finalName>${project.artifactId}-${project.version}</finalName>
+ <release.dir>${basedir}/target</release.dir>
+ <bundle.name>${project.artifactId}-${project.version}</bundle.name>
+ <pkgzip.dir>${basedir}/../release/pkgzip</pkgzip.dir>
+ <excludesFile>**/*$*</excludesFile>
+ <nexusproxy>https://nexus.open-o.org/content</nexusproxy>
+ <powermock.version>1.6.5</powermock.version>
+
+
+ <stringtemplate.version>3.2.1</stringtemplate.version>
+ <mysql.connector.version>5.1.38</mysql.connector.version>
+ <dropwizard.version>1.3.0</dropwizard.version>
+ <swagger.version>1.5.3</swagger.version>
+ <lombok.version>1.16.8</lombok.version>
+ <jersey.version>2.22.2</jersey.version>
+ <jaxrs.consumer.version>5.0</jaxrs.consumer.version>
+ <slf4j.version>1.7.25</slf4j.version>
+ <quartz.version>2.2.1</quartz.version>
+
+
+ <packagename>onap-holmes-rulemgt</packagename>
+ <linux64id>linux64</linux64id>
+ <win64id>win64</win64id>
+ <linux64outputdir>target/assembly/${linux64id}</linux64outputdir>
+ <win64outputdir>target/assembly/${win64id}</win64outputdir>
+ <version.output>target/version</version.output>
+ </properties>
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>org.onap.msb.java-sdk</groupId>
+ <artifactId>msb-java-sdk</artifactId>
+ <version>1.1.1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.easymock</groupId>
+ <artifactId>easymock</artifactId>
+ <version>3.0</version>
+ </dependency>
+ <dependency>
+ <groupId>org.onap.holmes.common</groupId>
+ <artifactId>holmes-actions</artifactId>
+ <version>1.2.0-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>io.dropwizard</groupId>
+ <artifactId>dropwizard-core</artifactId>
+ <version>${dropwizard.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>io.dropwizard</groupId>
+ <artifactId>dropwizard-db</artifactId>
+ <version>${dropwizard.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>io.swagger</groupId>
+ <artifactId>swagger-jersey2-jaxrs</artifactId>
+ <version>${swagger.version}</version>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.projectlombok</groupId>
+ <artifactId>lombok</artifactId>
+ <version>${lombok.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ <version>${slf4j.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.antlr</groupId>
+ <artifactId>stringtemplate</artifactId>
+ <version>${stringtemplate.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.quartz-scheduler</groupId>
+ <artifactId>quartz</artifactId>
+ <version>${quartz.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>4.8.2</version>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.hamcrest</groupId>
+ <artifactId>hamcrest-core</artifactId>
+ <version>1.3</version>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.powermock</groupId>
+ <artifactId>powermock-module-junit4</artifactId>
+ <version>1.6.5</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
+</project>
+
diff --git a/version.properties b/version.properties
index e2595ba..08f1f93 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=2
patch=0
base_version=${major}.${minor}.${patch}