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-config
/
appc-flow-controller
/
provider
/
pom.xml
diff --git
a/appc-config/appc-flow-controller/provider/pom.xml
b/appc-config/appc-flow-controller/provider/pom.xml
index
807b52b
..
d930971
100644
(file)
--- a/
appc-config/appc-flow-controller/provider/pom.xml
+++ b/
appc-config/appc-flow-controller/provider/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,27
+18,23
@@
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>
+ <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>
- <artifactId>appc-config-flow-controller</artifactId>
- <version>1.3.0-SNAPSHOT</version>
- </parent>
<artifactId>appc-config-flow-controller-provider</artifactId>
<packaging>bundle</packaging>
<name>Flow Executor - Provider</name>
<url>http://maven.apache.org</url>
<dependencies>
<artifactId>appc-config-flow-controller-provider</artifactId>
<packaging>bundle</packaging>
<name>Flow Executor - Provider</name>
<url>http://maven.apache.org</url>
<dependencies>
- <dependency>
- <groupId>equinoxSDK381</groupId>
- <artifactId>org.eclipse.osgi</artifactId>
- <version>${equinox.osgi.version}</version>
- </dependency>
<dependency>
<groupId>org.onap.ccsdk.sli.core</groupId>
<artifactId>sli-provider</artifactId>
<dependency>
<groupId>org.onap.ccsdk.sli.core</groupId>
<artifactId>sli-provider</artifactId>
@@
-55,6
+51,10
@@
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-annotations</artifactId>
</dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-annotations</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-lang3</artifactId>
+ </dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-core</artifactId>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-core</artifactId>
@@
-63,9
+63,20
@@
<groupId>com.fasterxml.jackson.dataformat</groupId>
<artifactId>jackson-dataformat-yaml</artifactId>
</dependency>
<groupId>com.fasterxml.jackson.dataformat</groupId>
<artifactId>jackson-dataformat-yaml</artifactId>
</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>
@@
-121,6
+132,11
@@
<version>1.9.2</version>
<scope>compile</scope>
</dependency>
<version>1.9.2</version>
<scope>compile</scope>
</dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.core</artifactId>
+ <scope>provided</scope>
+ </dependency>
</dependencies>
</dependencies>
@@
-136,7
+152,9
@@
<Bundle-SymbolicName>org.onap.appc.flow.controller</Bundle-SymbolicName>
<Bundle-Activator>org.onap.appc.flow.controller.FlowControllerActivator</Bundle-Activator>
<Export-Package>org.onap.appc.flow.controller</Export-Package>
<Bundle-SymbolicName>org.onap.appc.flow.controller</Bundle-SymbolicName>
<Bundle-Activator>org.onap.appc.flow.controller.FlowControllerActivator</Bundle-Activator>
<Export-Package>org.onap.appc.flow.controller</Export-Package>
- <Import-Package>*</Import-Package>
+ <Import-Package>groovy.lang;resolution:=optional,
+ org.codehaus.groovy.*;resolution:=optional,*</Import-Package>
+ <Embed-Dependency>eelf-core,logback-core,logback-classic</Embed-Dependency>
<DynamicImport-Package>*</DynamicImport-Package>
</instructions>
<manifestLocation>${project.basedir}/src/main/resources/META-INF</manifestLocation>
<DynamicImport-Package>*</DynamicImport-Package>
</instructions>
<manifestLocation>${project.basedir}/src/main/resources/META-INF</manifestLocation>
@@
-144,4
+162,5
@@
</plugin>
</plugins>
</build>
</plugin>
</plugins>
</build>
+ <version>1.6.1</version>
</project>
</project>