summary |
shortlog |
log |
commit | commitdiff |
review |
tree
raw |
patch |
inline | side by side (from parent 1:
2bb80a3)
Use centrally managed guava version specified in
oparent. Includes upgrade to oparent 1.2.0.
This change was submitted by script and may include
additional whitespace or formatting changes.
Change-Id: I139f7302e30f5c8e7eddfeb9d383c8d91fb1445b
Issue-ID: INT-619
Signed-off-by: Gary Wu <gary.i.wu@huawei.com>
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
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
<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
</parent>\r
\r
<groupId>org.onap.vfc.nfvo.wfengine</groupId>\r
</goals>\r
</pluginExecutionFilter>\r
<action>\r
</goals>\r
</pluginExecutionFilter>\r
<action>\r
</action>\r
</pluginExecution>\r
</pluginExecutions>\r
</action>\r
</pluginExecution>\r
</pluginExecutions>\r
</goals>\r
<configuration>\r
<transformers>\r
</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
<mainClass>org.onap.workflow.activitiext.activitiExtApp</mainClass>\r
</transformer>\r
</transformers>\r
</goals>\r
</pluginExecutionFilter>\r
<action>\r
</goals>\r
</pluginExecutionFilter>\r
<action>\r
</action>\r
</pluginExecution>\r
</pluginExecutions>\r
</action>\r
</pluginExecution>\r
</pluginExecutions>\r
<artifactId>fastjson</artifactId>\r
<version>1.2.23</version>\r
</dependency>\r
<artifactId>fastjson</artifactId>\r
<version>1.2.23</version>\r
</dependency>\r
<dependency>\r
<groupId>org.activiti</groupId>\r
<artifactId>activiti-engine</artifactId>\r
<dependency>\r
<groupId>org.activiti</groupId>\r
<artifactId>activiti-engine</artifactId>\r
<parent>\r
<groupId>org.onap.oparent</groupId>\r
<artifactId>oparent</artifactId>\r
<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
</parent>\r
<modelVersion>4.0.0</modelVersion>\r
<groupId>org.onap.vfc.nfvo.wfengine</groupId>\r
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
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
<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
</parent>\r
\r
<groupId>org.onap.vfc.nfvo.wfengine</groupId>\r
</goals>\r
</pluginExecutionFilter>\r
<action>\r
</goals>\r
</pluginExecutionFilter>\r
<action>\r
</action>\r
</pluginExecution>\r
</pluginExecutions>\r
</action>\r
</pluginExecution>\r
</pluginExecutions>\r
</goals>\r
<configuration>\r
<transformers>\r
</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
<mainClass>com.onap.workflow.WorkflowApp</mainClass>\r
</transformer>\r
</transformers>\r
</goals>\r
</pluginExecutionFilter>\r
<action>\r
</goals>\r
</pluginExecutionFilter>\r
<action>\r
</action>\r
</pluginExecution>\r
</pluginExecutions>\r
</action>\r
</pluginExecution>\r
</pluginExecutions>\r
<?xml version="1.0" encoding="UTF-8"?>
<!--
Copyright 2016 Huawei Technologies Co., Ltd.
<?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
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
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.
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.