홍길동 / onos

Go to a project
Toggle navigation Toggle navigation pinning
Brian Stanke
Committed by Ray Milkey
7cfd4433 1 parent be6de22e

ONOS-3704 - Cleaning up Maven build warning messages and cleaning up some versio… 

…ns of thirdparty libraries.

Change-Id: Id578e10713d41b6c02e92cb2c6e17a4da0787b52
Inline Side-by-side
Showing 12 changed files with 4 additions and 232 deletions
...@@ -121,13 +121,9 @@ ...@@ -121,13 +121,9 @@
121 com.fasterxml.jackson.databind, 121 com.fasterxml.jackson.databind,
122 com.fasterxml.jackson.databind.node, 122 com.fasterxml.jackson.databind.node,
123 org.apache.karaf.shell.commands, 123 org.apache.karaf.shell.commands,
124 - org.apache.commons.lang.math.*,
125 com.google.common.*, 124 com.google.common.*,
126 org.onlab.packet.*, 125 org.onlab.packet.*,
127 - org.onlab.rest.*,
128 org.onosproject.*, 126 org.onosproject.*,
129 - org.onlab.util.*,
130 - org.jboss.netty.util.*
131 </Import-Package> 127 </Import-Package>
132 <Web-ContextPath>${web.context}</Web-ContextPath> 128 <Web-ContextPath>${web.context}</Web-ContextPath>
133 </instructions> 129 </instructions>
......
...@@ -146,7 +146,6 @@ ...@@ -146,7 +146,6 @@
146 org.onlab.rest.*, 146 org.onlab.rest.*,
147 org.onosproject.*, 147 org.onosproject.*,
148 org.onlab.util.*, 148 org.onlab.util.*,
149 - org.jboss.netty.util.*
150 </Import-Package> 149 </Import-Package>
151 <Web-ContextPath>${web.context}</Web-ContextPath> 150 <Web-ContextPath>${web.context}</Web-ContextPath>
152 </instructions> 151 </instructions>
......
...@@ -92,14 +92,9 @@ ...@@ -92,14 +92,9 @@
92 <Import-Package> 92 <Import-Package>
93 org.slf4j, 93 org.slf4j,
94 org.osgi.framework, 94 org.osgi.framework,
95 - org.apache.commons.lang.math.*,
96 com.google.common.*, 95 com.google.common.*,
97 org.onlab.packet.*, 96 org.onlab.packet.*,
98 - org.onlab.rest.*,
99 org.onosproject.*, 97 org.onosproject.*,
100 - org.onosproject.mfwd.impl.*;
101 - org.onlab.util.*,
102 - org.jboss.netty.util.*
103 </Import-Package> 98 </Import-Package>
104 </instructions> 99 </instructions>
105 </configuration> 100 </configuration>
...@@ -107,7 +102,6 @@ ...@@ -107,7 +102,6 @@
107 <plugin> 102 <plugin>
108 <groupId>org.apache.maven.plugins</groupId> 103 <groupId>org.apache.maven.plugins</groupId>
109 <artifactId>maven-compiler-plugin</artifactId> 104 <artifactId>maven-compiler-plugin</artifactId>
110 - <version>2.5.1</version>
111 <configuration> 105 <configuration>
112 <source>1.8</source> 106 <source>1.8</source>
113 <target>1.8</target> 107 <target>1.8</target>
......
...@@ -125,15 +125,11 @@ ...@@ -125,15 +125,11 @@
125 com.sun.jersey.server.impl.container.servlet, 125 com.sun.jersey.server.impl.container.servlet,
126 com.fasterxml.jackson.databind, 126 com.fasterxml.jackson.databind,
127 com.fasterxml.jackson.databind.node, 127 com.fasterxml.jackson.databind.node,
128 - org.apache.commons.lang.math.*,
129 org.apache.karaf.shell.commands, 128 org.apache.karaf.shell.commands,
130 org.apache.karaf.shell.console, 129 org.apache.karaf.shell.console,
131 com.google.common.*, 130 com.google.common.*,
132 org.onlab.packet.*, 131 org.onlab.packet.*,
133 - org.onlab.rest.*,
134 org.onosproject.*, 132 org.onosproject.*,
135 - org.onlab.util.*,
136 - org.jboss.netty.util.*
137 </Import-Package> 133 </Import-Package>
138 <Web-ContextPath>${web.context}</Web-ContextPath> 134 <Web-ContextPath>${web.context}</Web-ContextPath>
139 </instructions> 135 </instructions>
......
...@@ -124,13 +124,10 @@ ...@@ -124,13 +124,10 @@
124 com.fasterxml.jackson.databind, 124 com.fasterxml.jackson.databind,
125 com.fasterxml.jackson.databind.node, 125 com.fasterxml.jackson.databind.node,
126 org.apache.karaf.shell.commands, 126 org.apache.karaf.shell.commands,
127 - org.apache.commons.lang.math.*,
128 com.google.common.*, 127 com.google.common.*,
129 org.onlab.packet.*, 128 org.onlab.packet.*,
130 - org.onlab.rest.*,
131 org.onosproject.*, 129 org.onosproject.*,
132 org.onlab.util.*, 130 org.onlab.util.*,
133 - org.jboss.netty.util.*
134 </Import-Package> 131 </Import-Package>
135 <Web-ContextPath>${web.context}</Web-ContextPath> 132 <Web-ContextPath>${web.context}</Web-ContextPath>
136 </instructions> 133 </instructions>
......
...@@ -53,6 +53,7 @@ ...@@ -53,6 +53,7 @@
53 <groupId>com.fasterxml.jackson.core</groupId> 53 <groupId>com.fasterxml.jackson.core</groupId>
54 <artifactId>jackson-annotations</artifactId> 54 <artifactId>jackson-annotations</artifactId>
55 <scope>provided</scope> 55 <scope>provided</scope>
56 + <version>${jackson.version}</version>
56 </dependency> 57 </dependency>
57 <dependency> 58 <dependency>
58 <groupId>org.onosproject</groupId> 59 <groupId>org.onosproject</groupId>
...@@ -62,11 +63,9 @@ ...@@ -62,11 +63,9 @@
62 <dependency> 63 <dependency>
63 <groupId>com.fasterxml.jackson.core</groupId> 64 <groupId>com.fasterxml.jackson.core</groupId>
64 <artifactId>jackson-databind</artifactId> 65 <artifactId>jackson-databind</artifactId>
66 + <version>${jackson.version}</version>
65 </dependency> 67 </dependency>
66 - <dependency> 68 +
67 - <groupId>com.fasterxml.jackson.core</groupId>
68 - <artifactId>jackson-annotations</artifactId>
69 - </dependency>
70 </dependencies> 69 </dependencies>
71 70
72 </project> 71 </project>
......
1 -/*
2 - * Copyright 2014-2015 Open Networking Laboratory
3 - *
4 - * Licensed under the Apache License, Version 2.0 (the "License");
5 - * you may not use this file except in compliance with the License.
6 - * You may obtain a copy of the License at
7 - *
8 - * http://www.apache.org/licenses/LICENSE-2.0
9 - *
10 - * Unless required by applicable law or agreed to in writing, software
11 - * distributed under the License is distributed on an "AS IS" BASIS,
12 - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13 - * See the License for the specific language governing permissions and
14 - * limitations under the License.
15 - */
16 -package org.onosproject.optical.testapp;
17 -
18 -import org.apache.felix.scr.annotations.Activate;
19 -import org.apache.felix.scr.annotations.Deactivate;
20 -import org.apache.felix.scr.annotations.Reference;
21 -import org.apache.felix.scr.annotations.ReferenceCardinality;
22 -import org.onosproject.core.ApplicationId;
23 -import org.onosproject.core.CoreService;
24 -import org.onosproject.net.Device;
25 -import org.onosproject.net.DeviceId;
26 -import org.onosproject.net.IndexedLambda;
27 -import org.onosproject.net.PortNumber;
28 -import org.onosproject.net.device.DeviceEvent;
29 -import org.onosproject.net.device.DeviceListener;
30 -import org.onosproject.net.device.DeviceService;
31 -import org.onosproject.net.flow.DefaultFlowRule;
32 -import org.onosproject.net.flow.DefaultTrafficSelector;
33 -import org.onosproject.net.flow.DefaultTrafficTreatment;
34 -import org.onosproject.net.flow.FlowRule;
35 -import org.onosproject.net.flow.FlowRuleService;
36 -import org.onosproject.net.flow.TrafficSelector;
37 -import org.onosproject.net.flow.TrafficTreatment;
38 -import org.onosproject.net.flow.criteria.Criteria;
39 -import org.onosproject.net.flow.instructions.Instructions;
40 -import org.slf4j.Logger;
41 -
42 -import java.util.HashMap;
43 -import java.util.Map;
44 -
45 -import static org.slf4j.LoggerFactory.getLogger;
46 -
47 -/**
48 - * Sample reactive forwarding application.
49 - *
50 - * @deprecated in Emu (ONOS 1.4).
51 - */
52 -@Deprecated
53 -//@Component(immediate = true)
54 -public class LambdaForwarding {
55 -
56 - private final Logger log = getLogger(getClass());
57 -
58 - @Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY)
59 - protected FlowRuleService flowRuleService;
60 -
61 - @Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY)
62 - protected CoreService coreService;
63 -
64 - @Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY)
65 - protected DeviceService deviceService;
66 -
67 - private ApplicationId appId;
68 -
69 - private final InternalDeviceListener listener = new InternalDeviceListener();
70 -
71 - private final Map<DeviceId, Integer> uglyMap = new HashMap<>();
72 -
73 - @Activate
74 - public void activate() {
75 - appId = coreService.registerApplication("org.onosproject.lambdafwd");
76 -
77 - uglyMap.put(DeviceId.deviceId("of:0000ffffffffff01"), 1);
78 - uglyMap.put(DeviceId.deviceId("of:0000ffffffffff02"), 2);
79 - uglyMap.put(DeviceId.deviceId("of:0000ffffffffff03"), 3);
80 -
81 - deviceService.addListener(listener);
82 -
83 - for (Device d : deviceService.getDevices()) {
84 - pushRules(d);
85 - }
86 -
87 -
88 - log.info("Started with Application ID {}", appId.id());
89 - }
90 -
91 - @Deactivate
92 - public void deactivate() {
93 - flowRuleService.removeFlowRulesById(appId);
94 -
95 - log.info("Stopped");
96 - }
97 -
98 -
99 - private void pushRules(Device device) {
100 -
101 - TrafficSelector.Builder sbuilder = DefaultTrafficSelector.builder();
102 - TrafficTreatment.Builder tbuilder = DefaultTrafficTreatment.builder();
103 - int inport;
104 - int outport;
105 - short lambda = 10;
106 - byte sigType = 1;
107 - Integer switchNumber = uglyMap.get(device.id());
108 - if (switchNumber == null) {
109 - return;
110 - }
111 -
112 - switch (switchNumber) {
113 - case 1:
114 - inport = 10;
115 - outport = 20;
116 - sbuilder.matchInPort(PortNumber.portNumber(inport));
117 - tbuilder.setOutput(PortNumber.portNumber(outport))
118 - .add(Instructions.modL0Lambda(new IndexedLambda(lambda)));
119 - break;
120 - case 2:
121 - inport = 21;
122 - outport = 11;
123 - sbuilder.add(Criteria.matchLambda(new IndexedLambda(lambda))).
124 - matchInPort(PortNumber.portNumber(inport)); // match sigtype
125 - tbuilder.setOutput(PortNumber.portNumber(outport));
126 - break;
127 - case 3:
128 - inport = 30;
129 - outport = 31;
130 - sbuilder.add(Criteria.matchLambda(new IndexedLambda(lambda))).
131 - matchInPort(PortNumber.portNumber(inport));
132 - tbuilder.setOutput(PortNumber.portNumber(outport))
133 - .add(Instructions.modL0Lambda(new IndexedLambda(lambda)));
134 - break;
135 - default:
136 - }
137 -
138 - TrafficTreatment treatment = tbuilder.build();
139 - TrafficSelector selector = sbuilder.build();
140 -
141 - FlowRule f = DefaultFlowRule.builder()
142 - .forDevice(device.id())
143 - .withSelector(selector)
144 - .withTreatment(treatment)
145 - .withPriority(100)
146 - .fromApp(appId)
147 - .makeTemporary(600)
148 - .build();
149 -
150 - flowRuleService.applyFlowRules(f);
151 -
152 -
153 -
154 - }
155 -
156 - public class InternalDeviceListener implements DeviceListener {
157 -
158 - @Override
159 - public void event(DeviceEvent event) {
160 - switch (event.type()) {
161 - case DEVICE_ADDED:
162 - pushRules(event.subject());
163 - break;
164 - case DEVICE_AVAILABILITY_CHANGED:
165 - break;
166 - case DEVICE_REMOVED:
167 - break;
168 - case DEVICE_SUSPENDED:
169 - break;
170 - case DEVICE_UPDATED:
171 - break;
172 - case PORT_ADDED:
173 - break;
174 - case PORT_REMOVED:
175 - break;
176 - case PORT_UPDATED:
177 - break;
178 - default:
179 - break;
180 -
181 - }
182 -
183 - }
184 -
185 - }
186 -
187 -
188 -}
189 -
190 -
...@@ -96,16 +96,11 @@ ...@@ -96,16 +96,11 @@
96 <Import-Package> 96 <Import-Package>
97 org.slf4j, 97 org.slf4j,
98 org.osgi.framework, 98 org.osgi.framework,
99 - org.apache.commons.lang.math.*,
100 com.google.common.*, 99 com.google.common.*,
101 org.apache.karaf.shell.commands, 100 org.apache.karaf.shell.commands,
102 org.apache.karaf.shell.console, 101 org.apache.karaf.shell.console,
103 org.onlab.packet.*, 102 org.onlab.packet.*,
104 - org.onlab.rest.*,
105 org.onosproject.*, 103 org.onosproject.*,
106 - org.onosproject.mfwd.impl.*;
107 - org.onlab.util.*,
108 - org.jboss.netty.util.*
109 </Import-Package> 104 </Import-Package>
110 </instructions> 105 </instructions>
111 </configuration> 106 </configuration>
...@@ -113,7 +108,6 @@ ...@@ -113,7 +108,6 @@
113 <plugin> 108 <plugin>
114 <groupId>org.apache.maven.plugins</groupId> 109 <groupId>org.apache.maven.plugins</groupId>
115 <artifactId>maven-compiler-plugin</artifactId> 110 <artifactId>maven-compiler-plugin</artifactId>
116 - <version>2.5.1</version>
117 <configuration> 111 <configuration>
118 <source>1.8</source> 112 <source>1.8</source>
119 <target>1.8</target> 113 <target>1.8</target>
......
...@@ -127,13 +127,10 @@ ...@@ -127,13 +127,10 @@
127 com.fasterxml.jackson.databind.node, 127 com.fasterxml.jackson.databind.node,
128 com.fasterxml.jackson.core, 128 com.fasterxml.jackson.core,
129 org.apache.karaf.shell.commands, 129 org.apache.karaf.shell.commands,
130 - org.apache.commons.lang.math.*,
131 com.google.common.*, 130 com.google.common.*,
132 org.onlab.packet.*, 131 org.onlab.packet.*,
133 - org.onlab.rest.*,
134 org.onosproject.*, 132 org.onosproject.*,
135 org.onlab.util.*, 133 org.onlab.util.*,
136 - org.jboss.netty.util.*
137 </Import-Package> 134 </Import-Package>
138 <Web-ContextPath>${web.context}</Web-ContextPath> 135 <Web-ContextPath>${web.context}</Web-ContextPath>
139 </instructions> 136 </instructions>
......
...@@ -49,7 +49,7 @@ ...@@ -49,7 +49,7 @@
49 <dependency> 49 <dependency>
50 <groupId>com.sun.jersey</groupId> 50 <groupId>com.sun.jersey</groupId>
51 <artifactId>jersey-client</artifactId> 51 <artifactId>jersey-client</artifactId>
52 - <version>1.19</version> 52 + <version>${jersey.version}</version>
53 </dependency> 53 </dependency>
54 <dependency> 54 <dependency>
55 <groupId>org.onosproject</groupId> 55 <groupId>org.onosproject</groupId>
...@@ -101,7 +101,6 @@ ...@@ -101,7 +101,6 @@
101 org.apache.karaf.shell.commands, 101 org.apache.karaf.shell.commands,
102 com.google.common.*, 102 com.google.common.*,
103 org.onlab.packet.*, 103 org.onlab.packet.*,
104 - org.onlab.rest.*,
105 org.onosproject.* 104 org.onosproject.*
106 </Import-Package> 105 </Import-Package>
107 <Web-ContextPath>${web.context}</Web-ContextPath> 106 <Web-ContextPath>${web.context}</Web-ContextPath>
......
...@@ -54,13 +54,6 @@ ...@@ -54,13 +54,6 @@
54 <plugin> 54 <plugin>
55 <groupId>org.apache.felix</groupId> 55 <groupId>org.apache.felix</groupId>
56 <artifactId>maven-bundle-plugin</artifactId> 56 <artifactId>maven-bundle-plugin</artifactId>
57 - <configuration>
58 - <instructions>
59 - <Export-Package>
60 - org.onosproject.openflow.*,org.projectfloodlight.openflow.*
61 - </Export-Package>
62 - </instructions>
63 - </configuration>
64 </plugin> 57 </plugin>
65 </plugins> 58 </plugins>
66 </build> 59 </build>
......
...@@ -69,13 +69,11 @@ ...@@ -69,13 +69,11 @@
69 com.fasterxml.jackson.databind.node, 69 com.fasterxml.jackson.databind.node,
70 com.fasterxml.jackson.core, 70 com.fasterxml.jackson.core,
71 org.apache.karaf.shell.commands, 71 org.apache.karaf.shell.commands,
72 - org.apache.commons.lang.math.*,
73 com.google.common.*, 72 com.google.common.*,
74 org.onlab.packet.*, 73 org.onlab.packet.*,
75 org.onlab.rest.*, 74 org.onlab.rest.*,
76 org.onosproject.*, 75 org.onosproject.*,
77 org.onlab.util.*, 76 org.onlab.util.*,
78 - org.jboss.netty.util.*
79 </Import-Package> 77 </Import-Package>
80 <Web-ContextPath>${web.context}</Web-ContextPath> 78 <Web-ContextPath>${web.context}</Web-ContextPath>
81 </instructions> 79 </instructions>
......