Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/karaf
Project: http://git-wip-us.apache.org/repos/asf/karaf/repo Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/01ca22e9 Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/01ca22e9 Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/01ca22e9 Branch: refs/heads/master Commit: 01ca22e97802538ec037759daf9b46a080543807 Parents: 51c32b7 e7ca1e2 Author: Freeman Fang <[email protected]> Authored: Thu Oct 12 16:50:27 2017 +0800 Committer: Freeman Fang <[email protected]> Committed: Thu Oct 12 16:50:27 2017 +0800 ---------------------------------------------------------------------- assemblies/apache-karaf-minimal/pom.xml | 30 +-- assemblies/apache-karaf/pom.xml | 20 +- assemblies/features/base/pom.xml | 10 - .../main/filtered-resources/resources/bin/karaf | 6 - .../filtered-resources/resources/bin/karaf.bat | 2 - .../main/resources/resources/lib/boot/README | 21 -- .../resources/resources/lib/endorsed/README | 23 --- assemblies/features/framework/pom.xml | 5 - exception/NOTICE | 67 ------- exception/pom.xml | 38 ---- .../src/main/java/java/lang/Exception.java | 194 ------------------- .../java/org/apache/karaf/itests/JmsTest.java | 2 +- .../itests/features/StandardFeaturesTest.java | 2 - .../apache/karaf/itests/features/XATest.java | 1 + .../asciidoc/user-guide/os-integration.adoc | 2 - pom.xml | 6 - .../apache/karaf/profile/assembly/Builder.java | 4 + .../resources/META-INF/plexus/components.xml | 2 + .../wrapper/internal/unix/karaf-wrapper.conf | 4 +- .../wrapper/internal/windows/karaf-wrapper.conf | 4 +- .../internal/windows64/karaf-wrapper.conf | 4 +- 21 files changed, 31 insertions(+), 416 deletions(-) ----------------------------------------------------------------------
