summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHuabingZhao <zhao.huabing@zte.com.cn>2016-10-13 06:25:53 +0000
committerGerrit Code Review <gerrit@open-o.org>2016-10-13 06:25:53 +0000
commit9e7073ec5e27170706f7361ee33fb853504e21f0 (patch)
treedffab5e2a7a35836fedf07d71d0967033206c90c
parent4af86531b4173f012180117a1a9a6bc75d8053d3 (diff)
parent05cbfaf80c4640a5d7a1c5d5a65e5e335815ae29 (diff)
Merge "Bump master version to 1.1.0-SNAPSHOT, part 2"
-rw-r--r--rest-client/pom.xml4
-rw-r--r--wso2bpel-ext/pom.xml3
-rw-r--r--wso2bpel-ext/wso2bpel-core/distribution/pom.xml3
-rw-r--r--wso2bpel-ext/wso2bpel-core/distribution/standalone/pom.xml13
-rw-r--r--wso2bpel-ext/wso2bpel-core/pom.xml3
-rw-r--r--wso2bpel-ext/wso2bpel-core/wso2bpel-mgr/pom.xml5
-rw-r--r--wso2bpel-ext/wso2bpel-parent/pom.xml3
-rw-r--r--wso2bpel-ext/wso2bpel-parent/wso2bpelparent-lite/pom.xml2
-rw-r--r--wso2bpel-ext/wso2bpel-parent/wso2bpelparent/pom.xml3
9 files changed, 22 insertions, 17 deletions
diff --git a/rest-client/pom.xml b/rest-client/pom.xml
index d43d4e4..7e9d94f 100644
--- a/rest-client/pom.xml
+++ b/rest-client/pom.xml
@@ -19,7 +19,7 @@
<parent>
<groupId>org.openo.common-services.common-utilities</groupId>
<artifactId>common-setting</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.1.0-SNAPSHOT</version>
</parent>
<artifactId>commonlib-restclient</artifactId>
<properties>
@@ -28,7 +28,7 @@
<dependency>
<groupId>org.openo.common-services.common-utilities</groupId>
<artifactId>commonlib-cbb</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.1.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty.aggregate</groupId>
diff --git a/wso2bpel-ext/pom.xml b/wso2bpel-ext/pom.xml
index b6bbc53..bbca681 100644
--- a/wso2bpel-ext/pom.xml
+++ b/wso2bpel-ext/pom.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0"?>
<!--
Copyright 2016 ZTE Corporation.
@@ -19,7 +20,7 @@
<parent>
<groupId>org.openo.common-services.common-utilities.wso2bpel-ext</groupId>
<artifactId>wso2bpelparent</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.1.0-SNAPSHOT</version>
<relativePath>wso2bpel-parent/wso2bpelparent</relativePath>
</parent>
diff --git a/wso2bpel-ext/wso2bpel-core/distribution/pom.xml b/wso2bpel-ext/wso2bpel-core/distribution/pom.xml
index 7032aaf..c06da10 100644
--- a/wso2bpel-ext/wso2bpel-core/distribution/pom.xml
+++ b/wso2bpel-ext/wso2bpel-core/distribution/pom.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0"?>
<!--
Copyright 2016 ZTE Corporation.
@@ -19,7 +20,7 @@
<parent>
<groupId>org.openo.common-services.common-utilities.wso2bpel-ext</groupId>
<artifactId>wso2bpel-core-parent</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.1.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/wso2bpel-ext/wso2bpel-core/distribution/standalone/pom.xml b/wso2bpel-ext/wso2bpel-core/distribution/standalone/pom.xml
index 8e2b3bb..187cdd3 100644
--- a/wso2bpel-ext/wso2bpel-core/distribution/standalone/pom.xml
+++ b/wso2bpel-ext/wso2bpel-core/distribution/standalone/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.openo.common-services.common-utilities.wso2bpel-ext</groupId>
<artifactId>distribution</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.1.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -148,17 +148,17 @@
<target name="unzip-wso2bps">
<unzip src="lib/wso2bps-3.5.0.zip" dest="target/assembly/wso2bps">
<patternset>
- <exclude name="**/*.bat" />
+ <exclude name="**/*.bat"/>
</patternset>
</unzip>
<copy todir="${linux64outputdir}/wso2bps">
<fileset dir="target/assembly/wso2bps/wso2bps-3.5.0">
- <exclude name="**/*.bat" />
+ <exclude name="**/*.bat"/>
</fileset>
</copy>
<copy todir="${win64outputdir}/wso2bps">
<fileset dir="target/assembly/wso2bps/wso2bps-3.5.0">
- <exclude name="**/*.sh" />
+ <exclude name="**/*.sh"/>
</fileset>
</copy>
</target>
@@ -174,12 +174,12 @@
<target name="distribution">
<copy todir="target/assembly/linux64/wso2bps-ext/lib">
<fileset dir="../../wso2bpel-mgr/lib">
- <include name="*" />
+ <include name="*"/>
</fileset>
</copy>
<copy todir="target/assembly/win64/wso2bps-ext/lib">
<fileset dir="../../wso2bpel-mgr/lib">
- <include name="*" />
+ <include name="*"/>
</fileset>
</copy>
<tar destfile="${version.output}/${packagename}-${project.version}-linux64.tar.gz" longfile="posix" compression="gzip">
@@ -211,4 +211,3 @@
</dependency>
</dependencies>
</project>
-
diff --git a/wso2bpel-ext/wso2bpel-core/pom.xml b/wso2bpel-ext/wso2bpel-core/pom.xml
index 57ef2f3..18672d5 100644
--- a/wso2bpel-ext/wso2bpel-core/pom.xml
+++ b/wso2bpel-ext/wso2bpel-core/pom.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0"?>
<!--
Copyright 2016 ZTE Corporation.
@@ -19,7 +20,7 @@
<parent>
<groupId>org.openo.common-services.common-utilities.wso2bpel-ext</groupId>
<artifactId>wso2bpel-root</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.1.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/wso2bpel-ext/wso2bpel-core/wso2bpel-mgr/pom.xml b/wso2bpel-ext/wso2bpel-core/wso2bpel-mgr/pom.xml
index 7e042f0..f33548d 100644
--- a/wso2bpel-ext/wso2bpel-core/wso2bpel-mgr/pom.xml
+++ b/wso2bpel-ext/wso2bpel-core/wso2bpel-mgr/pom.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0"?>
<!--
Copyright 2016 ZTE Corporation.
@@ -20,7 +21,7 @@
<parent>
<groupId>org.openo.common-services.common-utilities.wso2bpel-ext</groupId>
<artifactId>wso2bpel-core-parent</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.1.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -65,7 +66,7 @@
</goals>
</pluginExecutionFilter>
<action>
- <ignore />
+ <ignore/>
</action>
</pluginExecution>
</pluginExecutions>
diff --git a/wso2bpel-ext/wso2bpel-parent/pom.xml b/wso2bpel-ext/wso2bpel-parent/pom.xml
index b92f761..242d762 100644
--- a/wso2bpel-ext/wso2bpel-parent/pom.xml
+++ b/wso2bpel-ext/wso2bpel-parent/pom.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0"?>
<!--
Copyright 2016 ZTE Corporation.
@@ -19,7 +20,7 @@
<parent>
<groupId>org.openo.common-services.common-utilities.wso2bpel-ext</groupId>
<artifactId>wso2bpelparent-lite</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.1.0-SNAPSHOT</version>
<relativePath>wso2bpelparent-lite</relativePath>
</parent>
diff --git a/wso2bpel-ext/wso2bpel-parent/wso2bpelparent-lite/pom.xml b/wso2bpel-ext/wso2bpel-parent/wso2bpelparent-lite/pom.xml
index 10f205e..4785d90 100644
--- a/wso2bpel-ext/wso2bpel-parent/wso2bpelparent-lite/pom.xml
+++ b/wso2bpel-ext/wso2bpel-parent/wso2bpelparent-lite/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.openo.oparent</groupId>
<artifactId>oparent</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.1.0-SNAPSHOT</version>
<relativePath>../../../../oparent</relativePath>
</parent>
diff --git a/wso2bpel-ext/wso2bpel-parent/wso2bpelparent/pom.xml b/wso2bpel-ext/wso2bpel-parent/wso2bpelparent/pom.xml
index 8c9fc16..ce3d6ea 100644
--- a/wso2bpel-ext/wso2bpel-parent/wso2bpelparent/pom.xml
+++ b/wso2bpel-ext/wso2bpel-parent/wso2bpelparent/pom.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0"?>
<!--
Copyright 2016 ZTE Corporation.
@@ -19,7 +20,7 @@
<parent>
<groupId>org.openo.common-services.common-utilities.wso2bpel-ext</groupId>
<artifactId>wso2bpelparent-lite</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.1.0-SNAPSHOT</version>
<relativePath>../wso2bpelparent-lite</relativePath>
</parent>