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 2014/03/31 10:39:52 UTC
[1/2] git commit: Use "open" range for features references
Repository: karaf
Updated Branches:
refs/heads/master 74a9c72a8 -> 276e4762c
Use "open" range for features references
Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/93790e17
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/93790e17
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/93790e17
Branch: refs/heads/master
Commit: 93790e1708e92490a91e1be44512bb6bf6fb4cca
Parents: 816d376
Author: Jean-Baptiste Onofré <jb...@apache.org>
Authored: Mon Mar 31 10:37:40 2014 +0200
Committer: Jean-Baptiste Onofré <jb...@apache.org>
Committed: Mon Mar 31 10:37:40 2014 +0200
----------------------------------------------------------------------
.../spring/src/main/feature/feature.xml | 12 ++++----
.../standard/src/main/feature/feature.xml | 32 ++++++++++----------
pom.xml | 1 -
3 files changed, 22 insertions(+), 23 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/karaf/blob/93790e17/assemblies/features/spring/src/main/feature/feature.xml
----------------------------------------------------------------------
diff --git a/assemblies/features/spring/src/main/feature/feature.xml b/assemblies/features/spring/src/main/feature/feature.xml
index 4941592..1547ab4 100644
--- a/assemblies/features/spring/src/main/feature/feature.xml
+++ b/assemblies/features/spring/src/main/feature/feature.xml
@@ -22,7 +22,7 @@
<!-- Spring DM support -->
<feature name="spring-dm" description="Spring DM support" version="${spring.osgi.version}" resolver="(obr)">
- <feature version="[2.5.6,4)">spring</feature>
+ <feature version="[2.5.6,5)">spring</feature>
<bundle dependency="true" start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.cglib/${cglib.bundle.version}</bundle>
<bundle start-level="30">mvn:org.springframework.osgi/spring-osgi-io/${spring.osgi.version}</bundle>
<bundle start-level="30">mvn:org.springframework.osgi/spring-osgi-core/${spring.osgi.version}</bundle>
@@ -33,9 +33,9 @@
</feature>
<feature name="spring-dm-web" description="Spring DM Web support" version="${spring.osgi.version}" resolver="(obr)">
- <feature version="${spring.osgi.version}">spring-dm</feature>
+ <feature>spring-dm</feature>
<feature version="[2.5.6,4)">spring-web</feature>
- <feature version="${http.feature.version}">http</feature>
+ <feature>http</feature>
<bundle start-level="30">mvn:org.springframework.osgi/spring-osgi-web/${spring.osgi.version}</bundle>
</feature>
@@ -106,7 +106,7 @@
<feature name="spring-web" description="Spring 3.1.x Web support" version="${spring31.version}" resolver="(obr)">
<feature version="${spring31.version}">spring</feature>
- <feature version="${http.feature.version}">http</feature>
+ <feature>http</feature>
<bundle start-level="30">mvn:org.springframework/spring-web/${spring31.version}</bundle>
<bundle start-level="30">mvn:org.springframework/spring-webmvc/${spring31.version}</bundle>
</feature>
@@ -183,7 +183,7 @@
<feature name="spring-web" description="Spring 3.2.x Web support" version="${spring32.version}" resolver="(obr)">
<feature version="${spring32.version}">spring</feature>
- <feature version="${http.feature.version}">http</feature>
+ <feature>http</feature>
<bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-web/${spring32.version}</bundle>
<bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-webmvc/${spring32.version}</bundle>
</feature>
@@ -251,7 +251,7 @@
<feature name="spring-web" description="Spring 4.0.x Web support" version="${spring40.version}" resolver="(obr)">
<feature version="${spring40.version}">spring</feature>
- <feature version="${http.feature.version}">http</feature>
+ <feature>http</feature>
<bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-web/${spring40.version}</bundle>
<bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-webmvc/${spring40.version}</bundle>
</feature>
http://git-wip-us.apache.org/repos/asf/karaf/blob/93790e17/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 6371ce3..3fae4aa 100644
--- a/assemblies/features/standard/src/main/feature/feature.xml
+++ b/assemblies/features/standard/src/main/feature/feature.xml
@@ -26,7 +26,7 @@
</feature>
<feature version="${project.version}" description="Services Security for Karaf" name="service-security">
- <feature version="${project.version}">aries-proxy</feature>
+ <feature>aries-proxy</feature>
<bundle start="true" start-level="10">mvn:org.apache.karaf.service/org.apache.karaf.service.guard/${project.version}</bundle>
</feature>
@@ -38,7 +38,7 @@
</feature>
<feature name="aries-blueprint" description="Aries Blueprint" version="${project.version}">
- <feature version="${project.version}">aries-proxy</feature>
+ <feature>aries-proxy</feature>
<bundle start-level="20">mvn:org.apache.aries.blueprint/org.apache.aries.blueprint.api/${aries.blueprint.api.version}</bundle>
<bundle start-level="20">mvn:org.apache.aries.blueprint/org.apache.aries.blueprint.cm/${aries.blueprint.cm.version}</bundle>
<bundle start-level="20">mvn:org.apache.aries.blueprint/org.apache.aries.blueprint.core.compatibility/${aries.blueprint.core.compatibility.version}</bundle>
@@ -50,7 +50,7 @@
</feature>
<feature name="aries-annotation" description="Aries Annotations" version="${project.version}">
- <feature version="${project.version}">aries-blueprint</feature>
+ <feature>aries-blueprint</feature>
<bundle dependency="true" start-level="20">mvn:org.apache.commons/commons-jexl/${commons-jexl.version}</bundle>
<bundle dependency="true" start-level="20">mvn:org.ow2.asm/asm-all/${asm.version}</bundle>
<bundle dependency="true" start-level="20">mvn:org.apache.xbean/xbean-bundleutils/${xbean.version}</bundle>
@@ -71,8 +71,8 @@
</feature>
<feature name="shell-compat" description="Karaf Shell Compatibility" version="${project.version}">
- <feature version="${project.version}">aries-blueprint</feature>
- <feature version="${project.version}">shell</feature>
+ <feature>aries-blueprint</feature>
+ <feature>shell</feature>
<bundle start-level="30">mvn:org.apache.karaf.shell/org.apache.karaf.shell.console/${project.version}</bundle>
<bundle start-level="30">mvn:org.apache.karaf.shell/org.apache.karaf.shell.table/${project.version}</bundle>
</feature>
@@ -101,11 +101,11 @@
<bundle start-level="30">mvn:org.apache.karaf.wrapper/org.apache.karaf.wrapper.command/${project.version}</bundle>
</feature>
<feature name="service-wrapper" description="Provide OS integration (alias to wrapper feature)" version="${project.version}">
- <feature version="${project.version}">wrapper</feature>
+ <feature>wrapper</feature>
</feature>
<feature name="obr" description="Provide OSGi Bundle Repository (OBR) support" version="${project.version}">
- <feature version="${project.version}">aries-blueprint</feature>
+ <feature>aries-blueprint</feature>
<bundle start-level="30">mvn:org.apache.felix/org.osgi.service.obr/${felix.obr.version}</bundle>
<bundle start-level="30">mvn:org.apache.felix/org.apache.felix.bundlerepository/${felix.bundlerepository.version}</bundle>
<bundle start-level="30">mvn:org.apache.karaf.obr/org.apache.karaf.obr.core/${project.version}</bundle>
@@ -171,19 +171,19 @@
</feature>
<feature name="http" version="${project.version}" resolver="(obr)" description="Implementation of the OSGI HTTP Service">
- <feature version="${pax.web.version}">pax-http</feature>
+ <feature>pax-http</feature>
<bundle start-level="30">mvn:org.apache.karaf.http/org.apache.karaf.http.core/${project.version}</bundle>
<bundle start-level="30">mvn:org.apache.karaf.http/org.apache.karaf.http.command/${project.version}</bundle>
</feature>
<feature name="http-whiteboard" description="Provide HTTP Whiteboard pattern support" version="${project.version}" resolver="(obr)">
- <feature version="${project.version}">http</feature>
- <feature version="${pax.web.version}">pax-http-whiteboard</feature>
+ <feature>http</feature>
+ <feature>pax-http-whiteboard</feature>
</feature>
<feature name="war" description="Turn Karaf as a full WebContainer" version="${project.version}" resolver="(obr)">
- <feature version="${project.version}">http</feature>
- <feature version="${pax.web.version}">pax-war</feature>
+ <feature>http</feature>
+ <feature>pax-war</feature>
<bundle start-level="30">mvn:org.apache.karaf.web/org.apache.karaf.web.core/${project.version}</bundle>
<bundle start-level="30">mvn:org.apache.karaf.web/org.apache.karaf.web.command/${project.version}</bundle>
</feature>
@@ -201,7 +201,7 @@
<config name="org.apache.karaf.webconsole">
realm=karaf
</config>
- <feature version="${http.feature.version}">http</feature>
+ <feature>http</feature>
<bundle start-level="30">mvn:org.apache.felix/org.apache.felix.metatype/${felix.metatype.version}</bundle>
<bundle start-level="30">mvn:org.apache.karaf.webconsole/org.apache.karaf.webconsole.branding/${project.version}</bundle>
<bundle start-level="30">mvn:org.apache.karaf.webconsole/org.apache.karaf.webconsole.console/${project.version}</bundle>
@@ -229,15 +229,15 @@
sshRealm=karaf
hostKey=${karaf.etc}/host.key
</config>
- <feature version="${project.version}">shell</feature>
- <feature version="${project.version}">jaas</feature>
+ <feature>shell</feature>
+ <feature>jaas</feature>
<bundle start="true" start-level="30">mvn:org.apache.mina/mina-core/${mina.version}</bundle>
<bundle start="true" start-level="30">mvn:org.apache.sshd/sshd-core/${sshd.version}</bundle>
<bundle start="true" start-level="30">mvn:org.apache.karaf.shell/org.apache.karaf.shell.ssh/${project.version}</bundle>
</feature>
<feature name="management" description="Provide a JMX MBeanServer and a set of MBeans in Karaf" version="${project.version}">
- <feature version="${project.version}">jaas</feature>
+ <feature>jaas</feature>
<bundle dependency="true" start-level="20">mvn:org.apache.aries/org.apache.aries.util/${aries.util.version}</bundle>
<bundle start-level="30">mvn:org.apache.karaf.management/org.apache.karaf.management.server/${project.version}</bundle>
<bundle start-level="30">mvn:org.apache.aries.jmx/org.apache.aries.jmx.api/${aries.jmx.api.version}</bundle>
http://git-wip-us.apache.org/repos/asf/karaf/blob/93790e17/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 3f6e3fb..5bfeb7b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -249,7 +249,6 @@
<xbean.version>3.16</xbean.version>
<xerces.version>2.11.0</xerces.version>
<javax.mail.version>1.4.5</javax.mail.version>
- <http.feature.version>[4,5)</http.feature.version>
<weld.version>2.1.1.Final</weld.version>
<!-- Furter used maven plugin versions; e.g. in the docs -->
[2/2] git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/karaf
Posted by jb...@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/276e4762
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/276e4762
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/276e4762
Branch: refs/heads/master
Commit: 276e4762cfb07ceac0eb67a0d02555db0d92eb38
Parents: 93790e1 74a9c72
Author: Jean-Baptiste Onofré <jb...@apache.org>
Authored: Mon Mar 31 10:39:27 2014 +0200
Committer: Jean-Baptiste Onofré <jb...@apache.org>
Committed: Mon Mar 31 10:39:27 2014 +0200
----------------------------------------------------------------------
manual/src/main/webapp/users-guide/ejb.conf | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------