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-interfaces-service
/
bundle
/
pom.xml
diff --git
a/appc-inbound/appc-interfaces-service/bundle/pom.xml
b/appc-inbound/appc-interfaces-service/bundle/pom.xml
index
e5beab4
..
4a0f4ab
100644
(file)
--- a/
appc-inbound/appc-interfaces-service/bundle/pom.xml
+++ b/
appc-inbound/appc-interfaces-service/bundle/pom.xml
@@
-3,7
+3,7
@@
============LICENSE_START=======================================================
ONAP : APPC
================================================================================
============LICENSE_START=======================================================
ONAP : APPC
================================================================================
- Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ Copyright (C) 2017
-2019
AT&T Intellectual Property. All rights reserved.
Copyright (C) 2017 Amdocs
================================================================================
Licensed under the Apache License, Version 2.0 (the "License");
Copyright (C) 2017 Amdocs
================================================================================
Licensed under the Apache License, Version 2.0 (the "License");
@@
-18,16
+18,17
@@
See the License for the specific language governing permissions and
limitations under the License.
============LICENSE_END=========================================================
See the License for the specific language governing permissions and
limitations under the License.
============LICENSE_END=========================================================
- ECOMP is a trademark and service mark of AT&T Intellectual Property.
-->
<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>
- <artifactId>appc-interfaces-service</artifactId>
+ <parent>
+ <groupId>org.onap.appc.parent</groupId>
+ <artifactId>binding-parent</artifactId>
+ <version>2.6.0-SNAPSHOT</version>
+ <relativePath />
+ </parent>
<groupId>org.onap.appc</groupId>
<groupId>org.onap.appc</groupId>
- <version>1.3.0-SNAPSHOT</version>
- </parent>
<artifactId>appc-interfaces-service-bundle</artifactId>
<packaging>bundle</packaging>
<artifactId>appc-interfaces-service-bundle</artifactId>
<packaging>bundle</packaging>
@@
-40,10
+41,10
@@
<configuration>
<instructions>
<Export-Package>org.onap.appc.interfaces.services</Export-Package>
<configuration>
<instructions>
<Export-Package>org.onap.appc.interfaces.services</Export-Package>
- <Import-Package>org.onap.appc.aai.client,*;resolution:=optional</Import-Package>
+ <Import-Package>org.onap.appc.aai.client,
org.onap.appc.aai.client.*,
*;resolution:=optional</Import-Package>
<Embed-Dependency>jackson-dataformat-yaml</Embed-Dependency>
<DynamicImport-Package>*</DynamicImport-Package>
<Embed-Dependency>jackson-dataformat-yaml</Embed-Dependency>
<DynamicImport-Package>*</DynamicImport-Package>
-
<Embed-Transitive>true</Embed-Transitive>
+ <Embed-Transitive>true</Embed-Transitive>
</instructions>
</configuration>
</plugin>
</instructions>
</configuration>
</plugin>
@@
-56,7
+57,7
@@
<artifactId>appc-interfaces-service-model</artifactId>
<version>${project.version}</version>
</dependency>
<artifactId>appc-interfaces-service-model</artifactId>
<version>${project.version}</version>
</dependency>
-
<dependency>
+ <dependency>
<groupId>org.onap.appc</groupId>
<artifactId>appc-aai-client-provider</artifactId>
<version>${project.version}</version>
<groupId>org.onap.appc</groupId>
<artifactId>appc-aai-client-provider</artifactId>
<version>${project.version}</version>
@@
-87,14
+88,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>
@@
-104,20
+97,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>com.sun.jersey</groupId>
</dependency>
<dependency>
<groupId>com.sun.jersey</groupId>
@@
-159,4
+157,5
@@
<artifactId>commons-io</artifactId>
</dependency>
</dependencies>
<artifactId>commons-io</artifactId>
</dependency>
</dependencies>
+ <version>1.6.1</version>
</project>
</project>