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 "Prevent ConfigPusher from killing its thread"
[controller.git]
/
opendaylight
/
config
/
pom.xml
diff --git
a/opendaylight/config/pom.xml
b/opendaylight/config/pom.xml
index ca576824fa8887e1080f38860b9b0d0b2d26a5b0..9eede7765b47e7db1ce4220c0af3d0ae99cd8fc4 100644
(file)
--- a/
opendaylight/config/pom.xml
+++ b/
opendaylight/config/pom.xml
@@
-41,6
+41,7
@@
<module>netty-timer-config</module>
<module>config-persister-directory-adapter</module>
<module>config-persister-directory-xml-adapter</module>
<module>netty-timer-config</module>
<module>config-persister-directory-adapter</module>
<module>config-persister-directory-xml-adapter</module>
+ <module>config-persister-directory-autodetect-adapter</module>
<module>yang-test-plugin</module>
<module>shutdown-api</module>
<module>shutdown-impl</module>
<module>yang-test-plugin</module>
<module>shutdown-api</module>
<module>shutdown-impl</module>
@@
-67,10
+68,8
@@
<osgi.version>5.0.0</osgi.version>
<jacoco.version>0.6.2.201302030002</jacoco.version>
<slf4j.version>1.7.2</slf4j.version>
<osgi.version>5.0.0</osgi.version>
<jacoco.version>0.6.2.201302030002</jacoco.version>
<slf4j.version>1.7.2</slf4j.version>
- <opendaylight.yang.version>0.5.9-SNAPSHOT</opendaylight.yang.version>
- <opendaylight.binding.version>0.6.0-SNAPSHOT</opendaylight.binding.version>
- <opendaylight.yangtools.version>0.1.1-SNAPSHOT</opendaylight.yangtools.version>
<salGeneratorPath>${project.build.directory}/generated-sources/sal</salGeneratorPath>
<salGeneratorPath>${project.build.directory}/generated-sources/sal</salGeneratorPath>
+ <config.version>0.2.3-SNAPSHOT</config.version>
</properties>
<dependencies>
</properties>
<dependencies>
@@
-99,11
+98,6
@@
<artifactId>org.osgi.core</artifactId>
<version>${osgi.version}</version>
</dependency>
<artifactId>org.osgi.core</artifactId>
<version>${osgi.version}</version>
</dependency>
- <dependency>
- <groupId>com.google.code.findbugs</groupId>
- <artifactId>jsr305</artifactId>
- <version>2.0.1</version>
- </dependency>
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
@@
-159,29
+153,30
@@
<version>${config.version}</version>
</dependency>
<dependency>
<version>${config.version}</version>
</dependency>
<dependency>
- <groupId>org.opendaylight.bgpcep</groupId>
- <artifactId>mockito-configuration</artifactId>
- <version>${bgpcep.version}</version>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>config-persister-api</artifactId>
+ <version>${config.version}</version>
+ <type>test-jar</type>
</dependency>
<dependency>
<groupId>org.opendaylight.yangtools</groupId>
<artifactId>binding-generator-spi</artifactId>
</dependency>
<dependency>
<groupId>org.opendaylight.yangtools</groupId>
<artifactId>binding-generator-spi</artifactId>
- <version>${
opendaylight.binding
.version}</version>
+ <version>${
yangtools
.version}</version>
</dependency>
<dependency>
<groupId>org.opendaylight.yangtools</groupId>
<artifactId>binding-generator-util</artifactId>
</dependency>
<dependency>
<groupId>org.opendaylight.yangtools</groupId>
<artifactId>binding-generator-util</artifactId>
- <version>${
opendaylight.binding
.version}</version>
+ <version>${
yangtools
.version}</version>
</dependency>
<dependency>
<groupId>org.opendaylight.yangtools</groupId>
<artifactId>yang-parser-impl</artifactId>
</dependency>
<dependency>
<groupId>org.opendaylight.yangtools</groupId>
<artifactId>yang-parser-impl</artifactId>
- <version>${
opendaylight.yang
.version}</version>
+ <version>${
yangtools
.version}</version>
</dependency>
<dependency>
<groupId>org.opendaylight.yangtools</groupId>
<artifactId>binding-generator-impl</artifactId>
</dependency>
<dependency>
<groupId>org.opendaylight.yangtools</groupId>
<artifactId>binding-generator-impl</artifactId>
- <version>${
opendaylight.binding
.version}</version>
+ <version>${
yangtools
.version}</version>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
@@
-202,12
+197,12
@@
<dependency>
<groupId>org.opendaylight.yangtools</groupId>
<artifactId>binding-type-provider</artifactId>
<dependency>
<groupId>org.opendaylight.yangtools</groupId>
<artifactId>binding-type-provider</artifactId>
- <version>${
opendaylight.binding
.version}</version>
+ <version>${
yangtools
.version}</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>
+ <version>${
yangtools
.version}</version>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
@@
-225,17
+220,17
@@
<dependency>
<groupId>org.opendaylight.yangtools</groupId>
<artifactId>yang-binding</artifactId>
<dependency>
<groupId>org.opendaylight.yangtools</groupId>
<artifactId>yang-binding</artifactId>
- <version>${
opendaylight.binding
.version}</version>
+ <version>${
yangtools
.version}</version>
</dependency>
<dependency>
<groupId>org.opendaylight.yangtools</groupId>
<artifactId>yang-common</artifactId>
</dependency>
<dependency>
<groupId>org.opendaylight.yangtools</groupId>
<artifactId>yang-common</artifactId>
- <version>${
opendaylight.yang
.version}</version>
+ <version>${
yangtools
.version}</version>
</dependency>
<dependency>
<groupId>org.opendaylight.yangtools</groupId>
<artifactId>concepts</artifactId>
</dependency>
<dependency>
<groupId>org.opendaylight.yangtools</groupId>
<artifactId>concepts</artifactId>
- <version>${
opendaylight.
yangtools.version}</version>
+ <version>${yangtools.version}</version>
</dependency>
</dependencies>
</dependencyManagement>
</dependency>
</dependencies>
</dependencyManagement>
@@
-265,7
+260,7
@@
<goal>report</goal>
</goals>
<configuration>
<goal>report</goal>
</goals>
<configuration>
- <outputDirectory>${
basedir}/target
/jacoco</outputDirectory>
+ <outputDirectory>${
project.build.directory}
/jacoco</outputDirectory>
<haltOnFailure>false</haltOnFailure>
<check>
<classRatio>80</classRatio>
<haltOnFailure>false</haltOnFailure>
<check>
<classRatio>80</classRatio>
@@
-287,7
+282,7
@@
<plugin>
<groupId>org.opendaylight.yangtools</groupId>
<artifactId>yang-maven-plugin</artifactId>
<plugin>
<groupId>org.opendaylight.yangtools</groupId>
<artifactId>yang-maven-plugin</artifactId>
- <version>${
opendaylight.yang
.version}</version>
+ <version>${
yangtools
.version}</version>
<executions>
<execution>
<id>sal</id>
<executions>
<execution>
<id>sal</id>
@@
-307,7
+302,7
@@
</generator>
<generator>
<codeGeneratorClass>org.opendaylight.yangtools.yang.unified.doc.generator.maven.DocumentationGeneratorImpl</codeGeneratorClass>
</generator>
<generator>
<codeGeneratorClass>org.opendaylight.yangtools.yang.unified.doc.generator.maven.DocumentationGeneratorImpl</codeGeneratorClass>
- <outputBaseDir>
target
/site/models</outputBaseDir>
+ <outputBaseDir>
${project.build.directory}
/site/models</outputBaseDir>
</generator>
</codeGenerators>
<inspectDependencies>true</inspectDependencies>
</generator>
</codeGenerators>
<inspectDependencies>true</inspectDependencies>
@@
-318,7
+313,7
@@
<dependency>
<groupId>org.opendaylight.yangtools</groupId>
<artifactId>maven-sal-api-gen-plugin</artifactId>
<dependency>
<groupId>org.opendaylight.yangtools</groupId>
<artifactId>maven-sal-api-gen-plugin</artifactId>
- <version>${
opendaylight.binding
.version}</version>
+ <version>${
yangtools
.version}</version>
<type>jar</type>
</dependency>
</dependencies>
<type>jar</type>
</dependency>
</dependencies>