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 "RPC input is wrapped into RPC name element"
[controller.git]
/
opendaylight
/
web
/
root
/
pom.xml
diff --git
a/opendaylight/web/root/pom.xml
b/opendaylight/web/root/pom.xml
index ed899c5b5c7e50e74581b13b5f8988fd78a18a69..85388d9b05f70587f6ba5006590411fac1363a25 100644
(file)
--- a/
opendaylight/web/root/pom.xml
+++ b/
opendaylight/web/root/pom.xml
@@
-1,16
+1,21
@@
<?xml version="1.0" encoding="UTF-8"?>
<?xml version="1.0" encoding="UTF-8"?>
-<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.
0
-SNAPSHOT</version>
+ <version>1.4.
1
-SNAPSHOT</version>
<relativePath>../../commons/opendaylight</relativePath>
</parent>
<relativePath>../../commons/opendaylight</relativePath>
</parent>
+ <scm>
+ <connection>scm:git:ssh://git.opendaylight.org:29418/controller.git</connection>
+ <developerConnection>scm:git:ssh://git.opendaylight.org:29418/controller.git</developerConnection>
+ <url>https://wiki.opendaylight.org/view/OpenDaylight_Controller:Main</url>
+ <tag>HEAD</tag>
+ </scm>
<artifactId>web</artifactId>
<artifactId>web</artifactId>
- <version>0.4.
0
-SNAPSHOT</version>
+ <version>0.4.
1
-SNAPSHOT</version>
<packaging>bundle</packaging>
<build>
<packaging>bundle</packaging>
<build>
@@
-18,7
+23,7
@@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <version>
2.3.6
</version>
+ <version>
${bundle.plugin.version}
</version>
<extensions>true</extensions>
<configuration>
<instructions>
<extensions>true</extensions>
<configuration>
<instructions>
@@
-29,6
+34,9
@@
org.opendaylight.controller.sal.utils,
org.opendaylight.controller.usermanager,
org.opendaylight.controller.containermanager,
org.opendaylight.controller.sal.utils,
org.opendaylight.controller.usermanager,
org.opendaylight.controller.containermanager,
+ org.opendaylight.controller.clustering.services,
+ org.opendaylight.controller.connectionmanager,
+ org.opendaylight.controller.switchmanager,
com.google.gson,
javax.annotation,
javax.naming,
com.google.gson,
javax.annotation,
javax.naming,
@@
-73,7
+81,8
@@
org.springframework.web.servlet.view.json,
org.springframework.web.filter,
org.springframework.web.context,
org.springframework.web.servlet.view.json,
org.springframework.web.filter,
org.springframework.web.context,
- org.springframework.util
+ org.springframework.util,
+ org.apache.catalina.filters
</Import-Package>
<Export-Package>
org.opendaylight.controller.web
</Import-Package>
<Export-Package>
org.opendaylight.controller.web
@@
-88,65
+97,53
@@
<dependencies>
<dependency>
<groupId>org.opendaylight.controller</groupId>
<dependencies>
<dependency>
<groupId>org.opendaylight.controller</groupId>
- <artifactId>c
onfiguration
</artifactId>
- <version>0.4.
0
-SNAPSHOT</version>
+ <artifactId>c
lustering.services
</artifactId>
+ <version>0.4.
1
-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.opendaylight.controller</groupId>
</dependency>
<dependency>
<groupId>org.opendaylight.controller</groupId>
- <artifactId>
sal
</artifactId>
- <version>0.
5.0
-SNAPSHOT</version>
+ <artifactId>
connectionmanager
</artifactId>
+ <version>0.
1.1
-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.opendaylight.controller</groupId>
</dependency>
<dependency>
<groupId>org.opendaylight.controller</groupId>
- <artifactId>
usermanager
</artifactId>
- <version>0.4.
0
-SNAPSHOT</version>
+ <artifactId>
configuration
</artifactId>
+ <version>0.4.
1
-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.opendaylight.controller</groupId>
</dependency>
<dependency>
<groupId>org.opendaylight.controller</groupId>
- <artifactId>
containermanager
</artifactId>
- <version>0.
4.0
-SNAPSHOT</version>
+ <artifactId>
sal
</artifactId>
+ <version>0.
5.1
-SNAPSHOT</version>
</dependency>
<dependency>
</dependency>
<dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.8.1</version>
- <scope>test</scope>
+ <groupId>org.opendaylight.controller</groupId>
+ <artifactId>usermanager</artifactId>
+ <version>0.4.1-SNAPSHOT</version>
</dependency>
<dependency>
</dependency>
<dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-beans</artifactId>
- <version>3.2.1.RELEASE</version>
- <scope>provided</scope>
+ <groupId>org.opendaylight.controller</groupId>
+ <artifactId>containermanager</artifactId>
+ <version>0.5.1-SNAPSHOT</version>
</dependency>
<dependency>
</dependency>
<dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-core</artifactId>
- <version>3.2.1.RELEASE</version>
- <scope>provided</scope>
+ <groupId>org.opendaylight.controller</groupId>
+ <artifactId>switchmanager</artifactId>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
- <artifactId>spring-context</artifactId>
- <version>3.2.1.RELEASE</version>
- <scope>provided</scope>
+ <artifactId>org.springframework.web</artifactId>
</dependency>
<dependency>
</dependency>
<dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-expression</artifactId>
- <version>3.2.1.RELEASE</version>
- <scope>provided</scope>
+ <groupId>equinoxSDK381</groupId>
+ <artifactId>javax.servlet</artifactId>
</dependency>
<dependency>
</dependency>
<dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-web</artifactId>
- <version>3.2.1.RELEASE</version>
- <scope>provided</scope>
+ <groupId>com.google.code.gson</groupId>
+ <artifactId>gson</artifactId>
</dependency>
<dependency>
</dependency>
<dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-webmvc</artifactId>
- <version>3.2.1.RELEASE</version>
- <scope>provided</scope>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
</dependency>
</dependencies>
</project>
</dependency>
</dependencies>
</project>