Code Review
/
holmes
/
rule-management.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge "Use managed guava version"
[holmes/rule-management.git]
/
rulemgt
/
pom.xml
diff --git
a/rulemgt/pom.xml
b/rulemgt/pom.xml
index
ebd84bd
..
106de83
100644
(file)
--- a/
rulemgt/pom.xml
+++ b/
rulemgt/pom.xml
@@
-1,4
+1,4
@@
-<?xml version="1.0" encoding="UTF-8"
?>
+<?xml version="1.0" encoding="UTF-8"?>
<!--
~ Copyright 2017 ZTE Corporation.
~
<!--
~ Copyright 2017 ZTE Corporation.
~
@@
-14,8
+14,7
@@
~ See the License for the specific language governing permissions and
~ limitations under the License.
-->
~ 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">
<modelVersion>4.0.0</modelVersion>
<parent>
<modelVersion>4.0.0</modelVersion>
<parent>
@@
-268,7
+267,7
@@
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
- <version>19.0</version>
+
<exclusions>
<exclusion>
<groupId>com.fasterxml.jackson.core</groupId>
<exclusions>
<exclusion>
<groupId>com.fasterxml.jackson.core</groupId>
@@
-324,10
+323,8
@@
</goals>
<configuration>
<transformers>
</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.holmes.rulemgt.RuleActiveApp</mainClass>
</transformer>
</transformers>
<mainClass>org.onap.holmes.rulemgt.RuleActiveApp</mainClass>
</transformer>
</transformers>