You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@plc4x.apache.org by cd...@apache.org on 2019/10/13 16:43:42 UTC
[plc4x] branch feature/resolve-split-package-osgi updated: -
Excluded the slf4j-api module from all karaf modules
This is an automated email from the ASF dual-hosted git repository.
cdutz pushed a commit to branch feature/resolve-split-package-osgi
in repository https://gitbox.apache.org/repos/asf/plc4x.git
The following commit(s) were added to refs/heads/feature/resolve-split-package-osgi by this push:
new 526e56b - Excluded the slf4j-api module from all karaf modules
526e56b is described below
commit 526e56bee5700e1a28cf22b9095c1134cf6bdbed
Author: Christofer Dutz <ch...@c-ware.de>
AuthorDate: Sun Oct 13 18:43:29 2019 +0200
- Excluded the slf4j-api module from all karaf modules
---
plc4j/integrations/apache-karaf/karaf-demo-server/pom.xml | 7 -------
plc4j/integrations/apache-karaf/pom.xml | 9 +++++++++
2 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/plc4j/integrations/apache-karaf/karaf-demo-server/pom.xml b/plc4j/integrations/apache-karaf/karaf-demo-server/pom.xml
index a44b44c..078c054 100644
--- a/plc4j/integrations/apache-karaf/karaf-demo-server/pom.xml
+++ b/plc4j/integrations/apache-karaf/karaf-demo-server/pom.xml
@@ -83,13 +83,6 @@
<classifier>features</classifier>
<type>xml</type>
</dependency>
-
- <!-- This is just a way of removing this dependency -->
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- <scope>test</scope>
- </dependency>
</dependencies>
<build>
diff --git a/plc4j/integrations/apache-karaf/pom.xml b/plc4j/integrations/apache-karaf/pom.xml
index 093431b..1270a95 100644
--- a/plc4j/integrations/apache-karaf/pom.xml
+++ b/plc4j/integrations/apache-karaf/pom.xml
@@ -49,6 +49,15 @@
<module>karaf-demo-server</module>
</modules>
+ <dependencies>
+ <!-- This is just a way of removing this dependency -->
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ </dependencies>
+
<build>
<plugins>
<!-- With OSGI there's a lot of stuff with duplicate classes in different versions -->