ONOS-3704 - Cleaning up Maven build warning messages and cleaning up some versions of thirdparty libraries.
Change-Id: Id578e10713d41b6c02e92cb2c6e17a4da0787b52
diff --git a/apps/cordfabric/pom.xml b/apps/cordfabric/pom.xml
index fbd202c..9015140 100644
--- a/apps/cordfabric/pom.xml
+++ b/apps/cordfabric/pom.xml
@@ -121,13 +121,9 @@
com.fasterxml.jackson.databind,
com.fasterxml.jackson.databind.node,
org.apache.karaf.shell.commands,
- org.apache.commons.lang.math.*,
com.google.common.*,
org.onlab.packet.*,
- org.onlab.rest.*,
org.onosproject.*,
- org.onlab.util.*,
- org.jboss.netty.util.*
</Import-Package>
<Web-ContextPath>${web.context}</Web-ContextPath>
</instructions>
diff --git a/apps/cordvtn/pom.xml b/apps/cordvtn/pom.xml
index f2b0a8a..1b47313 100644
--- a/apps/cordvtn/pom.xml
+++ b/apps/cordvtn/pom.xml
@@ -146,7 +146,6 @@
org.onlab.rest.*,
org.onosproject.*,
org.onlab.util.*,
- org.jboss.netty.util.*
</Import-Package>
<Web-ContextPath>${web.context}</Web-ContextPath>
</instructions>
diff --git a/apps/igmp/pom.xml b/apps/igmp/pom.xml
index 23b2661..94cdbe9 100644
--- a/apps/igmp/pom.xml
+++ b/apps/igmp/pom.xml
@@ -92,14 +92,9 @@
<Import-Package>
org.slf4j,
org.osgi.framework,
- org.apache.commons.lang.math.*,
com.google.common.*,
org.onlab.packet.*,
- org.onlab.rest.*,
org.onosproject.*,
- org.onosproject.mfwd.impl.*;
- org.onlab.util.*,
- org.jboss.netty.util.*
</Import-Package>
</instructions>
</configuration>
@@ -107,7 +102,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
- <version>2.5.1</version>
<configuration>
<source>1.8</source>
<target>1.8</target>
diff --git a/apps/mfwd/pom.xml b/apps/mfwd/pom.xml
index 45d3cd5..ec80266 100644
--- a/apps/mfwd/pom.xml
+++ b/apps/mfwd/pom.xml
@@ -125,15 +125,11 @@
com.sun.jersey.server.impl.container.servlet,
com.fasterxml.jackson.databind,
com.fasterxml.jackson.databind.node,
- org.apache.commons.lang.math.*,
org.apache.karaf.shell.commands,
org.apache.karaf.shell.console,
com.google.common.*,
org.onlab.packet.*,
- org.onlab.rest.*,
org.onosproject.*,
- org.onlab.util.*,
- org.jboss.netty.util.*
</Import-Package>
<Web-ContextPath>${web.context}</Web-ContextPath>
</instructions>
diff --git a/apps/olt/app/pom.xml b/apps/olt/app/pom.xml
index 7ae11e3..b79d7cd 100644
--- a/apps/olt/app/pom.xml
+++ b/apps/olt/app/pom.xml
@@ -124,13 +124,10 @@
com.fasterxml.jackson.databind,
com.fasterxml.jackson.databind.node,
org.apache.karaf.shell.commands,
- org.apache.commons.lang.math.*,
com.google.common.*,
org.onlab.packet.*,
- org.onlab.rest.*,
org.onosproject.*,
org.onlab.util.*,
- org.jboss.netty.util.*
</Import-Package>
<Web-ContextPath>${web.context}</Web-ContextPath>
</instructions>
diff --git a/apps/optical/pom.xml b/apps/optical/pom.xml
index 9b273cd..50da547 100644
--- a/apps/optical/pom.xml
+++ b/apps/optical/pom.xml
@@ -53,6 +53,7 @@
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-annotations</artifactId>
<scope>provided</scope>
+ <version>${jackson.version}</version>
</dependency>
<dependency>
<groupId>org.onosproject</groupId>
@@ -62,11 +63,9 @@
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
+ <version>${jackson.version}</version>
</dependency>
- <dependency>
- <groupId>com.fasterxml.jackson.core</groupId>
- <artifactId>jackson-annotations</artifactId>
- </dependency>
+
</dependencies>
</project>
diff --git a/apps/optical/src/main/java/org/onosproject/optical/testapp/LambdaForwarding.java b/apps/optical/src/main/java/org/onosproject/optical/testapp/LambdaForwarding.java
deleted file mode 100644
index 1d170d6..0000000
--- a/apps/optical/src/main/java/org/onosproject/optical/testapp/LambdaForwarding.java
+++ /dev/null
@@ -1,190 +0,0 @@
-/*
- * Copyright 2014-2015 Open Networking Laboratory
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.onosproject.optical.testapp;
-
-import org.apache.felix.scr.annotations.Activate;
-import org.apache.felix.scr.annotations.Deactivate;
-import org.apache.felix.scr.annotations.Reference;
-import org.apache.felix.scr.annotations.ReferenceCardinality;
-import org.onosproject.core.ApplicationId;
-import org.onosproject.core.CoreService;
-import org.onosproject.net.Device;
-import org.onosproject.net.DeviceId;
-import org.onosproject.net.IndexedLambda;
-import org.onosproject.net.PortNumber;
-import org.onosproject.net.device.DeviceEvent;
-import org.onosproject.net.device.DeviceListener;
-import org.onosproject.net.device.DeviceService;
-import org.onosproject.net.flow.DefaultFlowRule;
-import org.onosproject.net.flow.DefaultTrafficSelector;
-import org.onosproject.net.flow.DefaultTrafficTreatment;
-import org.onosproject.net.flow.FlowRule;
-import org.onosproject.net.flow.FlowRuleService;
-import org.onosproject.net.flow.TrafficSelector;
-import org.onosproject.net.flow.TrafficTreatment;
-import org.onosproject.net.flow.criteria.Criteria;
-import org.onosproject.net.flow.instructions.Instructions;
-import org.slf4j.Logger;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import static org.slf4j.LoggerFactory.getLogger;
-
-/**
- * Sample reactive forwarding application.
- *
- * @deprecated in Emu (ONOS 1.4).
- */
-@Deprecated
-//@Component(immediate = true)
-public class LambdaForwarding {
-
- private final Logger log = getLogger(getClass());
-
- @Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY)
- protected FlowRuleService flowRuleService;
-
- @Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY)
- protected CoreService coreService;
-
- @Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY)
- protected DeviceService deviceService;
-
- private ApplicationId appId;
-
- private final InternalDeviceListener listener = new InternalDeviceListener();
-
- private final Map<DeviceId, Integer> uglyMap = new HashMap<>();
-
- @Activate
- public void activate() {
- appId = coreService.registerApplication("org.onosproject.lambdafwd");
-
- uglyMap.put(DeviceId.deviceId("of:0000ffffffffff01"), 1);
- uglyMap.put(DeviceId.deviceId("of:0000ffffffffff02"), 2);
- uglyMap.put(DeviceId.deviceId("of:0000ffffffffff03"), 3);
-
- deviceService.addListener(listener);
-
- for (Device d : deviceService.getDevices()) {
- pushRules(d);
- }
-
-
- log.info("Started with Application ID {}", appId.id());
- }
-
- @Deactivate
- public void deactivate() {
- flowRuleService.removeFlowRulesById(appId);
-
- log.info("Stopped");
- }
-
-
- private void pushRules(Device device) {
-
- TrafficSelector.Builder sbuilder = DefaultTrafficSelector.builder();
- TrafficTreatment.Builder tbuilder = DefaultTrafficTreatment.builder();
- int inport;
- int outport;
- short lambda = 10;
- byte sigType = 1;
- Integer switchNumber = uglyMap.get(device.id());
- if (switchNumber == null) {
- return;
- }
-
- switch (switchNumber) {
- case 1:
- inport = 10;
- outport = 20;
- sbuilder.matchInPort(PortNumber.portNumber(inport));
- tbuilder.setOutput(PortNumber.portNumber(outport))
- .add(Instructions.modL0Lambda(new IndexedLambda(lambda)));
- break;
- case 2:
- inport = 21;
- outport = 11;
- sbuilder.add(Criteria.matchLambda(new IndexedLambda(lambda))).
- matchInPort(PortNumber.portNumber(inport)); // match sigtype
- tbuilder.setOutput(PortNumber.portNumber(outport));
- break;
- case 3:
- inport = 30;
- outport = 31;
- sbuilder.add(Criteria.matchLambda(new IndexedLambda(lambda))).
- matchInPort(PortNumber.portNumber(inport));
- tbuilder.setOutput(PortNumber.portNumber(outport))
- .add(Instructions.modL0Lambda(new IndexedLambda(lambda)));
- break;
- default:
- }
-
- TrafficTreatment treatment = tbuilder.build();
- TrafficSelector selector = sbuilder.build();
-
- FlowRule f = DefaultFlowRule.builder()
- .forDevice(device.id())
- .withSelector(selector)
- .withTreatment(treatment)
- .withPriority(100)
- .fromApp(appId)
- .makeTemporary(600)
- .build();
-
- flowRuleService.applyFlowRules(f);
-
-
-
- }
-
- public class InternalDeviceListener implements DeviceListener {
-
- @Override
- public void event(DeviceEvent event) {
- switch (event.type()) {
- case DEVICE_ADDED:
- pushRules(event.subject());
- break;
- case DEVICE_AVAILABILITY_CHANGED:
- break;
- case DEVICE_REMOVED:
- break;
- case DEVICE_SUSPENDED:
- break;
- case DEVICE_UPDATED:
- break;
- case PORT_ADDED:
- break;
- case PORT_REMOVED:
- break;
- case PORT_UPDATED:
- break;
- default:
- break;
-
- }
-
- }
-
- }
-
-
-}
-
-
diff --git a/apps/pim/pom.xml b/apps/pim/pom.xml
index c9500fb..3973351 100644
--- a/apps/pim/pom.xml
+++ b/apps/pim/pom.xml
@@ -96,16 +96,11 @@
<Import-Package>
org.slf4j,
org.osgi.framework,
- org.apache.commons.lang.math.*,
com.google.common.*,
org.apache.karaf.shell.commands,
org.apache.karaf.shell.console,
org.onlab.packet.*,
- org.onlab.rest.*,
org.onosproject.*,
- org.onosproject.mfwd.impl.*;
- org.onlab.util.*,
- org.jboss.netty.util.*
</Import-Package>
</instructions>
</configuration>
@@ -113,7 +108,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
- <version>2.5.1</version>
<configuration>
<source>1.8</source>
<target>1.8</target>
diff --git a/apps/segmentrouting/pom.xml b/apps/segmentrouting/pom.xml
index 3f59618..5562b9f 100644
--- a/apps/segmentrouting/pom.xml
+++ b/apps/segmentrouting/pom.xml
@@ -127,13 +127,10 @@
com.fasterxml.jackson.databind.node,
com.fasterxml.jackson.core,
org.apache.karaf.shell.commands,
- org.apache.commons.lang.math.*,
com.google.common.*,
org.onlab.packet.*,
- org.onlab.rest.*,
org.onosproject.*,
org.onlab.util.*,
- org.jboss.netty.util.*
</Import-Package>
<Web-ContextPath>${web.context}</Web-ContextPath>
</instructions>
diff --git a/apps/virtualbng/pom.xml b/apps/virtualbng/pom.xml
index 1588064..c078823 100644
--- a/apps/virtualbng/pom.xml
+++ b/apps/virtualbng/pom.xml
@@ -49,7 +49,7 @@
<dependency>
<groupId>com.sun.jersey</groupId>
<artifactId>jersey-client</artifactId>
- <version>1.19</version>
+ <version>${jersey.version}</version>
</dependency>
<dependency>
<groupId>org.onosproject</groupId>
@@ -101,7 +101,6 @@
org.apache.karaf.shell.commands,
com.google.common.*,
org.onlab.packet.*,
- org.onlab.rest.*,
org.onosproject.*
</Import-Package>
<Web-ContextPath>${web.context}</Web-ContextPath>
diff --git a/apps/vtn/sfcmgr/pom.xml b/apps/vtn/sfcmgr/pom.xml
index 88dda53..a6a297b 100644
--- a/apps/vtn/sfcmgr/pom.xml
+++ b/apps/vtn/sfcmgr/pom.xml
@@ -54,13 +54,6 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <configuration>
- <instructions>
- <Export-Package>
- org.onosproject.openflow.*,org.projectfloodlight.openflow.*
- </Export-Package>
- </instructions>
- </configuration>
</plugin>
</plugins>
</build>
diff --git a/apps/vtn/vtnweb/pom.xml b/apps/vtn/vtnweb/pom.xml
index fdbfe00..aa52b1c 100644
--- a/apps/vtn/vtnweb/pom.xml
+++ b/apps/vtn/vtnweb/pom.xml
@@ -69,13 +69,11 @@
com.fasterxml.jackson.databind.node,
com.fasterxml.jackson.core,
org.apache.karaf.shell.commands,
- org.apache.commons.lang.math.*,
com.google.common.*,
org.onlab.packet.*,
org.onlab.rest.*,
org.onosproject.*,
org.onlab.util.*,
- org.jboss.netty.util.*
</Import-Package>
<Web-ContextPath>${web.context}</Web-ContextPath>
</instructions>