[GitHub] [karaf] jbonofre opened a new pull request #1286: [KARAF-6904] Use pax-url-classpath and pax-url-wrap feature names

2020-12-29 Thread GitBox 


jbonofre opened a new pull request #1286:
URL: https://github.com/apache/karaf/pull/1286


   



This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org

[BUILD-FAILURE]: Job 'Karaf/karaf-runtime/karaf-4.2.x [karaf-4.2.x] [94]'

2020-12-29 Thread Apache Jenkins Server 
BUILD-FAILURE: Job 'Karaf/karaf-runtime/karaf-4.2.x [karaf-4.2.x] [94]':
Check console output at "https://ci-builds.apache.org/job/Karaf/job/karaf-runtime/job/karaf-4.2.x/94/";>Karaf/karaf-runtime/karaf-4.2.x
 [karaf-4.2.x] [94]"

[BUILD-FAILURE]: Job 'Karaf/karaf-runtime/karaf-4.2.x [karaf-4.2.x] [95]'

2020-12-29 Thread Apache Jenkins Server 
BUILD-FAILURE: Job 'Karaf/karaf-runtime/karaf-4.2.x [karaf-4.2.x] [95]':
Check console output at "https://ci-builds.apache.org/job/Karaf/job/karaf-runtime/job/karaf-4.2.x/95/";>Karaf/karaf-runtime/karaf-4.2.x
 [karaf-4.2.x] [95]"

[karaf] branch karaf-4.2.x updated: [KARAF-6979] Upgrade to jline 3.18.0

2020-12-29 Thread jbonofre 
This is an automated email from the ASF dual-hosted git repository.

jbonofre pushed a commit to branch karaf-4.2.x
in repository https://gitbox.apache.org/repos/asf/karaf.git


The following commit(s) were added to refs/heads/karaf-4.2.x by this push:
 new 597f10c  [KARAF-6979] Upgrade to jline 3.18.0
597f10c is described below

commit 597f10c60e44d74047fcd520ab4fb3cfc8af76f7
Author: jbonofre 
AuthorDate: Sun Dec 27 08:27:21 2020 +0100

[KARAF-6979] Upgrade to jline 3.18.0

(cherry picked from commit d32ce538e3420b02142807762297e6e688ae4590)
---
 pom.xml   |  2 +-
 .../org/apache/karaf/shell/impl/console/JLineTerminal.java| 11 +++
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index e6d0785..888c1cf 100644
--- a/pom.xml
+++ b/pom.xml
@@ -265,7 +265,7 @@
 1.18
 3.9.0.GA
 9.4.35.v20201120
-3.17.1
+3.18.0
 4.13.1
 3.2.3
 1.2.17
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 df21c62..b884218 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
@@ -38,6 +38,7 @@ import org.jline.terminal.Attributes;
 import org.jline.terminal.Cursor;
 import org.jline.terminal.MouseEvent;
 import org.jline.terminal.Size;
+import org.jline.utils.ColorPalette;
 import org.jline.utils.InfoCmp.Capability;
 import org.jline.utils.NonBlockingReader;
 import org.slf4j.Logger;
@@ -338,4 +339,14 @@ public class JLineTerminal implements Terminal, 
org.jline.terminal.Terminal {
 public boolean trackFocus(boolean tracking) {
 return terminal.trackFocus(tracking);
 }
+
+@Override
+public Size getBufferSize() {
+return terminal.getBufferSize();
+}
+
+@Override
+public ColorPalette getPalette() {
+return terminal.getPalette();
+}
 }

[GitHub] [karaf] jbonofre merged pull request #1284: [KARAF-6979] Upgrade to jline 3.18.0

2020-12-29 Thread GitBox 


jbonofre merged pull request #1284:
URL: https://github.com/apache/karaf/pull/1284


   



This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org

[karaf] branch master updated: [KARAF-6979] Upgrade to jline 3.18.0

2020-12-29 Thread jbonofre 
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 d32ce53  [KARAF-6979] Upgrade to jline 3.18.0
 new 92c171e  Merge pull request #1284 from jbonofre/KARAF-6979
d32ce53 is described below

commit d32ce538e3420b02142807762297e6e688ae4590
Author: jbonofre 
AuthorDate: Sun Dec 27 08:27:21 2020 +0100

[KARAF-6979] Upgrade to jline 3.18.0
---
 pom.xml   |  2 +-
 .../org/apache/karaf/shell/impl/console/JLineTerminal.java| 11 +++
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index b93cded..88fb779 100644
--- a/pom.xml
+++ b/pom.xml
@@ -254,7 +254,7 @@
 4.5.13
 1.18
 3.9.0.GA
-3.17.1
+3.18.0
 4.13.1
 3.2.3
 1.2.17
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 df21c62..b884218 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
@@ -38,6 +38,7 @@ import org.jline.terminal.Attributes;
 import org.jline.terminal.Cursor;
 import org.jline.terminal.MouseEvent;
 import org.jline.terminal.Size;
+import org.jline.utils.ColorPalette;
 import org.jline.utils.InfoCmp.Capability;
 import org.jline.utils.NonBlockingReader;
 import org.slf4j.Logger;
@@ -338,4 +339,14 @@ public class JLineTerminal implements Terminal, 
org.jline.terminal.Terminal {
 public boolean trackFocus(boolean tracking) {
 return terminal.trackFocus(tracking);
 }
+
+@Override
+public Size getBufferSize() {
+return terminal.getBufferSize();
+}
+
+@Override
+public ColorPalette getPalette() {
+return terminal.getPalette();
+}
 }

[karaf] branch karaf-4.2.x updated: [KARAF-6977] Cleanup pom

2020-12-29 Thread jbonofre 
This is an automated email from the ASF dual-hosted git repository.

jbonofre pushed a commit to branch karaf-4.2.x
in repository https://gitbox.apache.org/repos/asf/karaf.git


The following commit(s) were added to refs/heads/karaf-4.2.x by this push:
 new 0ef9339  [KARAF-6977] Cleanup pom
0ef9339 is described below

commit 0ef9339cf6ec90189ddf796d0bfae12c3d4556b6
Author: jbonofre 
AuthorDate: Wed Dec 30 07:29:35 2020 +0100

[KARAF-6977] Cleanup pom
---
 .../enterprise-legacy/src/main/feature/feature.xml|  4 ++--
 .../features/spring-legacy/src/main/feature/feature.xml   |  4 ++--
 bom/pom.xml   | 15 ---
 pom.xml   |  6 --
 4 files changed, 4 insertions(+), 25 deletions(-)

diff --git a/assemblies/features/enterprise-legacy/src/main/feature/feature.xml 
b/assemblies/features/enterprise-legacy/src/main/feature/feature.xml
index 60792d5..bd2fb45 100644
--- a/assemblies/features/enterprise-legacy/src/main/feature/feature.xml
+++ b/assemblies/features/enterprise-legacy/src/main/feature/feature.xml
@@ -118,7 +118,7 @@
mvn:org.apache.geronimo.specs/geronimo-jpa_2.0_spec/${geronimo.jpa-spec.version}
 http
 mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.antlr/${antlr.bundle.version}
-mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.ant/${ant.bundle.version}
+mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.ant/1.10.9_1
 mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.dom4j/${dom4j.bundle.version}
 mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.serp/${serp.bundle.version}
 mvn:com.fasterxml/classmate/1.1.0
@@ -146,7 +146,7 @@
 http
 mvn:org.eclipse.persistence/javax.persistence/2.1.0
 mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.antlr/${antlr.bundle.version}
-mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.ant/${ant.bundle.version}
+mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.ant/1.10.9_1
 mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.dom4j/${dom4j.bundle.version}
 mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.serp/${serp.bundle.version}
 mvn:com.fasterxml/classmate/1.1.0
diff --git a/assemblies/features/spring-legacy/src/main/feature/feature.xml 
b/assemblies/features/spring-legacy/src/main/feature/feature.xml
index 7564ffc..2bb8d65 100644
--- a/assemblies/features/spring-legacy/src/main/feature/feature.xml
+++ b/assemblies/features/spring-legacy/src/main/feature/feature.xml
@@ -86,7 +86,7 @@
 war
 mvn:commons-collections/commons-collections/${commons-collections.version}
 mvn:commons-beanutils/commons-beanutils/${commons-beanutils.version}
-mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.struts/${struts.bundle.version}
+mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.struts/1.3.10_1
 mvn:org.springframework/spring-struts/${spring31.version}
 
 
@@ -163,7 +163,7 @@
 war
 mvn:commons-collections/commons-collections/${commons-collections.version}
 mvn:commons-beanutils/commons-beanutils/${commons-beanutils.version}
-mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.struts/${struts.bundle.version}
+mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.struts/1.3.10_1
 mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-struts/${spring32.version}
 
 
diff --git a/bom/pom.xml b/bom/pom.xml
index 7f22126..55d864d 100644
--- a/bom/pom.xml
+++ b/bom/pom.xml
@@ -755,21 +755,6 @@
 ${maven.wagon.version}
 
 
-org.apache.servicemix.bundles
-
org.apache.servicemix.bundles.xercesImpl
-${xerces.bundle.version}
-
-
-org.apache.servicemix.bundles
-org.apache.servicemix.bundles.xalan
-${xalan.bundle.version}
-
-
-org.apache.servicemix.bundles
-
org.apache.servicemix.bundles.xalan-serializer
-${xalan-serializer.bundle.version}
-
-
 org.springframework.osgi
 spring-osgi-core
 ${spring.osgi.version}
diff --git a/pom.xml b/pom.xml
index 3be48ba..e6d0785 100644
--- a/pom.xml
+++ b/pom.xml
@@ -141,7 +141,6 @@
 5.15.11
 1.0_6
 1.9.5_1
-1.10.8_1
 2.7.7_5
 6.2.1
 9.0
@@ -313,17 +312,12 @@
 2.5.1
 10.14.2.0
 2.0.0-M24
-1.3.10_1
 4.18
-2.12.0_1
-2.7.2_3
-
2.7.2_1
 1.4.7
 
 1.1
 2.3.0
 
-

[karaf] branch master updated: [KARAF-6977] Remove ant bundle from bom

2020-12-29 Thread jbonofre 
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 f082cbb  [KARAF-6977] Remove ant bundle from bom
 new 47a07b5  Merge pull request #1285 from jbonofre/KARAF-6977
f082cbb is described below

commit f082cbb57687ceb4edb4feed97977ca32b157f26
Author: jbonofre 
AuthorDate: Tue Dec 29 08:17:34 2020 +0100

[KARAF-6977] Remove ant bundle from bom
---
 bom/pom.xml | 13 +
 1 file changed, 1 insertion(+), 12 deletions(-)

diff --git a/bom/pom.xml b/bom/pom.xml
index 013cca1..e5264ea 100644
--- a/bom/pom.xml
+++ b/bom/pom.xml
@@ -1418,17 +1418,6 @@
 
 
 org.apache.servicemix.bundles
-org.apache.servicemix.bundles.ant
-1.8.4_1
-
-
-commons-logging
-commons-logging-api
-
-
-
-
-org.apache.servicemix.bundles
 org.apache.servicemix.bundles.jasypt
 ${jasypt.bundle.version}
 
@@ -1480,4 +1469,4 @@
 
 
 
-
\ No newline at end of file
+

[GitHub] [karaf] jbonofre merged pull request #1285: [KARAF-6977] Remove ant bundle from bom

2020-12-29 Thread GitBox 


jbonofre merged pull request #1285:
URL: https://github.com/apache/karaf/pull/1285


   



This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org

[BUILD-STABLE]: Job 'Karaf/karaf-runtime/master [master] [124]'

2020-12-29 Thread Apache Jenkins Server 
BUILD-STABLE: Job 'Karaf/karaf-runtime/master [master] [124]':
Is back to normal.