You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by ff...@apache.org on 2017/10/12 08:50:53 UTC
[1/2] karaf git commit: [KARAF-5413]revise the wrap/pax-http-service
feature version to the pax version
Repository: karaf
Updated Branches:
refs/heads/master e7ca1e209 -> 01ca22e97
[KARAF-5413]revise the wrap/pax-http-service feature version to the pax version
Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/51c32b72
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/51c32b72
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/51c32b72
Branch: refs/heads/master
Commit: 51c32b723fbd82f02de9941d134e7c5386e0193a
Parents: f56fd1b
Author: Freeman Fang <fr...@gmail.com>
Authored: Thu Oct 12 16:50:02 2017 +0800
Committer: Freeman Fang <fr...@gmail.com>
Committed: Thu Oct 12 16:50:02 2017 +0800
----------------------------------------------------------------------
assemblies/features/standard/src/main/feature/feature.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/karaf/blob/51c32b72/assemblies/features/standard/src/main/feature/feature.xml
----------------------------------------------------------------------
diff --git a/assemblies/features/standard/src/main/feature/feature.xml b/assemblies/features/standard/src/main/feature/feature.xml
index 4fabaf1..d785e80 100644
--- a/assemblies/features/standard/src/main/feature/feature.xml
+++ b/assemblies/features/standard/src/main/feature/feature.xml
@@ -560,7 +560,7 @@
<capability>http-service;provider:=felix-httplite</capability>
</feature>
- <feature name="pax-http-service" description="Pax-Web OSGi HTTP Service" version="${project.version}">
+ <feature name="pax-http-service" description="Pax-Web OSGi HTTP Service" version="${pax.web.version}">
<feature>pax-http</feature>
<bundle start-level="30">mvn:org.apache.karaf.http/org.apache.karaf.http.core/${project.version}</bundle>
<capability>http-service;provider:=pax-http</capability>
@@ -972,7 +972,7 @@
<bundle>mvn:org.apache.aries.blueprint/org.apache.aries.blueprint.webosgi/${aries.blueprint.web.version}</bundle>
</feature>
- <feature name="wrap" description="Wrap URL handler" version="${project.version}">
+ <feature name="wrap" description="Wrap URL handler" version="${pax.url.version}">
<bundle start-level="5">mvn:org.ops4j.pax.url/pax-url-wrap/${pax.url.version}/jar/uber</bundle>
</feature>
[2/2] karaf git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/karaf
Posted by ff...@apache.org.
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 <fr...@gmail.com>
Authored: Thu Oct 12 16:50:27 2017 +0800
Committer: Freeman Fang <fr...@gmail.com>
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(-)
----------------------------------------------------------------------