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 2015/06/17 07:56:39 UTC
karaf git commit: [KARAF-3785] Remove comment from jledit loader
Repository: karaf
Updated Branches:
refs/heads/karaf-2.x 7fbefe3ed -> 6740a8db4
[KARAF-3785] Remove comment from jledit loader
Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/6740a8db
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/6740a8db
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/6740a8db
Branch: refs/heads/karaf-2.x
Commit: 6740a8db436cf55d9394429574793198d460cb39
Parents: 7fbefe3
Author: Jean-Baptiste Onofré <jb...@apache.org>
Authored: Wed Jun 17 07:55:40 2015 +0200
Committer: Jean-Baptiste Onofré <jb...@apache.org>
Committed: Wed Jun 17 07:55:40 2015 +0200
----------------------------------------------------------------------
pom.xml | 2 ++
.../resources/META-INF/services/org/jledit/simple | 16 ----------------
2 files changed, 2 insertions(+), 16 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/karaf/blob/6740a8db/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 7431fe6..bc25114 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1674,6 +1674,8 @@
<exclude>**/*.conf</exclude>
<!-- SSH keys -->
<exclude>**/*.key</exclude>
+ <!-- JLEdit loader -->
+ <exclude>**/org/jledit/simple</exclude>
</excludes>
</configuration>
</plugin>
http://git-wip-us.apache.org/repos/asf/karaf/blob/6740a8db/shell/console/src/main/resources/META-INF/services/org/jledit/simple
----------------------------------------------------------------------
diff --git a/shell/console/src/main/resources/META-INF/services/org/jledit/simple b/shell/console/src/main/resources/META-INF/services/org/jledit/simple
index 29939ba..9e58ccc 100644
--- a/shell/console/src/main/resources/META-INF/services/org/jledit/simple
+++ b/shell/console/src/main/resources/META-INF/services/org/jledit/simple
@@ -1,17 +1 @@
-##---------------------------------------------------------------------------
-## Licensed to the Apache Software Foundation (ASF) under one or more
-## contributor license agreements. See the NOTICE file distributed with
-## this work for additional information regarding copyright ownership.
-## The ASF licenses this file to You under the Apache License, Version 2.0
-## (the "License"); you may not use this file except in compliance with
-## the License. You may obtain a copy of the License at
-##
-## http://www.apache.org/licenses/LICENSE-2.0
-##
-## Unless required by applicable law or agreed to in writing, software
-## distributed under the License is distributed on an "AS IS" BASIS,
-## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-## See the License for the specific language governing permissions and
-## limitations under the License.
-##---------------------------------------------------------------------------
org.jledit.simple.SimpleConsoleEditor
\ No newline at end of file