diff options
| author |   Gary Wu <gary.i.wu@huawei.com> | 2018-08-24 15:23:11 -0700 |
|---|---|---|
| committer | Gary Wu <gary.i.wu@huawei.com> | 2018-08-27 10:28:32 -0700 |
| commit | e5e5a1bfa7daccdae412f43815ba0e5a2d7f175d (patch) | |
| tree | de62728a20a3c7e5aad4e5ffe66e534d9396385e | |
| parent | 5e597c793b223af4e78869a9d122dc1c2f30444b (diff) | |
Use managed guava version
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: I06554d57ab55c9d6d5df3160d11f236cc563d9de
Issue-ID: INT-619
Signed-off-by: Gary Wu <gary.i.wu@huawei.com>
| -rw-r--r-- | dmaap-dsa/pom.xml | 13 | ||||
| -rw-r--r-- | pom.xml | 8 |
2 files changed, 8 insertions, 13 deletions
diff --git a/dmaap-dsa/pom.xml b/dmaap-dsa/pom.xml index f6a8762..4802dc1 100644 --- a/dmaap-dsa/pom.xml +++ b/dmaap-dsa/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> @@ -235,7 +234,7 @@ <dependency> <groupId>com.google.guava</groupId> <artifactId>guava</artifactId> - <version>19.0</version> + <exclusions> <exclusion> <groupId>com.fasterxml.jackson.core</groupId> @@ -291,10 +290,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.dsa.DMaapDsaActiveApp</mainClass> </transformer> </transformers> @@ -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.dsa</groupId> @@ -146,4 +145,3 @@ </dependencies> </dependencyManagement> </project> - |