You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by gn...@apache.org on 2018/02/05 13:40:12 UTC
[karaf] branch master updated (c9f1826 -> 81f69e2)
This is an automated email from the ASF dual-hosted git repository.
gnodet pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/karaf.git.
from c9f1826 [KARAF-5591][KARAF-5593] Do not consider blacklisted features during resolution
new 260498b [KARAF-5595] Upgrade toJLine 3.6.0 and Jansi 1.17
new 81f69e2 Upgrade unit tests to use a more recent felix framework version, avoiding an NPE in the console
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../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
pom.xml | 4 +--
.../karaf/shell/impl/console/JLineTerminal.java | 29 +++++++++++++++++++++
5 files changed, 32 insertions(+), 3 deletions(-)
delete mode 100644 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
create mode 100644 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
--
To stop receiving notification emails like this one, please contact
gnodet@apache.org.
[karaf] 02/02: Upgrade unit tests to use a more recent felix
framework version, avoiding an NPE in the console
Posted by gn...@apache.org.
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 <gn...@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.
[karaf] 01/02: [KARAF-5595] Upgrade toJLine 3.6.0 and Jansi 1.17
Posted by gn...@apache.org.
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 260498b717483df8c88bc365a58a3a20cb413014
Author: Guillaume Nodet <gn...@gmail.com>
AuthorDate: Mon Feb 5 08:43:10 2018 +0100
[KARAF-5595] Upgrade toJLine 3.6.0 and Jansi 1.17
---
pom.xml | 4 +--
.../karaf/shell/impl/console/JLineTerminal.java | 29 ++++++++++++++++++++++
2 files changed, 31 insertions(+), 2 deletions(-)
diff --git a/pom.xml b/pom.xml
index 31d4c7e..83592ac 100644
--- a/pom.xml
+++ b/pom.xml
@@ -255,10 +255,10 @@
<hibernate43.version>4.3.6.Final</hibernate43.version>
<hibernate.version>5.2.8.Final</hibernate.version>
<hibernate.validator.version>5.3.4.Final</hibernate.validator.version>
- <jansi.version>1.16</jansi.version>
+ <jansi.version>1.17</jansi.version>
<javassist.version>3.9.0.GA</javassist.version>
<jetty.version>9.3.21.v20170918</jetty.version>
- <jline.version>3.5.2</jline.version>
+ <jline.version>3.6.0</jline.version>
<jsw.version>3.2.3</jsw.version>
<log4j.version>1.2.17</log4j.version>
<maven.version>3.5.2</maven.version>
diff --git a/shell/core/src/main/java/org/apache/karaf/shell/impl/console/JLineTerminal.java b/shell/core/src/main/java/org/apache/karaf/shell/impl/console/JLineTerminal.java
index 113f091..c38e835 100644
--- a/shell/core/src/main/java/org/apache/karaf/shell/impl/console/JLineTerminal.java
+++ b/shell/core/src/main/java/org/apache/karaf/shell/impl/console/JLineTerminal.java
@@ -304,4 +304,33 @@ public class JLineTerminal implements Terminal, org.jline.terminal.Terminal {
}
}
+ @Override
+ public boolean canPauseResume() {
+ return terminal.canPauseResume();
+ }
+
+ @Override
+ public void pause() {
+ terminal.pause();
+ }
+
+ @Override
+ public void resume() {
+ terminal.resume();
+ }
+
+ @Override
+ public boolean paused() {
+ return terminal.paused();
+ }
+
+ @Override
+ public boolean hasFocusSupport() {
+ return terminal.hasFocusSupport();
+ }
+
+ @Override
+ public boolean trackFocus(boolean tracking) {
+ return terminal.trackFocus(tracking);
+ }
}
--
To stop receiving notification emails like this one, please contact
gnodet@apache.org.