diff options
author | 2018-09-07 05:52:33 +0000 | |
---|---|---|
committer | 2018-09-07 05:52:33 +0000 | |
commit | 4cb3469191d9cb88ef31ded841857465e921cb56 (patch) | |
tree | 0a63391438f64825fa52766898357f6ace319efc /activiti-extension | |
parent | 8d4131b8ebc3ed07dcc97e821ebd0aa8470b12d6 (diff) | |
parent | 8deb1fab001f139c5f37923f89862536af287a64 (diff) |
Merge "Use managed guava version"
Diffstat (limited to 'activiti-extension')
-rw-r--r-- | activiti-extension/pom.xml | 17 |
1 files changed, 7 insertions, 10 deletions
diff --git a/activiti-extension/pom.xml b/activiti-extension/pom.xml index d8450b7..b908790 100644 --- 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
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">
+<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">
<parent>
<groupId>org.onap.oparent</groupId>
<artifactId>oparent</artifactId>
- <version>0.1.1</version>
+ <version>1.2.0</version>
</parent>
<groupId>org.onap.vfc.nfvo.wfengine</groupId>
@@ -100,7 +99,7 @@ </goals>
</pluginExecutionFilter>
<action>
- <ignore />
+ <ignore/>
</action>
</pluginExecution>
</pluginExecutions>
@@ -153,10 +152,8 @@ </goals>
<configuration>
<transformers>
- <transformer
- implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer" />
- <transformer
- implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
+ <transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer"/>
+ <transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
<mainClass>org.onap.workflow.activitiext.activitiExtApp</mainClass>
</transformer>
</transformers>
@@ -216,7 +213,7 @@ </goals>
</pluginExecutionFilter>
<action>
- <ignore></ignore>
+ <ignore/>
</action>
</pluginExecution>
</pluginExecutions>
@@ -335,7 +332,7 @@ <artifactId>fastjson</artifactId>
<version>1.2.23</version>
</dependency>
-
+
<dependency>
<groupId>org.activiti</groupId>
<artifactId>activiti-engine</artifactId>
|