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 2020/12/30 16:17:18 UTC
[karaf] branch master updated: [KARAF-6904] Use pax-url-classpath
and pax-url-wrap feature names
This is an automated email from the ASF dual-hosted git repository.
jbonofre pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/karaf.git
The following commit(s) were added to refs/heads/master by this push:
new 63264cd [KARAF-6904] Use pax-url-classpath and pax-url-wrap feature names
new 6fef62c Merge pull request #1286 from jbonofre/KARAF-6904
63264cd is described below
commit 63264cd300b3352d165614a8ded3dd80df9e81ad
Author: jbonofre <jb...@apache.org>
AuthorDate: Wed Dec 30 08:09:11 2020 +0100
[KARAF-6904] Use pax-url-classpath and pax-url-wrap feature names
---
assemblies/features/enterprise/src/main/feature/feature.xml | 2 +-
assemblies/features/framework/src/main/feature/feature.xml | 4 ++--
.../features/spring-legacy/src/main/feature/feature.xml | 4 ++--
assemblies/features/standard/src/main/feature/feature.xml | 12 ++++++++----
4 files changed, 13 insertions(+), 9 deletions(-)
diff --git a/assemblies/features/enterprise/src/main/feature/feature.xml b/assemblies/features/enterprise/src/main/feature/feature.xml
index 7675554..93e93af 100644
--- a/assemblies/features/enterprise/src/main/feature/feature.xml
+++ b/assemblies/features/enterprise/src/main/feature/feature.xml
@@ -163,7 +163,7 @@ com.atomikos.icatch.log_base_dir=${karaf.data}/atomikos
<feature name="hibernate" description="Hibernate JPA engine support" version="${hibernate.version}">
<!-- hibernate-orm feature installs osgi.core and osgi.compendium bundle (it should not), causing huge refresh -->
- <feature prerequisite="true">wrap</feature>
+ <feature prerequisite="true">pax-url-wrap</feature>
<feature>transaction-api</feature>
<feature>aries-blueprint</feature>
<bundle>mvn:org.jboss.logging/jboss-logging/3.3.2.Final</bundle>
diff --git a/assemblies/features/framework/src/main/feature/feature.xml b/assemblies/features/framework/src/main/feature/feature.xml
index ab7fff4..98ae97e 100644
--- a/assemblies/features/framework/src/main/feature/feature.xml
+++ b/assemblies/features/framework/src/main/feature/feature.xml
@@ -24,7 +24,7 @@
<feature version="${project.version}" description="Karaf core feature" name="framework" hidden="true">
<!-- persistent wiring extension -->
<bundle start-level="1">mvn:org.apache.karaf.features/org.apache.karaf.features.extension/${project.version}</bundle>
- <!-- mvn: and wrap: url handlers -->
+ <!-- mvn: url handlers -->
<bundle start-level="5">mvn:org.ops4j.pax.url/pax-url-aether/${pax.url.version}</bundle>
<!-- logging -->
<bundle start-level="8">mvn:org.ops4j.pax.logging/pax-logging-api/${pax.logging.version}</bundle>
@@ -50,7 +50,7 @@
<feature version="${project.version}" description="Karaf core feature" name="framework-logback" hidden="true">
<!-- persistent wiring extension -->
<bundle start-level="1">mvn:org.apache.karaf.features/org.apache.karaf.features.extension/${project.version}</bundle>
- <!-- mvn: and wrap: url handlers -->
+ <!-- mvn: url handlers -->
<bundle start-level="5">mvn:org.ops4j.pax.url/pax-url-aether/${pax.url.version}</bundle>
<!-- logging -->
<bundle start-level="8">mvn:org.ops4j.pax.logging/pax-logging-api/${pax.logging.version}</bundle>
diff --git a/assemblies/features/spring-legacy/src/main/feature/feature.xml b/assemblies/features/spring-legacy/src/main/feature/feature.xml
index f5790af..8bcea4e 100644
--- a/assemblies/features/spring-legacy/src/main/feature/feature.xml
+++ b/assemblies/features/spring-legacy/src/main/feature/feature.xml
@@ -120,7 +120,7 @@
</feature>
<feature name="spring-web-portlet" description="Spring 3.1.x Web Portlet support" version="${spring31.version}">
- <feature prerequisite="true">wrap</feature>
+ <feature prerequisite="true">pax-url-wrap</feature>
<feature version="[${spring31.version},3.2)">spring-web</feature>
<bundle dependency="true" start-level="30">wrap:mvn:javax.portlet/portlet-api/${portlet-api.version}$Export-Package=javax.portlet.*;version=2.0</bundle>
<bundle start-level="30">mvn:org.springframework/spring-webmvc-portlet/${spring31.version}</bundle>
@@ -197,7 +197,7 @@
</feature>
<feature name="spring-web-portlet" description="Spring 4.3.x Web Portlet support" version="${spring43.version}">
- <feature prerequisite="true">wrap</feature>
+ <feature prerequisite="true">pax-url-wrap</feature>
<feature version="[${spring43.version},4.4)">spring-web</feature>
<bundle dependency="true" start-level="30">wrap:mvn:javax.portlet/portlet-api/${portlet-api.version}$Export-Package=javax.portlet.*;version=2.0</bundle>
<bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-webmvc-portlet/${spring43.version}</bundle>
diff --git a/assemblies/features/standard/src/main/feature/feature.xml b/assemblies/features/standard/src/main/feature/feature.xml
index 8734a1b..d026faa 100644
--- a/assemblies/features/standard/src/main/feature/feature.xml
+++ b/assemblies/features/standard/src/main/feature/feature.xml
@@ -391,7 +391,7 @@ completionMode = GLOBAL
<feature name="deployer" description="Karaf Deployer" version="${project.version}">
<bundle start-level="26">mvn:org.apache.karaf.deployer/org.apache.karaf.deployer.features/${project.version}</bundle>
<conditional>
- <condition>wrap</condition>
+ <condition>pax-url-wrap</condition>
<bundle start-level="24">mvn:org.apache.karaf.deployer/org.apache.karaf.deployer.wrap/${project.version}</bundle>
</conditional>
<conditional>
@@ -1472,11 +1472,15 @@ org.apache.felix.eventadmin.AddSubject=true
<requirement>osgi.implementation;osgi.implementation="osgi.http";version:Version="1.1"</requirement>
</feature>
- <feature name="wrap" description="Wrap URL handler" version="${pax.url.version}">
+ <feature name="pax-url-wrap" description="Wrap URL handler" version="${pax.url.version}">
<bundle start-level="10">mvn:org.ops4j.pax.url/pax-url-wrap/${pax.url.version}/jar/uber</bundle>
</feature>
- <feature name="classpath" description="Classpath URL handler" version="${pax.url.version}">
+ <feature name="wrap" description="Transition feature to pax-url-wrap" version="${pax.url.version}">
+ <feature version="${pax.url.version}">pax-url-wrap</feature>
+ </feature>
+
+ <feature name="pax-url-classpath" description="Classpath URL handler" version="${pax.url.version}">
<bundle start-level="10">mvn:org.ops4j.pax.url/pax-url-classpath/${pax.url.version}</bundle>
</feature>
@@ -1654,7 +1658,7 @@ jul.layout.type = simple
</feature>
<feature name="standard" description="Wrap feature describing all features part of a standard distribution" version="${project.version}">
- <feature>wrap</feature>
+ <feature>pax-url-wrap</feature>
<feature>shell</feature>
<feature>shell-compat</feature>
<feature>feature</feature>