Code Review
/
appc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Release appc
[appc.git]
/
appc-inbound
/
appc-design-services
/
provider
/
pom.xml
diff --git
a/appc-inbound/appc-design-services/provider/pom.xml
b/appc-inbound/appc-design-services/provider/pom.xml
index
f34319b
..
8233f0d
100755
(executable)
--- a/
appc-inbound/appc-design-services/provider/pom.xml
+++ b/
appc-inbound/appc-design-services/provider/pom.xml
@@
-3,7
+3,7
@@
============LICENSE_START=======================================================
ONAP : APPC
================================================================================
============LICENSE_START=======================================================
ONAP : APPC
================================================================================
- Copyright (C) 2017-201
8
AT&T Intellectual Property. All rights reserved.
+ Copyright (C) 2017-201
9
AT&T Intellectual Property. All rights reserved.
Copyright (C) 2017 Amdocs
Modification Copyright (C) 2018 IBM
================================================================================
Copyright (C) 2017 Amdocs
Modification Copyright (C) 2018 IBM
================================================================================
@@
-20,14
+20,15
@@
limitations under the License.
============LICENSE_END=========================================================
-->
limitations under the License.
============LICENSE_END=========================================================
-->
-<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>
<modelVersion>4.0.0</modelVersion>
- <parent>
- <artifactId>appc-design-services</artifactId>
+ <parent>
+ <groupId>org.onap.appc.parent</groupId>
+ <artifactId>binding-parent</artifactId>
+ <version>2.7.0</version>
+ <relativePath/>
+ </parent>
<groupId>org.onap.appc</groupId>
<groupId>org.onap.appc</groupId>
- <version>1.4.0-SNAPSHOT</version>
- </parent>
<artifactId>appc-design-services-provider</artifactId>
<packaging>bundle</packaging>
<artifactId>appc-design-services-provider</artifactId>
<packaging>bundle</packaging>
@@
-41,7
+42,6
@@
<instructions>
<Export-Package>org.onap.appc.design.services</Export-Package>
<Import-Package>org.onap.appc.instar,*;resolution:=optional</Import-Package>
<instructions>
<Export-Package>org.onap.appc.design.services</Export-Package>
<Import-Package>org.onap.appc.instar,*;resolution:=optional</Import-Package>
- <Embed-Dependency>jackson-dataformat-yaml</Embed-Dependency>
<DynamicImport-Package>*</DynamicImport-Package>
<Embed-Transitive>true</Embed-Transitive>
</instructions>
<DynamicImport-Package>*</DynamicImport-Package>
<Embed-Transitive>true</Embed-Transitive>
</instructions>
@@
-56,9
+56,16
@@
<artifactId>mockito-core</artifactId>
<scope>test</scope>
</dependency>
<artifactId>mockito-core</artifactId>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.javassist</groupId>
+ <artifactId>javassist</artifactId>
+ <version>3.22.0-GA</version>
+ <scope>test</scope>
+ </dependency>
<dependency>
<groupId>org.onap.appc</groupId>
<artifactId>appc-design-services-model</artifactId>
<dependency>
<groupId>org.onap.appc</groupId>
<artifactId>appc-design-services-model</artifactId>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.onap.appc</groupId>
</dependency>
<dependency>
<groupId>org.onap.appc</groupId>
@@
-89,14
+96,6
@@
<groupId>org.opendaylight.controller</groupId>
<artifactId>config-api</artifactId>
</dependency>
<groupId>org.opendaylight.controller</groupId>
<artifactId>config-api</artifactId>
</dependency>
- <dependency>
- <groupId>org.opendaylight.controller</groupId>
- <artifactId>sal-binding-config</artifactId>
- </dependency>
- <dependency>
- <groupId>org.opendaylight.controller</groupId>
- <artifactId>sal-binding-api</artifactId>
- </dependency>
<dependency>
<groupId>org.opendaylight.controller</groupId>
<artifactId>sal-common-util</artifactId>
<dependency>
<groupId>org.opendaylight.controller</groupId>
<artifactId>sal-common-util</artifactId>
@@
-106,20
+105,25
@@
<groupId>org.opendaylight.controller</groupId>
<scope>test</scope>
</dependency>
<groupId>org.opendaylight.controller</groupId>
<scope>test</scope>
</dependency>
- <dependency>
- <artifactId>sal-rest-connector</artifactId>
- <groupId>org.opendaylight.netconf</groupId>
- <scope>test</scope>
- </dependency>
<dependency>
<groupId>org.opendaylight.controller</groupId>
<artifactId>sal-binding-broker-impl</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.opendaylight.controller</groupId>
<artifactId>sal-binding-broker-impl</artifactId>
<scope>test</scope>
</dependency>
-
+ <dependency>
+ <groupId>ch.qos.logback</groupId>
+ <artifactId>logback-classic</artifactId>
+ <version>${logback.version}</version>
+ </dependency>
<dependency>
<groupId>com.att.eelf</groupId>
<artifactId>eelf-core</artifactId>
<dependency>
<groupId>com.att.eelf</groupId>
<artifactId>eelf-core</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>ch.qos.logback</groupId>
+ <artifactId>logback-classic</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.onap.ccsdk.sli.adaptors</groupId>
</dependency>
<dependency>
<groupId>org.onap.ccsdk.sli.adaptors</groupId>
@@
-130,10
+134,9
@@
<groupId>org.onap.ccsdk.sli.core</groupId>
<artifactId>sli-provider</artifactId>
</dependency>
<groupId>org.onap.ccsdk.sli.core</groupId>
<artifactId>sli-provider</artifactId>
</dependency>
-
<dependency>
- <groupId>
com.sun.jersey
</groupId>
+ <dependency>
+ <groupId>
org.glassfish.jersey.core
</groupId>
<artifactId>jersey-client</artifactId>
<artifactId>jersey-client</artifactId>
- <version>1.17</version>
<scope>provided</scope>
</dependency>
<dependency>
<scope>provided</scope>
</dependency>
<dependency>
@@
-143,12
+146,19
@@
<dependency>
<groupId>com.fasterxml.jackson.dataformat</groupId>
<artifactId>jackson-dataformat-yaml</artifactId>
<dependency>
<groupId>com.fasterxml.jackson.dataformat</groupId>
<artifactId>jackson-dataformat-yaml</artifactId>
- <version>2.3.2</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
</dependency>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
</dependency>
+ <dependency>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-core</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.yaml</groupId>
+ <artifactId>snakeyaml</artifactId>
+ </dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
@@
-185,5
+195,5
@@
<version>1.6.5</version>
</dependency>
</dependencies>
<version>1.6.5</version>
</dependency>
</dependencies>
+ <version>1.7.0</version>
</project>
</project>
-