Code Review
/
appc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Change parent version
[appc.git]
/
appc-dg-util
/
appc-dg-util-bundle
/
pom.xml
diff --git
a/appc-dg-util/appc-dg-util-bundle/pom.xml
b/appc-dg-util/appc-dg-util-bundle/pom.xml
index
faf77e4
..
dd64a53
100644
(file)
--- a/
appc-dg-util/appc-dg-util-bundle/pom.xml
+++ b/
appc-dg-util/appc-dg-util-bundle/pom.xml
@@
-6,6
+6,8
@@
Copyright (C) 2017-2018 AT&T Intellectual Property. All rights reserved.
Copyright (C) 2017 Amdocs
================================================================================
Copyright (C) 2017-2018 AT&T Intellectual Property. All rights reserved.
Copyright (C) 2017 Amdocs
================================================================================
+ Modifications Copyright (C) 2018 Nokia
+ ================================================================================
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
@@
-22,13
+24,15
@@
<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>
<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.appc</groupId>
- <artifactId>appc-dg-util</artifactId>
- <version>1.4.0-SNAPSHOT</version>
- </parent>
-
+ <parent>
+ <groupId>org.onap.appc.parent</groupId>
+ <artifactId>binding-parent</artifactId>
+ <version>2.5.0</version>
+ <relativePath />
+ </parent>
+ <groupId>org.onap.appc</groupId>
<artifactId>appc-dg-util-bundle</artifactId>
<artifactId>appc-dg-util-bundle</artifactId>
+ <version>1.5.0-SNAPSHOT</version>
<packaging>bundle</packaging>
<name>appc-dg-util - bundle</name>
<properties>
<packaging>bundle</packaging>
<name>appc-dg-util - bundle</name>
<properties>
@@
-40,7
+44,7
@@
<dependencies>
<dependency>
<groupId>org.onap.appc</groupId>
<dependencies>
<dependency>
<groupId>org.onap.appc</groupId>
- <artifactId>appc-common</artifactId>
+ <artifactId>appc-common
-bundle
</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<version>${project.version}</version>
</dependency>
<dependency>
@@
-95,11
+99,6
@@
<artifactId>httpclient</artifactId>
<version>4.5.3</version>
</dependency>
<artifactId>httpclient</artifactId>
<version>4.5.3</version>
</dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
<dependency>
<groupId>org.onap.ccsdk.sli.core</groupId>
<artifactId>sli-common</artifactId>
<dependency>
<groupId>org.onap.ccsdk.sli.core</groupId>
<artifactId>sli-common</artifactId>
@@
-177,7
+176,7
@@
<dependency>
<groupId>org.onap.appc</groupId>
<artifactId>appc-netconf-adapter-bundle</artifactId>
<dependency>
<groupId>org.onap.appc</groupId>
<artifactId>appc-netconf-adapter-bundle</artifactId>
- <version>1.
4
.0-SNAPSHOT</version>
+ <version>1.
5
.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>junit</groupId>
</dependency>
<dependency>
<groupId>junit</groupId>
@@
-190,14
+189,10
@@
<scope>test</scope>
</dependency>
<dependency>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.powermock</groupId>
- <artifactId>powermock-api-mockito</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.powermock</groupId>
- <artifactId>powermock-module-junit4</artifactId>
+ <groupId>org.assertj</groupId>
+ <artifactId>assertj-core</artifactId>
<scope>test</scope>
<scope>test</scope>
+ <version>${assertj.version}</version>
</dependency>
</dependencies>
</dependency>
</dependencies>