karaf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gno...@apache.org
Subject [karaf] 02/02: Upgrade unit tests to use a more recent felix framework version, avoiding an NPE in the console
Date Mon, 05 Feb 2018 13:40:14 GMT
This is an automated email from the ASF dual-hosted git repository.

gnodet pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/karaf.git

commit 81f69e2cb95a8e4bbfa7a634f0ea52ec98449d82
Author: Guillaume Nodet <gnodet@gmail.com>
AuthorDate: Mon Feb 5 08:58:57 2018 +0100

    Upgrade unit tests to use a more recent felix framework version, avoiding an NPE in the
console
---
 .../resources/test-karaf-home/etc/config.properties    |   2 +-
 .../4.0.2/org.apache.felix.framework-4.0.2.jar         | Bin 480883 -> 0 bytes
 .../5.6.10/org.apache.felix.framework-5.6.10.jar       | Bin 0 -> 692174 bytes
 3 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/main/src/test/resources/test-karaf-home/etc/config.properties b/main/src/test/resources/test-karaf-home/etc/config.properties
index 8d603ea..c30059b 100755
--- a/main/src/test/resources/test-karaf-home/etc/config.properties
+++ b/main/src/test/resources/test-karaf-home/etc/config.properties
@@ -31,7 +31,7 @@ karaf.framework=felix
 #
 # Location of the OSGi frameworks
 #
-karaf.framework.felix=mvn:org.apache.felix/org.apache.felix.framework/4.0.2
+karaf.framework.felix=mvn:org.apache.felix/org.apache.felix.framework/5.6.10
 
 karaf.shutdown.port.file=${karaf.data}/port
 karaf.pid.file=${karaf.base}/karaf.pid
diff --git a/main/src/test/resources/test-karaf-home/system/org/apache/felix/org.apache.felix.framework/4.0.2/org.apache.felix.framework-4.0.2.jar
b/main/src/test/resources/test-karaf-home/system/org/apache/felix/org.apache.felix.framework/4.0.2/org.apache.felix.framework-4.0.2.jar
deleted file mode 100644
index 79bb774..0000000
Binary files a/main/src/test/resources/test-karaf-home/system/org/apache/felix/org.apache.felix.framework/4.0.2/org.apache.felix.framework-4.0.2.jar
and /dev/null differ
diff --git a/main/src/test/resources/test-karaf-home/system/org/apache/felix/org.apache.felix.framework/5.6.10/org.apache.felix.framework-5.6.10.jar
b/main/src/test/resources/test-karaf-home/system/org/apache/felix/org.apache.felix.framework/5.6.10/org.apache.felix.framework-5.6.10.jar
new file mode 100644
index 0000000..71dbbef
Binary files /dev/null and b/main/src/test/resources/test-karaf-home/system/org/apache/felix/org.apache.felix.framework/5.6.10/org.apache.felix.framework-5.6.10.jar
differ

-- 
To stop receiving notification emails like this one, please contact
gnodet@apache.org.

Mime
View raw message