diff options
| author |   tang peng <tang.peng5@zte.com.cn> | 2018-09-07 00:05:51 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2018-09-07 00:05:51 +0000 |
| commit | b8651a1e20797576bb4af8ec672b60a65c215549 (patch) | |
| tree | 44b4a0160c9e924fb9ca9b4f6fadcbe25123f18c | |
| parent | a9e01a4e720ff10684a9c46e9e8ab85848d3b3a7 (diff) | |
| parent | e980fd724cd155572d2dc22fbfcdc0542f95eaf6 (diff) | |
Merge "Use managed guava version"
| -rw-r--r-- | pom.xml | 8 | ||||
| -rw-r--r-- | rulemgt/pom.xml | 13 |
2 files changed, 8 insertions, 13 deletions
@@ -1,4 +1,4 @@ -<?xml version="1.0" encoding="UTF-8" ?>
+<?xml version="1.0" encoding="UTF-8"?>
<!--
~ Copyright 2017 ZTE Corporation.
~
@@ -14,13 +14,12 @@ ~ 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>
<groupId>org.onap.oparent</groupId>
<artifactId>oparent</artifactId>
- <version>0.1.1</version>
+ <version>1.2.0</version>
</parent>
<groupId>org.onap.holmes.rule-management</groupId>
@@ -167,4 +166,3 @@ </dependencies>
</dependencyManagement>
</project>
-
diff --git a/rulemgt/pom.xml b/rulemgt/pom.xml index ebd84bd..106de83 100644 --- 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. ~ @@ -14,8 +14,7 @@ ~ 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> @@ -268,7 +267,7 @@ <dependency> <groupId>com.google.guava</groupId> <artifactId>guava</artifactId> - <version>19.0</version> + <exclusions> <exclusion> <groupId>com.fasterxml.jackson.core</groupId> @@ -324,10 +323,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.holmes.rulemgt.RuleActiveApp</mainClass> </transformer> </transformers> |