Code Review
/
controller.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge changes Ia09a1107,I2c30f3b6
[controller.git]
/
opendaylight
/
config
/
logback-config
/
pom.xml
diff --git
a/opendaylight/config/logback-config/pom.xml
b/opendaylight/config/logback-config/pom.xml
index 7b3873741120bda450dc04bc206338f47c0274dd..b63f3298c1af9602674894915664499bcb9d038f 100644
(file)
--- a/
opendaylight/config/logback-config/pom.xml
+++ b/
opendaylight/config/logback-config/pom.xml
@@
-6,7
+6,7
@@
<parent>
<groupId>org.opendaylight.controller</groupId>
<artifactId>config-subsystem</artifactId>
<parent>
<groupId>org.opendaylight.controller</groupId>
<artifactId>config-subsystem</artifactId>
- <version>0.2.
1
-SNAPSHOT</version>
+ <version>0.2.
3
-SNAPSHOT</version>
</parent>
<artifactId>logback-config</artifactId>
<name>${project.artifactId}</name>
</parent>
<artifactId>logback-config</artifactId>
<name>${project.artifactId}</name>
@@
-19,7
+19,6
@@
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>config-api</artifactId>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>config-api</artifactId>
- <version>0.2.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
@@
-28,12
+27,10
@@
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
- <version>${logback.version}</version>
</dependency>
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-core</artifactId>
</dependency>
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-core</artifactId>
- <version>${logback.version}</version>
</dependency>
<dependency>
</dependency>
<dependency>
@@
-50,26
+47,22
@@
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>config-manager</artifactId>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>config-manager</artifactId>
- <version>0.2.1-SNAPSHOT</version>
<scope>test</scope>
<type>test-jar</type>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>config-manager</artifactId>
<scope>test</scope>
<type>test-jar</type>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>config-manager</artifactId>
- <version>0.2.1-SNAPSHOT</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>config-util</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>config-util</artifactId>
- <version>0.2.1-SNAPSHOT</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.opendaylight.bgpcep</groupId>
<artifactId>mockito-configuration</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.opendaylight.bgpcep</groupId>
<artifactId>mockito-configuration</artifactId>
- <version>${bgpcep.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<scope>test</scope>
</dependency>
<dependency>
@@
-102,7
+95,8
@@
com.google.common.base,
com.google.common.collect,
org.apache.commons.lang3,
com.google.common.base,
com.google.common.collect,
org.apache.commons.lang3,
- org.slf4j
+ org.slf4j,
+ org.osgi.framework
</Import-Package>
<Export-Package>
org.opendaylight.controller.config.yang.logback.config,
</Import-Package>
<Export-Package>
org.opendaylight.controller.config.yang.logback.config,