diff options
author | gjoranv <gv@verizonmedia.com> | 2023-01-09 00:41:24 +0100 |
---|---|---|
committer | gjoranv <gv@verizonmedia.com> | 2023-01-09 13:00:35 +0100 |
commit | 667ca51d1d09bf858b437b1dd86e8f6eee721410 (patch) | |
tree | 59b4c9231d8cfc4eb05fa86e669359ffea0724fd /jdisc_core/src | |
parent | 5d147c0c666ed1bb220f7fd18b7bd955a96af2cb (diff) |
Move BsnVersion to exported package c.y.jdisc.application
Diffstat (limited to 'jdisc_core/src')
-rw-r--r-- | jdisc_core/src/main/java/com/yahoo/jdisc/application/BsnVersion.java (renamed from jdisc_core/src/main/java/com/yahoo/jdisc/core/BsnVersion.java) | 2 | ||||
-rw-r--r-- | jdisc_core/src/main/java/com/yahoo/jdisc/core/BundleCollisionHook.java | 4 | ||||
-rw-r--r-- | jdisc_core/src/test/java/com/yahoo/jdisc/application/BsnVersionTest.java (renamed from jdisc_core/src/test/java/com/yahoo/jdisc/core/BsnVersionTest.java) | 2 |
3 files changed, 3 insertions, 5 deletions
diff --git a/jdisc_core/src/main/java/com/yahoo/jdisc/core/BsnVersion.java b/jdisc_core/src/main/java/com/yahoo/jdisc/application/BsnVersion.java index ee9ecc9fc3e..40573eee3b2 100644 --- a/jdisc_core/src/main/java/com/yahoo/jdisc/core/BsnVersion.java +++ b/jdisc_core/src/main/java/com/yahoo/jdisc/application/BsnVersion.java @@ -1,4 +1,4 @@ -package com.yahoo.jdisc.core; +package com.yahoo.jdisc.application; import org.osgi.framework.Bundle; import org.osgi.framework.Version; diff --git a/jdisc_core/src/main/java/com/yahoo/jdisc/core/BundleCollisionHook.java b/jdisc_core/src/main/java/com/yahoo/jdisc/core/BundleCollisionHook.java index e78f3251890..203c2e975e4 100644 --- a/jdisc_core/src/main/java/com/yahoo/jdisc/core/BundleCollisionHook.java +++ b/jdisc_core/src/main/java/com/yahoo/jdisc/core/BundleCollisionHook.java @@ -1,11 +1,11 @@ // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.jdisc.core; +import com.yahoo.jdisc.application.BsnVersion; import org.osgi.framework.Bundle; import org.osgi.framework.BundleContext; import org.osgi.framework.BundleEvent; import org.osgi.framework.ServiceRegistration; -import org.osgi.framework.Version; import org.osgi.framework.hooks.bundle.CollisionHook; import org.osgi.framework.hooks.bundle.EventHook; import org.osgi.framework.hooks.bundle.FindHook; @@ -15,10 +15,8 @@ import java.util.Collection; import java.util.HashMap; import java.util.HashSet; import java.util.Map; -import java.util.Objects; import java.util.Set; import java.util.logging.Logger; -import java.util.stream.Collectors; /** * A bundle {@link CollisionHook} that contains a set of bundles that are allowed to collide with bundles diff --git a/jdisc_core/src/test/java/com/yahoo/jdisc/core/BsnVersionTest.java b/jdisc_core/src/test/java/com/yahoo/jdisc/application/BsnVersionTest.java index baeb36d28a8..484c4c9fb3c 100644 --- a/jdisc_core/src/test/java/com/yahoo/jdisc/core/BsnVersionTest.java +++ b/jdisc_core/src/test/java/com/yahoo/jdisc/application/BsnVersionTest.java @@ -1,4 +1,4 @@ -package com.yahoo.jdisc.core; +package com.yahoo.jdisc.application; import org.junit.jupiter.api.Test; import org.osgi.framework.Version; |