From 1ed46e9691f03219337fadb456e677dedc8b5119 Mon Sep 17 00:00:00 2001 From: Tony Tkacik Date: Thu, 16 Apr 2015 12:53:33 +0200 Subject: [PATCH] Bug 2907: Make sure we are properly bumped to Karaf 3.0.3 Change-Id: Ic9303c71fcfc39849401a7cdaa24b44f3836067b Signed-off-by: Tony Tkacik --- features/akka/pom.xml | 2 +- features/extras/pom.xml | 2 +- .../src/main/resources/etc/custom.properties | 14 --------- opendaylight/adsal/hosttracker/shell/pom.xml | 2 +- .../resources/archetype-resources/pom.xml | 2 +- .../resources/archetype-resources/pom.xml | 2 +- opendaylight/commons/opendaylight/pom.xml | 3 +- .../internal/AbstractFeatureWrapper.java | 31 ++++++++++++++----- opendaylight/md-sal/sal-karaf-xsql/pom.xml | 2 +- 9 files changed, 30 insertions(+), 30 deletions(-) diff --git a/features/akka/pom.xml b/features/akka/pom.xml index 4185972180..20f71402c3 100644 --- a/features/akka/pom.xml +++ b/features/akka/pom.xml @@ -22,7 +22,7 @@ DependencyManagement section of your parent pom --> 1.1.0-SNAPSHOT 1.5.0-SNAPSHOT - 3.0.1 + 3.0.3 0.7.0-SNAPSHOT 1.5.0-SNAPSHOT 2.16 diff --git a/features/extras/pom.xml b/features/extras/pom.xml index 6ac5872f00..ee6d480099 100644 --- a/features/extras/pom.xml +++ b/features/extras/pom.xml @@ -22,7 +22,7 @@ DependencyManagement section of your parent pom --> 1.1.0-SNAPSHOT 1.5.0-SNAPSHOT - 3.0.1 + 3.0.3 1.5.0-SNAPSHOT 2.16 diff --git a/karaf/opendaylight-karaf-resources/src/main/resources/etc/custom.properties b/karaf/opendaylight-karaf-resources/src/main/resources/etc/custom.properties index e726b800d2..ab16bf8621 100644 --- a/karaf/opendaylight-karaf-resources/src/main/resources/etc/custom.properties +++ b/karaf/opendaylight-karaf-resources/src/main/resources/etc/custom.properties @@ -1,20 +1,6 @@ # Extra packages to import from the boot class loader org.osgi.framework.system.packages.extra=org.apache.karaf.branding,sun.reflect,sun.reflect.misc,sun.misc,sun.nio.ch -# Override the config.properties to remove -# ${services-${karaf.framework}} -# This is to work around: -# https://issues.apache.org/jira/browse/KARAF-3092 -# Which should be fixed in karaf 3.0.2 -# Which is not as of today (2014-08-24) released. -# Since it is biting folks, we need to fix it here -# Please remove this when we shift to karaf 3.0.2 -org.osgi.framework.system.capabilities= \ - ${eecap-${java.specification.version}}, \ - service-reference;effective:=active;objectClass=org.osgi.service.packageadmin.PackageAdmin, \ - service-reference;effective:=active;objectClass=org.osgi.service.startlevel.StartLevel, \ - service-reference;effective:=active;objectClass=org.osgi.service.url.URLHandlers - # https://bugs.eclipse.org/bugs/show_bug.cgi?id=325578 # Extend the framework to avoid the resources to be presented with # a URL of type bundleresource: but to be presented as file: diff --git a/opendaylight/adsal/hosttracker/shell/pom.xml b/opendaylight/adsal/hosttracker/shell/pom.xml index 0292e113ee..f336d654ac 100644 --- a/opendaylight/adsal/hosttracker/shell/pom.xml +++ b/opendaylight/adsal/hosttracker/shell/pom.xml @@ -18,7 +18,7 @@ org.apache.karaf.shell org.apache.karaf.shell.console - 3.0.0 + ${karaf.version} org.mockito diff --git a/opendaylight/archetypes/opendaylight-karaf-distro-archetype/src/main/resources/archetype-resources/pom.xml b/opendaylight/archetypes/opendaylight-karaf-distro-archetype/src/main/resources/archetype-resources/pom.xml index c2e399b370..3836906a20 100644 --- a/opendaylight/archetypes/opendaylight-karaf-distro-archetype/src/main/resources/archetype-resources/pom.xml +++ b/opendaylight/archetypes/opendaylight-karaf-distro-archetype/src/main/resources/archetype-resources/pom.xml @@ -21,7 +21,7 @@ DependencyManagement section of your parent pom --> 1.1.0-SNAPSHOT 1.5.0-SNAPSHOT - 3.0.1 + 3.0.3 diff --git a/opendaylight/archetypes/opendaylight-karaf-features/src/main/resources/archetype-resources/pom.xml b/opendaylight/archetypes/opendaylight-karaf-features/src/main/resources/archetype-resources/pom.xml index cd893fd546..5355e66945 100644 --- a/opendaylight/archetypes/opendaylight-karaf-features/src/main/resources/archetype-resources/pom.xml +++ b/opendaylight/archetypes/opendaylight-karaf-features/src/main/resources/archetype-resources/pom.xml @@ -26,7 +26,7 @@ DependencyManagement section of your parent pom --> 1.1.0-SNAPSHOT 1.5.0-SNAPSHOT - 3.0.1 + 3.0.3 1.5.0-SNAPSHOT 1.5.0-SNAPSHOT 2.16 diff --git a/opendaylight/commons/opendaylight/pom.xml b/opendaylight/commons/opendaylight/pom.xml index 2915a8dfd9..5865c84b1f 100644 --- a/opendaylight/commons/opendaylight/pom.xml +++ b/opendaylight/commons/opendaylight/pom.xml @@ -108,8 +108,7 @@ 1.1.1 2.0 1.1.0-SNAPSHOT - 3.0.0 - 3.0.1 + ${karaf.version} 0.7 1.8 1.0.0 diff --git a/opendaylight/config/config-persister-feature-adapter/src/main/java/org/opendaylight/controller/configpusherfeature/internal/AbstractFeatureWrapper.java b/opendaylight/config/config-persister-feature-adapter/src/main/java/org/opendaylight/controller/configpusherfeature/internal/AbstractFeatureWrapper.java index 90b6d53bd1..d18928d06c 100644 --- a/opendaylight/config/config-persister-feature-adapter/src/main/java/org/opendaylight/controller/configpusherfeature/internal/AbstractFeatureWrapper.java +++ b/opendaylight/config/config-persister-feature-adapter/src/main/java/org/opendaylight/controller/configpusherfeature/internal/AbstractFeatureWrapper.java @@ -10,11 +10,11 @@ package org.opendaylight.controller.configpusherfeature.internal; import com.google.common.base.Preconditions; import java.util.LinkedHashSet; import java.util.List; -import java.util.Map; import javax.xml.bind.JAXBException; import org.apache.karaf.features.BundleInfo; import org.apache.karaf.features.Conditional; import org.apache.karaf.features.ConfigFileInfo; +import org.apache.karaf.features.ConfigInfo; import org.apache.karaf.features.Dependency; import org.apache.karaf.features.Feature; import org.slf4j.Logger; @@ -37,7 +37,7 @@ public class AbstractFeatureWrapper implements Feature { /* * @param f Feature to wrap */ - public AbstractFeatureWrapper(Feature f) { + public AbstractFeatureWrapper(final Feature f) { Preconditions.checkNotNull(f,"FeatureWrapper requires non-null Feature in constructor"); this.feature = f; } @@ -47,11 +47,11 @@ public class AbstractFeatureWrapper implements Feature { * from the underlying Feature Config files */ public LinkedHashSet getFeatureConfigSnapshotHolders() throws Exception { - LinkedHashSet snapShotHolders = new LinkedHashSet(); - for(ConfigFileInfo c: getConfigurationFiles()) { + final LinkedHashSet snapShotHolders = new LinkedHashSet(); + for(final ConfigFileInfo c: getConfigurationFiles()) { try { snapShotHolders.add(new FeatureConfigSnapshotHolder(c,this)); - } catch (JAXBException e) { + } catch (final JAXBException e) { LOG.debug("{} is not a config subsystem config file",c.getFinalname()); } } @@ -67,7 +67,7 @@ public class AbstractFeatureWrapper implements Feature { } @Override - public boolean equals(Object obj) { + public boolean equals(final Object obj) { if (this == obj) { return true; } @@ -77,7 +77,7 @@ public class AbstractFeatureWrapper implements Feature { if (getClass() != obj.getClass()) { return false; } - AbstractFeatureWrapper other = (AbstractFeatureWrapper) obj; + final AbstractFeatureWrapper other = (AbstractFeatureWrapper) obj; if (feature == null) { if (other.feature != null) { return false; @@ -97,6 +97,7 @@ public class AbstractFeatureWrapper implements Feature { * @return * @see org.apache.karaf.features.Feature#getId() */ + @Override public String getId() { return feature.getId(); } @@ -105,6 +106,7 @@ public class AbstractFeatureWrapper implements Feature { * @return * @see org.apache.karaf.features.Feature#getName() */ + @Override public String getName() { return feature.getName(); } @@ -113,6 +115,7 @@ public class AbstractFeatureWrapper implements Feature { * @return * @see org.apache.karaf.features.Feature#getDescription() */ + @Override public String getDescription() { return feature.getDescription(); } @@ -121,6 +124,7 @@ public class AbstractFeatureWrapper implements Feature { * @return * @see org.apache.karaf.features.Feature#getDetails() */ + @Override public String getDetails() { return feature.getDetails(); } @@ -129,6 +133,7 @@ public class AbstractFeatureWrapper implements Feature { * @return * @see org.apache.karaf.features.Feature#getVersion() */ + @Override public String getVersion() { return feature.getVersion(); } @@ -137,6 +142,7 @@ public class AbstractFeatureWrapper implements Feature { * @return * @see org.apache.karaf.features.Feature#hasVersion() */ + @Override public boolean hasVersion() { return feature.hasVersion(); } @@ -145,6 +151,7 @@ public class AbstractFeatureWrapper implements Feature { * @return * @see org.apache.karaf.features.Feature#getResolver() */ + @Override public String getResolver() { return feature.getResolver(); } @@ -153,6 +160,7 @@ public class AbstractFeatureWrapper implements Feature { * @return * @see org.apache.karaf.features.Feature#getInstall() */ + @Override public String getInstall() { return feature.getInstall(); } @@ -161,6 +169,7 @@ public class AbstractFeatureWrapper implements Feature { * @return * @see org.apache.karaf.features.Feature#getDependencies() */ + @Override public List getDependencies() { return feature.getDependencies(); } @@ -169,6 +178,7 @@ public class AbstractFeatureWrapper implements Feature { * @return * @see org.apache.karaf.features.Feature#getBundles() */ + @Override public List getBundles() { return feature.getBundles(); } @@ -177,7 +187,8 @@ public class AbstractFeatureWrapper implements Feature { * @return * @see org.apache.karaf.features.Feature#getConfigurations() */ - public Map> getConfigurations() { + @Override + public List getConfigurations() { return feature.getConfigurations(); } @@ -185,6 +196,7 @@ public class AbstractFeatureWrapper implements Feature { * @return * @see org.apache.karaf.features.Feature#getConfigurationFiles() */ + @Override public List getConfigurationFiles() { return feature.getConfigurationFiles(); } @@ -193,6 +205,7 @@ public class AbstractFeatureWrapper implements Feature { * @return * @see org.apache.karaf.features.Feature#getConditional() */ + @Override public List getConditional() { return feature.getConditional(); } @@ -201,6 +214,7 @@ public class AbstractFeatureWrapper implements Feature { * @return * @see org.apache.karaf.features.Feature#getStartLevel() */ + @Override public int getStartLevel() { return feature.getStartLevel(); } @@ -209,6 +223,7 @@ public class AbstractFeatureWrapper implements Feature { * @return * @see org.apache.karaf.features.Feature#getRegion() */ + @Override public String getRegion() { return feature.getRegion(); } diff --git a/opendaylight/md-sal/sal-karaf-xsql/pom.xml b/opendaylight/md-sal/sal-karaf-xsql/pom.xml index 9ed3707d3d..14a87a23f7 100644 --- a/opendaylight/md-sal/sal-karaf-xsql/pom.xml +++ b/opendaylight/md-sal/sal-karaf-xsql/pom.xml @@ -37,7 +37,7 @@ org.apache.karaf.shell org.apache.karaf.shell.console - 3.0.1 + ${karaf.version} -- 2.36.6