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/02/13 07:09:08 UTC
[karaf] branch master updated: Add osgi.core in the instance
classpath (required by pax-logging)
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 93e44a1 Add osgi.core in the instance classpath (required by pax-logging)
new 1da3401 Merge pull request #1068 from coshxx/master
93e44a1 is described below
commit 93e44a101acddc7516acb726640076e62aade877
Author: cosh <co...@googlemail.com>
AuthorDate: Thu Feb 13 08:00:58 2020 +0100
Add osgi.core in the instance classpath (required by pax-logging)
---
.../features/base/src/main/filtered-resources/resources/bin/instance | 1 +
.../features/base/src/main/filtered-resources/resources/bin/instance.bat | 1 +
2 files changed, 2 insertions(+)
diff --git a/assemblies/features/base/src/main/filtered-resources/resources/bin/instance b/assemblies/features/base/src/main/filtered-resources/resources/bin/instance
index afbe156..d9c1296 100755
--- a/assemblies/features/base/src/main/filtered-resources/resources/bin/instance
+++ b/assemblies/features/base/src/main/filtered-resources/resources/bin/instance
@@ -82,6 +82,7 @@ setupClassPath() {
CLASSPATH="${CLASSPATH}:${KARAF_HOME}/system/org/apache/karaf/shell/org.apache.karaf.shell.core/@@project.version@@/org.apache.karaf.shell.core-@@project.version@@.jar"
CLASSPATH="${CLASSPATH}:${KARAF_HOME}/system/org/ops4j/pax/logging/pax-logging-api/@@pax.logging.version@@/pax-logging-api-@@pax.logging.version@@.jar"
CLASSPATH="${CLASSPATH}:${KARAF_HOME}/system/org/jline/jline/@@jline.version@@/jline-@@jline.version@@.jar"
+ CLASSPATH="${CLASSPATH}:${KARAF_HOME}/lib/boot/osgi.core-@@osgi.version@@.jar"
}
init() {
diff --git a/assemblies/features/base/src/main/filtered-resources/resources/bin/instance.bat b/assemblies/features/base/src/main/filtered-resources/resources/bin/instance.bat
index 0ff82cc..4cf9196 100644
--- a/assemblies/features/base/src/main/filtered-resources/resources/bin/instance.bat
+++ b/assemblies/features/base/src/main/filtered-resources/resources/bin/instance.bat
@@ -155,6 +155,7 @@ set CLASSPATH=%KARAF_HOME%\system\org\apache\karaf\instance\org.apache.karaf.ins
set CLASSPATH=%CLASSPATH%;%KARAF_HOME%\system\org\apache\karaf\shell\org.apache.karaf.shell.core\@@project.version@@\org.apache.karaf.shell.core-@@project.version@@.jar
set CLASSPATH=%CLASSPATH%;%KARAF_HOME%\system\org\ops4j\pax\logging\pax-logging-api\@@pax.logging.version@@\pax-logging-api-@@pax.logging.version@@.jar
set CLASSPATH=%CLASSPATH%;%KARAF_HOME%\system\org\jline\jline\@@jline.version@@\jline-@@jline.version@@.jar
+set CLASSPATH=%CLASSPATH%;%KARAF_HOME%\lib\boot\osgi.core-@@osgi.version@@.jar
:EXECUTE
if "%SHIFT%" == "true" SET ARGS=%2 %3 %4 %5 %6 %7 %8