From 8ca7ceb6955bb92a2fe4ec58a9c151059fc9c044 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ga=C3=ABl=20L=27hopital?= <gael@lhopital.org>
Date: Fri, 22 Nov 2024 14:23:48 +0100
Subject: [PATCH 1/2] Distinguish thing action scope across the binding
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Gaël L'hopital <gael@lhopital.org>
---
 .../binding/freeboxos/internal/action/ActivePlayerActions.java  | 2 +-
 .../openhab/binding/freeboxos/internal/action/CallActions.java  | 2 +-
 .../binding/freeboxos/internal/action/FreeplugActions.java      | 2 +-
 .../openhab/binding/freeboxos/internal/action/HostActions.java  | 2 +-
 .../binding/freeboxos/internal/action/PlayerActions.java        | 2 +-
 .../binding/freeboxos/internal/action/RepeaterActions.java      | 2 +-
 .../binding/freeboxos/internal/action/ServerActions.java        | 2 +-
 bundles/org.openhab.binding.linky/pom.xml                       | 2 +-
 8 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/bundles/org.openhab.binding.freeboxos/src/main/java/org/openhab/binding/freeboxos/internal/action/ActivePlayerActions.java b/bundles/org.openhab.binding.freeboxos/src/main/java/org/openhab/binding/freeboxos/internal/action/ActivePlayerActions.java
index 650eb745643c8..b0f61427511cb 100644
--- a/bundles/org.openhab.binding.freeboxos/src/main/java/org/openhab/binding/freeboxos/internal/action/ActivePlayerActions.java
+++ b/bundles/org.openhab.binding.freeboxos/src/main/java/org/openhab/binding/freeboxos/internal/action/ActivePlayerActions.java
@@ -29,7 +29,7 @@
  * @author Gaël L'hopital - Initial contribution
  */
 @Component(scope = ServiceScope.PROTOTYPE, service = ActivePlayerActions.class)
-@ThingActionsScope(name = "freeboxos")
+@ThingActionsScope(name = "freeboxos-activeplayer")
 @NonNullByDefault
 public class ActivePlayerActions extends PlayerActions {
     private final Logger logger = LoggerFactory.getLogger(ActivePlayerActions.class);
diff --git a/bundles/org.openhab.binding.freeboxos/src/main/java/org/openhab/binding/freeboxos/internal/action/CallActions.java b/bundles/org.openhab.binding.freeboxos/src/main/java/org/openhab/binding/freeboxos/internal/action/CallActions.java
index fcb9ed67c3482..69e1d4888498c 100644
--- a/bundles/org.openhab.binding.freeboxos/src/main/java/org/openhab/binding/freeboxos/internal/action/CallActions.java
+++ b/bundles/org.openhab.binding.freeboxos/src/main/java/org/openhab/binding/freeboxos/internal/action/CallActions.java
@@ -30,7 +30,7 @@
  * @author Gaël L'hopital - Initial contribution
  */
 @Component(scope = ServiceScope.PROTOTYPE, service = CallActions.class)
-@ThingActionsScope(name = "freeboxos")
+@ThingActionsScope(name = "freeboxos-call")
 @NonNullByDefault
 public class CallActions implements ThingActions {
     private final Logger logger = LoggerFactory.getLogger(CallActions.class);
diff --git a/bundles/org.openhab.binding.freeboxos/src/main/java/org/openhab/binding/freeboxos/internal/action/FreeplugActions.java b/bundles/org.openhab.binding.freeboxos/src/main/java/org/openhab/binding/freeboxos/internal/action/FreeplugActions.java
index 3d39bb9d64bcd..0bbf0a15994fd 100644
--- a/bundles/org.openhab.binding.freeboxos/src/main/java/org/openhab/binding/freeboxos/internal/action/FreeplugActions.java
+++ b/bundles/org.openhab.binding.freeboxos/src/main/java/org/openhab/binding/freeboxos/internal/action/FreeplugActions.java
@@ -30,7 +30,7 @@
  * @author Gaël L'hopital - Initial contribution
  */
 @Component(scope = ServiceScope.PROTOTYPE, service = FreeplugActions.class)
-@ThingActionsScope(name = "freeboxos")
+@ThingActionsScope(name = "freeboxos-freeplug")
 @NonNullByDefault
 public class FreeplugActions implements ThingActions {
     private final Logger logger = LoggerFactory.getLogger(FreeplugActions.class);
diff --git a/bundles/org.openhab.binding.freeboxos/src/main/java/org/openhab/binding/freeboxos/internal/action/HostActions.java b/bundles/org.openhab.binding.freeboxos/src/main/java/org/openhab/binding/freeboxos/internal/action/HostActions.java
index de62617f4b472..4930d751fb9ca 100644
--- a/bundles/org.openhab.binding.freeboxos/src/main/java/org/openhab/binding/freeboxos/internal/action/HostActions.java
+++ b/bundles/org.openhab.binding.freeboxos/src/main/java/org/openhab/binding/freeboxos/internal/action/HostActions.java
@@ -30,7 +30,7 @@
  * @author Gaël L'hopital - Initial contribution
  */
 @Component(scope = ServiceScope.PROTOTYPE, service = HostActions.class)
-@ThingActionsScope(name = "freeboxos")
+@ThingActionsScope(name = "freeboxos-host")
 @NonNullByDefault
 public class HostActions implements ThingActions {
     private final Logger logger = LoggerFactory.getLogger(HostActions.class);
diff --git a/bundles/org.openhab.binding.freeboxos/src/main/java/org/openhab/binding/freeboxos/internal/action/PlayerActions.java b/bundles/org.openhab.binding.freeboxos/src/main/java/org/openhab/binding/freeboxos/internal/action/PlayerActions.java
index d86be1c77f708..df9a847e9f923 100644
--- a/bundles/org.openhab.binding.freeboxos/src/main/java/org/openhab/binding/freeboxos/internal/action/PlayerActions.java
+++ b/bundles/org.openhab.binding.freeboxos/src/main/java/org/openhab/binding/freeboxos/internal/action/PlayerActions.java
@@ -31,7 +31,7 @@
  * @author Gaël L'hopital - Initial contribution
  */
 @Component(scope = ServiceScope.PROTOTYPE, service = PlayerActions.class)
-@ThingActionsScope(name = "freeboxos")
+@ThingActionsScope(name = "freeboxos-player")
 @NonNullByDefault
 public class PlayerActions implements ThingActions {
     private final Logger logger = LoggerFactory.getLogger(PlayerActions.class);
diff --git a/bundles/org.openhab.binding.freeboxos/src/main/java/org/openhab/binding/freeboxos/internal/action/RepeaterActions.java b/bundles/org.openhab.binding.freeboxos/src/main/java/org/openhab/binding/freeboxos/internal/action/RepeaterActions.java
index f29dc884a89bc..1349975f16a8d 100644
--- a/bundles/org.openhab.binding.freeboxos/src/main/java/org/openhab/binding/freeboxos/internal/action/RepeaterActions.java
+++ b/bundles/org.openhab.binding.freeboxos/src/main/java/org/openhab/binding/freeboxos/internal/action/RepeaterActions.java
@@ -30,7 +30,7 @@
  * @author Gaël L'hopital - Initial contribution
  */
 @Component(scope = ServiceScope.PROTOTYPE, service = RepeaterActions.class)
-@ThingActionsScope(name = "freeboxos")
+@ThingActionsScope(name = "freeboxos-repeater")
 @NonNullByDefault
 public class RepeaterActions implements ThingActions {
     private final Logger logger = LoggerFactory.getLogger(RepeaterActions.class);
diff --git a/bundles/org.openhab.binding.freeboxos/src/main/java/org/openhab/binding/freeboxos/internal/action/ServerActions.java b/bundles/org.openhab.binding.freeboxos/src/main/java/org/openhab/binding/freeboxos/internal/action/ServerActions.java
index be10ad8932ad3..a0d97e2d26f73 100644
--- a/bundles/org.openhab.binding.freeboxos/src/main/java/org/openhab/binding/freeboxos/internal/action/ServerActions.java
+++ b/bundles/org.openhab.binding.freeboxos/src/main/java/org/openhab/binding/freeboxos/internal/action/ServerActions.java
@@ -30,7 +30,7 @@
  * @author Gaël L'hopital - Initial contribution
  */
 @Component(scope = ServiceScope.PROTOTYPE, service = ServerActions.class)
-@ThingActionsScope(name = "freeboxos")
+@ThingActionsScope(name = "freeboxos-server")
 @NonNullByDefault
 public class ServerActions implements ThingActions {
     private final Logger logger = LoggerFactory.getLogger(ServerActions.class);
diff --git a/bundles/org.openhab.binding.linky/pom.xml b/bundles/org.openhab.binding.linky/pom.xml
index dd72d6bc7cd95..a8725c6e68a7e 100644
--- a/bundles/org.openhab.binding.linky/pom.xml
+++ b/bundles/org.openhab.binding.linky/pom.xml
@@ -23,7 +23,7 @@
       <groupId>org.jsoup</groupId>
       <artifactId>jsoup</artifactId>
       <version>1.14.3</version>
-      <scope>provided</scope>
+      <scope>compile</scope>
     </dependency>
   </dependencies>
 

From e0d84071e0264f3705ce9eb14f8f92a3ee1a82ff Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ga=C3=ABl=20L=27hopital?= <gael@lhopital.org>
Date: Fri, 22 Nov 2024 14:27:35 +0100
Subject: [PATCH 2/2] Remove leftover file
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Gaël L'hopital <gael@lhopital.org>
---
 bundles/org.openhab.binding.linky/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bundles/org.openhab.binding.linky/pom.xml b/bundles/org.openhab.binding.linky/pom.xml
index a8725c6e68a7e..dd72d6bc7cd95 100644
--- a/bundles/org.openhab.binding.linky/pom.xml
+++ b/bundles/org.openhab.binding.linky/pom.xml
@@ -23,7 +23,7 @@
       <groupId>org.jsoup</groupId>
       <artifactId>jsoup</artifactId>
       <version>1.14.3</version>
-      <scope>compile</scope>
+      <scope>provided</scope>
     </dependency>
   </dependencies>