홍길동 / onos

Go to a project
Toggle navigation Toggle navigation pinning
Hyunsun Moon
Committed by Gerrit Code Review
31dacd4c 1 parent bb8775b7

Fixed openstack4j dependencies 

Change-Id: I3bba45dc8edc71807ca5961ec191a619506ab4bc
Inline Side-by-side
Showing 3 changed files with 1 additions and 10 deletions
...@@ -19,6 +19,5 @@ ...@@ -19,6 +19,5 @@
19 <feature>onos-api</feature> 19 <feature>onos-api</feature>
20 <bundle>mvn:${project.groupId}/onos-app-cordvtn/${project.version}</bundle> 20 <bundle>mvn:${project.groupId}/onos-app-cordvtn/${project.version}</bundle>
21 <bundle>wrap:mvn:com.jcraft/jsch/0.1.53$Bundle-SymbolicName=jsch&amp;Bundle-Version=0.1.53</bundle> 21 <bundle>wrap:mvn:com.jcraft/jsch/0.1.53$Bundle-SymbolicName=jsch&amp;Bundle-Version=0.1.53</bundle>
22 - <bundle>wrap:mvn:org.pacesys/openstack4j/2.11/jar/withdeps$Bundle-SymbolicName=openstack4j&amp;Bundle-Version=2.11</bundle>
23 </feature> 22 </feature>
24 </features> 23 </features>
......
...@@ -99,11 +99,6 @@ ...@@ -99,11 +99,6 @@
99 </dependency> 99 </dependency>
100 <dependency> 100 <dependency>
101 <groupId>org.onosproject</groupId> 101 <groupId>org.onosproject</groupId>
102 - <artifactId>onos-app-openstackinterface-api</artifactId>
103 - <version>${project.version}</version>
104 - </dependency>
105 - <dependency>
106 - <groupId>org.onosproject</groupId>
107 <artifactId>onos-app-dhcp-api</artifactId> 102 <artifactId>onos-app-dhcp-api</artifactId>
108 <version>${project.version}</version> 103 <version>${project.version}</version>
109 </dependency> 104 </dependency>
...@@ -147,6 +142,7 @@ ...@@ -147,6 +142,7 @@
147 </Bundle-SymbolicName> 142 </Bundle-SymbolicName>
148 <Import-Package> 143 <Import-Package>
149 !org.apache.http.*, 144 !org.apache.http.*,
145 + !com.fasterxml.jackson.dataformat.*,
150 *,org.glassfish.jersey.servlet 146 *,org.glassfish.jersey.servlet
151 </Import-Package> 147 </Import-Package>
152 <Embed-Dependency> 148 <Embed-Dependency>
......
...@@ -47,10 +47,6 @@ ...@@ -47,10 +47,6 @@
47 <param-name>javax.ws.rs.Application</param-name> 47 <param-name>javax.ws.rs.Application</param-name>
48 <param-value>org.onosproject.cordvtn.rest.CordVtnWebApplication</param-value> 48 <param-value>org.onosproject.cordvtn.rest.CordVtnWebApplication</param-value>
49 </init-param> 49 </init-param>
50 - <init-param>
51 - <param-name>jersey.config.server.disableAutoDiscovery</param-name>
52 - <param-value>true</param-value>
53 - </init-param>
54 <load-on-startup>1</load-on-startup> 50 <load-on-startup>1</load-on-startup>
55 </servlet> 51 </servlet>
56 52
......