Code Review
/
controller.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Changing the file names from run.sh/run.bat to runsanity.sh/runsanity.bat to make...
[controller.git]
/
opendaylight
/
distribution
/
opendaylight
/
pom.xml
diff --git
a/opendaylight/distribution/opendaylight/pom.xml
b/opendaylight/distribution/opendaylight/pom.xml
index 05867335b5d8de3e6eec9bca3b870b3859be94a8..790b9b34c0dd30ebe106d4e1ed527112d706140e 100644
(file)
--- a/
opendaylight/distribution/opendaylight/pom.xml
+++ b/
opendaylight/distribution/opendaylight/pom.xml
@@
-69,6
+69,11
@@
<artifactId>sal-binding-api</artifactId>
<version>${mdsal.version}</version>
</dependency>
<artifactId>sal-binding-api</artifactId>
<version>${mdsal.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.opendaylight.controller</groupId>
+ <artifactId>sal-binding-config</artifactId>
+ <version>${mdsal.version}</version>
+ </dependency>
<dependency>
<groupId>org.opendaylight.controller</groupId>
<artifactId>sal-binding-broker-impl</artifactId>
<dependency>
<groupId>org.opendaylight.controller</groupId>
<artifactId>sal-binding-broker-impl</artifactId>
@@
-109,6
+114,11
@@
<artifactId>model-flow-statistics</artifactId>
<version>${mdsal.version}</version>
</dependency>
<artifactId>model-flow-statistics</artifactId>
<version>${mdsal.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.opendaylight.controller.model</groupId>
+ <artifactId>model-flow-management</artifactId>
+ <version>${mdsal.version}</version>
+ </dependency>
<dependency>
<groupId>org.opendaylight.controller</groupId>
<dependency>
<groupId>org.opendaylight.controller</groupId>
@@
-188,37
+198,37
@@
<dependency>
<groupId>org.opendaylight.controller</groupId>
<artifactId>netconf-api</artifactId>
<dependency>
<groupId>org.opendaylight.controller</groupId>
<artifactId>netconf-api</artifactId>
- <version>${
config
.version}</version>
+ <version>${
netconf
.version}</version>
</dependency>
<dependency>
<groupId>org.opendaylight.controller</groupId>
<artifactId>netconf-impl</artifactId>
</dependency>
<dependency>
<groupId>org.opendaylight.controller</groupId>
<artifactId>netconf-impl</artifactId>
- <version>${
config
.version}</version>
+ <version>${
netconf
.version}</version>
</dependency>
<dependency>
<groupId>org.opendaylight.controller</groupId>
<artifactId>netconf-util</artifactId>
</dependency>
<dependency>
<groupId>org.opendaylight.controller</groupId>
<artifactId>netconf-util</artifactId>
- <version>${
config
.version}</version>
+ <version>${
netconf
.version}</version>
</dependency>
<dependency>
<groupId>org.opendaylight.controller</groupId>
<artifactId>netconf-client</artifactId>
</dependency>
<dependency>
<groupId>org.opendaylight.controller</groupId>
<artifactId>netconf-client</artifactId>
- <version>${
config
.version}</version>
+ <version>${
netconf
.version}</version>
</dependency>
<dependency>
<groupId>org.opendaylight.controller</groupId>
<artifactId>netconf-mapping-api</artifactId>
</dependency>
<dependency>
<groupId>org.opendaylight.controller</groupId>
<artifactId>netconf-mapping-api</artifactId>
- <version>${
config
.version}</version>
+ <version>${
netconf
.version}</version>
</dependency>
<dependency>
<groupId>org.opendaylight.controller</groupId>
<artifactId>config-netconf-connector</artifactId>
</dependency>
<dependency>
<groupId>org.opendaylight.controller</groupId>
<artifactId>config-netconf-connector</artifactId>
- <version>${
config
.version}</version>
+ <version>${
netconf
.version}</version>
</dependency>
<dependency>
<groupId>org.opendaylight.controller</groupId>
<artifactId>config-persister-impl</artifactId>
</dependency>
<dependency>
<groupId>org.opendaylight.controller</groupId>
<artifactId>config-persister-impl</artifactId>
- <version>${
config
.version}</version>
+ <version>${
netconf
.version}</version>
</dependency>
</dependency>
@@
-406,7
+416,7
@@
<dependency>
<groupId>org.opendaylight.controller</groupId>
<artifactId>statisticsmanager</artifactId>
<dependency>
<groupId>org.opendaylight.controller</groupId>
<artifactId>statisticsmanager</artifactId>
- <version>${
controll
er.version}</version>
+ <version>${
statisticsmanag
er.version}</version>
</dependency>
<dependency>
<groupId>org.opendaylight.controller</groupId>
</dependency>
<dependency>
<groupId>org.opendaylight.controller</groupId>
@@
-446,7
+456,7
@@
<dependency>
<groupId>org.opendaylight.controller</groupId>
<artifactId>forwardingrulesmanager</artifactId>
<dependency>
<groupId>org.opendaylight.controller</groupId>
<artifactId>forwardingrulesmanager</artifactId>
- <version>${
controll
er.version}</version>
+ <version>${
forwardingrulesmanag
er.version}</version>
</dependency>
<dependency>
<groupId>org.opendaylight.controller</groupId>
</dependency>
<dependency>
<groupId>org.opendaylight.controller</groupId>
@@
-628,6
+638,11
@@
<artifactId>usermanager.northbound</artifactId>
<version>0.0.1-SNAPSHOT</version>
</dependency>
<artifactId>usermanager.northbound</artifactId>
<version>0.0.1-SNAPSHOT</version>
</dependency>
+ <dependency>
+ <groupId>org.opendaylight.controller</groupId>
+ <artifactId>controllermanager.northbound</artifactId>
+ <version>0.0.1-SNAPSHOT</version>
+ </dependency>
<!-- Debug and logging -->
<dependency>
<!-- Debug and logging -->
<dependency>
@@
-1235,12
+1250,17
@@
</execution>
</executions>
<configuration>
</execution>
</executions>
<configuration>
- <executable>java</executable>
+ <executable>
${java.home}/bin/
java</executable>
<arguments>
<argument>-cp</argument>
<argument>./target/dependency/*</argument>
<argument>org.opendaylight.controller.distribution.Sanity</argument>
</arguments>
<arguments>
<argument>-cp</argument>
<argument>./target/dependency/*</argument>
<argument>org.opendaylight.controller.distribution.Sanity</argument>
</arguments>
+ <environmentVariables>
+ <JAVA_HOME>
+ ${java.home}
+ </JAVA_HOME>
+ </environmentVariables>
</configuration>
</plugin>
</plugins>
</configuration>
</plugin>
</plugins>