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 "Resolve Bug:623 : Generate private key using bouncycastle."
[controller.git]
/
opendaylight
/
northbound
/
commons
/
pom.xml
diff --git
a/opendaylight/northbound/commons/pom.xml
b/opendaylight/northbound/commons/pom.xml
index 8e52242105680b8505b7a2e2cdd90dba261a3061..684744c015a6d2d69d098334d336f53ed2a9b369 100644
(file)
--- a/
opendaylight/northbound/commons/pom.xml
+++ b/
opendaylight/northbound/commons/pom.xml
@@
-1,11
+1,10
@@
<?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.
1
-SNAPSHOT</version>
+ <version>1.4.
2
-SNAPSHOT</version>
<relativePath>../../commons/opendaylight</relativePath>
</parent>
<scm>
<relativePath>../../commons/opendaylight</relativePath>
</parent>
<scm>
@@
-16,7
+15,7
@@
</scm>
<artifactId>commons.northbound</artifactId>
</scm>
<artifactId>commons.northbound</artifactId>
- <version>0.4.
1
-SNAPSHOT</version>
+ <version>0.4.
2
-SNAPSHOT</version>
<packaging>bundle</packaging>
<build>
<packaging>bundle</packaging>
<build>
@@
-52,9
+51,10
@@
org.osgi.service.packageadmin,
org.osgi.util.tracker,
javax.servlet.http,
org.osgi.service.packageadmin,
org.osgi.util.tracker,
javax.servlet.http,
- org.codehaus.jackson,
- org.codehaus.jackson.jaxrs,
- org.codehaus.jackson.map,
+ com.fasterxml.jackson.core,
+ com.fasterxml.jackson.databind,
+ com.fasterxml.jackson.jaxrs.base,
+ com.fasterxml.jackson.jaxrs.json,
org.slf4j
</Import-Package>
</instructions>
org.slf4j
</Import-Package>
</instructions>
@@
-64,6
+64,10
@@
</plugins>
</build>
<dependencies>
</plugins>
</build>
<dependencies>
+ <dependency>
+ <groupId>org.opendaylight.controller</groupId>
+ <artifactId>containermanager</artifactId>
+ </dependency>
<dependency>
<groupId>org.opendaylight.controller</groupId>
<artifactId>switchmanager</artifactId>
<dependency>
<groupId>org.opendaylight.controller</groupId>
<artifactId>switchmanager</artifactId>
@@
-71,30
+75,31
@@
<dependency>
<groupId>org.opendaylight.controller</groupId>
<artifactId>sal</artifactId>
<dependency>
<groupId>org.opendaylight.controller</groupId>
<artifactId>sal</artifactId>
- <version>${sal.version}</version>
</dependency>
<dependency>
<groupId>org.opendaylight.controller</groupId>
<artifactId>usermanager</artifactId>
</dependency>
<dependency>
<groupId>org.opendaylight.controller</groupId>
<artifactId>usermanager</artifactId>
- <version>${usermanager.version}</version>
</dependency>
<dependency>
<groupId>org.opendaylight.controller</groupId>
<artifactId>bundlescanner</artifactId>
</dependency>
<dependency>
<groupId>org.opendaylight.controller</groupId>
<artifactId>bundlescanner</artifactId>
- <version>${bundlescanner.version}</version>
</dependency>
</dependency>
- <dependency>
- <groupId>org.codehaus.jackson</groupId>
- <artifactId>jackson-core-asl</artifactId>
- </dependency>
- <dependency>
- <groupId>org.codehaus.jackson</groupId>
- <artifactId>jackson-mapper-asl</artifactId>
+
+ <dependency>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-databind</artifactId>
</dependency>
</dependency>
+
<dependency>
<dependency>
-
<groupId>org.codehaus.jackson
</groupId>
-
<artifactId>jackson-jaxrs
</artifactId>
+
<groupId>com.fasterxml.jackson.jaxrs
</groupId>
+
<artifactId>jackson-jaxrs-json-provider
</artifactId>
</dependency>
</dependency>
+
+ <dependency>
+ <groupId>com.fasterxml.jackson.jaxrs</groupId>
+ <artifactId>jackson-jaxrs-base</artifactId>
+ </dependency>
+
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
@@
-107,17
+112,10
@@
<dependency>
<groupId>com.sun.jersey</groupId>
<artifactId>jersey-server</artifactId>
<dependency>
<groupId>com.sun.jersey</groupId>
<artifactId>jersey-server</artifactId>
- <version>${jersey.version}</version>
</dependency>
<dependency>
<groupId>com.sun.jersey</groupId>
<artifactId>jersey-client</artifactId>
</dependency>
<dependency>
<groupId>com.sun.jersey</groupId>
<artifactId>jersey-client</artifactId>
- <version>${jersey.version}</version>
- </dependency>
- <dependency>
- <groupId>com.sun.jersey</groupId>
- <artifactId>jersey-json</artifactId>
- <version>${jersey.version}</version>
</dependency>
</dependencies>
</project>
</dependency>
</dependencies>
</project>