From 52c35c45d2afc89595cca04929b347693b61d68c Mon Sep 17 00:00:00 2001 From: David Erickson Date: Sat, 18 May 2013 15:50:54 -0700 Subject: [PATCH] Formatting cleanup of POM files Replaced tabs with two spaces and removed some extraneous lines and tail whitespace. Change-Id: I3dbc766b3ffabf76a17a04454beb69933f67f8a0 Signed-off-by: David Erickson --- opendaylight/arphandler/pom.xml | 44 +-- opendaylight/clustering/services/pom.xml | 18 +- .../services_implementation/pom.xml | 126 ++++---- opendaylight/clustering/test/pom.xml | 44 +-- opendaylight/configuration/api/pom.xml | 28 +- .../configuration/implementation/pom.xml | 10 +- opendaylight/containermanager/api/pom.xml | 38 +-- .../distribution/opendaylight/pom.xml | 20 +- opendaylight/forwarding/staticrouting/pom.xml | 42 +-- .../forwardingrulesmanager/api/pom.xml | 55 ++-- opendaylight/hosttracker/api/pom.xml | 130 ++++---- .../hosttracker/implementation/pom.xml | 238 +++++++------- .../hosttracker/integrationtest/pom.xml | 71 +++-- opendaylight/northbound/commons/pom.xml | 2 +- opendaylight/northbound/hosttracker/pom.xml | 14 +- opendaylight/northbound/staticrouting/pom.xml | 10 +- opendaylight/northbound/statistics/pom.xml | 73 ++--- opendaylight/northbound/subnets/pom.xml | 20 +- opendaylight/northbound/switchmanager/pom.xml | 40 +-- opendaylight/northbound/topology/pom.xml | 46 +-- .../protocol_plugins/openflow/pom.xml | 6 +- .../routing/dijkstra_implementation/pom.xml | 54 ++-- opendaylight/sal/api/pom.xml | 2 +- opendaylight/sal/implementation/pom.xml | 8 +- opendaylight/samples/loadbalancer/pom.xml | 184 +++++------ .../samples/northbound/loadbalancer/pom.xml | 54 ++-- opendaylight/samples/simpleforwarding/pom.xml | 18 +- opendaylight/security/pom.xml | 110 +++---- opendaylight/switchmanager/api/pom.xml | 52 ++-- .../switchmanager/implementation/pom.xml | 64 ++-- opendaylight/topologymanager/pom.xml | 61 ++-- opendaylight/usermanager/pom.xml | 174 +++++------ opendaylight/web/devices/pom.xml | 227 +++++++------- opendaylight/web/flows/pom.xml | 226 +++++++------- opendaylight/web/root/pom.xml | 294 +++++++++--------- opendaylight/web/topology/pom.xml | 244 +++++++-------- opendaylight/web/troubleshoot/pom.xml | 230 +++++++------- third-party/openflowj/pom.xml | 86 ++--- 38 files changed, 1577 insertions(+), 1586 deletions(-) diff --git a/opendaylight/arphandler/pom.xml b/opendaylight/arphandler/pom.xml index e95512dcd0..62f93b235d 100644 --- a/opendaylight/arphandler/pom.xml +++ b/opendaylight/arphandler/pom.xml @@ -16,29 +16,29 @@ - org.apache.felix - maven-bundle-plugin - 2.3.6 - true - - - - org.opendaylight.controller.sal.core, - org.opendaylight.controller.sal.utils, - org.opendaylight.controller.sal.packet, - org.opendaylight.controller.switchmanager, - org.opendaylight.controller.hosttracker, - org.opendaylight.controller.hosttracker.hostAware, - org.apache.felix.dm, - org.osgi.service.component, - org.slf4j - - - org.opendaylight.controller.arphandler.internal.Activator - - + org.apache.felix + maven-bundle-plugin + 2.3.6 + true + + + + org.opendaylight.controller.sal.core, + org.opendaylight.controller.sal.utils, + org.opendaylight.controller.sal.packet, + org.opendaylight.controller.switchmanager, + org.opendaylight.controller.hosttracker, + org.opendaylight.controller.hosttracker.hostAware, + org.apache.felix.dm, + org.osgi.service.component, + org.slf4j + + + org.opendaylight.controller.arphandler.internal.Activator + + ${project.basedir}/META-INF - + diff --git a/opendaylight/clustering/services/pom.xml b/opendaylight/clustering/services/pom.xml index 36462ba76a..628d2b13e5 100644 --- a/opendaylight/clustering/services/pom.xml +++ b/opendaylight/clustering/services/pom.xml @@ -15,21 +15,21 @@ - org.apache.felix - maven-bundle-plugin - 2.3.6 - true - - - + org.apache.felix + maven-bundle-plugin + 2.3.6 + true + + + org.opendaylight.controller.clustering.services javax.transaction - + ${project.basedir}/META-INF - + diff --git a/opendaylight/clustering/services_implementation/pom.xml b/opendaylight/clustering/services_implementation/pom.xml index 6edb50b82e..d6ff7ca6d1 100644 --- a/opendaylight/clustering/services_implementation/pom.xml +++ b/opendaylight/clustering/services_implementation/pom.xml @@ -29,70 +29,70 @@ - - - org.apache.felix - maven-bundle-plugin - 2.3.6 - true - - - - org.slf4j, - !org.jboss.*, - !bsh*, - !net.jcip.*, - javax.transaction, - *, - org.opendaylight.controller.clustering.services, - org.opendaylight.controller.sal.core - - - org.opendaylight.controller.clustering.services_implementation.internal.Activator - - - - - - - - - - * - - - infinispan-core,jgroups,jboss-marshalling-river,jboss-marshalling,jboss-logging,staxmapper;type=!pom;inline=false - - - true - - + + + org.apache.felix + maven-bundle-plugin + 2.3.6 + true + + + + org.slf4j, + !org.jboss.*, + !bsh*, + !net.jcip.*, + javax.transaction, + *, + org.opendaylight.controller.clustering.services, + org.opendaylight.controller.sal.core + + + org.opendaylight.controller.clustering.services_implementation.internal.Activator + + + + + + + + + + * + + + infinispan-core,jgroups,jboss-marshalling-river,jboss-marshalling,jboss-logging,staxmapper;type=!pom;inline=false + + + true + + ${project.basedir}/META-INF - - - - org.jacoco - jacoco-maven-plugin - - org.opendaylight.controller.* - - - - pre-test - - prepare-agent - - - - post-test - test - - report - - - - - + + + + org.jacoco + jacoco-maven-plugin + + org.opendaylight.controller.* + + + + pre-test + + prepare-agent + + + + post-test + test + + report + + + + + diff --git a/opendaylight/clustering/test/pom.xml b/opendaylight/clustering/test/pom.xml index 161e7a9182..695e939cd3 100644 --- a/opendaylight/clustering/test/pom.xml +++ b/opendaylight/clustering/test/pom.xml @@ -13,29 +13,29 @@ bundle - - - org.apache.felix - maven-bundle-plugin - 2.3.6 - true - - - - org.slf4j, - javax.transaction, - org.eclipse.osgi.framework.console, - ch.qos.logback.classic, - org.opendaylight.controller.clustering.services - - - OSGI-INF/component.xml - - + + + org.apache.felix + maven-bundle-plugin + 2.3.6 + true + + + + org.slf4j, + javax.transaction, + org.eclipse.osgi.framework.console, + ch.qos.logback.classic, + org.opendaylight.controller.clustering.services + + + OSGI-INF/component.xml + + ${project.basedir}/META-INF - - - + + + diff --git a/opendaylight/configuration/api/pom.xml b/opendaylight/configuration/api/pom.xml index c7eeb3c6eb..ff7bbe478e 100644 --- a/opendaylight/configuration/api/pom.xml +++ b/opendaylight/configuration/api/pom.xml @@ -16,30 +16,30 @@ - org.apache.felix + org.apache.felix maven-bundle-plugin 2.3.6 true - - - + + + org.opendaylight.controller.sal.utils, org.apache.commons.lang3.builder - - + + org.opendaylight.controller.configuration - - + + ${project.basedir}/META-INF - + - - org.opendaylight.controller - sal - 0.5.0-SNAPSHOT - + + org.opendaylight.controller + sal + 0.5.0-SNAPSHOT + diff --git a/opendaylight/configuration/implementation/pom.xml b/opendaylight/configuration/implementation/pom.xml index 78e4de8d82..232a50586d 100644 --- a/opendaylight/configuration/implementation/pom.xml +++ b/opendaylight/configuration/implementation/pom.xml @@ -53,10 +53,10 @@ configuration 0.4.0-SNAPSHOT - - org.opendaylight.controller - sal - 0.5.0-SNAPSHOT - + + org.opendaylight.controller + sal + 0.5.0-SNAPSHOT + diff --git a/opendaylight/containermanager/api/pom.xml b/opendaylight/containermanager/api/pom.xml index ac6757fa30..c4203bf625 100644 --- a/opendaylight/containermanager/api/pom.xml +++ b/opendaylight/containermanager/api/pom.xml @@ -16,36 +16,36 @@ - org.apache.felix + org.apache.felix maven-bundle-plugin 2.3.6 true - - - - org.opendaylight.controller.sal.action, - org.opendaylight.controller.sal.authorization, - org.opendaylight.controller.sal.core, - org.opendaylight.controller.sal.flowprogrammer, - org.opendaylight.controller.sal.match, + + + + org.opendaylight.controller.sal.action, + org.opendaylight.controller.sal.authorization, + org.opendaylight.controller.sal.core, + org.opendaylight.controller.sal.flowprogrammer, + org.opendaylight.controller.sal.match, org.opendaylight.controller.sal.reader, org.opendaylight.controller.sal.utils, org.apache.commons.lang3.builder - - + + org.opendaylight.controller.containermanager - - + + ${project.basedir}/META-INF - + - - org.opendaylight.controller - sal - 0.5.0-SNAPSHOT - + + org.opendaylight.controller + sal + 0.5.0-SNAPSHOT + diff --git a/opendaylight/distribution/opendaylight/pom.xml b/opendaylight/distribution/opendaylight/pom.xml index 51885febcb..3ebd4c80aa 100644 --- a/opendaylight/distribution/opendaylight/pom.xml +++ b/opendaylight/distribution/opendaylight/pom.xml @@ -57,26 +57,24 @@ ../../topologymanager ../../usermanager ../../security - - + + ../../../third-party/openflowj ../../../third-party/net.sf.jung2 ../../../third-party/jersey-servlet - + ../../sal/api ../../sal/implementation - + ../../web/root ../../web/flows ../../web/devices ../../web/troubleshoot ../../web/topology - + - - ../../northbound/commons ../../northbound/topology ../../northbound/staticrouting @@ -85,20 +83,20 @@ ../../northbound/hosttracker ../../northbound/subnets ../../northbound/switchmanager - + ../../logging/bridge - + ../../protocol_plugins/openflow ../../protocol_plugins/stub - + ../../samples/simpleforwarding ../../samples/loadbalancer ../../samples/northbound/loadbalancer - + diff --git a/opendaylight/forwarding/staticrouting/pom.xml b/opendaylight/forwarding/staticrouting/pom.xml index f8749727f7..80eea57b8f 100644 --- a/opendaylight/forwarding/staticrouting/pom.xml +++ b/opendaylight/forwarding/staticrouting/pom.xml @@ -15,16 +15,16 @@ - org.apache.felix - maven-bundle-plugin - 2.3.6 - true - - - - org.opendaylight.controller.sal.utils, - org.opendaylight.controller.sal.core, - org.opendaylight.controller.configuration, + org.apache.felix + maven-bundle-plugin + 2.3.6 + true + + + + org.opendaylight.controller.sal.utils, + org.opendaylight.controller.sal.core, + org.opendaylight.controller.configuration, org.opendaylight.controller.forwardingrulesmanager, org.opendaylight.controller.hosttracker, org.opendaylight.controller.hosttracker.hostAware, @@ -38,15 +38,15 @@ org.apache.felix.dm, org.apache.commons.lang3.builder - + org.opendaylight.controller.forwarding.staticrouting - - org.opendaylight.controller.forwarding.staticrouting.internal.Activator - - + + org.opendaylight.controller.forwarding.staticrouting.internal.Activator + + ${project.basedir}/META-INF - + @@ -77,10 +77,10 @@ 4.8.1 test - - org.opendaylight.controller - sal - 0.5.0-SNAPSHOT - + + org.opendaylight.controller + sal + 0.5.0-SNAPSHOT + diff --git a/opendaylight/forwardingrulesmanager/api/pom.xml b/opendaylight/forwardingrulesmanager/api/pom.xml index 2fed2dc196..b2a124bb4e 100644 --- a/opendaylight/forwardingrulesmanager/api/pom.xml +++ b/opendaylight/forwardingrulesmanager/api/pom.xml @@ -1,6 +1,7 @@ - + 4.0.0 org.opendaylight.controller @@ -16,20 +17,20 @@ - org.apache.felix - maven-bundle-plugin - 2.3.6 - true - - - - - - org.opendaylight.controller.forwardingrulesmanager - - - org.opendaylight.controller.clustering.services, - org.opendaylight.controller.configuration, + org.apache.felix + maven-bundle-plugin + 2.3.6 + true + + + + + + org.opendaylight.controller.forwardingrulesmanager + + + org.opendaylight.controller.clustering.services, + org.opendaylight.controller.configuration, org.opendaylight.controller.hosttracker, org.opendaylight.controller.hosttracker.hostAware, org.opendaylight.controller.switchmanager, @@ -37,7 +38,7 @@ org.opendaylight.controller.sal.core, org.opendaylight.controller.sal.flowprogrammer, org.opendaylight.controller.sal.match, - org.opendaylight.controller.sal.utils, + org.opendaylight.controller.sal.utils, org.opendaylight.controller.sal.packet, javax.xml.bind.annotation, javax.xml.bind, @@ -46,11 +47,11 @@ org.osgi.service.component, org.slf4j, org.eclipse.osgi.framework.console, - org.osgi.framework - - + org.osgi.framework + + org.opendaylight.controller.hosttracker - + @@ -69,7 +70,7 @@ org.opendaylight.controller configuration 0.4.0-SNAPSHOT - + org.opendaylight.controller clustering.services @@ -80,11 +81,11 @@ switchmanager 0.4.0-SNAPSHOT - - org.opendaylight.controller - sal - 0.5.0-SNAPSHOT - + + org.opendaylight.controller + sal + 0.5.0-SNAPSHOT + junit junit diff --git a/opendaylight/hosttracker/api/pom.xml b/opendaylight/hosttracker/api/pom.xml index 5ed95e794f..6da648324c 100644 --- a/opendaylight/hosttracker/api/pom.xml +++ b/opendaylight/hosttracker/api/pom.xml @@ -2,71 +2,71 @@ 4.0.0 - - org.opendaylight.controller - commons.opendaylight - 1.4.0-SNAPSHOT - ../../commons/opendaylight - - hosttracker - 0.4.0-SNAPSHOT - bundle + + org.opendaylight.controller + commons.opendaylight + 1.4.0-SNAPSHOT + ../../commons/opendaylight + + hosttracker + 0.4.0-SNAPSHOT + bundle - - - - org.apache.felix - maven-bundle-plugin - 2.3.6 - true - - - - org.opendaylight.controller.hosttracker, - org.opendaylight.controller.hosttracker.hostAware - - - org.opendaylight.controller.sal.core, - org.opendaylight.controller.sal.utils, - org.opendaylight.controller.topologymanager, - org.opendaylight.controller.sal.packet.address, - org.opendaylight.controller.switchmanager, - org.opendaylight.controller.clustering.services, - javax.xml.bind.annotation, - javax.xml.bind, - org.apache.felix.dm, - org.apache.commons.lang3.builder, - org.osgi.service.component, - org.slf4j, - org.eclipse.osgi.framework.console, - org.osgi.framework - - + + + + org.apache.felix + maven-bundle-plugin + 2.3.6 + true + + + + org.opendaylight.controller.hosttracker, + org.opendaylight.controller.hosttracker.hostAware + + + org.opendaylight.controller.sal.core, + org.opendaylight.controller.sal.utils, + org.opendaylight.controller.topologymanager, + org.opendaylight.controller.sal.packet.address, + org.opendaylight.controller.switchmanager, + org.opendaylight.controller.clustering.services, + javax.xml.bind.annotation, + javax.xml.bind, + org.apache.felix.dm, + org.apache.commons.lang3.builder, + org.osgi.service.component, + org.slf4j, + org.eclipse.osgi.framework.console, + org.osgi.framework + + ${project.basedir}/META-INF - - - - - - - org.opendaylight.controller - topologymanager - 0.4.0-SNAPSHOT - - - org.opendaylight.controller - switchmanager - 0.4.0-SNAPSHOT - - - org.opendaylight.controller - clustering.services - 0.4.0-SNAPSHOT - - - org.opendaylight.controller - sal - 0.5.0-SNAPSHOT - - + + + + + + + org.opendaylight.controller + topologymanager + 0.4.0-SNAPSHOT + + + org.opendaylight.controller + switchmanager + 0.4.0-SNAPSHOT + + + org.opendaylight.controller + clustering.services + 0.4.0-SNAPSHOT + + + org.opendaylight.controller + sal + 0.5.0-SNAPSHOT + + diff --git a/opendaylight/hosttracker/implementation/pom.xml b/opendaylight/hosttracker/implementation/pom.xml index 35a2238b2a..a2ebf1aa9d 100644 --- a/opendaylight/hosttracker/implementation/pom.xml +++ b/opendaylight/hosttracker/implementation/pom.xml @@ -1,124 +1,124 @@ - 4.0.0 - - org.opendaylight.controller - commons.opendaylight - 1.4.0-SNAPSHOT - ../../commons/opendaylight - - hosttracker.implementation - 0.4.0-SNAPSHOT - bundle + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" + xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + 4.0.0 + + org.opendaylight.controller + commons.opendaylight + 1.4.0-SNAPSHOT + ../../commons/opendaylight + + hosttracker.implementation + 0.4.0-SNAPSHOT + bundle - - - jacoco - reuseReports - target/jacoco.exec - target/jacoco-it.exec - java - - - - - - - org.jacoco - jacoco-maven-plugin - 0.5.3.201107060350 - - - - - - org.apache.felix - maven-bundle-plugin - 2.3.6 - true - - - - - - org.opendaylight.controller.sal.core, - org.opendaylight.controller.sal.utils, - org.opendaylight.controller.sal.topology, - org.opendaylight.controller.hosttracker, - org.opendaylight.controller.topologymanager, - org.opendaylight.controller.sal.packet.address, - org.opendaylight.controller.switchmanager, - org.opendaylight.controller.clustering.services, - org.opendaylight.controller.hosttracker.hostAware, - javax.xml.bind.annotation, - javax.xml.bind, - org.apache.felix.dm, - org.apache.commons.lang3.builder, - org.osgi.service.component, - org.slf4j, - org.eclipse.osgi.framework.console, - org.osgi.framework - - - org.opendaylight.controller.hosttracker.internal.Activator - - - - + + + jacoco + reuseReports + target/jacoco.exec + target/jacoco-it.exec + java + + + + + + + org.jacoco + jacoco-maven-plugin + 0.5.3.201107060350 + + + + + + org.apache.felix + maven-bundle-plugin + 2.3.6 + true + + + + + + org.opendaylight.controller.sal.core, + org.opendaylight.controller.sal.utils, + org.opendaylight.controller.sal.topology, + org.opendaylight.controller.hosttracker, + org.opendaylight.controller.topologymanager, + org.opendaylight.controller.sal.packet.address, + org.opendaylight.controller.switchmanager, + org.opendaylight.controller.clustering.services, + org.opendaylight.controller.hosttracker.hostAware, + javax.xml.bind.annotation, + javax.xml.bind, + org.apache.felix.dm, + org.apache.commons.lang3.builder, + org.osgi.service.component, + org.slf4j, + org.eclipse.osgi.framework.console, + org.osgi.framework + + + org.opendaylight.controller.hosttracker.internal.Activator + + + + ${project.basedir}/META-INF - - - - org.jacoco - jacoco-maven-plugin - - org.opendaylight.controller.* - - - - pre-test - - prepare-agent - - - - post-test - test - - report - - - - - - - - - org.opendaylight.controller - topologymanager - 0.4.0-SNAPSHOT - - - org.opendaylight.controller - switchmanager - 0.4.0-SNAPSHOT - - - org.opendaylight.controller - clustering.services - 0.4.0-SNAPSHOT - - - org.opendaylight.controller - sal - 0.5.0-SNAPSHOT - - - org.opendaylight.controller - hosttracker - 0.4.0-SNAPSHOT - - + + + + org.jacoco + jacoco-maven-plugin + + org.opendaylight.controller.* + + + + pre-test + + prepare-agent + + + + post-test + test + + report + + + + + + + + + org.opendaylight.controller + topologymanager + 0.4.0-SNAPSHOT + + + org.opendaylight.controller + switchmanager + 0.4.0-SNAPSHOT + + + org.opendaylight.controller + clustering.services + 0.4.0-SNAPSHOT + + + org.opendaylight.controller + sal + 0.5.0-SNAPSHOT + + + org.opendaylight.controller + hosttracker + 0.4.0-SNAPSHOT + + diff --git a/opendaylight/hosttracker/integrationtest/pom.xml b/opendaylight/hosttracker/integrationtest/pom.xml index e3aaad748a..dd8a3ad6bd 100644 --- a/opendaylight/hosttracker/integrationtest/pom.xml +++ b/opendaylight/hosttracker/integrationtest/pom.xml @@ -11,24 +11,24 @@ hosttracker.integrationtest 0.4.0-SNAPSHOT - + - org.opendaylight.controller - hosttracker - 0.4.0-SNAPSHOT + org.opendaylight.controller + hosttracker + 0.4.0-SNAPSHOT - org.opendaylight.controller - hosttracker.implementation - 0.4.0-SNAPSHOT + org.opendaylight.controller + hosttracker.implementation + 0.4.0-SNAPSHOT - + org.opendaylight.controller sal 0.5.0-SNAPSHOT - + org.opendaylight.controller sal.implementation 0.4.0-SNAPSHOT @@ -38,66 +38,66 @@ containermanager 0.4.0-SNAPSHOT - + org.opendaylight.controller containermanager.implementation 0.4.0-SNAPSHOT - + org.opendaylight.controller arphandler 0.4.0-SNAPSHOT - + org.opendaylight.controller clustering.services 0.4.0-SNAPSHOT - - + + org.opendaylight.controller clustering.stub 0.4.0-SNAPSHOT - - org.opendaylight.controller - switchmanager - 0.4.0-SNAPSHOT + + org.opendaylight.controller + switchmanager + 0.4.0-SNAPSHOT - - org.opendaylight.controller - switchmanager.implementation - 0.4.0-SNAPSHOT + + org.opendaylight.controller + switchmanager.implementation + 0.4.0-SNAPSHOT - - org.opendaylight.controller - configuration - 0.4.0-SNAPSHOT + + org.opendaylight.controller + configuration + 0.4.0-SNAPSHOT - org.opendaylight.controller - configuration.implementation - 0.4.0-SNAPSHOT + org.opendaylight.controller + configuration.implementation + 0.4.0-SNAPSHOT - - org.opendaylight.controller - topologymanager - 0.4.0-SNAPSHOT + + org.opendaylight.controller + topologymanager + 0.4.0-SNAPSHOT - + jacoco ../implementation/target/jacoco.exec ../implementaiton/target/jacoco-it.exec java - + @@ -134,5 +134,4 @@ - diff --git a/opendaylight/northbound/commons/pom.xml b/opendaylight/northbound/commons/pom.xml index 083a081d01..7c0835a903 100644 --- a/opendaylight/northbound/commons/pom.xml +++ b/opendaylight/northbound/commons/pom.xml @@ -34,7 +34,7 @@ org.opendaylight.controller.containermanager, org.opendaylight.controller.usermanager, javax.servlet.http, - org.slf4j, + org.slf4j ${project.basedir}/META-INF diff --git a/opendaylight/northbound/hosttracker/pom.xml b/opendaylight/northbound/hosttracker/pom.xml index a26bbbd610..853c54ec2c 100644 --- a/opendaylight/northbound/hosttracker/pom.xml +++ b/opendaylight/northbound/hosttracker/pom.xml @@ -46,7 +46,7 @@ org.opendaylight.controller.northbound.commons.exception, org.opendaylight.controller.northbound.commons.utils, org.opendaylight.controller.sal.authorization, - javax.ws.rs, + javax.ws.rs, javax.ws.rs.core, javax.xml.bind.annotation, javax.xml.bind, @@ -81,16 +81,16 @@ switchmanager 0.4.0-SNAPSHOT - + org.opendaylight.controller sal 0.5.0-SNAPSHOT - + - org.opendaylight.controller - commons.northbound - 0.4.0-SNAPSHOT - + org.opendaylight.controller + commons.northbound + 0.4.0-SNAPSHOT + org.codehaus.enunciate enunciate-core-annotations diff --git a/opendaylight/northbound/staticrouting/pom.xml b/opendaylight/northbound/staticrouting/pom.xml index 823b76076c..f656faf308 100644 --- a/opendaylight/northbound/staticrouting/pom.xml +++ b/opendaylight/northbound/staticrouting/pom.xml @@ -45,7 +45,7 @@ org.opendaylight.controller.northbound.commons.exception, org.opendaylight.controller.northbound.commons.utils, org.opendaylight.controller.sal.authorization, - org.slf4j, + org.slf4j, javax.ws.rs, javax.ws.rs.core, javax.xml.bind.annotation, @@ -83,10 +83,10 @@ ${enunciate.version} - org.opendaylight.controller - commons.northbound - 0.4.0-SNAPSHOT - + org.opendaylight.controller + commons.northbound + 0.4.0-SNAPSHOT + org.opendaylight.controller.thirdparty com.sun.jersey.jersey-servlet diff --git a/opendaylight/northbound/statistics/pom.xml b/opendaylight/northbound/statistics/pom.xml index 8a9799e9d9..7ce5c43d12 100644 --- a/opendaylight/northbound/statistics/pom.xml +++ b/opendaylight/northbound/statistics/pom.xml @@ -34,32 +34,32 @@ - - org.opendaylight.controller.forwardingrulesmanager, - org.opendaylight.controller.sal.action, - org.opendaylight.controller.sal.core, - org.opendaylight.controller.sal.flowprogrammer, - org.opendaylight.controller.sal.match, - org.opendaylight.controller.sal.packet, - org.opendaylight.controller.sal.reader, - org.opendaylight.controller.sal.utils, - org.opendaylight.controller.containermanager, - org.opendaylight.controller.statisticsmanager, - org.opendaylight.controller.usermanager, - org.opendaylight.controller.switchmanager, - org.opendaylight.controller.sal.authorization, - org.apache.commons.logging, - com.sun.jersey.spi.container.servlet, - org.opendaylight.controller.northbound.commons, - org.opendaylight.controller.northbound.commons.exception, - org.opendaylight.controller.northbound.commons.utils, - javax.ws.rs, - javax.ws.rs.core, - javax.xml.bind.annotation, - javax.xml.bind, - org.slf4j, - !org.codehaus.enunciate.jaxrs - + + org.opendaylight.controller.forwardingrulesmanager, + org.opendaylight.controller.sal.action, + org.opendaylight.controller.sal.core, + org.opendaylight.controller.sal.flowprogrammer, + org.opendaylight.controller.sal.match, + org.opendaylight.controller.sal.packet, + org.opendaylight.controller.sal.reader, + org.opendaylight.controller.sal.utils, + org.opendaylight.controller.containermanager, + org.opendaylight.controller.statisticsmanager, + org.opendaylight.controller.usermanager, + org.opendaylight.controller.switchmanager, + org.opendaylight.controller.sal.authorization, + org.apache.commons.logging, + com.sun.jersey.spi.container.servlet, + org.opendaylight.controller.northbound.commons, + org.opendaylight.controller.northbound.commons.exception, + org.opendaylight.controller.northbound.commons.utils, + javax.ws.rs, + javax.ws.rs.core, + javax.xml.bind.annotation, + javax.xml.bind, + org.slf4j, + !org.codehaus.enunciate.jaxrs + /controller/nb/v2/statistics @@ -80,30 +80,25 @@ statisticsmanager 0.4.0-SNAPSHOT - + org.opendaylight.controller sal 0.5.0-SNAPSHOT - - - + + org.opendaylight.controller.thirdparty com.sun.jersey.jersey-servlet 1.17-SNAPSHOT - - - org.opendaylight.controller - commons.northbound - 0.4.0-SNAPSHOT - - + + org.opendaylight.controller + commons.northbound + 0.4.0-SNAPSHOT + org.codehaus.enunciate enunciate-core-annotations ${enunciate.version} - - diff --git a/opendaylight/northbound/subnets/pom.xml b/opendaylight/northbound/subnets/pom.xml index 2d9e20b2ab..4a701e37ab 100644 --- a/opendaylight/northbound/subnets/pom.xml +++ b/opendaylight/northbound/subnets/pom.xml @@ -50,17 +50,17 @@ - org.opendaylight.controller.sal.core, - org.opendaylight.controller.sal.utils, - org.opendaylight.controller.containermanager, - org.opendaylight.controller.switchmanager, + org.opendaylight.controller.sal.core, + org.opendaylight.controller.sal.utils, + org.opendaylight.controller.containermanager, + org.opendaylight.controller.switchmanager, org.opendaylight.controller.northbound.commons, org.opendaylight.controller.northbound.commons.exception, org.opendaylight.controller.northbound.commons.utils, com.sun.jersey.spi.container.servlet, org.opendaylight.controller.sal.authorization, org.opendaylight.controller.usermanager, - javax.ws.rs, + javax.ws.rs, javax.ws.rs.core, javax.xml.bind.annotation, org.slf4j, @@ -96,11 +96,11 @@ com.sun.jersey.jersey-servlet 1.17-SNAPSHOT - - org.opendaylight.controller - commons.northbound - 0.4.0-SNAPSHOT - + + org.opendaylight.controller + commons.northbound + 0.4.0-SNAPSHOT + org.codehaus.enunciate enunciate-core-annotations diff --git a/opendaylight/northbound/switchmanager/pom.xml b/opendaylight/northbound/switchmanager/pom.xml index 358eed3f2b..26e1b2469c 100644 --- a/opendaylight/northbound/switchmanager/pom.xml +++ b/opendaylight/northbound/switchmanager/pom.xml @@ -24,8 +24,8 @@ 0.5.0-SNAPSHOT - - + + org.apache.felix maven-bundle-plugin @@ -40,13 +40,13 @@ org.opendaylight.controller.switchmanager, org.opendaylight.controller.usermanager, org.apache.commons.lang3.tuple, - org.apache.commons.logging, + org.apache.commons.logging, com.sun.jersey.spi.container.servlet, org.opendaylight.controller.northbound.commons, org.opendaylight.controller.northbound.commons.exception, org.opendaylight.controller.northbound.commons.utils, org.opendaylight.controller.sal.authorization, - javax.ws.rs, + javax.ws.rs, javax.ws.rs.core, javax.xml.bind.annotation, javax.xml.bind, @@ -66,7 +66,7 @@ com.sun.jersey.jersey-servlet 1.17-SNAPSHOT - + org.opendaylight.controller containermanager @@ -78,30 +78,30 @@ 0.4.0-SNAPSHOT - + org.opendaylight.controller sal 0.5.0-SNAPSHOT - + - org.opendaylight.controller - commons.northbound - 0.4.0-SNAPSHOT - - - - org.springframework - spring-web - ${spring.version} - provided - - + org.opendaylight.controller + commons.northbound + 0.4.0-SNAPSHOT + + + + org.springframework + spring-web + ${spring.version} + provided + + org.codehaus.enunciate enunciate-core-annotations ${enunciate.version} - + diff --git a/opendaylight/northbound/topology/pom.xml b/opendaylight/northbound/topology/pom.xml index 517492f39a..726f7975f0 100644 --- a/opendaylight/northbound/topology/pom.xml +++ b/opendaylight/northbound/topology/pom.xml @@ -43,13 +43,13 @@ org.opendaylight.controller.sal.core, org.opendaylight.controller.sal.packet, org.opendaylight.controller.sal.authorization, - org.opendaylight.controller.sal.packet.address, + org.opendaylight.controller.sal.packet.address, org.opendaylight.controller.sal.utils, org.opendaylight.controller.switchmanager, org.opendaylight.controller.usermanager, org.opendaylight.controller.topologymanager, com.sun.jersey.spi.container.servlet, - javax.ws.rs, + javax.ws.rs, javax.ws.rs.core, javax.xml.bind, javax.xml.bind.annotation, @@ -59,7 +59,7 @@ /controller/nb/v2/topology ${project.basedir}/src/main/resources/META-INF - + @@ -69,26 +69,26 @@ enunciate-core-annotations ${enunciate.version} - - org.opendaylight.controller - containermanager - 0.4.0-SNAPSHOT - - - org.opendaylight.controller - commons.northbound - 0.4.0-SNAPSHOT - - - org.opendaylight.controller - sal - 0.5.0-SNAPSHOT - - - org.opendaylight.controller - topologymanager - 0.4.0-SNAPSHOT - + + org.opendaylight.controller + containermanager + 0.4.0-SNAPSHOT + + + org.opendaylight.controller + commons.northbound + 0.4.0-SNAPSHOT + + + org.opendaylight.controller + sal + 0.5.0-SNAPSHOT + + + org.opendaylight.controller + topologymanager + 0.4.0-SNAPSHOT + org.opendaylight.controller.thirdparty com.sun.jersey.jersey-servlet diff --git a/opendaylight/protocol_plugins/openflow/pom.xml b/opendaylight/protocol_plugins/openflow/pom.xml index 98d1ecf636..9d84d45967 100644 --- a/opendaylight/protocol_plugins/openflow/pom.xml +++ b/opendaylight/protocol_plugins/openflow/pom.xml @@ -37,11 +37,11 @@ org.apache.felix.dm, org.slf4j, org.eclipse.osgi.framework.console, - org.osgi.framework, - javax.net.ssl + org.osgi.framework, + javax.net.ssl - org.opendaylight.controller.protocol_plugin.openflow.internal + org.opendaylight.controller.protocol_plugin.openflow.internal org.openflow.openflowj diff --git a/opendaylight/routing/dijkstra_implementation/pom.xml b/opendaylight/routing/dijkstra_implementation/pom.xml index e6c831d897..22036b5d64 100644 --- a/opendaylight/routing/dijkstra_implementation/pom.xml +++ b/opendaylight/routing/dijkstra_implementation/pom.xml @@ -15,34 +15,34 @@ - org.apache.felix - maven-bundle-plugin - 2.3.6 - true - - - - org.slf4j, - org.opendaylight.controller.sal.routing, - org.opendaylight.controller.sal.core, - org.opendaylight.controller.sal.topology, - org.opendaylight.controller.sal.utils, - org.opendaylight.controller.sal.reader, - org.apache.commons.collections15, - org.opendaylight.controller.switchmanager, - org.opendaylight.controller.topologymanager, - edu.uci.ics.jung.graph, - edu.uci.ics.jung.algorithms.shortestpath, - edu.uci.ics.jung.graph.util, - org.apache.felix.dm, - org.junit;resolution:=optional - - - org.opendaylight.controller.routing.dijkstra_implementation.internal.Activator - - + org.apache.felix + maven-bundle-plugin + 2.3.6 + true + + + + org.slf4j, + org.opendaylight.controller.sal.routing, + org.opendaylight.controller.sal.core, + org.opendaylight.controller.sal.topology, + org.opendaylight.controller.sal.utils, + org.opendaylight.controller.sal.reader, + org.apache.commons.collections15, + org.opendaylight.controller.switchmanager, + org.opendaylight.controller.topologymanager, + edu.uci.ics.jung.graph, + edu.uci.ics.jung.algorithms.shortestpath, + edu.uci.ics.jung.graph.util, + org.apache.felix.dm, + org.junit;resolution:=optional + + + org.opendaylight.controller.routing.dijkstra_implementation.internal.Activator + + ${project.basedir}/META-INF - + diff --git a/opendaylight/sal/api/pom.xml b/opendaylight/sal/api/pom.xml index 5551999856..c9f898aa87 100644 --- a/opendaylight/sal/api/pom.xml +++ b/opendaylight/sal/api/pom.xml @@ -32,7 +32,7 @@ org.opendaylight.controller.sal.authorization, - org.opendaylight.controller.sal.action, + org.opendaylight.controller.sal.action, org.opendaylight.controller.sal.core, org.opendaylight.controller.sal.discovery, org.opendaylight.controller.sal.topology, diff --git a/opendaylight/sal/implementation/pom.xml b/opendaylight/sal/implementation/pom.xml index 8d4da22295..3eb2379a78 100644 --- a/opendaylight/sal/implementation/pom.xml +++ b/opendaylight/sal/implementation/pom.xml @@ -35,13 +35,13 @@ org.opendaylight.controller.sal.utils, org.apache.felix.dm, org.eclipse.osgi.framework.console, - org.osgi.framework + org.osgi.framework - - org.opendaylight.controller.sal.implementation.internal.Activator - + + org.opendaylight.controller.sal.implementation.internal.Activator + ${project.basedir}/META-INF diff --git a/opendaylight/samples/loadbalancer/pom.xml b/opendaylight/samples/loadbalancer/pom.xml index ba3ee2fbd5..ca7e93c5a9 100644 --- a/opendaylight/samples/loadbalancer/pom.xml +++ b/opendaylight/samples/loadbalancer/pom.xml @@ -1,97 +1,97 @@ - 4.0.0 - - org.opendaylight.controller - commons.opendaylight - 1.4.0-SNAPSHOT - ../../commons/opendaylight - - samples.loadbalancer - 0.4.0-SNAPSHOT - bundle + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" + xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + 4.0.0 + + org.opendaylight.controller + commons.opendaylight + 1.4.0-SNAPSHOT + ../../commons/opendaylight + + samples.loadbalancer + 0.4.0-SNAPSHOT + bundle - - - - org.apache.felix - maven-bundle-plugin - 2.3.6 - true - - - - org.opendaylight.controller.samples.loadbalancer, - org.opendaylight.controller.samples.loadbalancer.entities, - org.opendaylight.controller.samples.loadbalancer.internal, - org.opendaylight.controller.samples.loadbalancer.policies - - - org.opendaylight.controller.sal.core, - org.opendaylight.controller.sal.utils, - org.opendaylight.controller.sal.action, - org.opendaylight.controller.sal.match, - org.opendaylight.controller.sal.packet, - org.opendaylight.controller.sal.routing, - org.opendaylight.controller.sal.flowprogrammer, - org.opendaylight.controller.sal.packet.address, - org.opendaylight.controller.hosttracker, - org.opendaylight.controller.hosttracker.hostAware, - org.opendaylight.controller.samples.loadbalancer, - org.opendaylight.controller.samples.loadbalancer.entities, - org.opendaylight.controller.samples.loadbalancer.internal, - org.opendaylight.controller.samples.loadbalancer.policies, - org.opendaylight.controller.topologymanager, - org.opendaylight.controller.forwardingrulesmanager, - org.opendaylight.controller.switchmanager, - org.opendaylight.controller.clustering.services, - javax.xml.bind.annotation, - javax.xml.bind, - org.apache.felix.dm, - org.apache.commons.lang3.builder, - org.osgi.service.component, - org.slf4j, - org.eclipse.osgi.framework.console, - org.osgi.framework - - - org.opendaylight.controller.samples.loadbalancer.internal.Activator - - - - + + + + org.apache.felix + maven-bundle-plugin + 2.3.6 + true + + + + org.opendaylight.controller.samples.loadbalancer, + org.opendaylight.controller.samples.loadbalancer.entities, + org.opendaylight.controller.samples.loadbalancer.internal, + org.opendaylight.controller.samples.loadbalancer.policies + + + org.opendaylight.controller.sal.core, + org.opendaylight.controller.sal.utils, + org.opendaylight.controller.sal.action, + org.opendaylight.controller.sal.match, + org.opendaylight.controller.sal.packet, + org.opendaylight.controller.sal.routing, + org.opendaylight.controller.sal.flowprogrammer, + org.opendaylight.controller.sal.packet.address, + org.opendaylight.controller.hosttracker, + org.opendaylight.controller.hosttracker.hostAware, + org.opendaylight.controller.samples.loadbalancer, + org.opendaylight.controller.samples.loadbalancer.entities, + org.opendaylight.controller.samples.loadbalancer.internal, + org.opendaylight.controller.samples.loadbalancer.policies, + org.opendaylight.controller.topologymanager, + org.opendaylight.controller.forwardingrulesmanager, + org.opendaylight.controller.switchmanager, + org.opendaylight.controller.clustering.services, + javax.xml.bind.annotation, + javax.xml.bind, + org.apache.felix.dm, + org.apache.commons.lang3.builder, + org.osgi.service.component, + org.slf4j, + org.eclipse.osgi.framework.console, + org.osgi.framework + + + org.opendaylight.controller.samples.loadbalancer.internal.Activator + + + + ${project.basedir}/META-INF - - - - - - - org.opendaylight.controller - topologymanager - 0.4.0-SNAPSHOT - - - org.opendaylight.controller - switchmanager - 0.4.0-SNAPSHOT - - - org.opendaylight.controller - forwardingrulesmanager - 0.4.0-SNAPSHOT - - - org.opendaylight.controller - hosttracker - 0.4.0-SNAPSHOT - - - org.opendaylight.controller - sal - 0.5.0-SNAPSHOT - - + + + + + + + org.opendaylight.controller + topologymanager + 0.4.0-SNAPSHOT + + + org.opendaylight.controller + switchmanager + 0.4.0-SNAPSHOT + + + org.opendaylight.controller + forwardingrulesmanager + 0.4.0-SNAPSHOT + + + org.opendaylight.controller + hosttracker + 0.4.0-SNAPSHOT + + + org.opendaylight.controller + sal + 0.5.0-SNAPSHOT + + diff --git a/opendaylight/samples/northbound/loadbalancer/pom.xml b/opendaylight/samples/northbound/loadbalancer/pom.xml index c736d0427a..dc23940d55 100644 --- a/opendaylight/samples/northbound/loadbalancer/pom.xml +++ b/opendaylight/samples/northbound/loadbalancer/pom.xml @@ -24,7 +24,7 @@ 0.5.0-SNAPSHOT - + org.apache.felix maven-bundle-plugin @@ -33,25 +33,25 @@ - org.opendaylight.controller.samples.loadbalancer, - org.opendaylight.controller.samples.loadbalancer.entities, - org.opendaylight.controller.samples.loadbalancer.internal, - org.opendaylight.controller.samples.loadbalancer.policies, - org.opendaylight.controller.hosttracker, - org.opendaylight.controller.sal.core, - org.opendaylight.controller.sal.utils, - org.opendaylight.controller.containermanager, - org.opendaylight.controller.switchmanager, - org.apache.commons.logging, - com.sun.jersey.spi.container.servlet, - org.opendaylight.controller.northbound.commons, - org.opendaylight.controller.northbound.commons.exception, - javax.ws.rs, - javax.ws.rs.core, - javax.xml.bind.annotation, - javax.xml.bind, - org.slf4j, - !org.codehaus.enunciate.jaxrs + org.opendaylight.controller.samples.loadbalancer, + org.opendaylight.controller.samples.loadbalancer.entities, + org.opendaylight.controller.samples.loadbalancer.internal, + org.opendaylight.controller.samples.loadbalancer.policies, + org.opendaylight.controller.hosttracker, + org.opendaylight.controller.sal.core, + org.opendaylight.controller.sal.utils, + org.opendaylight.controller.containermanager, + org.opendaylight.controller.switchmanager, + org.apache.commons.logging, + com.sun.jersey.spi.container.servlet, + org.opendaylight.controller.northbound.commons, + org.opendaylight.controller.northbound.commons.exception, + javax.ws.rs, + javax.ws.rs.core, + javax.xml.bind.annotation, + javax.xml.bind, + org.slf4j, + !org.codehaus.enunciate.jaxrs /one/nb/v2/lb @@ -80,17 +80,17 @@ org.opendaylight.controller samples.loadbalancer 0.4.0-SNAPSHOT - - + + org.opendaylight.controller sal 0.5.0-SNAPSHOT - + - org.opendaylight.controller - commons.northbound - 0.4.0-SNAPSHOT - + org.opendaylight.controller + commons.northbound + 0.4.0-SNAPSHOT + org.codehaus.enunciate enunciate-core-annotations diff --git a/opendaylight/samples/simpleforwarding/pom.xml b/opendaylight/samples/simpleforwarding/pom.xml index f26f56b7eb..fd288c7127 100644 --- a/opendaylight/samples/simpleforwarding/pom.xml +++ b/opendaylight/samples/simpleforwarding/pom.xml @@ -22,8 +22,8 @@ - org.opendaylight.controller.sal.utils, - org.opendaylight.controller.sal.core, + org.opendaylight.controller.sal.utils, + org.opendaylight.controller.sal.core, org.opendaylight.controller.forwardingrulesmanager, org.opendaylight.controller.hosttracker, org.opendaylight.controller.hosttracker.hostAware, @@ -36,13 +36,13 @@ org.opendaylight.controller.sal.routing, org.opendaylight.controller.topologymanager, org.apache.commons.lang3.builder, - org.junit;resolution:=optional, - org.slf4j, + org.junit;resolution:=optional, + org.slf4j, org.apache.felix.dm - - org.opendaylight.controller.samples.simpleforwarding.internal.Activator - + + org.opendaylight.controller.samples.simpleforwarding.internal.Activator + ${project.basedir}/META-INF @@ -76,10 +76,10 @@ 4.8.1 test - + org.opendaylight.controller sal 0.5.0-SNAPSHOT - + diff --git a/opendaylight/security/pom.xml b/opendaylight/security/pom.xml index 6c689f1102..eb818ffcc2 100644 --- a/opendaylight/security/pom.xml +++ b/opendaylight/security/pom.xml @@ -1,60 +1,60 @@ - 4.0.0 - - org.opendaylight.controller - commons.opendaylight - 1.4.0-SNAPSHOT - ../commons/opendaylight - + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" + xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + 4.0.0 + + org.opendaylight.controller + commons.opendaylight + 1.4.0-SNAPSHOT + ../commons/opendaylight + - security - 0.4.0-SNAPSHOT - bundle - - - - org.apache.felix - maven-bundle-plugin - 2.3.6 - true - - - - org.apache.catalina - - - org.slf4j, - javax.servlet, - org.apache.catalina, - org.apache.catalina.connector, - org.apache.catalina.valves, - org.apache.catalina.realm, - org.opendaylight.controller.sal.utils, - org.opendaylight.controller.sal.authorization, - org.opendaylight.controller.usermanager - - - org.opendaylight.controller.security - - + security + 0.4.0-SNAPSHOT + bundle + + + + org.apache.felix + maven-bundle-plugin + 2.3.6 + true + + + + org.apache.catalina + + + org.slf4j, + javax.servlet, + org.apache.catalina, + org.apache.catalina.connector, + org.apache.catalina.valves, + org.apache.catalina.realm, + org.opendaylight.controller.sal.utils, + org.opendaylight.controller.sal.authorization, + org.opendaylight.controller.usermanager + + + org.opendaylight.controller.security + + ${project.basedir}/META-INF - - - - - - - org.opendaylight.controller - usermanager - 0.4.0-SNAPSHOT - - - org.opendaylight.controller - sal - 0.5.0-SNAPSHOT - - + + + + + + + org.opendaylight.controller + usermanager + 0.4.0-SNAPSHOT + + + org.opendaylight.controller + sal + 0.5.0-SNAPSHOT + + diff --git a/opendaylight/switchmanager/api/pom.xml b/opendaylight/switchmanager/api/pom.xml index cc56d96869..106ff3dd2a 100644 --- a/opendaylight/switchmanager/api/pom.xml +++ b/opendaylight/switchmanager/api/pom.xml @@ -33,19 +33,19 @@ - org.apache.felix - maven-bundle-plugin - 2.3.6 - true - - - - org.opendaylight.controller.switchmanager - - - org.opendaylight.controller.clustering.services, - org.opendaylight.controller.configuration, - org.opendaylight.controller.sal.core, + org.apache.felix + maven-bundle-plugin + 2.3.6 + true + + + + org.opendaylight.controller.switchmanager + + + org.opendaylight.controller.clustering.services, + org.opendaylight.controller.configuration, + org.opendaylight.controller.sal.core, org.opendaylight.controller.sal.utils, org.opendaylight.controller.sal.packet, org.opendaylight.controller.sal.inventory, @@ -56,9 +56,9 @@ javax.xml.bind.annotation, org.apache.commons.lang3.builder - + ${project.basedir}/META-INF - + org.jacoco @@ -85,20 +85,20 @@ - - org.opendaylight.controller - clustering.services - 0.4.0-SNAPSHOT - + + org.opendaylight.controller + clustering.services + 0.4.0-SNAPSHOT + org.opendaylight.controller configuration 0.4.0-SNAPSHOT - - - org.opendaylight.controller - sal - 0.5.0-SNAPSHOT - + + + org.opendaylight.controller + sal + 0.5.0-SNAPSHOT + diff --git a/opendaylight/switchmanager/implementation/pom.xml b/opendaylight/switchmanager/implementation/pom.xml index 128ab25873..511cab14cd 100644 --- a/opendaylight/switchmanager/implementation/pom.xml +++ b/opendaylight/switchmanager/implementation/pom.xml @@ -33,19 +33,19 @@ - org.apache.felix - maven-bundle-plugin - 2.3.6 - true - - - - - - org.opendaylight.controller.switchmanager, - org.opendaylight.controller.clustering.services, - org.opendaylight.controller.configuration, - org.opendaylight.controller.sal.core, + org.apache.felix + maven-bundle-plugin + 2.3.6 + true + + + + + + org.opendaylight.controller.switchmanager, + org.opendaylight.controller.clustering.services, + org.opendaylight.controller.configuration, + org.opendaylight.controller.sal.core, org.opendaylight.controller.sal.utils, org.opendaylight.controller.sal.packet, org.opendaylight.controller.sal.inventory, @@ -57,11 +57,11 @@ org.apache.commons.lang3.builder - org.opendaylight.controller.switchmanager.internal.Activator + org.opendaylight.controller.switchmanager.internal.Activator - + ${project.basedir}/META-INF - + org.jacoco @@ -88,25 +88,25 @@ - - org.opendaylight.controller - clustering.services - 0.4.0-SNAPSHOT - + + org.opendaylight.controller + clustering.services + 0.4.0-SNAPSHOT + org.opendaylight.controller configuration 0.4.0-SNAPSHOT - - - org.opendaylight.controller - sal - 0.5.0-SNAPSHOT - - - org.opendaylight.controller - switchmanager - 0.4.0-SNAPSHOT - + + + org.opendaylight.controller + sal + 0.5.0-SNAPSHOT + + + org.opendaylight.controller + switchmanager + 0.4.0-SNAPSHOT + diff --git a/opendaylight/topologymanager/pom.xml b/opendaylight/topologymanager/pom.xml index 57a036b948..65fabb126c 100755 --- a/opendaylight/topologymanager/pom.xml +++ b/opendaylight/topologymanager/pom.xml @@ -16,37 +16,37 @@ - org.apache.felix - maven-bundle-plugin - 2.3.6 - true - - - - org.opendaylight.controller.topologymanager - - - javax.xml.bind.annotation, - org.opendaylight.controller.sal.core, - org.opendaylight.controller.sal.utils, - org.opendaylight.controller.sal.packet, - org.opendaylight.controller.sal.topology, - org.opendaylight.controller.configuration, - org.opendaylight.controller.clustering.services, - org.osgi.service.component, - org.slf4j, - org.apache.felix.dm, - org.apache.commons.lang3.builder, - org.apache.commons.lang3.tuple, - org.eclipse.osgi.framework.console, - org.osgi.framework - - - org.opendaylight.controller.topologymanager.internal.Activator - - + org.apache.felix + maven-bundle-plugin + 2.3.6 + true + + + + org.opendaylight.controller.topologymanager + + + javax.xml.bind.annotation, + org.opendaylight.controller.sal.core, + org.opendaylight.controller.sal.utils, + org.opendaylight.controller.sal.packet, + org.opendaylight.controller.sal.topology, + org.opendaylight.controller.configuration, + org.opendaylight.controller.clustering.services, + org.osgi.service.component, + org.slf4j, + org.apache.felix.dm, + org.apache.commons.lang3.builder, + org.apache.commons.lang3.tuple, + org.eclipse.osgi.framework.console, + org.osgi.framework + + + org.opendaylight.controller.topologymanager.internal.Activator + + ${project.basedir}/META-INF - + @@ -66,6 +66,5 @@ configuration 0.4.0-SNAPSHOT - diff --git a/opendaylight/usermanager/pom.xml b/opendaylight/usermanager/pom.xml index 5e15c4cbfe..1859e8ed4c 100644 --- a/opendaylight/usermanager/pom.xml +++ b/opendaylight/usermanager/pom.xml @@ -1,91 +1,89 @@ - - - 4.0.0 - - org.opendaylight.controller - commons.opendaylight - 1.4.0-SNAPSHOT - ../commons/opendaylight - + + 4.0.0 + + org.opendaylight.controller + commons.opendaylight + 1.4.0-SNAPSHOT + ../commons/opendaylight + - usermanager - 0.4.0-SNAPSHOT - bundle - - - - org.apache.felix - maven-bundle-plugin - 2.3.6 - true - - - - org.opendaylight.controller.clustering.services, - org.opendaylight.controller.configuration, - org.opendaylight.controller.sal.authorization, - org.opendaylight.controller.sal.core, - org.opendaylight.controller.sal.packet, - org.opendaylight.controller.sal.utils, - org.opendaylight.controller.switchmanager, - org.opendaylight.controller.containermanager, - org.slf4j, - org.eclipse.osgi.framework.console, - org.osgi.framework, - org.apache.felix.dm, - org.apache.commons.lang3.builder, - org.apache.commons.logging, - javax.servlet, - javax.servlet.http, - org.springframework.security.web.context, - org.springframework.security.core, - org.springframework.security.core.context, - org.apache.commons.lang3, - org.springframework.security.authentication, - org.springframework.security.core.authority, - org.springframework.security.core.userdetails - - - - org.opendaylight.controller.usermanager, - org.opendaylight.controller.usermanager.internal - - - org.opendaylight.controller.usermanager.internal.Activator - - + usermanager + 0.4.0-SNAPSHOT + bundle + + + + org.apache.felix + maven-bundle-plugin + 2.3.6 + true + + + + org.opendaylight.controller.clustering.services, + org.opendaylight.controller.configuration, + org.opendaylight.controller.sal.authorization, + org.opendaylight.controller.sal.core, + org.opendaylight.controller.sal.packet, + org.opendaylight.controller.sal.utils, + org.opendaylight.controller.switchmanager, + org.opendaylight.controller.containermanager, + org.slf4j, + org.eclipse.osgi.framework.console, + org.osgi.framework, + org.apache.felix.dm, + org.apache.commons.lang3.builder, + org.apache.commons.logging, + javax.servlet, + javax.servlet.http, + org.springframework.security.web.context, + org.springframework.security.core, + org.springframework.security.core.context, + org.apache.commons.lang3, + org.springframework.security.authentication, + org.springframework.security.core.authority, + org.springframework.security.core.userdetails + + + org.opendaylight.controller.usermanager, + org.opendaylight.controller.usermanager.internal + + + org.opendaylight.controller.usermanager.internal.Activator + + ${project.basedir}/META-INF - - - - - - - org.opendaylight.controller - switchmanager - 0.4.0-SNAPSHOT - - - org.opendaylight.controller - containermanager - 0.4.0-SNAPSHOT - - - org.opendaylight.controller - clustering.services - 0.4.0-SNAPSHOT - - - org.opendaylight.controller - configuration - 0.4.0-SNAPSHOT - - - org.opendaylight.controller - sal - 0.5.0-SNAPSHOT - - + + + + + + + org.opendaylight.controller + switchmanager + 0.4.0-SNAPSHOT + + + org.opendaylight.controller + containermanager + 0.4.0-SNAPSHOT + + + org.opendaylight.controller + clustering.services + 0.4.0-SNAPSHOT + + + org.opendaylight.controller + configuration + 0.4.0-SNAPSHOT + + + org.opendaylight.controller + sal + 0.5.0-SNAPSHOT + + diff --git a/opendaylight/web/devices/pom.xml b/opendaylight/web/devices/pom.xml index 980717323d..eb0b5d393e 100644 --- a/opendaylight/web/devices/pom.xml +++ b/opendaylight/web/devices/pom.xml @@ -1,117 +1,118 @@ - 4.0.0 - - org.opendaylight.controller - commons.opendaylight - 1.4.0-SNAPSHOT - ../../commons/opendaylight - - devices.web - 0.4.0-SNAPSHOT - bundle - - - - org.apache.felix - maven-bundle-plugin - 2.3.6 - true - - - - - - org.opendaylight.controller.forwardingrulesmanager, - org.opendaylight.controller.sal.authorization, - org.opendaylight.controller.sal.action, - org.opendaylight.controller.sal.core, - org.opendaylight.controller.sal.utils, - org.opendaylight.controller.containermanager, - org.opendaylight.controller.switchmanager, - org.opendaylight.controller.forwarding.staticrouting, - org.opendaylight.controller.usermanager, - org.opendaylight.controller.web, - com.google.gson, - javax.annotation, - javax.naming, - javax.servlet, - javax.servlet.annotation, - javax.servlet.http, - javax.servlet.jsp, - javax.servlet.jsp.el, - javax.servlet.jsp.jstl.core, - javax.servlet.jsp.jstl.fmt, - javax.servlet.jsp.jstl.tlv, - javax.servlet.jsp.tagext, - javax.servlet.resources, - javax.xml.parsers, - javax.xml.transform, - org.apache.commons.logging, - org.apache.taglibs.standard.functions, - org.apache.taglibs.standard.resources, - org.apache.taglibs.standard.tag.common.core, - org.apache.taglibs.standard.tag.common.fmt, - org.apache.taglibs.standard.tag.rt.core, - org.apache.taglibs.standard.tag.rt.fmt, - org.apache.taglibs.standard.tei, - org.apache.taglibs.standard.tlv, - org.codehaus.jackson, - org.codehaus.jackson.annotate, - org.codehaus.jackson.map, - org.codehaus.jackson.map.annotate, - org.osgi.framework, - org.slf4j, - org.springframework.beans, - org.springframework.beans.factory.xml, - org.springframework.context.config, - org.springframework.stereotype, - org.springframework.web, - org.springframework.web.bind.annotation, - org.springframework.web.servlet, - org.springframework.web.servlet.config, - org.springframework.web.servlet.view, - org.springframework.web.filter, - org.springframework.web.context - - /controller/web/devices - + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + 4.0.0 + + org.opendaylight.controller + commons.opendaylight + 1.4.0-SNAPSHOT + ../../commons/opendaylight + + + devices.web + 0.4.0-SNAPSHOT + bundle + + + + org.apache.felix + maven-bundle-plugin + 2.3.6 + true + + + + + + org.opendaylight.controller.forwardingrulesmanager, + org.opendaylight.controller.sal.authorization, + org.opendaylight.controller.sal.action, + org.opendaylight.controller.sal.core, + org.opendaylight.controller.sal.utils, + org.opendaylight.controller.containermanager, + org.opendaylight.controller.switchmanager, + org.opendaylight.controller.forwarding.staticrouting, + org.opendaylight.controller.usermanager, + org.opendaylight.controller.web, + com.google.gson, + javax.annotation, + javax.naming, + javax.servlet, + javax.servlet.annotation, + javax.servlet.http, + javax.servlet.jsp, + javax.servlet.jsp.el, + javax.servlet.jsp.jstl.core, + javax.servlet.jsp.jstl.fmt, + javax.servlet.jsp.jstl.tlv, + javax.servlet.jsp.tagext, + javax.servlet.resources, + javax.xml.parsers, + javax.xml.transform, + org.apache.commons.logging, + org.apache.taglibs.standard.functions, + org.apache.taglibs.standard.resources, + org.apache.taglibs.standard.tag.common.core, + org.apache.taglibs.standard.tag.common.fmt, + org.apache.taglibs.standard.tag.rt.core, + org.apache.taglibs.standard.tag.rt.fmt, + org.apache.taglibs.standard.tei, + org.apache.taglibs.standard.tlv, + org.codehaus.jackson, + org.codehaus.jackson.annotate, + org.codehaus.jackson.map, + org.codehaus.jackson.map.annotate, + org.osgi.framework, + org.slf4j, + org.springframework.beans, + org.springframework.beans.factory.xml, + org.springframework.context.config, + org.springframework.stereotype, + org.springframework.web, + org.springframework.web.bind.annotation, + org.springframework.web.servlet, + org.springframework.web.servlet.config, + org.springframework.web.servlet.view, + org.springframework.web.filter, + org.springframework.web.context + + /controller/web/devices + ${project.basedir}/src/main/resources/META-INF - - - - - - - org.opendaylight.controller - forwardingrulesmanager - 0.4.0-SNAPSHOT - - - org.opendaylight.controller - containermanager - 0.4.0-SNAPSHOT - - - org.opendaylight.controller - switchmanager - 0.4.0-SNAPSHOT - - - org.opendaylight.controller - sal - 0.5.0-SNAPSHOT - - - org.opendaylight.controller - web - 0.4.0-SNAPSHOT - - - org.opendaylight.controller - forwarding.staticrouting - 0.4.0-SNAPSHOT - - + + + + + + + org.opendaylight.controller + forwardingrulesmanager + 0.4.0-SNAPSHOT + + + org.opendaylight.controller + containermanager + 0.4.0-SNAPSHOT + + + org.opendaylight.controller + switchmanager + 0.4.0-SNAPSHOT + + + org.opendaylight.controller + sal + 0.5.0-SNAPSHOT + + + org.opendaylight.controller + web + 0.4.0-SNAPSHOT + + + org.opendaylight.controller + forwarding.staticrouting + 0.4.0-SNAPSHOT + + diff --git a/opendaylight/web/flows/pom.xml b/opendaylight/web/flows/pom.xml index eefaea3ca5..7aa0ac9454 100644 --- a/opendaylight/web/flows/pom.xml +++ b/opendaylight/web/flows/pom.xml @@ -1,117 +1,117 @@ - 4.0.0 - - org.opendaylight.controller - commons.opendaylight - 1.4.0-SNAPSHOT - ../../commons/opendaylight - - flows.web - 0.4.0-SNAPSHOT - bundle - - - - org.apache.felix - maven-bundle-plugin - 2.3.6 - true - - - - - - org.opendaylight.controller.forwardingrulesmanager, - org.opendaylight.controller.sal.authorization, - org.opendaylight.controller.sal.action, - org.opendaylight.controller.sal.core, - org.opendaylight.controller.sal.flowprogrammer, - org.opendaylight.controller.sal.utils, - org.opendaylight.controller.containermanager, - org.opendaylight.controller.switchmanager, - org.opendaylight.controller.usermanager, - org.opendaylight.controller.web, - com.google.gson, - javax.annotation, - javax.naming, - javax.servlet, - javax.servlet.annotation, - javax.servlet.http, - javax.servlet.jsp, - javax.servlet.jsp.el, - javax.servlet.jsp.jstl.core, - javax.servlet.jsp.jstl.fmt, - javax.servlet.jsp.jstl.tlv, - javax.servlet.jsp.tagext, - javax.servlet.resources, - javax.xml.parsers, - javax.xml.transform, - org.apache.commons.logging, - org.apache.taglibs.standard.functions, - org.apache.taglibs.standard.resources, - org.apache.taglibs.standard.tag.common.core, - org.apache.taglibs.standard.tag.common.fmt, - org.apache.taglibs.standard.tag.rt.core, - org.apache.taglibs.standard.tag.rt.fmt, - org.apache.taglibs.standard.tei, - org.apache.taglibs.standard.tlv, - org.codehaus.jackson, - org.codehaus.jackson.annotate, - org.codehaus.jackson.map, - org.codehaus.jackson.map.annotate, - org.osgi.framework, - org.slf4j, - org.springframework.beans, - org.springframework.beans.factory.xml, - org.springframework.context.config, - org.springframework.stereotype, - org.springframework.web, - org.springframework.web.bind.annotation, - org.springframework.web.servlet, - org.springframework.web.servlet.config, - org.springframework.web.servlet.view, - org.springframework.web.filter, - org.springframework.web.context - - /controller/web/flows - + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + 4.0.0 + + org.opendaylight.controller + commons.opendaylight + 1.4.0-SNAPSHOT + ../../commons/opendaylight + + flows.web + 0.4.0-SNAPSHOT + bundle + + + + org.apache.felix + maven-bundle-plugin + 2.3.6 + true + + + + + + org.opendaylight.controller.forwardingrulesmanager, + org.opendaylight.controller.sal.authorization, + org.opendaylight.controller.sal.action, + org.opendaylight.controller.sal.core, + org.opendaylight.controller.sal.flowprogrammer, + org.opendaylight.controller.sal.utils, + org.opendaylight.controller.containermanager, + org.opendaylight.controller.switchmanager, + org.opendaylight.controller.usermanager, + org.opendaylight.controller.web, + com.google.gson, + javax.annotation, + javax.naming, + javax.servlet, + javax.servlet.annotation, + javax.servlet.http, + javax.servlet.jsp, + javax.servlet.jsp.el, + javax.servlet.jsp.jstl.core, + javax.servlet.jsp.jstl.fmt, + javax.servlet.jsp.jstl.tlv, + javax.servlet.jsp.tagext, + javax.servlet.resources, + javax.xml.parsers, + javax.xml.transform, + org.apache.commons.logging, + org.apache.taglibs.standard.functions, + org.apache.taglibs.standard.resources, + org.apache.taglibs.standard.tag.common.core, + org.apache.taglibs.standard.tag.common.fmt, + org.apache.taglibs.standard.tag.rt.core, + org.apache.taglibs.standard.tag.rt.fmt, + org.apache.taglibs.standard.tei, + org.apache.taglibs.standard.tlv, + org.codehaus.jackson, + org.codehaus.jackson.annotate, + org.codehaus.jackson.map, + org.codehaus.jackson.map.annotate, + org.osgi.framework, + org.slf4j, + org.springframework.beans, + org.springframework.beans.factory.xml, + org.springframework.context.config, + org.springframework.stereotype, + org.springframework.web, + org.springframework.web.bind.annotation, + org.springframework.web.servlet, + org.springframework.web.servlet.config, + org.springframework.web.servlet.view, + org.springframework.web.filter, + org.springframework.web.context + + /controller/web/flows + ${project.basedir}/src/main/resources/META-INF - - - - - - - org.opendaylight.controller - forwardingrulesmanager - 0.4.0-SNAPSHOT - - - org.opendaylight.controller - containermanager - 0.4.0-SNAPSHOT - - - org.opendaylight.controller - usermanager - 0.4.0-SNAPSHOT - - - org.opendaylight.controller - switchmanager - 0.4.0-SNAPSHOT - - - org.opendaylight.controller - sal - 0.5.0-SNAPSHOT - - - org.opendaylight.controller - web - 0.4.0-SNAPSHOT - - + + + + + + + org.opendaylight.controller + forwardingrulesmanager + 0.4.0-SNAPSHOT + + + org.opendaylight.controller + containermanager + 0.4.0-SNAPSHOT + + + org.opendaylight.controller + usermanager + 0.4.0-SNAPSHOT + + + org.opendaylight.controller + switchmanager + 0.4.0-SNAPSHOT + + + org.opendaylight.controller + sal + 0.5.0-SNAPSHOT + + + org.opendaylight.controller + web + 0.4.0-SNAPSHOT + + diff --git a/opendaylight/web/root/pom.xml b/opendaylight/web/root/pom.xml index 76a7cb10aa..872260b637 100644 --- a/opendaylight/web/root/pom.xml +++ b/opendaylight/web/root/pom.xml @@ -1,153 +1,153 @@ - 4.0.0 - - org.opendaylight.controller - commons.opendaylight - 1.4.0-SNAPSHOT - ../../commons/opendaylight - + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + 4.0.0 + + org.opendaylight.controller + commons.opendaylight + 1.4.0-SNAPSHOT + ../../commons/opendaylight + - web - 0.4.0-SNAPSHOT - bundle + web + 0.4.0-SNAPSHOT + bundle - - - - org.apache.felix - maven-bundle-plugin - 2.3.6 - true - - - - org.opendaylight.controller.configuration, - org.opendaylight.controller.sal.authorization, - org.opendaylight.controller.sal.core, - org.opendaylight.controller.sal.utils, - org.opendaylight.controller.usermanager, - org.opendaylight.controller.usermanager.internal, - org.opendaylight.controller.containermanager, - com.google.gson, - javax.annotation, - javax.naming, - javax.servlet, - javax.servlet.annotation, - javax.servlet.http, - javax.servlet.jsp, - javax.servlet.jsp.el, - javax.servlet.jsp.jstl.core, - javax.servlet.jsp.jstl.fmt, - javax.servlet.jsp.jstl.tlv, - javax.servlet.jsp.tagext, - javax.servlet.resources, - javax.xml.parsers, - javax.xml.transform, - org.apache.commons.logging, - org.apache.taglibs.standard.functions, - org.apache.taglibs.standard.resources, - org.apache.taglibs.standard.tag.common.core, - org.apache.taglibs.standard.tag.common.fmt, - org.apache.taglibs.standard.tag.rt.core, - org.apache.taglibs.standard.tag.rt.fmt, - org.apache.taglibs.standard.tei, - org.apache.taglibs.standard.tlv, - org.codehaus.jackson, - org.codehaus.jackson.annotate, - org.codehaus.jackson.map, - org.codehaus.jackson.map.annotate, - org.osgi.framework, - org.slf4j, - org.springframework.beans, - org.springframework.beans.factory.xml, - org.springframework.context.config, - org.springframework.core, - org.springframework.stereotype, - org.springframework.ui, - org.springframework.web, - org.springframework.web.bind.annotation, - org.springframework.web.servlet, - org.springframework.web.servlet.config, - org.springframework.web.servlet.view, - org.springframework.web.servlet.view.json, - org.springframework.web.filter, - org.springframework.web.context, - org.springframework.util - - - org.opendaylight.controller.web - - / - + + + + org.apache.felix + maven-bundle-plugin + 2.3.6 + true + + + + org.opendaylight.controller.configuration, + org.opendaylight.controller.sal.authorization, + org.opendaylight.controller.sal.core, + org.opendaylight.controller.sal.utils, + org.opendaylight.controller.usermanager, + org.opendaylight.controller.usermanager.internal, + org.opendaylight.controller.containermanager, + com.google.gson, + javax.annotation, + javax.naming, + javax.servlet, + javax.servlet.annotation, + javax.servlet.http, + javax.servlet.jsp, + javax.servlet.jsp.el, + javax.servlet.jsp.jstl.core, + javax.servlet.jsp.jstl.fmt, + javax.servlet.jsp.jstl.tlv, + javax.servlet.jsp.tagext, + javax.servlet.resources, + javax.xml.parsers, + javax.xml.transform, + org.apache.commons.logging, + org.apache.taglibs.standard.functions, + org.apache.taglibs.standard.resources, + org.apache.taglibs.standard.tag.common.core, + org.apache.taglibs.standard.tag.common.fmt, + org.apache.taglibs.standard.tag.rt.core, + org.apache.taglibs.standard.tag.rt.fmt, + org.apache.taglibs.standard.tei, + org.apache.taglibs.standard.tlv, + org.codehaus.jackson, + org.codehaus.jackson.annotate, + org.codehaus.jackson.map, + org.codehaus.jackson.map.annotate, + org.osgi.framework, + org.slf4j, + org.springframework.beans, + org.springframework.beans.factory.xml, + org.springframework.context.config, + org.springframework.core, + org.springframework.stereotype, + org.springframework.ui, + org.springframework.web, + org.springframework.web.bind.annotation, + org.springframework.web.servlet, + org.springframework.web.servlet.config, + org.springframework.web.servlet.view, + org.springframework.web.servlet.view.json, + org.springframework.web.filter, + org.springframework.web.context, + org.springframework.util + + + org.opendaylight.controller.web + + / + ${project.basedir}/src/main/resources/META-INF - - - - - - - org.opendaylight.controller - configuration - 0.4.0-SNAPSHOT - - - org.opendaylight.controller - sal - 0.5.0-SNAPSHOT - - - org.opendaylight.controller - usermanager - 0.4.0-SNAPSHOT - - - org.opendaylight.controller - containermanager - 0.4.0-SNAPSHOT - - - junit - junit - 4.8.1 - test - - - org.springframework - spring-beans - 3.2.1.RELEASE - provided - - - org.springframework - spring-core - 3.2.1.RELEASE - provided - - - org.springframework - spring-context - 3.2.1.RELEASE - provided - - - org.springframework - spring-expression - 3.2.1.RELEASE - provided - - - org.springframework - spring-web - 3.2.1.RELEASE - provided - - - org.springframework - spring-webmvc - 3.2.1.RELEASE - provided - - + + + + + + + org.opendaylight.controller + configuration + 0.4.0-SNAPSHOT + + + org.opendaylight.controller + sal + 0.5.0-SNAPSHOT + + + org.opendaylight.controller + usermanager + 0.4.0-SNAPSHOT + + + org.opendaylight.controller + containermanager + 0.4.0-SNAPSHOT + + + junit + junit + 4.8.1 + test + + + org.springframework + spring-beans + 3.2.1.RELEASE + provided + + + org.springframework + spring-core + 3.2.1.RELEASE + provided + + + org.springframework + spring-context + 3.2.1.RELEASE + provided + + + org.springframework + spring-expression + 3.2.1.RELEASE + provided + + + org.springframework + spring-web + 3.2.1.RELEASE + provided + + + org.springframework + spring-webmvc + 3.2.1.RELEASE + provided + + diff --git a/opendaylight/web/topology/pom.xml b/opendaylight/web/topology/pom.xml index 2a8cb9fa1e..3dbb324988 100644 --- a/opendaylight/web/topology/pom.xml +++ b/opendaylight/web/topology/pom.xml @@ -1,126 +1,126 @@ - 4.0.0 - - org.opendaylight.controller - commons.opendaylight - 1.4.0-SNAPSHOT - ../../commons/opendaylight - - topology.web - 0.4.0-SNAPSHOT - bundle - - - - org.apache.felix - maven-bundle-plugin - 2.3.6 - true - - - - - - org.opendaylight.controller.containermanager, - org.opendaylight.controller.configuration, - org.opendaylight.controller.sal.authorization, - org.opendaylight.controller.sal.packet.address, - org.opendaylight.controller.sal.action, - org.opendaylight.controller.sal.core, - org.opendaylight.controller.sal.utils, - org.opendaylight.controller.switchmanager, - org.opendaylight.controller.topologymanager, - org.opendaylight.controller.usermanager, - org.opendaylight.controller.web, - com.google.gson, - edu.uci.ics.jung.algorithms.layout, - edu.uci.ics.jung.graph, - javax.annotation, - javax.naming, - javax.servlet, - javax.servlet.annotation, - javax.servlet.http, - javax.servlet.jsp, - javax.servlet.jsp.el, - javax.servlet.jsp.jstl.core, - javax.servlet.jsp.jstl.fmt, - javax.servlet.jsp.jstl.tlv, - javax.servlet.jsp.tagext, - javax.servlet.resources, - javax.xml.parsers, - javax.xml.transform, - org.apache.commons.logging, - org.apache.taglibs.standard.functions, - org.apache.taglibs.standard.resources, - org.apache.taglibs.standard.tag.common.core, - org.apache.taglibs.standard.tag.common.fmt, - org.apache.taglibs.standard.tag.rt.core, - org.apache.taglibs.standard.tag.rt.fmt, - org.apache.taglibs.standard.tei, - org.apache.taglibs.standard.tlv, - org.codehaus.jackson, - org.codehaus.jackson.annotate, - org.codehaus.jackson.map, - org.codehaus.jackson.map.annotate, - org.osgi.framework, - org.slf4j, - org.springframework.beans, - org.springframework.beans.factory.xml, - org.springframework.context.config, - org.springframework.stereotype, - org.springframework.util, - org.springframework.web, - org.springframework.web.bind.annotation, - org.springframework.web.servlet, - org.springframework.web.servlet.config, - org.springframework.web.servlet.view, - org.springframework.web.filter, - org.springframework.web.context, - - /controller/web/topology - + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + 4.0.0 + + org.opendaylight.controller + commons.opendaylight + 1.4.0-SNAPSHOT + ../../commons/opendaylight + + topology.web + 0.4.0-SNAPSHOT + bundle + + + + org.apache.felix + maven-bundle-plugin + 2.3.6 + true + + + + + + org.opendaylight.controller.containermanager, + org.opendaylight.controller.configuration, + org.opendaylight.controller.sal.authorization, + org.opendaylight.controller.sal.packet.address, + org.opendaylight.controller.sal.action, + org.opendaylight.controller.sal.core, + org.opendaylight.controller.sal.utils, + org.opendaylight.controller.switchmanager, + org.opendaylight.controller.topologymanager, + org.opendaylight.controller.usermanager, + org.opendaylight.controller.web, + com.google.gson, + edu.uci.ics.jung.algorithms.layout, + edu.uci.ics.jung.graph, + javax.annotation, + javax.naming, + javax.servlet, + javax.servlet.annotation, + javax.servlet.http, + javax.servlet.jsp, + javax.servlet.jsp.el, + javax.servlet.jsp.jstl.core, + javax.servlet.jsp.jstl.fmt, + javax.servlet.jsp.jstl.tlv, + javax.servlet.jsp.tagext, + javax.servlet.resources, + javax.xml.parsers, + javax.xml.transform, + org.apache.commons.logging, + org.apache.taglibs.standard.functions, + org.apache.taglibs.standard.resources, + org.apache.taglibs.standard.tag.common.core, + org.apache.taglibs.standard.tag.common.fmt, + org.apache.taglibs.standard.tag.rt.core, + org.apache.taglibs.standard.tag.rt.fmt, + org.apache.taglibs.standard.tei, + org.apache.taglibs.standard.tlv, + org.codehaus.jackson, + org.codehaus.jackson.annotate, + org.codehaus.jackson.map, + org.codehaus.jackson.map.annotate, + org.osgi.framework, + org.slf4j, + org.springframework.beans, + org.springframework.beans.factory.xml, + org.springframework.context.config, + org.springframework.stereotype, + org.springframework.util, + org.springframework.web, + org.springframework.web.bind.annotation, + org.springframework.web.servlet, + org.springframework.web.servlet.config, + org.springframework.web.servlet.view, + org.springframework.web.filter, + org.springframework.web.context, + + /controller/web/topology + ${project.basedir}/src/main/resources/META-INF - - - - - - - org.opendaylight.controller.thirdparty - net.sf.jung2 - 2.0.1-SNAPSHOT - - - org.opendaylight.controller - containermanager - 0.4.0-SNAPSHOT - - - org.opendaylight.controller - configuration - 0.4.0-SNAPSHOT - - - org.opendaylight.controller - switchmanager - 0.4.0-SNAPSHOT - - - org.opendaylight.controller - sal - 0.5.0-SNAPSHOT - - - org.opendaylight.controller - topologymanager - 0.4.0-SNAPSHOT - - - org.opendaylight.controller - web - 0.4.0-SNAPSHOT - - + + + + + + + org.opendaylight.controller.thirdparty + net.sf.jung2 + 2.0.1-SNAPSHOT + + + org.opendaylight.controller + containermanager + 0.4.0-SNAPSHOT + + + org.opendaylight.controller + configuration + 0.4.0-SNAPSHOT + + + org.opendaylight.controller + switchmanager + 0.4.0-SNAPSHOT + + + org.opendaylight.controller + sal + 0.5.0-SNAPSHOT + + + org.opendaylight.controller + topologymanager + 0.4.0-SNAPSHOT + + + org.opendaylight.controller + web + 0.4.0-SNAPSHOT + + diff --git a/opendaylight/web/troubleshoot/pom.xml b/opendaylight/web/troubleshoot/pom.xml index 0d088826fd..26001d60ab 100644 --- a/opendaylight/web/troubleshoot/pom.xml +++ b/opendaylight/web/troubleshoot/pom.xml @@ -1,119 +1,119 @@ - 4.0.0 - - org.opendaylight.controller - commons.opendaylight - 1.4.0-SNAPSHOT - ../../commons/opendaylight - - troubleshoot.web - 0.4.0-SNAPSHOT - bundle - - - - org.apache.felix - maven-bundle-plugin - 2.3.6 - true - - - - - - org.opendaylight.controller.forwardingrulesmanager, - org.opendaylight.controller.sal.authorization, - org.opendaylight.controller.sal.action, - org.opendaylight.controller.sal.core, - org.opendaylight.controller.sal.utils, - org.opendaylight.controller.containermanager, - org.opendaylight.controller.switchmanager, - org.opendaylight.controller.statisticsmanager, - org.opendaylight.controller.sal.flowprogrammer, - org.opendaylight.controller.sal.match, - org.opendaylight.controller.sal.reader, - org.opendaylight.controller.web, - com.google.gson, - javax.annotation, - javax.naming, - javax.servlet, - javax.servlet.annotation, - javax.servlet.http, - javax.servlet.jsp, - javax.servlet.jsp.el, - javax.servlet.jsp.jstl.core, - javax.servlet.jsp.jstl.fmt, - javax.servlet.jsp.jstl.tlv, - javax.servlet.jsp.tagext, - javax.servlet.resources, - javax.xml.parsers, - javax.xml.transform, - org.apache.commons.logging, - org.apache.taglibs.standard.functions, - org.apache.taglibs.standard.resources, - org.apache.taglibs.standard.tag.common.core, - org.apache.taglibs.standard.tag.common.fmt, - org.apache.taglibs.standard.tag.rt.core, - org.apache.taglibs.standard.tag.rt.fmt, - org.apache.taglibs.standard.tei, - org.apache.taglibs.standard.tlv, - org.codehaus.jackson, - org.codehaus.jackson.annotate, - org.codehaus.jackson.map, - org.codehaus.jackson.map.annotate, - org.osgi.framework, - org.slf4j, - org.springframework.beans, - org.springframework.beans.factory.xml, - org.springframework.context.config, - org.springframework.stereotype, - org.springframework.web, - org.springframework.web.bind.annotation, - org.springframework.web.servlet, - org.springframework.web.servlet.config, - org.springframework.web.servlet.view, - org.springframework.web.filter, - org.springframework.web.context - - /controller/web/troubleshoot - + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + 4.0.0 + + org.opendaylight.controller + commons.opendaylight + 1.4.0-SNAPSHOT + ../../commons/opendaylight + + troubleshoot.web + 0.4.0-SNAPSHOT + bundle + + + + org.apache.felix + maven-bundle-plugin + 2.3.6 + true + + + + + + org.opendaylight.controller.forwardingrulesmanager, + org.opendaylight.controller.sal.authorization, + org.opendaylight.controller.sal.action, + org.opendaylight.controller.sal.core, + org.opendaylight.controller.sal.utils, + org.opendaylight.controller.containermanager, + org.opendaylight.controller.switchmanager, + org.opendaylight.controller.statisticsmanager, + org.opendaylight.controller.sal.flowprogrammer, + org.opendaylight.controller.sal.match, + org.opendaylight.controller.sal.reader, + org.opendaylight.controller.web, + com.google.gson, + javax.annotation, + javax.naming, + javax.servlet, + javax.servlet.annotation, + javax.servlet.http, + javax.servlet.jsp, + javax.servlet.jsp.el, + javax.servlet.jsp.jstl.core, + javax.servlet.jsp.jstl.fmt, + javax.servlet.jsp.jstl.tlv, + javax.servlet.jsp.tagext, + javax.servlet.resources, + javax.xml.parsers, + javax.xml.transform, + org.apache.commons.logging, + org.apache.taglibs.standard.functions, + org.apache.taglibs.standard.resources, + org.apache.taglibs.standard.tag.common.core, + org.apache.taglibs.standard.tag.common.fmt, + org.apache.taglibs.standard.tag.rt.core, + org.apache.taglibs.standard.tag.rt.fmt, + org.apache.taglibs.standard.tei, + org.apache.taglibs.standard.tlv, + org.codehaus.jackson, + org.codehaus.jackson.annotate, + org.codehaus.jackson.map, + org.codehaus.jackson.map.annotate, + org.osgi.framework, + org.slf4j, + org.springframework.beans, + org.springframework.beans.factory.xml, + org.springframework.context.config, + org.springframework.stereotype, + org.springframework.web, + org.springframework.web.bind.annotation, + org.springframework.web.servlet, + org.springframework.web.servlet.config, + org.springframework.web.servlet.view, + org.springframework.web.filter, + org.springframework.web.context + + /controller/web/troubleshoot + ${project.basedir}/src/main/resources/META-INF - - - - - - - org.opendaylight.controller - forwardingrulesmanager - 0.4.0-SNAPSHOT - - - org.opendaylight.controller - containermanager - 0.4.0-SNAPSHOT - - - org.opendaylight.controller - switchmanager - 0.4.0-SNAPSHOT - - - org.opendaylight.controller - sal - 0.5.0-SNAPSHOT - - - org.opendaylight.controller - statisticsmanager - 0.4.0-SNAPSHOT - - - org.opendaylight.controller - web - 0.4.0-SNAPSHOT - - + + + + + + + org.opendaylight.controller + forwardingrulesmanager + 0.4.0-SNAPSHOT + + + org.opendaylight.controller + containermanager + 0.4.0-SNAPSHOT + + + org.opendaylight.controller + switchmanager + 0.4.0-SNAPSHOT + + + org.opendaylight.controller + sal + 0.5.0-SNAPSHOT + + + org.opendaylight.controller + statisticsmanager + 0.4.0-SNAPSHOT + + + org.opendaylight.controller + web + 0.4.0-SNAPSHOT + + diff --git a/third-party/openflowj/pom.xml b/third-party/openflowj/pom.xml index 0cc0597565..f927bf4db8 100644 --- a/third-party/openflowj/pom.xml +++ b/third-party/openflowj/pom.xml @@ -78,52 +78,52 @@ - org.apache.felix - maven-bundle-plugin - 2.3.6 - true - - - - org.openflow.example;version="1.0.1"; - uses:="org.openflow.example.cli, - org.openflow.protocol, - org.openflow.io, - org.openflow.protocol.factory", - org.openflow.io;version="1.0.1"; - uses:="org.openflow.protocol, - org.openflow.protocol.factory", - org.openflow.protocol;version="1.0.1"; - uses:="org.openflow.protocol.statistics, - org.openflow.protocol, - org.openflow.protocol.factory", - org.openflow.protocol.action;version="1.0.1"; - uses:="org.openflow.protocol", - org.openflow.protocol.factory;version="1.0.1"; - uses:="org.openflow.protocol.statistics, - org.openflow.protocol, - org.openflow.protocol.action, - org.openflow.protocol.queue", - org.openflow.protocol.queue;version="1.0.2"; - uses:="org.openflow.protocol, - org.openflow.protocol.factory", - org.openflow.protocol.statistics;version="1.0.1"; - uses:="org.openflow.protocol, - org.openflow.protocol.factory", - org.openflow.util;version="1.0.1" - - + org.apache.felix + maven-bundle-plugin + 2.3.6 + true + + + + org.openflow.example;version="1.0.1"; + uses:="org.openflow.example.cli, + org.openflow.protocol, + org.openflow.io, + org.openflow.protocol.factory", + org.openflow.io;version="1.0.1"; + uses:="org.openflow.protocol, + org.openflow.protocol.factory", + org.openflow.protocol;version="1.0.1"; + uses:="org.openflow.protocol.statistics, + org.openflow.protocol, + org.openflow.protocol.factory", + org.openflow.protocol.action;version="1.0.1"; + uses:="org.openflow.protocol", + org.openflow.protocol.factory;version="1.0.1"; + uses:="org.openflow.protocol.statistics, + org.openflow.protocol, + org.openflow.protocol.action, + org.openflow.protocol.queue", + org.openflow.protocol.queue;version="1.0.2"; + uses:="org.openflow.protocol, + org.openflow.protocol.factory", + org.openflow.protocol.statistics;version="1.0.1"; + uses:="org.openflow.protocol, + org.openflow.protocol.factory", + org.openflow.util;version="1.0.1" + + ${project.basedir}/META-INF - + - org.apache.maven.plugins - maven-compiler-plugin - 2.3.2 - - 1.6 - 1.6 - + org.apache.maven.plugins + maven-compiler-plugin + 2.3.2 + + 1.6 + 1.6 + -- 2.36.6