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 "Bug 509: Fixed order of invoking Schema listeners."
[controller.git]
/
opendaylight
/
md-sal
/
test
/
sal-rest-connector-it
/
pom.xml
diff --git
a/opendaylight/md-sal/test/sal-rest-connector-it/pom.xml
b/opendaylight/md-sal/test/sal-rest-connector-it/pom.xml
index a9fc739456b95740c3ab9c00313c31711e7ebba9..f0a8584730955a76514824494d02de82f66ded54 100644
(file)
--- a/
opendaylight/md-sal/test/sal-rest-connector-it/pom.xml
+++ b/
opendaylight/md-sal/test/sal-rest-connector-it/pom.xml
@@
-43,7
+43,7
@@
</plugins>
<pluginManagement>
<plugins>
</plugins>
<pluginManagement>
<plugins>
- <!--This plugin's configuration is used to store Eclipse
+ <!--This plugin's configuration is used to store Eclipse
m2e settings only. It has no influence on the Maven build itself. -->
<plugin>
<groupId>org.eclipse.m2e</groupId>
m2e settings only. It has no influence on the Maven build itself. -->
<plugin>
<groupId>org.eclipse.m2e</groupId>
@@
-605,7
+605,7
@@
<artifactId>jersey-core</artifactId>
<version>${jersey.version}</version>
</dependency>
<artifactId>jersey-core</artifactId>
<version>${jersey.version}</version>
</dependency>
- <!-- <dependency> <groupId>com.sun.jersey</groupId> <artifactId>jersey-servlet</artifactId>
+ <!-- <dependency> <groupId>com.sun.jersey</groupId> <artifactId>jersey-servlet</artifactId>
<version>${jersey.version}</version> </dependency> -->
<dependency>
<groupId>com.sun.jersey</groupId>
<version>${jersey.version}</version> </dependency> -->
<dependency>
<groupId>com.sun.jersey</groupId>
@@
-667,7
+667,7
@@
</dependency>
<dependency>
<groupId>org.opendaylight.controller</groupId>
</dependency>
<dependency>
<groupId>org.opendaylight.controller</groupId>
- <artifactId>config-persister-file-adapter</artifactId>
+ <artifactId>config-persister-file-
xml-
adapter</artifactId>
<version>${config.version}</version>
</dependency>
<dependency>
<version>${config.version}</version>
</dependency>
<dependency>