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 "Switch to using yangtools version of mockito-configuration"
[controller.git]
/
opendaylight
/
config
/
yang-jmx-generator-plugin
/
pom.xml
diff --git
a/opendaylight/config/yang-jmx-generator-plugin/pom.xml
b/opendaylight/config/yang-jmx-generator-plugin/pom.xml
index 81d55efeaf4b82405d5a448628b2bea8148236fd..21e728c41f4fbd4f16eb7af3b5145fecfa2d9c5e 100644
(file)
--- a/
opendaylight/config/yang-jmx-generator-plugin/pom.xml
+++ b/
opendaylight/config/yang-jmx-generator-plugin/pom.xml
@@
-4,10
+4,11
@@
<parent>
<artifactId>config-subsystem</artifactId>
<groupId>org.opendaylight.controller</groupId>
<parent>
<artifactId>config-subsystem</artifactId>
<groupId>org.opendaylight.controller</groupId>
- <version>0.2.
1
-SNAPSHOT</version>
+ <version>0.2.
3
-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
<artifactId>yang-jmx-generator-plugin</artifactId>
<relativePath>..</relativePath>
</parent>
<artifactId>yang-jmx-generator-plugin</artifactId>
+
<dependencies>
<dependency>
<dependencies>
<dependency>
@@
-18,19
+19,16
@@
<dependency>
<groupId>org.opendaylight.controller</groupId>
<artifactId>yang-jmx-generator</artifactId>
<dependency>
<groupId>org.opendaylight.controller</groupId>
<artifactId>yang-jmx-generator</artifactId>
- <version>0.2.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.opendaylight.yangtools</groupId>
<artifactId>yang-maven-plugin-spi</artifactId>
</dependency>
<dependency>
<groupId>org.opendaylight.yangtools</groupId>
<artifactId>yang-maven-plugin-spi</artifactId>
- <version>${opendaylight.yang.version}</version>
</dependency>
<dependency>
<groupId>org.opendaylight.yangtools</groupId>
<artifactId>binding-type-provider</artifactId>
</dependency>
<dependency>
<groupId>org.opendaylight.yangtools</groupId>
<artifactId>binding-type-provider</artifactId>
- <version>${opendaylight.binding.version}</version>
</dependency>
<dependency>
</dependency>
<dependency>
@@
-38,8
+36,24
@@
<artifactId>core</artifactId>
<version>3.3.0-v_771</version>
<scope>test</scope>
<artifactId>core</artifactId>
<version>3.3.0-v_771</version>
<scope>test</scope>
+
+ <exclusions>
+ <exclusion>
+ <groupId>org.eclipse.equinox</groupId>
+ <artifactId>app</artifactId>
+ </exclusion>
+ </exclusions>
+
</dependency>
</dependency>
+ <dependency>
+ <groupId>org.eclipse.equinox</groupId>
+ <artifactId>app</artifactId>
+ <version>1.0.0-v20070606</version>
+ <scope>test</scope>
+ </dependency>
+
+
<dependency>
<groupId>org.freemarker</groupId>
<artifactId>freemarker</artifactId>
<dependency>
<groupId>org.freemarker</groupId>
<artifactId>freemarker</artifactId>
@@
-49,7
+63,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>
</dependency>
<dependency>
@@
-58,7
+71,6
@@
</dependency>
<dependency>
</dependency>
<dependency>
- <!--FIXME two implementations of slf4j on classpath, logback classic from parent-->
<groupId>com.googlecode.slf4j-maven-plugin-log</groupId>
<artifactId>slf4j-maven-plugin-log</artifactId>
<version>1.0.0</version>
<groupId>com.googlecode.slf4j-maven-plugin-log</groupId>
<artifactId>slf4j-maven-plugin-log</artifactId>
<version>1.0.0</version>
@@
-72,7
+84,6
@@
<dependency>
<groupId>org.opendaylight.controller</groupId>
<artifactId>yang-jmx-generator</artifactId>
<dependency>
<groupId>org.opendaylight.controller</groupId>
<artifactId>yang-jmx-generator</artifactId>
- <version>0.2.1-SNAPSHOT</version>
<scope>test</scope>
<type>test-jar</type>
</dependency>
<scope>test</scope>
<type>test-jar</type>
</dependency>
@@
-82,13
+93,18
@@
<artifactId>jdt</artifactId>
<version>3.3.0-v20070607-1300</version>
<scope>test</scope>
<artifactId>jdt</artifactId>
<version>3.3.0-v20070607-1300</version>
<scope>test</scope>
+
+ <exclusions>
+ <exclusion>
+ <groupId>org.eclipse.equinox</groupId>
+ <artifactId>app</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
</dependency>
<dependency>
- <groupId>org.opendaylight.
bgpcep
</groupId>
+ <groupId>org.opendaylight.
yangtools
</groupId>
<artifactId>mockito-configuration</artifactId>
<artifactId>mockito-configuration</artifactId>
- <version>0.2.0-SNAPSHOT</version>
- <scope>test</scope>
</dependency>
<dependency>
</dependency>
<dependency>