[maven-release-plugin] copy for tag karaf-2.2.6
git-svn-id: https://svn.apache.org/repos/asf/karaf/tags/karaf-2.2.6@1309796 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index a359459..8e7884d 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -85,6 +85,8 @@
* [KARAF-1284] - Karaf bundle archetype maven bundle plugin configuration is missing "instructions" tags.
* [KARAF-1298] - dev:watch does not work in some cases
* [KARAF-1304] - Quick help text for features:info command is erroneous
+ * [KARAF-1318] - User bundles are treated as system bundles
+ * [KARAF-1323] - Testfailures in source package
** Dependency upgrade
* [KARAF-1151] - Upgrade to Spring 3.0.7.RELEASE
diff --git a/assemblies/apache-karaf/src/main/descriptors/unix-src.xml b/assemblies/apache-karaf/src/main/descriptors/unix-src.xml
index a4640ee..a2cf64d 100644
--- a/assemblies/apache-karaf/src/main/descriptors/unix-src.xml
+++ b/assemblies/apache-karaf/src/main/descriptors/unix-src.xml
@@ -54,6 +54,8 @@
<include>**/*.bin</include>
<include>**/*.jnilib</include>
<include>**/*.cert</include>
+ <include>**/*.kar</include>
+ <include>**/*.zip</include>
<include>apache-karaf/src/main/release/bin/*/wrapper</include>
</includes>
<excludes>
diff --git a/assemblies/apache-karaf/src/main/descriptors/windows-src.xml b/assemblies/apache-karaf/src/main/descriptors/windows-src.xml
index 6619259..b032f5d 100644
--- a/assemblies/apache-karaf/src/main/descriptors/windows-src.xml
+++ b/assemblies/apache-karaf/src/main/descriptors/windows-src.xml
@@ -55,6 +55,8 @@
<include>**/*.bin</include>
<include>**/*.jnilib</include>
<include>**/*.cert</include>
+ <include>**/*.kar</include>
+ <include>**/*.zip</include>
<include>apache-karaf/src/main/release/bin/*/wrapper</include>
</includes>
<excludes>
diff --git a/assemblies/apache-karaf/src/main/filtered-resources/etc/config.properties b/assemblies/apache-karaf/src/main/filtered-resources/etc/config.properties
index a74cf7e..e6b0c7d 100644
--- a/assemblies/apache-karaf/src/main/filtered-resources/etc/config.properties
+++ b/assemblies/apache-karaf/src/main/filtered-resources/etc/config.properties
@@ -83,7 +83,7 @@
karaf.auto.start=startup.properties
org.osgi.framework.startlevel.beginning=100
-karaf.startlevel.bundle=60
+karaf.startlevel.bundle=80
karaf.shutdown.port.file=${karaf.data}/port
diff --git a/manual/src/main/webapp/users-guide/provisioning.conf b/manual/src/main/webapp/users-guide/provisioning.conf
index 68a9f8b..a08d249 100644
--- a/manual/src/main/webapp/users-guide/provisioning.conf
+++ b/manual/src/main/webapp/users-guide/provisioning.conf
@@ -104,7 +104,7 @@
*Available since Karaf 2.0*
By default, the bundles deployed through the feature mechanism will have a start-level equals to the value defined in the configuration file {{config.properties}}
-with the variable {{karaf.startlevel.bundle=60}}. This value can be changed using the xml attribute start-level.
+with the variable {{karaf.startlevel.bundle=80}}. This value can be changed using the xml attribute start-level.
{code:xml}
<feature name='my-project' version='1.0.0'>
