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:02:28 UTC
[1/3] karaf git commit: KARAF-5413 - Added missing version in
features.xml descriptors
Repository: karaf
Updated Branches:
refs/heads/master c77fe2cae -> f56fd1bdf
KARAF-5413 - Added missing version in features.xml descriptors
Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/20f38306
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/20f38306
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/20f38306
Branch: refs/heads/master
Commit: 20f383065ef0c16d68b1a77c1a8e1166c9b286f6
Parents: e5bd746
Author: Paolo Antinori <pa...@redhat.com>
Authored: Mon Oct 9 14:56:07 2017 +0200
Committer: Paolo Antinori <pa...@redhat.com>
Committed: Mon Oct 9 14:56:07 2017 +0200
----------------------------------------------------------------------
assemblies/features/standard/src/main/feature/feature.xml | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/karaf/blob/20f38306/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 487d4ea..5404af0 100644
--- a/assemblies/features/standard/src/main/feature/feature.xml
+++ b/assemblies/features/standard/src/main/feature/feature.xml
@@ -113,7 +113,7 @@
</conditional>
</feature>
- <feature name="jaas-boot" hidden="true">
+ <feature name="jaas-boot" hidden="true" version="${project.version}">
<library export="true" delegate="true" type="boot">
mvn:org.apache.karaf.jaas/org.apache.karaf.jaas.boot/${project.version}
</library>
@@ -560,7 +560,7 @@
<capability>http-service;provider:=felix-httplite</capability>
</feature>
- <feature name="pax-http-service" description="Pax-Web OSGi HTTP Service">
+ <feature name="pax-http-service" description="Pax-Web OSGi HTTP Service" version="${project.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">
+ <feature name="wrap" description="Wrap URL handler" version="${project.version}">
<bundle start="true" start-level="5">mvn:org.ops4j.pax.url/pax-url-wrap/${pax.url.version}/jar/uber</bundle>
</feature>
[2/3] karaf git commit: Merge branch 'KARAF-5413' of
https://github.com/paoloantinori/karaf
Posted by ff...@apache.org.
Merge branch 'KARAF-5413' of https://github.com/paoloantinori/karaf
Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/62e7179e
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/62e7179e
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/62e7179e
Branch: refs/heads/master
Commit: 62e7179e216a01b6ff4a9eb51968a6ef671573f8
Parents: 28415d0 20f3830
Author: Freeman Fang <fr...@gmail.com>
Authored: Thu Oct 12 15:36:07 2017 +0800
Committer: Freeman Fang <fr...@gmail.com>
Committed: Thu Oct 12 15:36:07 2017 +0800
----------------------------------------------------------------------
assemblies/features/standard/src/main/feature/feature.xml | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
[3/3] 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
Conflicts:
assemblies/features/standard/src/main/feature/feature.xml
Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/f56fd1bd
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/f56fd1bd
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/f56fd1bd
Branch: refs/heads/master
Commit: f56fd1bdf126536cf1db1bf504b38214db657908
Parents: 62e7179 c77fe2c
Author: Freeman Fang <fr...@gmail.com>
Authored: Thu Oct 12 16:02:05 2017 +0800
Committer: Freeman Fang <fr...@gmail.com>
Committed: Thu Oct 12 16:02:05 2017 +0800
----------------------------------------------------------------------
.../resources/resources/etc/system.properties | 1 -
.../framework/src/main/feature/feature.xml | 28 ++++++------
.../standard/src/main/feature/feature.xml | 46 ++++++++++----------
.../karaf/features/internal/osgi/Activator.java | 11 +++--
.../core/internal/InstanceServiceImpl.java | 20 ++++++++-
.../features/GenerateDescriptorMojo.java | 3 +-
.../karaf/util/filesstream/FilesStream.java | 3 +-
7 files changed, 65 insertions(+), 47 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/karaf/blob/f56fd1bd/assemblies/features/standard/src/main/feature/feature.xml
----------------------------------------------------------------------
diff --cc assemblies/features/standard/src/main/feature/feature.xml
index 5404af0,f2d7683..4fabaf1
--- a/assemblies/features/standard/src/main/feature/feature.xml
+++ b/assemblies/features/standard/src/main/feature/feature.xml
@@@ -972,8 -972,8 +972,8 @@@
<bundle>mvn:org.apache.aries.blueprint/org.apache.aries.blueprint.webosgi/${aries.blueprint.web.version}</bundle>
</feature>
- <feature name="wrap" description="Wrap URL handler">
+ <feature name="wrap" description="Wrap URL handler" version="${project.version}">
- <bundle start="true" start-level="5">mvn:org.ops4j.pax.url/pax-url-wrap/${pax.url.version}/jar/uber</bundle>
+ <bundle start-level="5">mvn:org.ops4j.pax.url/pax-url-wrap/${pax.url.version}/jar/uber</bundle>
</feature>
<feature name="profile" description="Profiles support" version="${project.version}">