From: Giovanni Meo Date: Wed, 25 Sep 2013 14:37:25 +0000 (+0000) Subject: Merge "Stop overriding method just to call super." X-Git-Tag: releasepom-0.1.0~15 X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=commitdiff_plain;h=17c1485e008e4b90e955841c0672c12ed3a7344e;hp=d0853adc639de247a097f19868cce0ccaf7c2453;p=controller.git Merge "Stop overriding method just to call super." --- diff --git a/opendaylight/appauth/pom.xml b/opendaylight/appauth/pom.xml index 71aa49f0f2..4f9cf4c17d 100644 --- a/opendaylight/appauth/pom.xml +++ b/opendaylight/appauth/pom.xml @@ -22,7 +22,7 @@ org.apache.felix maven-bundle-plugin - 2.3.6 + ${bundle.plugin.version} true diff --git a/opendaylight/archetypes/odl-model-project/pom.xml b/opendaylight/archetypes/odl-model-project/pom.xml index eb81614983..9d05405380 100644 --- a/opendaylight/archetypes/odl-model-project/pom.xml +++ b/opendaylight/archetypes/odl-model-project/pom.xml @@ -8,6 +8,11 @@ maven-archetype odl-model-project + + scm:git:ssh://git.opendaylight.org:29418/controller.git + scm:git:ssh://git.opendaylight.org:29418/controller.git + https://wiki.opendaylight.org/view/OpenDaylight_Controller:Main + diff --git a/opendaylight/archetypes/odl-model-project/src/main/resources/archetype-resources/pom.xml b/opendaylight/archetypes/odl-model-project/src/main/resources/archetype-resources/pom.xml index b60dee7c41..e592e6df8e 100644 --- a/opendaylight/archetypes/odl-model-project/src/main/resources/archetype-resources/pom.xml +++ b/opendaylight/archetypes/odl-model-project/src/main/resources/archetype-resources/pom.xml @@ -10,15 +10,20 @@ UTF-8 http://nexus.opendaylight.org/content 0.5.8-SNAPSHOT - 2.4.0 + 2.3.7 + + scm:git:ssh://git.opendaylight.org:29418/controller.git + scm:git:ssh://git.opendaylight.org:29418/controller.git + https://wiki.opendaylight.org/view/OpenDaylight_Controller:Main + org.apache.felix maven-bundle-plugin - ${maven.bundle.version} + ${bundle.plugin.version} true diff --git a/opendaylight/arphandler/pom.xml b/opendaylight/arphandler/pom.xml index c58ddd2f21..e3beb8061d 100644 --- a/opendaylight/arphandler/pom.xml +++ b/opendaylight/arphandler/pom.xml @@ -22,7 +22,7 @@ org.apache.felix maven-bundle-plugin - 2.3.6 + ${bundle.plugin.version} true diff --git a/opendaylight/clustering/services/pom.xml b/opendaylight/clustering/services/pom.xml index d251d45425..59df46b36e 100644 --- a/opendaylight/clustering/services/pom.xml +++ b/opendaylight/clustering/services/pom.xml @@ -22,7 +22,7 @@ org.apache.felix maven-bundle-plugin - 2.3.6 + ${bundle.plugin.version} true diff --git a/opendaylight/clustering/services_implementation/pom.xml b/opendaylight/clustering/services_implementation/pom.xml index fddaa6c9dc..9606bdc019 100644 --- a/opendaylight/clustering/services_implementation/pom.xml +++ b/opendaylight/clustering/services_implementation/pom.xml @@ -38,7 +38,7 @@ org.apache.felix maven-bundle-plugin - 2.3.6 + ${bundle.plugin.version} true diff --git a/opendaylight/clustering/stub/pom.xml b/opendaylight/clustering/stub/pom.xml index b3c49851f6..3cc7d7baac 100644 --- a/opendaylight/clustering/stub/pom.xml +++ b/opendaylight/clustering/stub/pom.xml @@ -22,7 +22,7 @@ org.apache.felix maven-bundle-plugin - 2.3.6 + ${bundle.plugin.version} true diff --git a/opendaylight/clustering/test/pom.xml b/opendaylight/clustering/test/pom.xml index 0b09f41de5..340a6c771f 100644 --- a/opendaylight/clustering/test/pom.xml +++ b/opendaylight/clustering/test/pom.xml @@ -22,7 +22,7 @@ org.apache.felix maven-bundle-plugin - 2.3.6 + ${bundle.plugin.version} true diff --git a/opendaylight/commons/concepts/pom.xml b/opendaylight/commons/concepts/pom.xml index ab351dbdc5..22555271e1 100644 --- a/opendaylight/commons/concepts/pom.xml +++ b/opendaylight/commons/concepts/pom.xml @@ -22,7 +22,7 @@ org.apache.felix maven-bundle-plugin - 2.3.6 + ${bundle.plugin.version} true diff --git a/opendaylight/commons/opendaylight/pom.xml b/opendaylight/commons/opendaylight/pom.xml index 042bc54928..abda95aee5 100644 --- a/opendaylight/commons/opendaylight/pom.xml +++ b/opendaylight/commons/opendaylight/pom.xml @@ -58,6 +58,7 @@ 3.1 0.5.3.201107060350 1.3.1 + 2.3.7 diff --git a/opendaylight/configuration/api/pom.xml b/opendaylight/configuration/api/pom.xml index bef02e4e29..68fae6417c 100644 --- a/opendaylight/configuration/api/pom.xml +++ b/opendaylight/configuration/api/pom.xml @@ -23,7 +23,7 @@ org.apache.felix maven-bundle-plugin - 2.3.6 + ${bundle.plugin.version} true diff --git a/opendaylight/configuration/implementation/pom.xml b/opendaylight/configuration/implementation/pom.xml index c656ce1d6c..66473e262f 100644 --- a/opendaylight/configuration/implementation/pom.xml +++ b/opendaylight/configuration/implementation/pom.xml @@ -23,7 +23,7 @@ org.apache.felix maven-bundle-plugin - 2.3.6 + ${bundle.plugin.version} true diff --git a/opendaylight/connectionmanager/api/pom.xml b/opendaylight/connectionmanager/api/pom.xml index 4cc14b3d38..7029f49c0c 100644 --- a/opendaylight/connectionmanager/api/pom.xml +++ b/opendaylight/connectionmanager/api/pom.xml @@ -23,7 +23,7 @@ org.apache.felix maven-bundle-plugin - 2.3.6 + ${bundle.plugin.version} true diff --git a/opendaylight/connectionmanager/implementation/pom.xml b/opendaylight/connectionmanager/implementation/pom.xml index 5df2b0b26d..5571d944ca 100644 --- a/opendaylight/connectionmanager/implementation/pom.xml +++ b/opendaylight/connectionmanager/implementation/pom.xml @@ -23,7 +23,7 @@ org.apache.felix maven-bundle-plugin - 2.3.6 + ${bundle.plugin.version} true diff --git a/opendaylight/containermanager/api/pom.xml b/opendaylight/containermanager/api/pom.xml index 2b207aa797..891c44dfd0 100644 --- a/opendaylight/containermanager/api/pom.xml +++ b/opendaylight/containermanager/api/pom.xml @@ -23,7 +23,7 @@ org.apache.felix maven-bundle-plugin - 2.3.6 + ${bundle.plugin.version} true diff --git a/opendaylight/containermanager/implementation/pom.xml b/opendaylight/containermanager/implementation/pom.xml index 5af8e2265c..7900ce8901 100644 --- a/opendaylight/containermanager/implementation/pom.xml +++ b/opendaylight/containermanager/implementation/pom.xml @@ -23,7 +23,7 @@ org.apache.felix maven-bundle-plugin - 2.3.6 + ${bundle.plugin.version} true diff --git a/opendaylight/containermanager/it.implementation/pom.xml b/opendaylight/containermanager/it.implementation/pom.xml index ba71dbfdfe..805f2a7531 100644 --- a/opendaylight/containermanager/it.implementation/pom.xml +++ b/opendaylight/containermanager/it.implementation/pom.xml @@ -23,7 +23,7 @@ org.apache.felix maven-bundle-plugin - 2.3.6 + ${bundle.plugin.version} true diff --git a/opendaylight/forwarding/staticrouting/pom.xml b/opendaylight/forwarding/staticrouting/pom.xml index 458914807c..2304e6be5d 100644 --- a/opendaylight/forwarding/staticrouting/pom.xml +++ b/opendaylight/forwarding/staticrouting/pom.xml @@ -22,7 +22,7 @@ org.apache.felix maven-bundle-plugin - 2.3.6 + ${bundle.plugin.version} true diff --git a/opendaylight/forwardingrulesmanager/api/pom.xml b/opendaylight/forwardingrulesmanager/api/pom.xml index 73ba8b95b0..253906e9c1 100644 --- a/opendaylight/forwardingrulesmanager/api/pom.xml +++ b/opendaylight/forwardingrulesmanager/api/pom.xml @@ -24,7 +24,7 @@ org.apache.felix maven-bundle-plugin - 2.3.6 + ${bundle.plugin.version} true diff --git a/opendaylight/forwardingrulesmanager/implementation/pom.xml b/opendaylight/forwardingrulesmanager/implementation/pom.xml index d146eead6f..651d077fd8 100644 --- a/opendaylight/forwardingrulesmanager/implementation/pom.xml +++ b/opendaylight/forwardingrulesmanager/implementation/pom.xml @@ -41,7 +41,7 @@ org.apache.felix maven-bundle-plugin - 2.3.6 + ${bundle.plugin.version} true diff --git a/opendaylight/hosttracker/api/pom.xml b/opendaylight/hosttracker/api/pom.xml index 49a3ff5d92..322792d089 100644 --- a/opendaylight/hosttracker/api/pom.xml +++ b/opendaylight/hosttracker/api/pom.xml @@ -22,7 +22,7 @@ org.apache.felix maven-bundle-plugin - 2.3.6 + ${bundle.plugin.version} true diff --git a/opendaylight/hosttracker/implementation/pom.xml b/opendaylight/hosttracker/implementation/pom.xml index e93559b42c..3e7a1df325 100644 --- a/opendaylight/hosttracker/implementation/pom.xml +++ b/opendaylight/hosttracker/implementation/pom.xml @@ -41,7 +41,7 @@ org.apache.felix maven-bundle-plugin - 2.3.6 + ${bundle.plugin.version} true diff --git a/opendaylight/hosttracker_new/api/pom.xml b/opendaylight/hosttracker_new/api/pom.xml index 72b671c0d2..f93b804166 100644 --- a/opendaylight/hosttracker_new/api/pom.xml +++ b/opendaylight/hosttracker_new/api/pom.xml @@ -22,7 +22,7 @@ org.apache.felix maven-bundle-plugin - 2.3.6 + ${bundle.plugin.version} true diff --git a/opendaylight/hosttracker_new/implementation/pom.xml b/opendaylight/hosttracker_new/implementation/pom.xml index dfc2955cfd..85f3ca857b 100644 --- a/opendaylight/hosttracker_new/implementation/pom.xml +++ b/opendaylight/hosttracker_new/implementation/pom.xml @@ -41,7 +41,7 @@ org.apache.felix maven-bundle-plugin - 2.3.6 + ${bundle.plugin.version} true diff --git a/opendaylight/logging/bridge/pom.xml b/opendaylight/logging/bridge/pom.xml index a6c4a7cd3e..664415e9b7 100644 --- a/opendaylight/logging/bridge/pom.xml +++ b/opendaylight/logging/bridge/pom.xml @@ -22,7 +22,7 @@ org.apache.felix maven-bundle-plugin - 2.3.6 + ${bundle.plugin.version} true diff --git a/opendaylight/md-sal/model/model-flow-service/pom.xml b/opendaylight/md-sal/model/model-flow-service/pom.xml index 18b338b544..583a7ac010 100644 --- a/opendaylight/md-sal/model/model-flow-service/pom.xml +++ b/opendaylight/md-sal/model/model-flow-service/pom.xml @@ -6,6 +6,11 @@ org.opendaylight.controller.model 1.0-SNAPSHOT + + scm:git:ssh://git.opendaylight.org:29418/controller.git + scm:git:ssh://git.opendaylight.org:29418/controller.git + https://wiki.opendaylight.org/view/OpenDaylight_Controller:MD-SAL + 4.0.0 model-flow-service @@ -28,4 +33,4 @@ bundle - \ No newline at end of file + diff --git a/opendaylight/md-sal/model/pom.xml b/opendaylight/md-sal/model/pom.xml index 2874122ac1..f7d9241c93 100644 --- a/opendaylight/md-sal/model/pom.xml +++ b/opendaylight/md-sal/model/pom.xml @@ -21,7 +21,7 @@ 0.5.7-SNAPSHOT UTF-8 - 2.4.0 + 2.3.7 @@ -37,7 +37,7 @@ org.apache.felix maven-bundle-plugin - ${maven.bundle.version} + ${bundle.plugin.version} true diff --git a/opendaylight/md-sal/pom.xml b/opendaylight/md-sal/pom.xml index bf1b95decf..33ec9999d6 100644 --- a/opendaylight/md-sal/pom.xml +++ b/opendaylight/md-sal/pom.xml @@ -34,7 +34,7 @@ 1.7.2 http://nexus.opendaylight.org/content 0.5.8-SNAPSHOT - 2.4.0 + 2.3.7 2.3.2 14.0.1 5.0.0 @@ -227,7 +227,7 @@ org.apache.felix maven-bundle-plugin - ${maven.bundle.version} + ${bundle.plugin.version} true diff --git a/opendaylight/md-sal/sal-binding-broker/pom.xml b/opendaylight/md-sal/sal-binding-broker/pom.xml index 8e06c9d71e..29ba03be62 100644 --- a/opendaylight/md-sal/sal-binding-broker/pom.xml +++ b/opendaylight/md-sal/sal-binding-broker/pom.xml @@ -19,6 +19,7 @@ org.apache.felix maven-bundle-plugin + ${bundle.plugin.version} true diff --git a/opendaylight/md-sal/sal-compability/pom.xml b/opendaylight/md-sal/sal-compability/pom.xml index 40301a379f..edb3b19f0c 100644 --- a/opendaylight/md-sal/sal-compability/pom.xml +++ b/opendaylight/md-sal/sal-compability/pom.xml @@ -7,6 +7,11 @@ 1.0-SNAPSHOT sal-compability + + scm:git:ssh://git.opendaylight.org:29418/controller.git + scm:git:ssh://git.opendaylight.org:29418/controller.git + https://wiki.opendaylight.org/view/OpenDaylight_Controller:MD-SAL + diff --git a/opendaylight/networkconfiguration/neutron/implementation/pom.xml b/opendaylight/networkconfiguration/neutron/implementation/pom.xml index 5aa3c3243a..2e8637a162 100644 --- a/opendaylight/networkconfiguration/neutron/implementation/pom.xml +++ b/opendaylight/networkconfiguration/neutron/implementation/pom.xml @@ -10,6 +10,11 @@ http://nexus.opendaylight.org/content 1.26.2 + + scm:git:ssh://git.opendaylight.org:29418/controller.git + scm:git:ssh://git.opendaylight.org:29418/controller.git + https://wiki.opendaylight.org/view/OpenDaylight_Controller:Main + diff --git a/opendaylight/networkconfiguration/neutron/pom.xml b/opendaylight/networkconfiguration/neutron/pom.xml index a905ebfa30..7f925bad5b 100644 --- a/opendaylight/networkconfiguration/neutron/pom.xml +++ b/opendaylight/networkconfiguration/neutron/pom.xml @@ -10,6 +10,11 @@ http://nexus.opendaylight.org/content 1.26.2 + + scm:git:ssh://git.opendaylight.org:29418/controller.git + scm:git:ssh://git.opendaylight.org:29418/controller.git + https://wiki.opendaylight.org/view/OpenDaylight_Controller:Main + diff --git a/opendaylight/northbound/bundlescanner/api/pom.xml b/opendaylight/northbound/bundlescanner/api/pom.xml index 2c96ec215d..685de7d46c 100644 --- a/opendaylight/northbound/bundlescanner/api/pom.xml +++ b/opendaylight/northbound/bundlescanner/api/pom.xml @@ -22,7 +22,7 @@ org.apache.felix maven-bundle-plugin - 2.3.6 + ${bundle.plugin.version} true diff --git a/opendaylight/northbound/bundlescanner/implementation/pom.xml b/opendaylight/northbound/bundlescanner/implementation/pom.xml index ceea28e954..78812d41d4 100644 --- a/opendaylight/northbound/bundlescanner/implementation/pom.xml +++ b/opendaylight/northbound/bundlescanner/implementation/pom.xml @@ -22,7 +22,7 @@ org.apache.felix maven-bundle-plugin - 2.3.6 + ${bundle.plugin.version} true diff --git a/opendaylight/northbound/commons/pom.xml b/opendaylight/northbound/commons/pom.xml index ff40ba07ee..dda6a0f975 100644 --- a/opendaylight/northbound/commons/pom.xml +++ b/opendaylight/northbound/commons/pom.xml @@ -22,7 +22,7 @@ org.apache.felix maven-bundle-plugin - 2.3.6 + ${bundle.plugin.version} true diff --git a/opendaylight/northbound/containermanager/pom.xml b/opendaylight/northbound/containermanager/pom.xml index 75341a6fdf..74e4ed8cdc 100644 --- a/opendaylight/northbound/containermanager/pom.xml +++ b/opendaylight/northbound/containermanager/pom.xml @@ -7,6 +7,11 @@ 1.4.0-SNAPSHOT ../../commons/opendaylight + + scm:git:ssh://git.opendaylight.org:29418/controller.git + scm:git:ssh://git.opendaylight.org:29418/controller.git + https://wiki.opendaylight.org/view/OpenDaylight_Controller:Main + org.opendaylight.controller containermanager.northbound @@ -23,7 +28,7 @@ org.apache.felix maven-bundle-plugin - 2.3.6 + ${bundle.plugin.version} true diff --git a/opendaylight/northbound/flowprogrammer/pom.xml b/opendaylight/northbound/flowprogrammer/pom.xml index addf857aa1..bfd2eb6290 100644 --- a/opendaylight/northbound/flowprogrammer/pom.xml +++ b/opendaylight/northbound/flowprogrammer/pom.xml @@ -33,7 +33,7 @@ org.apache.felix maven-bundle-plugin - 2.3.6 + ${bundle.plugin.version} true diff --git a/opendaylight/northbound/hosttracker/pom.xml b/opendaylight/northbound/hosttracker/pom.xml index e0315fb1ee..53af293510 100644 --- a/opendaylight/northbound/hosttracker/pom.xml +++ b/opendaylight/northbound/hosttracker/pom.xml @@ -33,7 +33,7 @@ org.apache.felix maven-bundle-plugin - 2.3.6 + ${bundle.plugin.version} true diff --git a/opendaylight/northbound/networkconfiguration/bridgedomain/pom.xml b/opendaylight/northbound/networkconfiguration/bridgedomain/pom.xml index c1eb56aa29..e845daa9d3 100644 --- a/opendaylight/northbound/networkconfiguration/bridgedomain/pom.xml +++ b/opendaylight/northbound/networkconfiguration/bridgedomain/pom.xml @@ -33,7 +33,7 @@ org.apache.felix maven-bundle-plugin - 2.3.6 + ${bundle.plugin.version} true diff --git a/opendaylight/northbound/networkconfiguration/neutron/pom.xml b/opendaylight/northbound/networkconfiguration/neutron/pom.xml index 6a143d9853..e3b572aea4 100644 --- a/opendaylight/northbound/networkconfiguration/neutron/pom.xml +++ b/opendaylight/northbound/networkconfiguration/neutron/pom.xml @@ -11,6 +11,11 @@ http://nexus.opendaylight.org/content 1.26.2 + + scm:git:ssh://git.opendaylight.org:29418/controller.git + scm:git:ssh://git.opendaylight.org:29418/controller.git + https://wiki.opendaylight.org/view/OpenDaylight_Controller:Main + @@ -117,4 +122,4 @@ 2.5.0 - \ No newline at end of file + diff --git a/opendaylight/northbound/networkconfiguration/neutron/src/main/java/org/opendaylight/controller/networkconfig/neutron/northbound/NeutronNetworksNorthbound.java b/opendaylight/northbound/networkconfiguration/neutron/src/main/java/org/opendaylight/controller/networkconfig/neutron/northbound/NeutronNetworksNorthbound.java index 2505da62cf..b77536b8db 100644 --- a/opendaylight/northbound/networkconfiguration/neutron/src/main/java/org/opendaylight/controller/networkconfig/neutron/northbound/NeutronNetworksNorthbound.java +++ b/opendaylight/northbound/networkconfiguration/neutron/src/main/java/org/opendaylight/controller/networkconfig/neutron/northbound/NeutronNetworksNorthbound.java @@ -103,11 +103,11 @@ public class NeutronNetworksNorthbound { Boolean bShared = null; Boolean bRouterExternal = null; if (queryAdminStateUp != null) - bAdminStateUp = new Boolean(queryAdminStateUp); + bAdminStateUp = Boolean.valueOf(queryAdminStateUp); if (queryShared != null) - bShared = new Boolean(queryShared); + bShared = Boolean.valueOf(queryShared); if (queryRouterExternal != null) - bRouterExternal = new Boolean(queryRouterExternal); + bRouterExternal = Boolean.valueOf(queryRouterExternal); if ((queryID == null || queryID.equals(oSN.getID())) && (queryName == null || queryName.equals(oSN.getNetworkName())) && (bAdminStateUp == null || bAdminStateUp.booleanValue() == oSN.isAdminStateUp()) && diff --git a/opendaylight/northbound/staticrouting/pom.xml b/opendaylight/northbound/staticrouting/pom.xml index 1028ca59ab..73d85b250b 100644 --- a/opendaylight/northbound/staticrouting/pom.xml +++ b/opendaylight/northbound/staticrouting/pom.xml @@ -33,7 +33,7 @@ org.apache.felix maven-bundle-plugin - 2.3.6 + ${bundle.plugin.version} true diff --git a/opendaylight/northbound/statistics/pom.xml b/opendaylight/northbound/statistics/pom.xml index 74f64c2457..b2fd4222a8 100644 --- a/opendaylight/northbound/statistics/pom.xml +++ b/opendaylight/northbound/statistics/pom.xml @@ -33,7 +33,7 @@ org.apache.felix maven-bundle-plugin - 2.3.6 + ${bundle.plugin.version} true diff --git a/opendaylight/northbound/subnets/pom.xml b/opendaylight/northbound/subnets/pom.xml index ba58e06ecb..693f7eba7b 100644 --- a/opendaylight/northbound/subnets/pom.xml +++ b/opendaylight/northbound/subnets/pom.xml @@ -48,7 +48,7 @@ org.apache.felix maven-bundle-plugin - 2.3.6 + ${bundle.plugin.version} true diff --git a/opendaylight/northbound/switchmanager/pom.xml b/opendaylight/northbound/switchmanager/pom.xml index 401cc948b8..8ca712fffc 100644 --- a/opendaylight/northbound/switchmanager/pom.xml +++ b/opendaylight/northbound/switchmanager/pom.xml @@ -34,7 +34,7 @@ org.apache.felix maven-bundle-plugin - 2.3.6 + ${bundle.plugin.version} true diff --git a/opendaylight/northbound/topology/pom.xml b/opendaylight/northbound/topology/pom.xml index d379164a14..d15e4e034b 100644 --- a/opendaylight/northbound/topology/pom.xml +++ b/opendaylight/northbound/topology/pom.xml @@ -34,7 +34,7 @@ org.apache.felix maven-bundle-plugin - 2.3.6 + ${bundle.plugin.version} true diff --git a/opendaylight/northboundtest/unit_test_suite/pom.xml b/opendaylight/northboundtest/unit_test_suite/pom.xml index ce22ddf517..a9990abd97 100644 --- a/opendaylight/northboundtest/unit_test_suite/pom.xml +++ b/opendaylight/northboundtest/unit_test_suite/pom.xml @@ -24,7 +24,7 @@ org.apache.felix maven-bundle-plugin - 2.3.6 + ${bundle.plugin.version} true diff --git a/opendaylight/protocol_plugins/openflow/pom.xml b/opendaylight/protocol_plugins/openflow/pom.xml index c93d4b61e7..a7f4db8460 100644 --- a/opendaylight/protocol_plugins/openflow/pom.xml +++ b/opendaylight/protocol_plugins/openflow/pom.xml @@ -22,7 +22,7 @@ org.apache.felix maven-bundle-plugin - 2.3.6 + ${bundle.plugin.version} true diff --git a/opendaylight/protocol_plugins/stub/pom.xml b/opendaylight/protocol_plugins/stub/pom.xml index 7f556598f1..b17d63df38 100644 --- a/opendaylight/protocol_plugins/stub/pom.xml +++ b/opendaylight/protocol_plugins/stub/pom.xml @@ -22,7 +22,7 @@ org.apache.felix maven-bundle-plugin - 2.3.6 + ${bundle.plugin.version} true diff --git a/opendaylight/routing/dijkstra_implementation/pom.xml b/opendaylight/routing/dijkstra_implementation/pom.xml index 37d3e2fb19..77330fd7c8 100644 --- a/opendaylight/routing/dijkstra_implementation/pom.xml +++ b/opendaylight/routing/dijkstra_implementation/pom.xml @@ -22,7 +22,7 @@ org.apache.felix maven-bundle-plugin - 2.3.6 + ${bundle.plugin.version} true diff --git a/opendaylight/sal/api/pom.xml b/opendaylight/sal/api/pom.xml index 32da9f3201..9b7e3dd712 100644 --- a/opendaylight/sal/api/pom.xml +++ b/opendaylight/sal/api/pom.xml @@ -22,7 +22,7 @@ org.apache.felix maven-bundle-plugin - 2.3.6 + ${bundle.plugin.version} true diff --git a/opendaylight/sal/connection/api/pom.xml b/opendaylight/sal/connection/api/pom.xml index c3f40aa42e..00fda77e69 100644 --- a/opendaylight/sal/connection/api/pom.xml +++ b/opendaylight/sal/connection/api/pom.xml @@ -22,7 +22,7 @@ org.apache.felix maven-bundle-plugin - 2.3.6 + ${bundle.plugin.version} true diff --git a/opendaylight/sal/connection/implementation/pom.xml b/opendaylight/sal/connection/implementation/pom.xml index 44f793a091..f2817ebd0b 100644 --- a/opendaylight/sal/connection/implementation/pom.xml +++ b/opendaylight/sal/connection/implementation/pom.xml @@ -22,7 +22,7 @@ org.apache.felix maven-bundle-plugin - 2.3.6 + ${bundle.plugin.version} true diff --git a/opendaylight/sal/implementation/pom.xml b/opendaylight/sal/implementation/pom.xml index dddc3c3e58..b44e85553d 100644 --- a/opendaylight/sal/implementation/pom.xml +++ b/opendaylight/sal/implementation/pom.xml @@ -22,7 +22,7 @@ org.apache.felix maven-bundle-plugin - 2.3.6 + ${bundle.plugin.version} true diff --git a/opendaylight/sal/networkconfiguration/api/pom.xml b/opendaylight/sal/networkconfiguration/api/pom.xml index 1f6f9cdf66..d114338941 100644 --- a/opendaylight/sal/networkconfiguration/api/pom.xml +++ b/opendaylight/sal/networkconfiguration/api/pom.xml @@ -22,7 +22,7 @@ org.apache.felix maven-bundle-plugin - 2.3.6 + ${bundle.plugin.version} true diff --git a/opendaylight/sal/networkconfiguration/implementation/pom.xml b/opendaylight/sal/networkconfiguration/implementation/pom.xml index 48e0ff615c..190c74cb78 100644 --- a/opendaylight/sal/networkconfiguration/implementation/pom.xml +++ b/opendaylight/sal/networkconfiguration/implementation/pom.xml @@ -22,7 +22,7 @@ org.apache.felix maven-bundle-plugin - 2.3.6 + ${bundle.plugin.version} true diff --git a/opendaylight/samples/loadbalancer/pom.xml b/opendaylight/samples/loadbalancer/pom.xml index 81a078a35b..c4d8686c65 100644 --- a/opendaylight/samples/loadbalancer/pom.xml +++ b/opendaylight/samples/loadbalancer/pom.xml @@ -24,7 +24,7 @@ org.apache.felix maven-bundle-plugin - 2.3.6 + ${bundle.plugin.version} true diff --git a/opendaylight/samples/northbound/loadbalancer/pom.xml b/opendaylight/samples/northbound/loadbalancer/pom.xml index e001dc8e58..c24ba8a169 100644 --- a/opendaylight/samples/northbound/loadbalancer/pom.xml +++ b/opendaylight/samples/northbound/loadbalancer/pom.xml @@ -34,7 +34,7 @@ org.apache.felix maven-bundle-plugin - 2.3.6 + ${bundle.plugin.version} true diff --git a/opendaylight/samples/simpleforwarding/pom.xml b/opendaylight/samples/simpleforwarding/pom.xml index 552ff88342..87036cdbf3 100644 --- a/opendaylight/samples/simpleforwarding/pom.xml +++ b/opendaylight/samples/simpleforwarding/pom.xml @@ -22,7 +22,7 @@ org.apache.felix maven-bundle-plugin - 2.3.6 + ${bundle.plugin.version} true diff --git a/opendaylight/security/pom.xml b/opendaylight/security/pom.xml index 3c2cb8ef6d..9c5b89b95a 100644 --- a/opendaylight/security/pom.xml +++ b/opendaylight/security/pom.xml @@ -23,7 +23,7 @@ org.apache.felix maven-bundle-plugin - 2.3.6 + ${bundle.plugin.version} true diff --git a/opendaylight/statisticsmanager/api/pom.xml b/opendaylight/statisticsmanager/api/pom.xml index bddcc2ae0e..b972f5d9a4 100644 --- a/opendaylight/statisticsmanager/api/pom.xml +++ b/opendaylight/statisticsmanager/api/pom.xml @@ -22,7 +22,7 @@ org.apache.felix maven-bundle-plugin - 2.3.6 + ${bundle.plugin.version} true diff --git a/opendaylight/statisticsmanager/implementation/pom.xml b/opendaylight/statisticsmanager/implementation/pom.xml index d7dea84686..4d47312e02 100644 --- a/opendaylight/statisticsmanager/implementation/pom.xml +++ b/opendaylight/statisticsmanager/implementation/pom.xml @@ -39,7 +39,7 @@ org.apache.felix maven-bundle-plugin - 2.3.6 + ${bundle.plugin.version} true diff --git a/opendaylight/switchmanager/api/pom.xml b/opendaylight/switchmanager/api/pom.xml index 14a056d5fe..3c2be9002d 100644 --- a/opendaylight/switchmanager/api/pom.xml +++ b/opendaylight/switchmanager/api/pom.xml @@ -40,7 +40,7 @@ org.apache.felix maven-bundle-plugin - 2.3.6 + ${bundle.plugin.version} true diff --git a/opendaylight/switchmanager/implementation/pom.xml b/opendaylight/switchmanager/implementation/pom.xml index ee126f3408..68dae260b0 100644 --- a/opendaylight/switchmanager/implementation/pom.xml +++ b/opendaylight/switchmanager/implementation/pom.xml @@ -40,7 +40,7 @@ org.apache.felix maven-bundle-plugin - 2.3.6 + ${bundle.plugin.version} true diff --git a/opendaylight/topologymanager/implementation/pom.xml b/opendaylight/topologymanager/implementation/pom.xml index 399f878223..ebf9dbc10c 100755 --- a/opendaylight/topologymanager/implementation/pom.xml +++ b/opendaylight/topologymanager/implementation/pom.xml @@ -23,7 +23,7 @@ org.apache.felix maven-bundle-plugin - 2.3.6 + ${bundle.plugin.version} true diff --git a/opendaylight/usermanager/api/pom.xml b/opendaylight/usermanager/api/pom.xml index eb4bea584c..fbf374fa3d 100644 --- a/opendaylight/usermanager/api/pom.xml +++ b/opendaylight/usermanager/api/pom.xml @@ -22,7 +22,7 @@ org.apache.felix maven-bundle-plugin - 2.3.6 + ${bundle.plugin.version} true diff --git a/opendaylight/usermanager/api/src/main/java/org/opendaylight/controller/usermanager/UserConfig.java b/opendaylight/usermanager/api/src/main/java/org/opendaylight/controller/usermanager/UserConfig.java index 07c814adf1..2e03db1655 100644 --- a/opendaylight/usermanager/api/src/main/java/org/opendaylight/controller/usermanager/UserConfig.java +++ b/opendaylight/usermanager/api/src/main/java/org/opendaylight/controller/usermanager/UserConfig.java @@ -38,7 +38,7 @@ public class UserConfig implements Serializable { private static final boolean strongPasswordCheck = Boolean.getBoolean("enableStrongPasswordCheck"); private static final String BAD_PASSWORD = "Bad Password"; private static final int USERNAME_MAXLENGTH = 32; - protected static final String PASSWORD_REGEX = "(?=.*[^\\w])(?=.*\\d)(?=.*[a-z])(?=.*[A-Z]).{8,256}$"; + protected static final String PASSWORD_REGEX = "(?=.*[^a-zA-Z0-9])(?=.*\\d)(?=.*[a-z])(?=.*[A-Z]).{8,256}$"; private static final Pattern INVALID_USERNAME_CHARACTERS = Pattern.compile("([/\\s\\.\\?#%;\\\\]+)"); private static MessageDigest oneWayFunction = null; static { diff --git a/opendaylight/usermanager/api/src/test/java/org/opendaylight/controller/usermanager/AuthorizationUserConfigTest.java b/opendaylight/usermanager/api/src/test/java/org/opendaylight/controller/usermanager/AuthorizationUserConfigTest.java index 8c029a7488..4c377271dc 100644 --- a/opendaylight/usermanager/api/src/test/java/org/opendaylight/controller/usermanager/AuthorizationUserConfigTest.java +++ b/opendaylight/usermanager/api/src/test/java/org/opendaylight/controller/usermanager/AuthorizationUserConfigTest.java @@ -153,5 +153,9 @@ public class AuthorizationUserConfigTest { // No special characters password = "aBc4ef7H8"; assertFalse(password.matches(regex)); + + // Underscore is a special character + password = "Azmb_123 "; + assertTrue(password.matches(regex)); } } diff --git a/opendaylight/usermanager/implementation/pom.xml b/opendaylight/usermanager/implementation/pom.xml index 25e558eed9..49a4e77d2d 100644 --- a/opendaylight/usermanager/implementation/pom.xml +++ b/opendaylight/usermanager/implementation/pom.xml @@ -22,7 +22,7 @@ org.apache.felix maven-bundle-plugin - 2.3.6 + ${bundle.plugin.version} true diff --git a/opendaylight/web/brandfragment/pom.xml b/opendaylight/web/brandfragment/pom.xml index 5a1968d416..541dbcadfd 100644 --- a/opendaylight/web/brandfragment/pom.xml +++ b/opendaylight/web/brandfragment/pom.xml @@ -25,7 +25,7 @@ org.apache.felix maven-bundle-plugin - 2.3.6 + ${bundle.plugin.version} true diff --git a/opendaylight/web/devices/pom.xml b/opendaylight/web/devices/pom.xml index ac52095aea..c0555d9d1d 100644 --- a/opendaylight/web/devices/pom.xml +++ b/opendaylight/web/devices/pom.xml @@ -22,7 +22,7 @@ org.apache.felix maven-bundle-plugin - 2.3.6 + ${bundle.plugin.version} true diff --git a/opendaylight/web/flows/pom.xml b/opendaylight/web/flows/pom.xml index 0f1f0cf135..8dd5777350 100644 --- a/opendaylight/web/flows/pom.xml +++ b/opendaylight/web/flows/pom.xml @@ -22,7 +22,7 @@ org.apache.felix maven-bundle-plugin - 2.3.6 + ${bundle.plugin.version} true diff --git a/opendaylight/web/root/pom.xml b/opendaylight/web/root/pom.xml index 641f32f876..05a8f5b1d7 100644 --- a/opendaylight/web/root/pom.xml +++ b/opendaylight/web/root/pom.xml @@ -23,7 +23,7 @@ org.apache.felix maven-bundle-plugin - 2.3.6 + ${bundle.plugin.version} true diff --git a/opendaylight/web/topology/pom.xml b/opendaylight/web/topology/pom.xml index c4c66e46d5..7ad2df353a 100644 --- a/opendaylight/web/topology/pom.xml +++ b/opendaylight/web/topology/pom.xml @@ -22,7 +22,7 @@ org.apache.felix maven-bundle-plugin - 2.3.6 + ${bundle.plugin.version} true diff --git a/opendaylight/web/troubleshoot/pom.xml b/opendaylight/web/troubleshoot/pom.xml index 2be78c49a5..6b87e74c69 100644 --- a/opendaylight/web/troubleshoot/pom.xml +++ b/opendaylight/web/troubleshoot/pom.xml @@ -22,7 +22,7 @@ org.apache.felix maven-bundle-plugin - 2.3.6 + ${bundle.plugin.version} true diff --git a/third-party/org.apache.catalina.filters.CorsFilter/pom.xml b/third-party/org.apache.catalina.filters.CorsFilter/pom.xml index 0789d50443..569921cd27 100644 --- a/third-party/org.apache.catalina.filters.CorsFilter/pom.xml +++ b/third-party/org.apache.catalina.filters.CorsFilter/pom.xml @@ -7,6 +7,11 @@ 1.1.0-SNAPSHOT ../commons/thirdparty + + scm:git:ssh://git.opendaylight.org:29418/controller.git + scm:git:ssh://git.opendaylight.org:29418/controller.git + https://wiki.opendaylight.org/view/OpenDaylight_Controller:Main + 4.0.0 org.opendaylight.controller.thirdparty org.apache.catalina.filters.CorsFilter