You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by jb...@apache.org on 2020/09/20 05:41:16 UTC
[karaf] branch karaf-4.2.x updated: [KARAF-6547] Upgrade to Felix
Utils 1.11.4
This is an automated email from the ASF dual-hosted git repository.
jbonofre pushed a commit to branch karaf-4.2.x
in repository https://gitbox.apache.org/repos/asf/karaf.git
The following commit(s) were added to refs/heads/karaf-4.2.x by this push:
new eae4f9a [KARAF-6547] Upgrade to Felix Utils 1.11.4
eae4f9a is described below
commit eae4f9a6c7f57486aecb086c1786758fc5ea91cb
Author: jbonofre <jb...@apache.org>
AuthorDate: Fri Sep 18 15:16:02 2020 +0200
[KARAF-6547] Upgrade to Felix Utils 1.11.4
(cherry picked from commit 60be2de84440a83f52e72f8918f030995f631711)
---
.../org/apache/karaf/features/internal/service/Deployer.java | 9 +--------
.../apache/karaf/features/internal/support/TestBundle.java | 11 ++++++-----
pom.xml | 2 +-
3 files changed, 8 insertions(+), 14 deletions(-)
diff --git a/features/core/src/main/java/org/apache/karaf/features/internal/service/Deployer.java b/features/core/src/main/java/org/apache/karaf/features/internal/service/Deployer.java
index 6bfc203..2693cc5 100644
--- a/features/core/src/main/java/org/apache/karaf/features/internal/service/Deployer.java
+++ b/features/core/src/main/java/org/apache/karaf/features/internal/service/Deployer.java
@@ -1384,14 +1384,7 @@ public class Deployer {
// Compute the list of resources to deploy in the region
Set<Resource> bundlesInRegion = bundlesPerRegions.get(region);
- // **********************************************************************
- // KARAF-6239: workaround to avoid several entries for the same resource
- Map<String, Resource> deduplicatedMap = new HashMap<>();
- for (Resource resource : bundlesInRegion) {
- deduplicatedMap.put(getSymbolicName(resource) + "/" + getVersion(resource), resource);
- }
- List<Resource> toDeploy = new ArrayList<>(deduplicatedMap.values());
- // **********************************************************************
+ List<Resource> toDeploy = bundlesInRegion != null ? new ArrayList<>(bundlesInRegion) : new ArrayList<>();
// Remove the system bundle
Bundle systemBundle = dstate.bundles.get(0l);
diff --git a/features/core/src/test/java/org/apache/karaf/features/internal/support/TestBundle.java b/features/core/src/test/java/org/apache/karaf/features/internal/support/TestBundle.java
index 3906da6..60afe2e 100644
--- a/features/core/src/test/java/org/apache/karaf/features/internal/support/TestBundle.java
+++ b/features/core/src/test/java/org/apache/karaf/features/internal/support/TestBundle.java
@@ -21,11 +21,7 @@ import java.io.IOException;
import java.io.InputStream;
import java.net.URL;
import java.security.cert.X509Certificate;
-import java.util.Dictionary;
-import java.util.Enumeration;
-import java.util.Hashtable;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
import org.apache.felix.utils.resource.ResourceBuilder;
import org.apache.felix.utils.resource.ResourceImpl;
@@ -241,6 +237,11 @@ public class TestBundle extends ResourceImpl implements BundleRevision, Bundle,
}
@Override
+ public int hashCode() {
+ return Objects.hash(location);
+ }
+
+ @Override
public int getStartLevel() {
return 0;
}
diff --git a/pom.xml b/pom.xml
index eba179a..e1fff07 100644
--- a/pom.xml
+++ b/pom.xml
@@ -201,7 +201,7 @@
<felix.http.version>4.0.20</felix.http.version>
<felix.inventory.version>1.0.6</felix.inventory.version>
<felix.plugin.version>5.1.1</felix.plugin.version>
- <felix.utils.version>1.11.2</felix.utils.version>
+ <felix.utils.version>1.11.4</felix.utils.version>
<felix.webconsole.version>4.5.4</felix.webconsole.version>
<felix.webconsole.api.version>3.3.0</felix.webconsole.api.version>
<felix.memoryusage.webconsole.plugin.version>1.0.10</felix.memoryusage.webconsole.plugin.version>