Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions assemblies/features/standard/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -462,6 +462,7 @@
<configuration>
<descriptors>
<descriptor>mvn:org.apache.karaf.features/framework/${project.version}/xml/features</descriptor>
<descriptor>mvn:org.ops4j.pax.web/pax-web-features/${pax.web.version}/xml/features</descriptor>
<descriptor>file:${project.build.directory}/feature/feature.xml</descriptor>
</descriptors>
<distribution>org.apache.karaf.features:framework</distribution>
Expand Down
7 changes: 5 additions & 2 deletions assemblies/features/standard/src/main/feature/feature.xml
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,6 @@
-->
<features name="standard-${project.version}" xmlns="http://karaf.apache.org/xmlns/features/v1.3.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://karaf.apache.org/xmlns/features/v1.3.0 http://karaf.apache.org/xmlns/features/v1.3.0">

<repository>mvn:org.ops4j.pax.web/pax-web-features/${pax.web.version}/xml/features</repository>

<feature version="${project.version}" description="OSGi Security for Karaf" name="framework-security">
<bundle start="false" start-level="1">mvn:org.apache.felix/org.apache.felix.framework.security/${felix.framework.security.version}</bundle>
</feature>
Expand Down Expand Up @@ -1674,10 +1672,15 @@ jul.layout.type = simple
</config>
</feature>

<!--

Documentation should be in another feature repo (or not present at all)

<feature name="documentation" description="Documentation of Karaf project in HTML" version="${project.version}">
<feature>pax-web-war</feature>
<bundle>mvn:org.apache.karaf/manual/${project.version}</bundle>
</feature>
-->

<feature name="standard" description="Wrap feature describing all features part of a standard distribution" version="${project.version}">
<feature>pax-url-wrap</feature>
Expand Down