BUG-8258: Bump karaf 4.1.2

This is a straightforward upgrade from 4.0.9 to 4.1.2 and will need
to be updated to 4.1.3.

Change-Id: I9275dd42e53dec3e46bc169b6aafb5cb75b40753
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
Signed-off-by: Stephen Kitt <skitt@redhat.com>

diff --git a/feature-repo-parent/pom.xml b/feature-repo-parent/pom.xml
index 33658154b697977b06b923a70b1cb9a3853e0eac..a807ccea3c419601053d77e10accd6de781b0c58 100644 (file)
--- a/feature-repo-parent/pom.xml
+++ b/feature-repo-parent/pom.xml
@@ -100,6 +100,9 @@
                 <artifactId>karaf-maven-plugin</artifactId>
                 <version>${karaf.plugin.version}</version>
                 <extensions>true</extensions>
+                <configuration>
+                    <enableGeneration>true</enableGeneration>
+                </configuration>
             </plugin>
         </plugins>
     </build>

diff --git a/karaf/opendaylight-karaf-resources/pom.xml b/karaf/opendaylight-karaf-resources/pom.xml
index 0b7775fa1e7c544151d3a4725dc6c70e32b7936c..ef043e4f51dc4277e5b0064d7983fb5b72520419 100644 (file)
--- a/karaf/opendaylight-karaf-resources/pom.xml
+++ b/karaf/opendaylight-karaf-resources/pom.xml
@@ -66,6 +66,11 @@
                        failonerror="true" ignorewhitespace="true"/>
                 <copy file="${project.build.directory}/assembly/bin/instance.bat"
                       tofile="${project.build.directory}/classes/bin/instance.bat"/>
+                <patch patchfile="${project.basedir}/src/main/patches/karaf-inc-${karaf.version}.patch"
+                       originalfile="${project.build.directory}/assembly/bin/inc"
+                       failonerror="true"/>
+                <copy file="${project.build.directory}/assembly/bin/inc"
+                      tofile="${project.build.directory}/classes/bin/inc"/>
                 <patch patchfile="${project.basedir}/src/main/patches/karaf-karaf-${karaf.version}.patch"
                        originalfile="${project.build.directory}/assembly/bin/karaf"
                        failonerror="true"/>
@@ -95,10 +100,10 @@
                 <copy file="${project.build.directory}/assembly/system/org/apache/karaf/features/standard/${karaf.version}/standard-${karaf.version}-features.xml"
                       tofile="${project.build.directory}/classes/system/org/apache/karaf/features/standard/${karaf.version}/standard-${karaf.version}-features.xml"/>
                 <patch patchfile="${project.basedir}/src/main/patches/karaf-paxweb.patch"
-                       originalfile="${project.build.directory}/assembly/system/org/ops4j/pax/web/pax-web-features/4.3.4/pax-web-features-4.3.4-features.xml"
+                       originalfile="${project.build.directory}/assembly/system/org/ops4j/pax/web/pax-web-features/6.0.6/pax-web-features-6.0.6-features.xml"
                        failonerror="true"/>
-                <copy file="${project.build.directory}/assembly/system/org/ops4j/pax/web/pax-web-features/4.3.4/pax-web-features-4.3.4-features.xml"
-                      tofile="${project.build.directory}/classes/system/org/ops4j/pax/web/pax-web-features/4.3.4/pax-web-features-4.3.4-features.xml"/>
+                <copy file="${project.build.directory}/assembly/system/org/ops4j/pax/web/pax-web-features/6.0.6/pax-web-features-6.0.6-features.xml"
+                      tofile="${project.build.directory}/classes/system/org/ops4j/pax/web/pax-web-features/6.0.6/pax-web-features-6.0.6-features.xml"/>
                 <patch patchfile="${project.basedir}/src/main/patches/karaf-etc-startup-properties-${karaf.version}.patch"
                        originalfile="${project.build.directory}/assembly/etc/startup.properties"
                        failonerror="true"/>

diff --git a/karaf/opendaylight-karaf-resources/src/main/patches/karaf-etc-startup-properties-4.0.10.patch b/karaf/opendaylight-karaf-resources/src/main/patches/karaf-etc-startup-properties-4.1.2.patch
similarity index 74%
rename from karaf/opendaylight-karaf-resources/src/main/patches/karaf-etc-startup-properties-4.0.10.patch
rename to karaf/opendaylight-karaf-resources/src/main/patches/karaf-etc-startup-properties-4.1.2.patch
index c23384e5e09df24ecfd7e163e96d67987004081a..ad4e89b0d0fceae4f3d0eb6cc022f542d369f70a 100644 (file)
--- a/karaf/opendaylight-karaf-resources/src/main/patches/karaf-etc-startup-properties-4.0.10.patch
+++ b/karaf/opendaylight-karaf-resources/src/main/patches/karaf-etc-startup-properties-4.1.2.patch
@@ -1,9 +1,9 @@
 --- startup.properties.orig    2017-06-01 19:30:31.926891539 +0200
 +++ startup.properties 2017-06-01 19:36:06.666646203 +0200
 @@ -7,3 +8,6 @@
- mvn\:org.apache.felix/org.apache.felix.fileinstall/3.5.8 = 11
- mvn\:org.ops4j.pax.url/pax-url-aether/2.5.2 = 5
- mvn\:org.apache.karaf.features/org.apache.karaf.features.core/4.0.10 = 15
+ mvn\:org.apache.felix/org.apache.felix.configadmin/1.8.14 = 10
+ mvn\:org.apache.felix/org.apache.felix.fileinstall/3.6.0 = 11
+ mvn\:org.apache.karaf.features/org.apache.karaf.features.core/4.1.2 = 15
 +mvn\:org.osgi/org.osgi.service.event/1.3.1 = 7
 +mvn\:org.bouncycastle/bcprov-jdk15on/1.58 = 14
 +mvn\:org.bouncycastle/bcprov-ext-jdk15on/1.58 = 14

diff --git a/karaf/opendaylight-karaf-resources/src/main/patches/karaf-inc-4.1.2.patch b/karaf/opendaylight-karaf-resources/src/main/patches/karaf-inc-4.1.2.patch
new file mode 100644 (file)
index 0000000..3ee6879
--- /dev/null
+++ b/karaf/opendaylight-karaf-resources/src/main/patches/karaf-inc-4.1.2.patch
@@ -0,0 +1,31 @@
+--- /home/nite/odl/odlparent/karaf/opendaylight-karaf-resources/target/assembly/bin/inc.orig   2017-09-19 11:49:03.217548319 +0200
++++ /home/nite/odl/odlparent/karaf/opendaylight-karaf-resources/target/assembly/bin/inc        2017-09-19 11:50:32.797822567 +0200
+@@ -257,6 +257,7 @@
+     fi
+ 
+     DEFAULT_JAVA_OPTS="-Xms${JAVA_MIN_MEM} -Xmx${JAVA_MAX_MEM} -XX:+UnlockDiagnosticVMOptions "
++    DEFAULT_JAVA_OPTS="$DEFAULT_JAVA_OPTS -XX:+HeapDumpOnOutOfMemoryError"
+ 
+     #Set the JVM_VENDOR specific JVM flags
+     if [ "${JVM_VENDOR}" = "SUN" ]; then
+@@ -285,6 +286,13 @@
+         fi
+     fi
+ 
++    # Add default security file option
++    if [ "x$ODL_JAVA_SECURITY_PROPERTIES" != "x" ]; then
++        DEFAULT_JAVA_OPTS="-Djava.security.properties="${ODL_JAVA_SECURITY_PROPERTIES}" $DEFAULT_JAVA_OPTS"
++    else
++        DEFAULT_JAVA_OPTS="-Djava.security.properties="${KARAF_ETC}/odl.java.security" $DEFAULT_JAVA_OPTS"
++    fi
++
+     DEFAULT_JAVA_DEBUG_PORT="5005"
+     if [ "x${JAVA_DEBUG_PORT}" = "x" ]; then
+         JAVA_DEBUG_PORT="${DEFAULT_JAVA_DEBUG_PORT}"
+@@ -316,4 +324,4 @@
+             CLASSPATH=$(cygpath --path --windows "${CLASSPATH}")
+         fi
+     fi
+-}
+\ No newline at end of file
++}

diff --git a/karaf/opendaylight-karaf-resources/src/main/patches/karaf-javax-mail-4.0.10.patch b/karaf/opendaylight-karaf-resources/src/main/patches/karaf-javax-mail-4.0.10.patch
deleted file mode 100644 (file)
index d9bfdde..0000000
--- a/karaf/opendaylight-karaf-resources/src/main/patches/karaf-javax-mail-4.0.10.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- system/org/apache/karaf/features/standard/4.0.10/standard-4.0.10-features.xml      2017-02-13 15:13:43.895825491 +0100
-+++ system/org/apache/karaf/features/standard/4.0.10/standard-4.0.10-features.xml      2017-02-13 15:40:10.593825491 +0100
-@@ -316,7 +316,7 @@
-     <feature name="jetty" version="8.1.14.v20131031">
-         <bundle start-level="30" dependency="true">mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.activation-api-1.1/2.7.0</bundle>
-         <bundle start-level="30" dependency="true">mvn:javax.servlet/javax.servlet-api/3.1.0</bundle>
--        <bundle start-level="30" dependency="true">mvn:javax.mail/mail/1.4.5</bundle>
-+        <bundle start-level="30" dependency="true">mvn:javax.mail/mail/1.4.4</bundle>
-         <bundle start-level="30" dependency="true">mvn:org.apache.geronimo.specs/geronimo-jta_1.1_spec/1.1.1</bundle>
-         <bundle start-level="30" dependency="true">mvn:org.apache.geronimo.specs/geronimo-annotation_1.1_spec/1.0.1</bundle>
-         <bundle start-level="30" dependency="true">mvn:org.apache.geronimo.specs/geronimo-jaspic_1.0_spec/1.1</bundle>

diff --git a/karaf/opendaylight-karaf-resources/src/main/patches/karaf-javax-mail-4.1.2.patch b/karaf/opendaylight-karaf-resources/src/main/patches/karaf-javax-mail-4.1.2.patch
new file mode 100644 (file)
index 0000000..e57a527
--- /dev/null
+++ b/karaf/opendaylight-karaf-resources/src/main/patches/karaf-javax-mail-4.1.2.patch
@@ -0,0 +1,11 @@
+--- system/org/apache/karaf/features/standard/4.0.9/standard-4.0.9-features.xml        2017-02-13 15:13:43.895825491 +0100
++++ system/org/apache/karaf/features/standard/4.0.9/standard-4.0.9-features.xml        2017-02-13 15:40:10.593825491 +0100
+@@ -316,7 +316,7 @@
+     <feature name="jetty" version="8.1.14.v20131031">
+         <bundle dependency="true" start-level="30">mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.activation-api-1.1/2.9.0</bundle>
+         <bundle dependency="true" start-level="30">mvn:javax.servlet/javax.servlet-api/3.1.0</bundle>
+-        <bundle dependency="true" start-level="30">mvn:javax.mail/mail/1.4.5</bundle>
++        <bundle dependency="true" start-level="30">mvn:javax.mail/mail/1.4.4</bundle>
+         <bundle dependency="true" start-level="30">mvn:org.apache.geronimo.specs/geronimo-jta_1.1_spec/1.1.1</bundle>
+         <bundle dependency="true" start-level="30">mvn:org.apache.geronimo.specs/geronimo-annotation_1.1_spec/1.0.1</bundle>
+         <bundle dependency="true" start-level="30">mvn:org.apache.geronimo.specs/geronimo-jaspic_1.0_spec/1.1</bundle>

diff --git a/karaf/opendaylight-karaf-resources/src/main/patches/karaf-karaf-4.0.10.patch b/karaf/opendaylight-karaf-resources/src/main/patches/karaf-karaf-4.1.2.patch
similarity index 50%
rename from karaf/opendaylight-karaf-resources/src/main/patches/karaf-karaf-4.0.10.patch
rename to karaf/opendaylight-karaf-resources/src/main/patches/karaf-karaf-4.1.2.patch
index 105060fe5d32c90723902c5e0a7714f6dbeaaa5d..da1e0d8cea5b02f49c08f264fb843c889f94600a 100644 (file)
--- a/karaf/opendaylight-karaf-resources/src/main/patches/karaf-karaf-4.0.10.patch
+++ b/karaf/opendaylight-karaf-resources/src/main/patches/karaf-karaf-4.1.2.patch
@@ -1,39 +1,6 @@
---- bin/karaf.orig     2017-04-07 10:30:36.660612690 +0200
-+++ bin/karaf  2017-04-07 10:52:05.728046790 +0200
-@@ -260,8 +260,8 @@
-     if [ "x${VERSION}" = "x" ]; then
-        VERSION=90
-     fi
--    if [ "${VERSION}" -lt "60" ]; then
--        echo "JVM must be greater than 1.6"
-+    if [ "${VERSION}" -lt "80" ]; then
-+        echo "JVM must be greater than 1.8"
-         exit 1;
-     fi
- }
-@@ -300,6 +300,7 @@
- 
- setupDefaults() {
-     DEFAULT_JAVA_OPTS="-Xms${JAVA_MIN_MEM} -Xmx${JAVA_MAX_MEM} -XX:+UnlockDiagnosticVMOptions -XX:+UnsyncloadClass "
-+    DEFAULT_JAVA_OPTS="$DEFAULT_JAVA_OPTS -XX:+HeapDumpOnOutOfMemoryError"
- 
-     #Set the JVM_VENDOR specific JVM flags
-     if [ "${JVM_VENDOR}" = "SUN" ]; then
-@@ -328,6 +329,13 @@
-         fi
-     fi
- 
-+    # Add default security file option
-+    if [ "x$ODL_JAVA_SECURITY_PROPERTIES" != "x" ]; then
-+        DEFAULT_JAVA_OPTS="-Djava.security.properties="${ODL_JAVA_SECURITY_PROPERTIES}" $DEFAULT_JAVA_OPTS"
-+    else
-+        DEFAULT_JAVA_OPTS="-Djava.security.properties="${KARAF_ETC}/odl.java.security" $DEFAULT_JAVA_OPTS"
-+    fi
-+
-     # Add the jars in the lib dir
-     for file in "${KARAF_HOME}"/lib/boot/*.jar
-     do
-@@ -483,6 +491,13 @@
+--- target/assembly/bin/karaf  2017-09-19 11:52:37.274203647 +0200
++++ target/assembly/bin/karaf  2017-09-19 11:54:28.482544108 +0200
+@@ -169,6 +169,13 @@
          KARAF_EXEC=""
      fi
  
@@ -44,10 +11,10 @@
 +    NON_BLOCKING_PRNG=
 +    [ -c /dev/urandom -a -r /dev/urandom ] && NON_BLOCKING_PRNG=-Djava.security.egd=file:/dev/./urandom
 +
-     while true; do
-         # When users want to update the lib version of, they just need to create
-         # a lib.next directory and on the new restart, it will replace the current lib directory.
-@@ -499,8 +514,12 @@
+     debug=false
+     nodebug=false
+     while [ "${1}" != "" ]; do
+@@ -256,8 +263,12 @@
          fi
  
          if [ "${ROOT_INSTANCE_RUNNING}" = "false" ] || [ "${CHECK_ROOT_INSTANCE_RUNNING}" = "false" ] ; then
@@ -57,10 +24,10 @@
              if [ "${VERSION}" -gt "80" ]; then
                  ${KARAF_EXEC} "${JAVA}" ${JAVA_OPTS} \
 +                    "$NON_BLOCKING_PRNG" \
-                     --add-exports=java.base/sun.net.www.protocol.http=ALL-UNNAMED \
-                     --add-exports=java.base/sun.net.www.protocol.https=ALL-UNNAMED \
-                     --add-exports=java.base/sun.net.www.protocol.jar=ALL-UNNAMED \
-@@ -519,10 +538,12 @@
+                     --add-opens java.base/java.security=ALL-UNNAMED \
+                     --add-opens java.base/java.net=ALL-UNNAMED \
+                     --add-opens java.base/java.lang=ALL-UNNAMED \
+@@ -280,10 +291,12 @@
                      ${KARAF_SYSTEM_OPTS} \
                      ${KARAF_OPTS} \
                      ${OPTS} \
@@ -74,7 +41,7 @@
                      -Djava.endorsed.dirs="${JAVA_ENDORSED_DIRS}" \
                      -Djava.ext.dirs="${JAVA_EXT_DIRS}" \
                      -Dkaraf.instances="${KARAF_HOME}/instances" \
-@@ -536,8 +557,9 @@
+@@ -297,8 +310,9 @@
                      ${KARAF_SYSTEM_OPTS} \
                      ${KARAF_OPTS} \
                      ${OPTS} \
@@ -84,4 +51,4 @@
 +                    ${MAIN}
              fi
          else
-             die "There is a Root instance already running with name ${ROOT_INSTANCE_NAME} and pid ${ROOT_INSTANCE_PID}"
+             die "There is a Root instance already running with name ${ROOT_INSTANCE_NAME} and pid ${ROOT_INSTANCE_PID}. If you know what you are doing and want to force the run anyway, export CHECK_ROOT_INSTANCE_RUNNING=false and re run the command."

diff --git a/karaf/opendaylight-karaf-resources/src/main/patches/karaf-paxweb.patch b/karaf/opendaylight-karaf-resources/src/main/patches/karaf-paxweb.patch
index 3446d1e5f9bc7adc1411d817dafcb1540d151abd..c179d0b71652d6eef8901e91786d5dee926b79ee 100644 (file)
--- a/karaf/opendaylight-karaf-resources/src/main/patches/karaf-paxweb.patch
+++ b/karaf/opendaylight-karaf-resources/src/main/patches/karaf-paxweb.patch
@@ -1,25 +1,24 @@
-diff -urN a/pax-web-features-4.3.4-features.xml b/pax-web-features-4.3.0-features.xml
---- system/org/ops4j/pax/web/pax-web-features/4.3.4/pax-web-features-4.3.0-features.xml        2017-05-05 01:32:43.260023036 +0200
-+++ system/org/ops4j/pax/web/pax-web-features/4.3.4/pax-web-features-4.3.0-features.xml        2017-05-05 01:35:46.437890587 +0200
-@@ -8,7 +8,7 @@
+--- target/assembly/system/org/ops4j/pax/web/pax-web-features/6.0.6/pax-web-features-6.0.6-features.xml        2017-09-19 11:18:05.698766852 +0200
++++ target/assembly/system/org/ops4j/pax/web/pax-web-features/6.0.6/pax-web-features-6.0.6-features.xml        2017-09-19 11:19:06.084943939 +0200
+@@ -25,7 +25,7 @@
          <bundle dependency="true" start-level="30">mvn:org.apache.geronimo.specs/geronimo-jta_1.1_spec/1.1.1</bundle>
                <bundle dependency="true" start-level="30">mvn:javax.annotation/javax.annotation-api/1.2</bundle>
          <bundle dependency="true" start-level="30">mvn:org.apache.geronimo.specs/geronimo-jaspic_1.0_spec/1.1</bundle>
 -        <bundle dependency="true" start-level="30">mvn:org.ow2.asm/asm-all/5.0.2</bundle>
 +        <bundle dependency="true" start-level="30">mvn:org.ow2.asm/asm-all/5.0.4</bundle>
-         <bundle dependency="true" start-level="30">mvn:org.apache.aries.spifly/org.apache.aries.spifly.dynamic.bundle/1.0.1</bundle>
+         <bundle dependency="true" start-level="30">mvn:org.apache.aries.spifly/org.apache.aries.spifly.dynamic.bundle/1.0.2</bundle>
          <bundle dependency="true" start-level="30">mvn:org.apache.aries/org.apache.aries.util/1.1.0</bundle>
-         <bundle start-level="30">mvn:org.eclipse.jetty/jetty-continuation/9.2.19.v20160908</bundle>
-@@ -72,7 +72,7 @@
-         </config>
-         <feature version="[7.0,10.0)">pax-jetty</feature>
+         <bundle start-level="30">mvn:org.eclipse.jetty/jetty-continuation/9.3.14.v20161028</bundle>
+@@ -99,7 +99,7 @@
+         <feature>scr</feature>
+         <feature version="[9.3,10.0)">pax-jetty</feature>
  
 -        <bundle dependency="true" start-level="20">mvn:org.ow2.asm/asm-all/5.0.2</bundle>
 +        <bundle dependency="true" start-level="20">mvn:org.ow2.asm/asm-all/5.0.4</bundle>
          <bundle dependency="true" start-level="20">mvn:org.apache.xbean/xbean-bundleutils/4.1</bundle>
          <bundle dependency="true" start-level="20">mvn:org.apache.xbean/xbean-reflect/4.1</bundle>
          <bundle dependency="true" start-level="20">mvn:org.apache.xbean/xbean-finder/4.1</bundle>
-@@ -148,7 +148,7 @@
+@@ -183,7 +183,7 @@
          <bundle dependency="true" start-level="30">mvn:org.apache.geronimo.specs/geronimo-annotation_1.1_spec/1.0.1</bundle>
          <bundle dependency="true" start-level="30">mvn:javax.websocket/javax.websocket-api/1.1</bundle>
  
@@ -28,7 +27,7 @@ diff -urN a/pax-web-features-4.3.4-features.xml b/pax-web-features-4.3.0-feature
          <bundle dependency="true" start-level="20">mvn:org.apache.xbean/xbean-bundleutils/4.1</bundle>
          <bundle dependency="true" start-level="20">mvn:org.apache.xbean/xbean-reflect/4.1</bundle>
          <bundle dependency="true" start-level="20">mvn:org.apache.xbean/xbean-finder/4.1</bundle>
-@@ -175,7 +175,7 @@
+@@ -212,7 +212,7 @@
          <bundle dependency="true">mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.jsr250-1.0/2.5.0</bundle>
          <bundle dependency="true">mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.jsr303-api-1.0.0/2.5.0</bundle>
          <bundle dependency="true">mvn:commons-beanutils/commons-beanutils/1.8.3</bundle>
@@ -37,3 +36,12 @@ diff -urN a/pax-web-features-4.3.4-features.xml b/pax-web-features-4.3.0-feature
          <bundle dependency="true">mvn:commons-codec/commons-codec/1.8</bundle>
          <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-digester/1.8_4</bundle>
          <bundle dependency="true">mvn:org.apache.geronimo.bundles/commons-discovery/0.4_1</bundle>
+@@ -257,7 +257,7 @@
+         <feature>undertow</feature>
+         <feature version="[6.0,6.1)">pax-http</feature>
+ 
+-        <bundle dependency="true">mvn:org.ow2.asm/asm-all/5.0.2</bundle>
++        <bundle dependency="true">mvn:org.ow2.asm/asm-all/5.0.4</bundle>
+         <bundle dependency="true">mvn:org.apache.xbean/xbean-bundleutils/4.1</bundle>
+         <bundle dependency="true">mvn:org.apache.xbean/xbean-reflect/4.1</bundle>
+         <bundle dependency="true">mvn:org.apache.xbean/xbean-finder/4.1</bundle>

diff --git a/karaf/opendaylight-karaf-resources/src/main/patches/karaf-quiesce-4.0.10.patch b/karaf/opendaylight-karaf-resources/src/main/patches/karaf-quiesce-4.0.10.patch
deleted file mode 100644 (file)
index 388bc42..0000000
--- a/karaf/opendaylight-karaf-resources/src/main/patches/karaf-quiesce-4.0.10.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- system/org/apache/karaf/features/standard/4.0.10/standard-4.0.10-features.xml      2017-01-10 16:50:18.000000000 +0100
-+++ system/org/apache/karaf/features/standard/4.0.10/standard-4.0.10-features.xml      2017-02-06 07:51:32.804000000 +0100
-@@ -24,6 +24,7 @@
-         <bundle start-level="20">mvn:org.apache.aries.blueprint/org.apache.aries.blueprint.cm/1.0.9</bundle>
-         <bundle start-level="20">mvn:org.apache.aries.blueprint/org.apache.aries.blueprint.core.compatibility/1.0.0</bundle>
-         <bundle start-level="20">mvn:org.apache.aries.blueprint/org.apache.aries.blueprint.core/1.7.1</bundle>
-+        <bundle start-level="20">mvn:org.apache.aries.quiesce/org.apache.aries.quiesce.api/1.0.0</bundle>
-         <conditional>
-             <condition>bundle</condition>
-             <bundle start-level="30">mvn:org.apache.karaf.bundle/org.apache.karaf.bundle.blueprintstate/4.0.10</bundle>

diff --git a/karaf/opendaylight-karaf-resources/src/main/patches/karaf-quiesce-4.1.2.patch b/karaf/opendaylight-karaf-resources/src/main/patches/karaf-quiesce-4.1.2.patch
new file mode 100644 (file)
index 0000000..d502f91
--- /dev/null
+++ b/karaf/opendaylight-karaf-resources/src/main/patches/karaf-quiesce-4.1.2.patch
@@ -0,0 +1,10 @@
+--- system/org/apache/karaf/features/standard/4.0.9/standard-4.0.9-features.xml        2017-01-10 16:50:18.000000000 +0100
++++ system/org/apache/karaf/features/standard/4.0.9/standard-4.0.9-features.xml        2017-02-06 07:51:32.804000000 +0100
+@@ -24,6 +24,7 @@
+         <bundle start-level="20">mvn:org.apache.aries.blueprint/org.apache.aries.blueprint.api/1.0.1</bundle>
+         <bundle start-level="20">mvn:org.apache.aries.blueprint/org.apache.aries.blueprint.cm/1.1.0</bundle>
+         <bundle start-level="20">mvn:org.apache.aries.blueprint/org.apache.aries.blueprint.core/1.8.2</bundle>
++        <bundle start-level="20">mvn:org.apache.aries.quiesce/org.apache.aries.quiesce.api/1.0.0</bundle>
+         <conditional>
+             <condition>bundle</condition>
+             <bundle start-level="30">mvn:org.apache.karaf.bundle/org.apache.karaf.bundle.blueprintstate/4.1.2</bundle>

diff --git a/karaf/opendaylight-karaf-resources/src/main/patches/karaf-setenv-4.0.10.patch b/karaf/opendaylight-karaf-resources/src/main/patches/karaf-setenv-4.1.2.patch
similarity index 100%
rename from karaf/opendaylight-karaf-resources/src/main/patches/karaf-setenv-4.0.10.patch
rename to karaf/opendaylight-karaf-resources/src/main/patches/karaf-setenv-4.1.2.patch

diff --git a/odlparent/pom.xml b/odlparent/pom.xml
index 10c75d94d0859c119a4f871b4fe324a0929d5b75..162e78ecc715fc392714b45cc73aa024418ed79a 100644 (file)
--- a/odlparent/pom.xml
+++ b/odlparent/pom.xml
@@ -87,8 +87,8 @@
     <jacoco.version>0.7.7.201606060606</jacoco.version>
     <!-- Used in aaa, controller, coretutorials, integration/distribution, l2switch, lacp, lispflowmapping, netide,
          nic, openflowplugin, ovsdb, persistence, sfc, snbi, snmp4sdn?, sxp, topoprocessing, unimgr, vtn -->
-    <karaf.version>4.0.10</karaf.version>
-    <karaf.plugin.version>4.0.10</karaf.plugin.version>
+    <karaf.version>4.1.2</karaf.version>
+    <karaf.plugin.version>4.1.2</karaf.plugin.version>
     <!-- Used in lispflowmapping, snmp4sdn, vtn -->
     <projectinfo>2.8.1</projectinfo>
     <!-- Used in of-config; see also snmp4sdn -->

diff --git a/untested-single-feature-parent/pom.xml b/untested-single-feature-parent/pom.xml
index 6d596079ac73fd834a52bc8894c397268c59aa0b..aaccec40304ab8f7ddc1fea122a591442b13c78b 100644 (file)
--- a/untested-single-feature-parent/pom.xml
+++ b/untested-single-feature-parent/pom.xml
@@ -49,6 +49,7 @@
                 <version>${karaf.plugin.version}</version>
                 <extensions>true</extensions>
                 <configuration combine.children="append">
+                    <enableGeneration>true</enableGeneration>
                     <simplifyBundleDependencies>true</simplifyBundleDependencies>
                     <checkDependencyChange>${checkDependencyChange}</checkDependencyChange>
                     <logDependencyChanges>true</logDependencyChanges>