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 2016/11/18 20:36:13 UTC
[1/2] karaf git commit: Fix NOTICEs files wrt jline
Repository: karaf
Updated Branches:
refs/heads/master 1e00d82d5 -> ea121450e
Fix NOTICEs files wrt jline
Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/ea121450
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/ea121450
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/ea121450
Branch: refs/heads/master
Commit: ea121450e2be22d0b500470cf94fa3e593665edb
Parents: c6d3661
Author: Guillaume Nodet <gn...@apache.org>
Authored: Mon Nov 14 09:38:57 2016 +0100
Committer: Guillaume Nodet <gn...@apache.org>
Committed: Thu Nov 17 14:59:56 2016 +0100
----------------------------------------------------------------------
NOTICE | 2 +-
archetypes/assembly/NOTICE | 2 +-
archetypes/blueprint/NOTICE | 2 +-
archetypes/bundle/NOTICE | 2 +-
archetypes/command/NOTICE | 2 +-
archetypes/feature/NOTICE | 2 +-
archetypes/kar/NOTICE | 2 +-
bundle/core/NOTICE | 2 +-
bundle/springstate/NOTICE | 2 +-
client/NOTICE | 2 +-
config/NOTICE | 2 +-
demos/branding/NOTICE | 2 +-
demos/command/NOTICE | 2 +-
demos/deployer/bundle/NOTICE | 2 +-
demos/deployer/kar/NOTICE | 2 +-
demos/dump/NOTICE | 2 +-
demos/web/NOTICE | 2 +-
deployer/blueprint/NOTICE | 2 +-
deployer/features/NOTICE | 2 +-
deployer/kar/NOTICE | 2 +-
deployer/spring/NOTICE | 2 +-
deployer/wrap/NOTICE | 2 +-
diagnostic/boot/NOTICE | 2 +-
diagnostic/core/NOTICE | 2 +-
etc/appended-resources/supplemental-models.xml | 6 +++---
exception/NOTICE | 2 +-
features/command/NOTICE | 2 +-
features/core/NOTICE | 2 +-
http/NOTICE | 2 +-
instance/NOTICE | 2 +-
itests/NOTICE | 2 +-
jaas/boot/NOTICE | 2 +-
jaas/command/NOTICE | 2 +-
jaas/config/NOTICE | 2 +-
jaas/jasypt/NOTICE | 2 +-
jaas/modules/NOTICE | 2 +-
jdbc/NOTICE | 2 +-
jms/core/NOTICE | 2 +-
jndi/NOTICE | 2 +-
kar/NOTICE | 2 +-
log/NOTICE | 2 +-
main/NOTICE | 2 +-
management/server/NOTICE | 2 +-
obr/NOTICE | 2 +-
package/NOTICE | 2 +-
scheduler/NOTICE | 2 +-
scr/command/NOTICE | 2 +-
scr/examples/component-factory/NOTICE | 2 +-
scr/examples/managed-service/NOTICE | 2 +-
scr/examples/service/NOTICE | 2 +-
scr/management/NOTICE | 2 +-
service/core/NOTICE | 2 +-
service/guard/NOTICE | 2 +-
shell/commands/NOTICE | 2 +-
shell/console/NOTICE | 2 +-
shell/core/NOTICE | 2 +-
shell/ssh/NOTICE | 2 +-
shell/table/NOTICE | 2 +-
subsystem/NOTICE | 2 +-
system/NOTICE | 2 +-
tooling/karaf-maven-plugin/NOTICE | 2 +-
util/NOTICE | 2 +-
web/NOTICE | 2 +-
webconsole/console/NOTICE | 2 +-
webconsole/features/NOTICE | 2 +-
webconsole/gogo/NOTICE | 2 +-
webconsole/http/NOTICE | 2 +-
webconsole/instance/NOTICE | 2 +-
wrapper/NOTICE | 2 +-
69 files changed, 71 insertions(+), 71 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/karaf/blob/ea121450/NOTICE
----------------------------------------------------------------------
diff --git a/NOTICE b/NOTICE
index 577362f..8424985 100644
--- a/NOTICE
+++ b/NOTICE
@@ -49,7 +49,7 @@ Jasypt (http://jasypt.sourceforge.net/).
Licensed under the Apache License 2.0.
This product uses software developed at
-JLine (http://jline.sourceforge.net).
+JLine (https://github.com/jline/).
Licensed under the BSD License.
This product uses software developed at
http://git-wip-us.apache.org/repos/asf/karaf/blob/ea121450/archetypes/assembly/NOTICE
----------------------------------------------------------------------
diff --git a/archetypes/assembly/NOTICE b/archetypes/assembly/NOTICE
index b70f1f9..ae24949 100644
--- a/archetypes/assembly/NOTICE
+++ b/archetypes/assembly/NOTICE
@@ -49,7 +49,7 @@ Jasypt (http://jasypt.sourceforge.net/).
Licensed under the Apache License 2.0.
This product uses software developed at
-JLine (http://jline.sourceforge.net).
+JLine (https://github.com/jline/).
Licensed under the BSD License.
This product uses software developed at
http://git-wip-us.apache.org/repos/asf/karaf/blob/ea121450/archetypes/blueprint/NOTICE
----------------------------------------------------------------------
diff --git a/archetypes/blueprint/NOTICE b/archetypes/blueprint/NOTICE
index b70f1f9..ae24949 100644
--- a/archetypes/blueprint/NOTICE
+++ b/archetypes/blueprint/NOTICE
@@ -49,7 +49,7 @@ Jasypt (http://jasypt.sourceforge.net/).
Licensed under the Apache License 2.0.
This product uses software developed at
-JLine (http://jline.sourceforge.net).
+JLine (https://github.com/jline/).
Licensed under the BSD License.
This product uses software developed at
http://git-wip-us.apache.org/repos/asf/karaf/blob/ea121450/archetypes/bundle/NOTICE
----------------------------------------------------------------------
diff --git a/archetypes/bundle/NOTICE b/archetypes/bundle/NOTICE
index b70f1f9..ae24949 100644
--- a/archetypes/bundle/NOTICE
+++ b/archetypes/bundle/NOTICE
@@ -49,7 +49,7 @@ Jasypt (http://jasypt.sourceforge.net/).
Licensed under the Apache License 2.0.
This product uses software developed at
-JLine (http://jline.sourceforge.net).
+JLine (https://github.com/jline/).
Licensed under the BSD License.
This product uses software developed at
http://git-wip-us.apache.org/repos/asf/karaf/blob/ea121450/archetypes/command/NOTICE
----------------------------------------------------------------------
diff --git a/archetypes/command/NOTICE b/archetypes/command/NOTICE
index b70f1f9..ae24949 100644
--- a/archetypes/command/NOTICE
+++ b/archetypes/command/NOTICE
@@ -49,7 +49,7 @@ Jasypt (http://jasypt.sourceforge.net/).
Licensed under the Apache License 2.0.
This product uses software developed at
-JLine (http://jline.sourceforge.net).
+JLine (https://github.com/jline/).
Licensed under the BSD License.
This product uses software developed at
http://git-wip-us.apache.org/repos/asf/karaf/blob/ea121450/archetypes/feature/NOTICE
----------------------------------------------------------------------
diff --git a/archetypes/feature/NOTICE b/archetypes/feature/NOTICE
index b70f1f9..ae24949 100644
--- a/archetypes/feature/NOTICE
+++ b/archetypes/feature/NOTICE
@@ -49,7 +49,7 @@ Jasypt (http://jasypt.sourceforge.net/).
Licensed under the Apache License 2.0.
This product uses software developed at
-JLine (http://jline.sourceforge.net).
+JLine (https://github.com/jline/).
Licensed under the BSD License.
This product uses software developed at
http://git-wip-us.apache.org/repos/asf/karaf/blob/ea121450/archetypes/kar/NOTICE
----------------------------------------------------------------------
diff --git a/archetypes/kar/NOTICE b/archetypes/kar/NOTICE
index b70f1f9..ae24949 100644
--- a/archetypes/kar/NOTICE
+++ b/archetypes/kar/NOTICE
@@ -49,7 +49,7 @@ Jasypt (http://jasypt.sourceforge.net/).
Licensed under the Apache License 2.0.
This product uses software developed at
-JLine (http://jline.sourceforge.net).
+JLine (https://github.com/jline/).
Licensed under the BSD License.
This product uses software developed at
http://git-wip-us.apache.org/repos/asf/karaf/blob/ea121450/bundle/core/NOTICE
----------------------------------------------------------------------
diff --git a/bundle/core/NOTICE b/bundle/core/NOTICE
index b70f1f9..ae24949 100644
--- a/bundle/core/NOTICE
+++ b/bundle/core/NOTICE
@@ -49,7 +49,7 @@ Jasypt (http://jasypt.sourceforge.net/).
Licensed under the Apache License 2.0.
This product uses software developed at
-JLine (http://jline.sourceforge.net).
+JLine (https://github.com/jline/).
Licensed under the BSD License.
This product uses software developed at
http://git-wip-us.apache.org/repos/asf/karaf/blob/ea121450/bundle/springstate/NOTICE
----------------------------------------------------------------------
diff --git a/bundle/springstate/NOTICE b/bundle/springstate/NOTICE
index b70f1f9..ae24949 100644
--- a/bundle/springstate/NOTICE
+++ b/bundle/springstate/NOTICE
@@ -49,7 +49,7 @@ Jasypt (http://jasypt.sourceforge.net/).
Licensed under the Apache License 2.0.
This product uses software developed at
-JLine (http://jline.sourceforge.net).
+JLine (https://github.com/jline/).
Licensed under the BSD License.
This product uses software developed at
http://git-wip-us.apache.org/repos/asf/karaf/blob/ea121450/client/NOTICE
----------------------------------------------------------------------
diff --git a/client/NOTICE b/client/NOTICE
index b70f1f9..ae24949 100644
--- a/client/NOTICE
+++ b/client/NOTICE
@@ -49,7 +49,7 @@ Jasypt (http://jasypt.sourceforge.net/).
Licensed under the Apache License 2.0.
This product uses software developed at
-JLine (http://jline.sourceforge.net).
+JLine (https://github.com/jline/).
Licensed under the BSD License.
This product uses software developed at
http://git-wip-us.apache.org/repos/asf/karaf/blob/ea121450/config/NOTICE
----------------------------------------------------------------------
diff --git a/config/NOTICE b/config/NOTICE
index b70f1f9..ae24949 100644
--- a/config/NOTICE
+++ b/config/NOTICE
@@ -49,7 +49,7 @@ Jasypt (http://jasypt.sourceforge.net/).
Licensed under the Apache License 2.0.
This product uses software developed at
-JLine (http://jline.sourceforge.net).
+JLine (https://github.com/jline/).
Licensed under the BSD License.
This product uses software developed at
http://git-wip-us.apache.org/repos/asf/karaf/blob/ea121450/demos/branding/NOTICE
----------------------------------------------------------------------
diff --git a/demos/branding/NOTICE b/demos/branding/NOTICE
index b70f1f9..ae24949 100644
--- a/demos/branding/NOTICE
+++ b/demos/branding/NOTICE
@@ -49,7 +49,7 @@ Jasypt (http://jasypt.sourceforge.net/).
Licensed under the Apache License 2.0.
This product uses software developed at
-JLine (http://jline.sourceforge.net).
+JLine (https://github.com/jline/).
Licensed under the BSD License.
This product uses software developed at
http://git-wip-us.apache.org/repos/asf/karaf/blob/ea121450/demos/command/NOTICE
----------------------------------------------------------------------
diff --git a/demos/command/NOTICE b/demos/command/NOTICE
index b70f1f9..ae24949 100644
--- a/demos/command/NOTICE
+++ b/demos/command/NOTICE
@@ -49,7 +49,7 @@ Jasypt (http://jasypt.sourceforge.net/).
Licensed under the Apache License 2.0.
This product uses software developed at
-JLine (http://jline.sourceforge.net).
+JLine (https://github.com/jline/).
Licensed under the BSD License.
This product uses software developed at
http://git-wip-us.apache.org/repos/asf/karaf/blob/ea121450/demos/deployer/bundle/NOTICE
----------------------------------------------------------------------
diff --git a/demos/deployer/bundle/NOTICE b/demos/deployer/bundle/NOTICE
index b70f1f9..ae24949 100644
--- a/demos/deployer/bundle/NOTICE
+++ b/demos/deployer/bundle/NOTICE
@@ -49,7 +49,7 @@ Jasypt (http://jasypt.sourceforge.net/).
Licensed under the Apache License 2.0.
This product uses software developed at
-JLine (http://jline.sourceforge.net).
+JLine (https://github.com/jline/).
Licensed under the BSD License.
This product uses software developed at
http://git-wip-us.apache.org/repos/asf/karaf/blob/ea121450/demos/deployer/kar/NOTICE
----------------------------------------------------------------------
diff --git a/demos/deployer/kar/NOTICE b/demos/deployer/kar/NOTICE
index b70f1f9..ae24949 100644
--- a/demos/deployer/kar/NOTICE
+++ b/demos/deployer/kar/NOTICE
@@ -49,7 +49,7 @@ Jasypt (http://jasypt.sourceforge.net/).
Licensed under the Apache License 2.0.
This product uses software developed at
-JLine (http://jline.sourceforge.net).
+JLine (https://github.com/jline/).
Licensed under the BSD License.
This product uses software developed at
http://git-wip-us.apache.org/repos/asf/karaf/blob/ea121450/demos/dump/NOTICE
----------------------------------------------------------------------
diff --git a/demos/dump/NOTICE b/demos/dump/NOTICE
index b70f1f9..ae24949 100644
--- a/demos/dump/NOTICE
+++ b/demos/dump/NOTICE
@@ -49,7 +49,7 @@ Jasypt (http://jasypt.sourceforge.net/).
Licensed under the Apache License 2.0.
This product uses software developed at
-JLine (http://jline.sourceforge.net).
+JLine (https://github.com/jline/).
Licensed under the BSD License.
This product uses software developed at
http://git-wip-us.apache.org/repos/asf/karaf/blob/ea121450/demos/web/NOTICE
----------------------------------------------------------------------
diff --git a/demos/web/NOTICE b/demos/web/NOTICE
index b70f1f9..ae24949 100644
--- a/demos/web/NOTICE
+++ b/demos/web/NOTICE
@@ -49,7 +49,7 @@ Jasypt (http://jasypt.sourceforge.net/).
Licensed under the Apache License 2.0.
This product uses software developed at
-JLine (http://jline.sourceforge.net).
+JLine (https://github.com/jline/).
Licensed under the BSD License.
This product uses software developed at
http://git-wip-us.apache.org/repos/asf/karaf/blob/ea121450/deployer/blueprint/NOTICE
----------------------------------------------------------------------
diff --git a/deployer/blueprint/NOTICE b/deployer/blueprint/NOTICE
index b70f1f9..ae24949 100644
--- a/deployer/blueprint/NOTICE
+++ b/deployer/blueprint/NOTICE
@@ -49,7 +49,7 @@ Jasypt (http://jasypt.sourceforge.net/).
Licensed under the Apache License 2.0.
This product uses software developed at
-JLine (http://jline.sourceforge.net).
+JLine (https://github.com/jline/).
Licensed under the BSD License.
This product uses software developed at
http://git-wip-us.apache.org/repos/asf/karaf/blob/ea121450/deployer/features/NOTICE
----------------------------------------------------------------------
diff --git a/deployer/features/NOTICE b/deployer/features/NOTICE
index b70f1f9..ae24949 100644
--- a/deployer/features/NOTICE
+++ b/deployer/features/NOTICE
@@ -49,7 +49,7 @@ Jasypt (http://jasypt.sourceforge.net/).
Licensed under the Apache License 2.0.
This product uses software developed at
-JLine (http://jline.sourceforge.net).
+JLine (https://github.com/jline/).
Licensed under the BSD License.
This product uses software developed at
http://git-wip-us.apache.org/repos/asf/karaf/blob/ea121450/deployer/kar/NOTICE
----------------------------------------------------------------------
diff --git a/deployer/kar/NOTICE b/deployer/kar/NOTICE
index b70f1f9..ae24949 100644
--- a/deployer/kar/NOTICE
+++ b/deployer/kar/NOTICE
@@ -49,7 +49,7 @@ Jasypt (http://jasypt.sourceforge.net/).
Licensed under the Apache License 2.0.
This product uses software developed at
-JLine (http://jline.sourceforge.net).
+JLine (https://github.com/jline/).
Licensed under the BSD License.
This product uses software developed at
http://git-wip-us.apache.org/repos/asf/karaf/blob/ea121450/deployer/spring/NOTICE
----------------------------------------------------------------------
diff --git a/deployer/spring/NOTICE b/deployer/spring/NOTICE
index b70f1f9..ae24949 100644
--- a/deployer/spring/NOTICE
+++ b/deployer/spring/NOTICE
@@ -49,7 +49,7 @@ Jasypt (http://jasypt.sourceforge.net/).
Licensed under the Apache License 2.0.
This product uses software developed at
-JLine (http://jline.sourceforge.net).
+JLine (https://github.com/jline/).
Licensed under the BSD License.
This product uses software developed at
http://git-wip-us.apache.org/repos/asf/karaf/blob/ea121450/deployer/wrap/NOTICE
----------------------------------------------------------------------
diff --git a/deployer/wrap/NOTICE b/deployer/wrap/NOTICE
index b70f1f9..ae24949 100644
--- a/deployer/wrap/NOTICE
+++ b/deployer/wrap/NOTICE
@@ -49,7 +49,7 @@ Jasypt (http://jasypt.sourceforge.net/).
Licensed under the Apache License 2.0.
This product uses software developed at
-JLine (http://jline.sourceforge.net).
+JLine (https://github.com/jline/).
Licensed under the BSD License.
This product uses software developed at
http://git-wip-us.apache.org/repos/asf/karaf/blob/ea121450/diagnostic/boot/NOTICE
----------------------------------------------------------------------
diff --git a/diagnostic/boot/NOTICE b/diagnostic/boot/NOTICE
index b70f1f9..ae24949 100644
--- a/diagnostic/boot/NOTICE
+++ b/diagnostic/boot/NOTICE
@@ -49,7 +49,7 @@ Jasypt (http://jasypt.sourceforge.net/).
Licensed under the Apache License 2.0.
This product uses software developed at
-JLine (http://jline.sourceforge.net).
+JLine (https://github.com/jline/).
Licensed under the BSD License.
This product uses software developed at
http://git-wip-us.apache.org/repos/asf/karaf/blob/ea121450/diagnostic/core/NOTICE
----------------------------------------------------------------------
diff --git a/diagnostic/core/NOTICE b/diagnostic/core/NOTICE
index b70f1f9..ae24949 100644
--- a/diagnostic/core/NOTICE
+++ b/diagnostic/core/NOTICE
@@ -49,7 +49,7 @@ Jasypt (http://jasypt.sourceforge.net/).
Licensed under the Apache License 2.0.
This product uses software developed at
-JLine (http://jline.sourceforge.net).
+JLine (https://github.com/jline/).
Licensed under the BSD License.
This product uses software developed at
http://git-wip-us.apache.org/repos/asf/karaf/blob/ea121450/etc/appended-resources/supplemental-models.xml
----------------------------------------------------------------------
diff --git a/etc/appended-resources/supplemental-models.xml b/etc/appended-resources/supplemental-models.xml
index 2924605..50f5bae 100644
--- a/etc/appended-resources/supplemental-models.xml
+++ b/etc/appended-resources/supplemental-models.xml
@@ -891,15 +891,15 @@
<groupId>org.jline</groupId>
<artifactId>jline</artifactId>
<name>JLine</name>
- <url>http://jline.sourceforge.net</url>
+ <url>https://github.com/jline/</url>
<organization>
<name>JLine</name>
- <url>http://jline.sourceforge.net</url>
+ <url>https://github.com/jline/</url>
</organization>
<licenses>
<license>
<name>The BSD License</name>
- <url>http://jline.sourceforge.net/license.html</url>
+ <url>http://www.opensource.org/licenses/bsd-license.php</url>
</license>
</licenses>
</project>
http://git-wip-us.apache.org/repos/asf/karaf/blob/ea121450/exception/NOTICE
----------------------------------------------------------------------
diff --git a/exception/NOTICE b/exception/NOTICE
index b70f1f9..ae24949 100644
--- a/exception/NOTICE
+++ b/exception/NOTICE
@@ -49,7 +49,7 @@ Jasypt (http://jasypt.sourceforge.net/).
Licensed under the Apache License 2.0.
This product uses software developed at
-JLine (http://jline.sourceforge.net).
+JLine (https://github.com/jline/).
Licensed under the BSD License.
This product uses software developed at
http://git-wip-us.apache.org/repos/asf/karaf/blob/ea121450/features/command/NOTICE
----------------------------------------------------------------------
diff --git a/features/command/NOTICE b/features/command/NOTICE
index b70f1f9..ae24949 100644
--- a/features/command/NOTICE
+++ b/features/command/NOTICE
@@ -49,7 +49,7 @@ Jasypt (http://jasypt.sourceforge.net/).
Licensed under the Apache License 2.0.
This product uses software developed at
-JLine (http://jline.sourceforge.net).
+JLine (https://github.com/jline/).
Licensed under the BSD License.
This product uses software developed at
http://git-wip-us.apache.org/repos/asf/karaf/blob/ea121450/features/core/NOTICE
----------------------------------------------------------------------
diff --git a/features/core/NOTICE b/features/core/NOTICE
index b70f1f9..ae24949 100644
--- a/features/core/NOTICE
+++ b/features/core/NOTICE
@@ -49,7 +49,7 @@ Jasypt (http://jasypt.sourceforge.net/).
Licensed under the Apache License 2.0.
This product uses software developed at
-JLine (http://jline.sourceforge.net).
+JLine (https://github.com/jline/).
Licensed under the BSD License.
This product uses software developed at
http://git-wip-us.apache.org/repos/asf/karaf/blob/ea121450/http/NOTICE
----------------------------------------------------------------------
diff --git a/http/NOTICE b/http/NOTICE
index b70f1f9..ae24949 100644
--- a/http/NOTICE
+++ b/http/NOTICE
@@ -49,7 +49,7 @@ Jasypt (http://jasypt.sourceforge.net/).
Licensed under the Apache License 2.0.
This product uses software developed at
-JLine (http://jline.sourceforge.net).
+JLine (https://github.com/jline/).
Licensed under the BSD License.
This product uses software developed at
http://git-wip-us.apache.org/repos/asf/karaf/blob/ea121450/instance/NOTICE
----------------------------------------------------------------------
diff --git a/instance/NOTICE b/instance/NOTICE
index b70f1f9..ae24949 100644
--- a/instance/NOTICE
+++ b/instance/NOTICE
@@ -49,7 +49,7 @@ Jasypt (http://jasypt.sourceforge.net/).
Licensed under the Apache License 2.0.
This product uses software developed at
-JLine (http://jline.sourceforge.net).
+JLine (https://github.com/jline/).
Licensed under the BSD License.
This product uses software developed at
http://git-wip-us.apache.org/repos/asf/karaf/blob/ea121450/itests/NOTICE
----------------------------------------------------------------------
diff --git a/itests/NOTICE b/itests/NOTICE
index b70f1f9..ae24949 100644
--- a/itests/NOTICE
+++ b/itests/NOTICE
@@ -49,7 +49,7 @@ Jasypt (http://jasypt.sourceforge.net/).
Licensed under the Apache License 2.0.
This product uses software developed at
-JLine (http://jline.sourceforge.net).
+JLine (https://github.com/jline/).
Licensed under the BSD License.
This product uses software developed at
http://git-wip-us.apache.org/repos/asf/karaf/blob/ea121450/jaas/boot/NOTICE
----------------------------------------------------------------------
diff --git a/jaas/boot/NOTICE b/jaas/boot/NOTICE
index b70f1f9..ae24949 100644
--- a/jaas/boot/NOTICE
+++ b/jaas/boot/NOTICE
@@ -49,7 +49,7 @@ Jasypt (http://jasypt.sourceforge.net/).
Licensed under the Apache License 2.0.
This product uses software developed at
-JLine (http://jline.sourceforge.net).
+JLine (https://github.com/jline/).
Licensed under the BSD License.
This product uses software developed at
http://git-wip-us.apache.org/repos/asf/karaf/blob/ea121450/jaas/command/NOTICE
----------------------------------------------------------------------
diff --git a/jaas/command/NOTICE b/jaas/command/NOTICE
index b70f1f9..ae24949 100644
--- a/jaas/command/NOTICE
+++ b/jaas/command/NOTICE
@@ -49,7 +49,7 @@ Jasypt (http://jasypt.sourceforge.net/).
Licensed under the Apache License 2.0.
This product uses software developed at
-JLine (http://jline.sourceforge.net).
+JLine (https://github.com/jline/).
Licensed under the BSD License.
This product uses software developed at
http://git-wip-us.apache.org/repos/asf/karaf/blob/ea121450/jaas/config/NOTICE
----------------------------------------------------------------------
diff --git a/jaas/config/NOTICE b/jaas/config/NOTICE
index b70f1f9..ae24949 100644
--- a/jaas/config/NOTICE
+++ b/jaas/config/NOTICE
@@ -49,7 +49,7 @@ Jasypt (http://jasypt.sourceforge.net/).
Licensed under the Apache License 2.0.
This product uses software developed at
-JLine (http://jline.sourceforge.net).
+JLine (https://github.com/jline/).
Licensed under the BSD License.
This product uses software developed at
http://git-wip-us.apache.org/repos/asf/karaf/blob/ea121450/jaas/jasypt/NOTICE
----------------------------------------------------------------------
diff --git a/jaas/jasypt/NOTICE b/jaas/jasypt/NOTICE
index b70f1f9..ae24949 100644
--- a/jaas/jasypt/NOTICE
+++ b/jaas/jasypt/NOTICE
@@ -49,7 +49,7 @@ Jasypt (http://jasypt.sourceforge.net/).
Licensed under the Apache License 2.0.
This product uses software developed at
-JLine (http://jline.sourceforge.net).
+JLine (https://github.com/jline/).
Licensed under the BSD License.
This product uses software developed at
http://git-wip-us.apache.org/repos/asf/karaf/blob/ea121450/jaas/modules/NOTICE
----------------------------------------------------------------------
diff --git a/jaas/modules/NOTICE b/jaas/modules/NOTICE
index b70f1f9..ae24949 100644
--- a/jaas/modules/NOTICE
+++ b/jaas/modules/NOTICE
@@ -49,7 +49,7 @@ Jasypt (http://jasypt.sourceforge.net/).
Licensed under the Apache License 2.0.
This product uses software developed at
-JLine (http://jline.sourceforge.net).
+JLine (https://github.com/jline/).
Licensed under the BSD License.
This product uses software developed at
http://git-wip-us.apache.org/repos/asf/karaf/blob/ea121450/jdbc/NOTICE
----------------------------------------------------------------------
diff --git a/jdbc/NOTICE b/jdbc/NOTICE
index b70f1f9..ae24949 100644
--- a/jdbc/NOTICE
+++ b/jdbc/NOTICE
@@ -49,7 +49,7 @@ Jasypt (http://jasypt.sourceforge.net/).
Licensed under the Apache License 2.0.
This product uses software developed at
-JLine (http://jline.sourceforge.net).
+JLine (https://github.com/jline/).
Licensed under the BSD License.
This product uses software developed at
http://git-wip-us.apache.org/repos/asf/karaf/blob/ea121450/jms/core/NOTICE
----------------------------------------------------------------------
diff --git a/jms/core/NOTICE b/jms/core/NOTICE
index b70f1f9..ae24949 100644
--- a/jms/core/NOTICE
+++ b/jms/core/NOTICE
@@ -49,7 +49,7 @@ Jasypt (http://jasypt.sourceforge.net/).
Licensed under the Apache License 2.0.
This product uses software developed at
-JLine (http://jline.sourceforge.net).
+JLine (https://github.com/jline/).
Licensed under the BSD License.
This product uses software developed at
http://git-wip-us.apache.org/repos/asf/karaf/blob/ea121450/jndi/NOTICE
----------------------------------------------------------------------
diff --git a/jndi/NOTICE b/jndi/NOTICE
index b70f1f9..ae24949 100644
--- a/jndi/NOTICE
+++ b/jndi/NOTICE
@@ -49,7 +49,7 @@ Jasypt (http://jasypt.sourceforge.net/).
Licensed under the Apache License 2.0.
This product uses software developed at
-JLine (http://jline.sourceforge.net).
+JLine (https://github.com/jline/).
Licensed under the BSD License.
This product uses software developed at
http://git-wip-us.apache.org/repos/asf/karaf/blob/ea121450/kar/NOTICE
----------------------------------------------------------------------
diff --git a/kar/NOTICE b/kar/NOTICE
index b70f1f9..ae24949 100644
--- a/kar/NOTICE
+++ b/kar/NOTICE
@@ -49,7 +49,7 @@ Jasypt (http://jasypt.sourceforge.net/).
Licensed under the Apache License 2.0.
This product uses software developed at
-JLine (http://jline.sourceforge.net).
+JLine (https://github.com/jline/).
Licensed under the BSD License.
This product uses software developed at
http://git-wip-us.apache.org/repos/asf/karaf/blob/ea121450/log/NOTICE
----------------------------------------------------------------------
diff --git a/log/NOTICE b/log/NOTICE
index b70f1f9..ae24949 100644
--- a/log/NOTICE
+++ b/log/NOTICE
@@ -49,7 +49,7 @@ Jasypt (http://jasypt.sourceforge.net/).
Licensed under the Apache License 2.0.
This product uses software developed at
-JLine (http://jline.sourceforge.net).
+JLine (https://github.com/jline/).
Licensed under the BSD License.
This product uses software developed at
http://git-wip-us.apache.org/repos/asf/karaf/blob/ea121450/main/NOTICE
----------------------------------------------------------------------
diff --git a/main/NOTICE b/main/NOTICE
index b70f1f9..ae24949 100644
--- a/main/NOTICE
+++ b/main/NOTICE
@@ -49,7 +49,7 @@ Jasypt (http://jasypt.sourceforge.net/).
Licensed under the Apache License 2.0.
This product uses software developed at
-JLine (http://jline.sourceforge.net).
+JLine (https://github.com/jline/).
Licensed under the BSD License.
This product uses software developed at
http://git-wip-us.apache.org/repos/asf/karaf/blob/ea121450/management/server/NOTICE
----------------------------------------------------------------------
diff --git a/management/server/NOTICE b/management/server/NOTICE
index b70f1f9..ae24949 100644
--- a/management/server/NOTICE
+++ b/management/server/NOTICE
@@ -49,7 +49,7 @@ Jasypt (http://jasypt.sourceforge.net/).
Licensed under the Apache License 2.0.
This product uses software developed at
-JLine (http://jline.sourceforge.net).
+JLine (https://github.com/jline/).
Licensed under the BSD License.
This product uses software developed at
http://git-wip-us.apache.org/repos/asf/karaf/blob/ea121450/obr/NOTICE
----------------------------------------------------------------------
diff --git a/obr/NOTICE b/obr/NOTICE
index b70f1f9..ae24949 100644
--- a/obr/NOTICE
+++ b/obr/NOTICE
@@ -49,7 +49,7 @@ Jasypt (http://jasypt.sourceforge.net/).
Licensed under the Apache License 2.0.
This product uses software developed at
-JLine (http://jline.sourceforge.net).
+JLine (https://github.com/jline/).
Licensed under the BSD License.
This product uses software developed at
http://git-wip-us.apache.org/repos/asf/karaf/blob/ea121450/package/NOTICE
----------------------------------------------------------------------
diff --git a/package/NOTICE b/package/NOTICE
index b70f1f9..ae24949 100644
--- a/package/NOTICE
+++ b/package/NOTICE
@@ -49,7 +49,7 @@ Jasypt (http://jasypt.sourceforge.net/).
Licensed under the Apache License 2.0.
This product uses software developed at
-JLine (http://jline.sourceforge.net).
+JLine (https://github.com/jline/).
Licensed under the BSD License.
This product uses software developed at
http://git-wip-us.apache.org/repos/asf/karaf/blob/ea121450/scheduler/NOTICE
----------------------------------------------------------------------
diff --git a/scheduler/NOTICE b/scheduler/NOTICE
index b70f1f9..ae24949 100644
--- a/scheduler/NOTICE
+++ b/scheduler/NOTICE
@@ -49,7 +49,7 @@ Jasypt (http://jasypt.sourceforge.net/).
Licensed under the Apache License 2.0.
This product uses software developed at
-JLine (http://jline.sourceforge.net).
+JLine (https://github.com/jline/).
Licensed under the BSD License.
This product uses software developed at
http://git-wip-us.apache.org/repos/asf/karaf/blob/ea121450/scr/command/NOTICE
----------------------------------------------------------------------
diff --git a/scr/command/NOTICE b/scr/command/NOTICE
index b70f1f9..ae24949 100644
--- a/scr/command/NOTICE
+++ b/scr/command/NOTICE
@@ -49,7 +49,7 @@ Jasypt (http://jasypt.sourceforge.net/).
Licensed under the Apache License 2.0.
This product uses software developed at
-JLine (http://jline.sourceforge.net).
+JLine (https://github.com/jline/).
Licensed under the BSD License.
This product uses software developed at
http://git-wip-us.apache.org/repos/asf/karaf/blob/ea121450/scr/examples/component-factory/NOTICE
----------------------------------------------------------------------
diff --git a/scr/examples/component-factory/NOTICE b/scr/examples/component-factory/NOTICE
index b70f1f9..ae24949 100644
--- a/scr/examples/component-factory/NOTICE
+++ b/scr/examples/component-factory/NOTICE
@@ -49,7 +49,7 @@ Jasypt (http://jasypt.sourceforge.net/).
Licensed under the Apache License 2.0.
This product uses software developed at
-JLine (http://jline.sourceforge.net).
+JLine (https://github.com/jline/).
Licensed under the BSD License.
This product uses software developed at
http://git-wip-us.apache.org/repos/asf/karaf/blob/ea121450/scr/examples/managed-service/NOTICE
----------------------------------------------------------------------
diff --git a/scr/examples/managed-service/NOTICE b/scr/examples/managed-service/NOTICE
index b70f1f9..ae24949 100644
--- a/scr/examples/managed-service/NOTICE
+++ b/scr/examples/managed-service/NOTICE
@@ -49,7 +49,7 @@ Jasypt (http://jasypt.sourceforge.net/).
Licensed under the Apache License 2.0.
This product uses software developed at
-JLine (http://jline.sourceforge.net).
+JLine (https://github.com/jline/).
Licensed under the BSD License.
This product uses software developed at
http://git-wip-us.apache.org/repos/asf/karaf/blob/ea121450/scr/examples/service/NOTICE
----------------------------------------------------------------------
diff --git a/scr/examples/service/NOTICE b/scr/examples/service/NOTICE
index b70f1f9..ae24949 100644
--- a/scr/examples/service/NOTICE
+++ b/scr/examples/service/NOTICE
@@ -49,7 +49,7 @@ Jasypt (http://jasypt.sourceforge.net/).
Licensed under the Apache License 2.0.
This product uses software developed at
-JLine (http://jline.sourceforge.net).
+JLine (https://github.com/jline/).
Licensed under the BSD License.
This product uses software developed at
http://git-wip-us.apache.org/repos/asf/karaf/blob/ea121450/scr/management/NOTICE
----------------------------------------------------------------------
diff --git a/scr/management/NOTICE b/scr/management/NOTICE
index b70f1f9..ae24949 100644
--- a/scr/management/NOTICE
+++ b/scr/management/NOTICE
@@ -49,7 +49,7 @@ Jasypt (http://jasypt.sourceforge.net/).
Licensed under the Apache License 2.0.
This product uses software developed at
-JLine (http://jline.sourceforge.net).
+JLine (https://github.com/jline/).
Licensed under the BSD License.
This product uses software developed at
http://git-wip-us.apache.org/repos/asf/karaf/blob/ea121450/service/core/NOTICE
----------------------------------------------------------------------
diff --git a/service/core/NOTICE b/service/core/NOTICE
index b70f1f9..ae24949 100644
--- a/service/core/NOTICE
+++ b/service/core/NOTICE
@@ -49,7 +49,7 @@ Jasypt (http://jasypt.sourceforge.net/).
Licensed under the Apache License 2.0.
This product uses software developed at
-JLine (http://jline.sourceforge.net).
+JLine (https://github.com/jline/).
Licensed under the BSD License.
This product uses software developed at
http://git-wip-us.apache.org/repos/asf/karaf/blob/ea121450/service/guard/NOTICE
----------------------------------------------------------------------
diff --git a/service/guard/NOTICE b/service/guard/NOTICE
index b70f1f9..ae24949 100644
--- a/service/guard/NOTICE
+++ b/service/guard/NOTICE
@@ -49,7 +49,7 @@ Jasypt (http://jasypt.sourceforge.net/).
Licensed under the Apache License 2.0.
This product uses software developed at
-JLine (http://jline.sourceforge.net).
+JLine (https://github.com/jline/).
Licensed under the BSD License.
This product uses software developed at
http://git-wip-us.apache.org/repos/asf/karaf/blob/ea121450/shell/commands/NOTICE
----------------------------------------------------------------------
diff --git a/shell/commands/NOTICE b/shell/commands/NOTICE
index b70f1f9..ae24949 100644
--- a/shell/commands/NOTICE
+++ b/shell/commands/NOTICE
@@ -49,7 +49,7 @@ Jasypt (http://jasypt.sourceforge.net/).
Licensed under the Apache License 2.0.
This product uses software developed at
-JLine (http://jline.sourceforge.net).
+JLine (https://github.com/jline/).
Licensed under the BSD License.
This product uses software developed at
http://git-wip-us.apache.org/repos/asf/karaf/blob/ea121450/shell/console/NOTICE
----------------------------------------------------------------------
diff --git a/shell/console/NOTICE b/shell/console/NOTICE
index b70f1f9..ae24949 100644
--- a/shell/console/NOTICE
+++ b/shell/console/NOTICE
@@ -49,7 +49,7 @@ Jasypt (http://jasypt.sourceforge.net/).
Licensed under the Apache License 2.0.
This product uses software developed at
-JLine (http://jline.sourceforge.net).
+JLine (https://github.com/jline/).
Licensed under the BSD License.
This product uses software developed at
http://git-wip-us.apache.org/repos/asf/karaf/blob/ea121450/shell/core/NOTICE
----------------------------------------------------------------------
diff --git a/shell/core/NOTICE b/shell/core/NOTICE
index b70f1f9..ae24949 100644
--- a/shell/core/NOTICE
+++ b/shell/core/NOTICE
@@ -49,7 +49,7 @@ Jasypt (http://jasypt.sourceforge.net/).
Licensed under the Apache License 2.0.
This product uses software developed at
-JLine (http://jline.sourceforge.net).
+JLine (https://github.com/jline/).
Licensed under the BSD License.
This product uses software developed at
http://git-wip-us.apache.org/repos/asf/karaf/blob/ea121450/shell/ssh/NOTICE
----------------------------------------------------------------------
diff --git a/shell/ssh/NOTICE b/shell/ssh/NOTICE
index b70f1f9..ae24949 100644
--- a/shell/ssh/NOTICE
+++ b/shell/ssh/NOTICE
@@ -49,7 +49,7 @@ Jasypt (http://jasypt.sourceforge.net/).
Licensed under the Apache License 2.0.
This product uses software developed at
-JLine (http://jline.sourceforge.net).
+JLine (https://github.com/jline/).
Licensed under the BSD License.
This product uses software developed at
http://git-wip-us.apache.org/repos/asf/karaf/blob/ea121450/shell/table/NOTICE
----------------------------------------------------------------------
diff --git a/shell/table/NOTICE b/shell/table/NOTICE
index b70f1f9..ae24949 100644
--- a/shell/table/NOTICE
+++ b/shell/table/NOTICE
@@ -49,7 +49,7 @@ Jasypt (http://jasypt.sourceforge.net/).
Licensed under the Apache License 2.0.
This product uses software developed at
-JLine (http://jline.sourceforge.net).
+JLine (https://github.com/jline/).
Licensed under the BSD License.
This product uses software developed at
http://git-wip-us.apache.org/repos/asf/karaf/blob/ea121450/subsystem/NOTICE
----------------------------------------------------------------------
diff --git a/subsystem/NOTICE b/subsystem/NOTICE
index b70f1f9..ae24949 100644
--- a/subsystem/NOTICE
+++ b/subsystem/NOTICE
@@ -49,7 +49,7 @@ Jasypt (http://jasypt.sourceforge.net/).
Licensed under the Apache License 2.0.
This product uses software developed at
-JLine (http://jline.sourceforge.net).
+JLine (https://github.com/jline/).
Licensed under the BSD License.
This product uses software developed at
http://git-wip-us.apache.org/repos/asf/karaf/blob/ea121450/system/NOTICE
----------------------------------------------------------------------
diff --git a/system/NOTICE b/system/NOTICE
index b70f1f9..ae24949 100644
--- a/system/NOTICE
+++ b/system/NOTICE
@@ -49,7 +49,7 @@ Jasypt (http://jasypt.sourceforge.net/).
Licensed under the Apache License 2.0.
This product uses software developed at
-JLine (http://jline.sourceforge.net).
+JLine (https://github.com/jline/).
Licensed under the BSD License.
This product uses software developed at
http://git-wip-us.apache.org/repos/asf/karaf/blob/ea121450/tooling/karaf-maven-plugin/NOTICE
----------------------------------------------------------------------
diff --git a/tooling/karaf-maven-plugin/NOTICE b/tooling/karaf-maven-plugin/NOTICE
index 7ec727b..20edc73 100644
--- a/tooling/karaf-maven-plugin/NOTICE
+++ b/tooling/karaf-maven-plugin/NOTICE
@@ -49,7 +49,7 @@ Jasypt (http://jasypt.sourceforge.net/).
Licensed under the Apache License 2.0.
This product uses software developed at
-JLine (http://jline.sourceforge.net).
+JLine (https://github.com/jline/).
Licensed under the BSD License.
This product uses software developed at
http://git-wip-us.apache.org/repos/asf/karaf/blob/ea121450/util/NOTICE
----------------------------------------------------------------------
diff --git a/util/NOTICE b/util/NOTICE
index b70f1f9..ae24949 100644
--- a/util/NOTICE
+++ b/util/NOTICE
@@ -49,7 +49,7 @@ Jasypt (http://jasypt.sourceforge.net/).
Licensed under the Apache License 2.0.
This product uses software developed at
-JLine (http://jline.sourceforge.net).
+JLine (https://github.com/jline/).
Licensed under the BSD License.
This product uses software developed at
http://git-wip-us.apache.org/repos/asf/karaf/blob/ea121450/web/NOTICE
----------------------------------------------------------------------
diff --git a/web/NOTICE b/web/NOTICE
index b70f1f9..ae24949 100644
--- a/web/NOTICE
+++ b/web/NOTICE
@@ -49,7 +49,7 @@ Jasypt (http://jasypt.sourceforge.net/).
Licensed under the Apache License 2.0.
This product uses software developed at
-JLine (http://jline.sourceforge.net).
+JLine (https://github.com/jline/).
Licensed under the BSD License.
This product uses software developed at
http://git-wip-us.apache.org/repos/asf/karaf/blob/ea121450/webconsole/console/NOTICE
----------------------------------------------------------------------
diff --git a/webconsole/console/NOTICE b/webconsole/console/NOTICE
index b70f1f9..ae24949 100644
--- a/webconsole/console/NOTICE
+++ b/webconsole/console/NOTICE
@@ -49,7 +49,7 @@ Jasypt (http://jasypt.sourceforge.net/).
Licensed under the Apache License 2.0.
This product uses software developed at
-JLine (http://jline.sourceforge.net).
+JLine (https://github.com/jline/).
Licensed under the BSD License.
This product uses software developed at
http://git-wip-us.apache.org/repos/asf/karaf/blob/ea121450/webconsole/features/NOTICE
----------------------------------------------------------------------
diff --git a/webconsole/features/NOTICE b/webconsole/features/NOTICE
index b70f1f9..ae24949 100644
--- a/webconsole/features/NOTICE
+++ b/webconsole/features/NOTICE
@@ -49,7 +49,7 @@ Jasypt (http://jasypt.sourceforge.net/).
Licensed under the Apache License 2.0.
This product uses software developed at
-JLine (http://jline.sourceforge.net).
+JLine (https://github.com/jline/).
Licensed under the BSD License.
This product uses software developed at
http://git-wip-us.apache.org/repos/asf/karaf/blob/ea121450/webconsole/gogo/NOTICE
----------------------------------------------------------------------
diff --git a/webconsole/gogo/NOTICE b/webconsole/gogo/NOTICE
index b70f1f9..ae24949 100644
--- a/webconsole/gogo/NOTICE
+++ b/webconsole/gogo/NOTICE
@@ -49,7 +49,7 @@ Jasypt (http://jasypt.sourceforge.net/).
Licensed under the Apache License 2.0.
This product uses software developed at
-JLine (http://jline.sourceforge.net).
+JLine (https://github.com/jline/).
Licensed under the BSD License.
This product uses software developed at
http://git-wip-us.apache.org/repos/asf/karaf/blob/ea121450/webconsole/http/NOTICE
----------------------------------------------------------------------
diff --git a/webconsole/http/NOTICE b/webconsole/http/NOTICE
index b70f1f9..ae24949 100644
--- a/webconsole/http/NOTICE
+++ b/webconsole/http/NOTICE
@@ -49,7 +49,7 @@ Jasypt (http://jasypt.sourceforge.net/).
Licensed under the Apache License 2.0.
This product uses software developed at
-JLine (http://jline.sourceforge.net).
+JLine (https://github.com/jline/).
Licensed under the BSD License.
This product uses software developed at
http://git-wip-us.apache.org/repos/asf/karaf/blob/ea121450/webconsole/instance/NOTICE
----------------------------------------------------------------------
diff --git a/webconsole/instance/NOTICE b/webconsole/instance/NOTICE
index b70f1f9..ae24949 100644
--- a/webconsole/instance/NOTICE
+++ b/webconsole/instance/NOTICE
@@ -49,7 +49,7 @@ Jasypt (http://jasypt.sourceforge.net/).
Licensed under the Apache License 2.0.
This product uses software developed at
-JLine (http://jline.sourceforge.net).
+JLine (https://github.com/jline/).
Licensed under the BSD License.
This product uses software developed at
http://git-wip-us.apache.org/repos/asf/karaf/blob/ea121450/wrapper/NOTICE
----------------------------------------------------------------------
diff --git a/wrapper/NOTICE b/wrapper/NOTICE
index b70f1f9..ae24949 100644
--- a/wrapper/NOTICE
+++ b/wrapper/NOTICE
@@ -49,7 +49,7 @@ Jasypt (http://jasypt.sourceforge.net/).
Licensed under the Apache License 2.0.
This product uses software developed at
-JLine (http://jline.sourceforge.net).
+JLine (https://github.com/jline/).
Licensed under the BSD License.
This product uses software developed at
[2/2] karaf git commit: Fix bin/instance shell wrt to jline
Posted by gn...@apache.org.
Fix bin/instance shell wrt to jline
Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/c6d36618
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/c6d36618
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/c6d36618
Branch: refs/heads/master
Commit: c6d366186547020f69f4d49ead6fd330a9873357
Parents: 1e00d82
Author: Guillaume Nodet <gn...@apache.org>
Authored: Mon Nov 14 09:38:34 2016 +0100
Committer: Guillaume Nodet <gn...@apache.org>
Committed: Thu Nov 17 14:59:56 2016 +0100
----------------------------------------------------------------------
.../base/src/main/filtered-resources/resources/bin/instance | 2 +-
.../base/src/main/filtered-resources/resources/bin/instance.bat | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/karaf/blob/c6d36618/assemblies/features/base/src/main/filtered-resources/resources/bin/instance
----------------------------------------------------------------------
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 2daeb15..94126db 100755
--- a/assemblies/features/base/src/main/filtered-resources/resources/bin/instance
+++ b/assemblies/features/base/src/main/filtered-resources/resources/bin/instance
@@ -295,7 +295,7 @@ setupDefaults() {
CLASSPATH="$KARAF_HOME/system/org/apache/karaf/instance/org.apache.karaf.instance.core/@@project.version@@/org.apache.karaf.instance.core-@@project.version@@.jar"
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/jline/jline/@@jline.version@@/jline-@@jline.version@@.jar"
+ CLASSPATH="$CLASSPATH:$KARAF_HOME/system/org/jline/jline/@@jline.version@@/jline-@@jline.version@@.jar"
DEFAULT_JAVA_DEBUG_PORT="5005"
if [ "x$JAVA_DEBUG_PORT" = "x" ]; then
http://git-wip-us.apache.org/repos/asf/karaf/blob/c6d36618/assemblies/features/base/src/main/filtered-resources/resources/bin/instance.bat
----------------------------------------------------------------------
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 ffdece2..e29cc56 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
@@ -142,7 +142,7 @@ goto :EOF
set CLASSPATH=%KARAF_HOME%\system\org\apache\karaf\instance\org.apache.karaf.instance.core\@@project.version@@\org.apache.karaf.instance.core-@@project.version@@.jar
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\jline\jline\@@jline.version@@\jline-@@jline.version@@.jar
+set CLASSPATH=%CLASSPATH%;%KARAF_HOME%\system\org\jline\jline\@@jline.version@@\jline-@@jline.version@@.jar
:EXECUTE
if "%SHIFT%" == "true" SET ARGS=%2 %3 %4 %5 %6 %7 %8