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 Iae4ee2f2,I148c22c4,I1dab84ae
[controller.git]
/
opendaylight
/
config
/
pom.xml
diff --git
a/opendaylight/config/pom.xml
b/opendaylight/config/pom.xml
index 4a9d37623c5785fcf15f840030f492aac717be7b..dbf8654d6e6ea15a3349688b072ce649bc292a58 100644
(file)
--- a/
opendaylight/config/pom.xml
+++ b/
opendaylight/config/pom.xml
@@
-1,18
+1,17
@@
<?xml version="1.0" encoding="UTF-8"?>
<!-- vi: set et smarttab sw=4 tabstop=4: -->
<?xml version="1.0" encoding="UTF-8"?>
<!-- vi: set et smarttab sw=4 tabstop=4: -->
-<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">
+<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>
<groupId>org.opendaylight.controller</groupId>
<artifactId>commons.opendaylight</artifactId>
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.opendaylight.controller</groupId>
<artifactId>commons.opendaylight</artifactId>
- <version>1.4.
1
-SNAPSHOT</version>
+ <version>1.4.
2
-SNAPSHOT</version>
<relativePath>../commons/opendaylight</relativePath>
</parent>
<relativePath>../commons/opendaylight</relativePath>
</parent>
- <version>0.2.
3
-SNAPSHOT</version>
+ <version>0.2.
4
-SNAPSHOT</version>
<artifactId>config-subsystem</artifactId>
<packaging>pom</packaging>
<name>${project.artifactId}</name>
<artifactId>config-subsystem</artifactId>
<packaging>pom</packaging>
<name>${project.artifactId}</name>
@@
-68,10
+67,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.4-SNAPSHOT</config.version>
</properties>
<dependencies>
</properties>
<dependencies>
@@
-100,11
+97,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>
@@
-168,22
+160,22
@@
<dependency>
<groupId>org.opendaylight.yangtools</groupId>
<artifactId>binding-generator-spi</artifactId>
<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>
@@
-204,12
+196,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>
@@
-227,17
+219,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>
@@
-267,7
+259,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>
@@
-289,7
+281,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>
@@
-309,7
+301,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>
@@
-320,7
+312,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>
@@
-418,7
+410,7
@@
</goals>
</pluginExecutionFilter>
<action>
</goals>
</pluginExecutionFilter>
<action>
- <ignore
></ignore
>
+ <ignore
/
>
</action>
</pluginExecution>
</pluginExecutions>
</action>
</pluginExecution>
</pluginExecutions>