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/01/16 12:58:22 UTC
[karaf] branch master updated: [KARAF-6593] Replace references in
client script to slf4j-api bundle jar with pax-logging-api and remove it
from assembly. Set version of slf4j-api to 1.7.29 in parent pom.
This is an automated email from the ASF dual-hosted git repository.
jbonofre pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/karaf.git
The following commit(s) were added to refs/heads/master by this push:
new 879913d [KARAF-6593] Replace references in client script to slf4j-api bundle jar with pax-logging-api and remove it from assembly. Set version of slf4j-api to 1.7.29 in parent pom.
new 302c2c9 Merge pull request #1059 from graben/KARAF-6593
879913d is described below
commit 879913d546c44da1b46c3e95cf41ac7f68ecb52e
Author: Benjamin Graf <be...@gmx.net>
AuthorDate: Sun Jan 12 19:23:18 2020 +0100
[KARAF-6593] Replace references in client script to slf4j-api bundle jar with pax-logging-api and remove it from assembly. Set version of slf4j-api to 1.7.29 in parent pom.
---
.../features/base/src/main/filtered-resources/resources/bin/client | 1 -
.../base/src/main/filtered-resources/resources/bin/client.bat | 1 -
assemblies/features/framework/pom.xml | 5 -----
client/pom.xml | 2 +-
pom.xml | 2 +-
5 files changed, 2 insertions(+), 9 deletions(-)
diff --git a/assemblies/features/base/src/main/filtered-resources/resources/bin/client b/assemblies/features/base/src/main/filtered-resources/resources/bin/client
index 482c030..f258a4c 100755
--- a/assemblies/features/base/src/main/filtered-resources/resources/bin/client
+++ b/assemblies/features/base/src/main/filtered-resources/resources/bin/client
@@ -82,7 +82,6 @@ setupClassPath() {
CLASSPATH="${CLASSPATH}:${KARAF_HOME}/system/org/apache/sshd/sshd-core/@@sshd.version@@/sshd-core-@@sshd.version@@.jar"
CLASSPATH="${CLASSPATH}:${KARAF_HOME}/system/org/fusesource/jansi/jansi/@@jansi.version@@/jansi-@@jansi.version@@.jar"
CLASSPATH="${CLASSPATH}:${KARAF_HOME}/system/org/jline/jline/@@jline.version@@/jline-@@jline.version@@.jar"
- CLASSPATH="${CLASSPATH}:${KARAF_HOME}/system/org/slf4j/slf4j-api/@@slf4j.version@@/slf4j-api-@@slf4j.version@@.jar"
}
init() {
diff --git a/assemblies/features/base/src/main/filtered-resources/resources/bin/client.bat b/assemblies/features/base/src/main/filtered-resources/resources/bin/client.bat
index 11273d4..412eb58 100644
--- a/assemblies/features/base/src/main/filtered-resources/resources/bin/client.bat
+++ b/assemblies/features/base/src/main/filtered-resources/resources/bin/client.bat
@@ -218,7 +218,6 @@ set CLASSPATH=%KARAF_HOME%\system\org\apache\karaf\org.apache.karaf.client\@@pro
set CLASSPATH=%CLASSPATH%;%KARAF_HOME%\system\org\apache\sshd\sshd-core\@@sshd.version@@\sshd-core-@@sshd.version@@.jar
set CLASSPATH=%CLASSPATH%;%KARAF_HOME%\system\org\jline\jline\@@jline.version@@\jline-@@jline.version@@.jar
set CLASSPATH=%CLASSPATH%;%KARAF_HOME%\system\org\fusesource\jansi\jansi\@@jansi.version@@\jansi-@@jansi.version@@.jar
-set CLASSPATH=%CLASSPATH%;%KARAF_HOME%\system\org\slf4j\slf4j-api\@@slf4j.version@@\slf4j-api-@@slf4j.version@@.jar
:EXECUTE
set arg1=%~1
diff --git a/assemblies/features/framework/pom.xml b/assemblies/features/framework/pom.xml
index 6bc683d..db2a545 100644
--- a/assemblies/features/framework/pom.xml
+++ b/assemblies/features/framework/pom.xml
@@ -246,11 +246,6 @@
<artifactId>jline</artifactId>
<outputDirectory>target/classes/resources/system/org/jline/jline/${jline.version}</outputDirectory>
</artifactItem>
- <artifactItem>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- <outputDirectory>target/classes/resources/system/org/slf4j/slf4j-api/${slf4j.version}</outputDirectory>
- </artifactItem>
</artifactItems>
</configuration>
</execution>
diff --git a/client/pom.xml b/client/pom.xml
index 5947b27..9eea90f 100644
--- a/client/pom.xml
+++ b/client/pom.xml
@@ -81,7 +81,7 @@
<Bundle-Description>Shell client bundle for Apache Karaf.</Bundle-Description>
<Private-Package>
org.apache.karaf.client;
- org.slf4j.impl;
+ org.slf4j*;
org.apache.felix.utils.properties;
org.apache.karaf.util.config;
META-INF;-split-package:=merge-first
diff --git a/pom.xml b/pom.xml
index c520ebe..0cdf7387 100644
--- a/pom.xml
+++ b/pom.xml
@@ -292,7 +292,7 @@
<portlet-api.version>2.0</portlet-api.version>
<plexus-utils.version>3.0.24</plexus-utils.version>
- <slf4j.version>1.7.12</slf4j.version>
+ <slf4j.version>1.7.29</slf4j.version>
<spring.osgi.version>1.2.1</spring.osgi.version>
<spring31.version>3.1.4.RELEASE</spring31.version>