Merge "Use managed guava version"

diff --git a/activiti-extension/pom.xml b/activiti-extension/pom.xml
index d8450b7..b908790 100644 (file)
--- a/activiti-extension/pom.xml
+++ b/activiti-extension/pom.xml
@@ -6,12 +6,11 @@
        under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES \r
        OR CONDITIONS OF ANY KIND, either express or implied. See the License for \r
        the specific language governing permissions and limitations under the License. -->\r
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"\r
-       xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">\r
+<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">\r
        <parent>\r
                <groupId>org.onap.oparent</groupId>\r
                <artifactId>oparent</artifactId>\r
-               <version>0.1.1</version>\r
+               <version>1.2.0</version>\r
        </parent>\r
 \r
        <groupId>org.onap.vfc.nfvo.wfengine</groupId>\r
@@ -100,7 +99,7 @@
                                                                        </goals>\r
                                                                </pluginExecutionFilter>\r
                                                                <action>\r
-                                                                       <ignore />\r
+                                                                       <ignore/>\r
                                                                </action>\r
                                                        </pluginExecution>\r
                                                </pluginExecutions>\r
@@ -153,10 +152,8 @@
                                                </goals>\r
                                                <configuration>\r
                                                        <transformers>\r
-                                                               <transformer\r
-                                                                       implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer" />\r
-                                                               <transformer\r
-                                                                       implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">\r
+                                                               <transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer"/>\r
+                                                               <transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">\r
                                                                        <mainClass>org.onap.workflow.activitiext.activitiExtApp</mainClass>\r
                                                                </transformer>\r
                                                        </transformers>\r
@@ -216,7 +213,7 @@
                                                                                </goals>\r
                                                                        </pluginExecutionFilter>\r
                                                                        <action>\r
-                                                                               <ignore></ignore>\r
+                                                                               <ignore/>\r
                                                                        </action>\r
                                                                </pluginExecution>\r
                                                        </pluginExecutions>\r
@@ -335,7 +332,7 @@
                        <artifactId>fastjson</artifactId>\r
                        <version>1.2.23</version>\r
                </dependency>\r
-       \r
+\r
                <dependency>\r
                        <groupId>org.activiti</groupId>\r
                        <artifactId>activiti-engine</artifactId>\r

diff --git a/pom.xml b/pom.xml
index f227624..9215344 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -18,7 +18,7 @@
     <parent>\r
         <groupId>org.onap.oparent</groupId>\r
         <artifactId>oparent</artifactId>\r
-        <version>1.1.0</version>\r
+        <version>1.2.0</version>\r
     </parent>\r
     <modelVersion>4.0.0</modelVersion>\r
     <groupId>org.onap.vfc.nfvo.wfengine</groupId>\r

diff --git a/wfenginemgrservice/pom.xml b/wfenginemgrservice/pom.xml
index c8f43fa..e2b7439 100644 (file)
--- a/wfenginemgrservice/pom.xml
+++ b/wfenginemgrservice/pom.xml
@@ -6,12 +6,11 @@
        under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES \r
        OR CONDITIONS OF ANY KIND, either express or implied. See the License for \r
        the specific language governing permissions and limitations under the License. -->\r
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"\r
-       xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">\r
+<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">\r
        <parent>\r
                <groupId>org.onap.oparent</groupId>\r
                <artifactId>oparent</artifactId>\r
-               <version>0.1.1</version>\r
+               <version>1.2.0</version>\r
        </parent>\r
 \r
        <groupId>org.onap.vfc.nfvo.wfengine</groupId>\r
@@ -100,7 +99,7 @@
                                                                        </goals>\r
                                                                </pluginExecutionFilter>\r
                                                                <action>\r
-                                                                       <ignore />\r
+                                                                       <ignore/>\r
                                                                </action>\r
                                                        </pluginExecution>\r
                                                </pluginExecutions>\r
@@ -153,10 +152,8 @@
                                                </goals>\r
                                                <configuration>\r
                                                        <transformers>\r
-                                                               <transformer\r
-                                                                       implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer" />\r
-                                                               <transformer\r
-                                                                       implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">\r
+                                                               <transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer"/>\r
+                                                               <transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">\r
                                                                        <mainClass>com.onap.workflow.WorkflowApp</mainClass>\r
                                                                </transformer>\r
                                                        </transformers>\r
@@ -221,7 +218,7 @@
                                                                                </goals>\r
                                                                        </pluginExecutionFilter>\r
                                                                        <action>\r
-                                                                               <ignore></ignore>\r
+                                                                               <ignore/>\r
                                                                        </action>\r
                                                                </pluginExecution>\r
                                                        </pluginExecutions>\r

diff --git a/wso2/pom.xml b/wso2/pom.xml
index 668c863..311e667 100644 (file)
--- a/wso2/pom.xml
+++ b/wso2/pom.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
   Copyright 2016 Huawei Technologies Co., Ltd.
- 
+
   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.