This upgrades a number of related dependencies in the process.
Change-Id: I1aadc6f4a0ca95fd1bec256a2272ccc4e9ca6860
Signed-off-by: Stephen Kitt <skitt@redhat.com>
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<features xmlns="http://karaf.apache.org/xmlns/features/v1.4.0" name="odl-akka-clustering-2.5">
+<features xmlns="http://karaf.apache.org/xmlns/features/v1.5.0" name="odl-akka-clustering-2.5">
<feature version="0.0.0">
- <feature prerequisite="false" dependency="false">odl-akka-system-2.5</feature>
+ <feature>odl-akka-system-2.5</feature>
<bundle>mvn:com.typesafe.akka/akka-cluster_2.12/2.5.11</bundle>
<bundle>mvn:com.typesafe.akka/akka-protobuf_2.12/2.5.11</bundle>
<bundle>mvn:com.typesafe.akka/akka-remote_2.12/2.5.11</bundle>
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<features xmlns="http://karaf.apache.org/xmlns/features/v1.4.0" name="odl-akka-leveldb-0.7">
+<features xmlns="http://karaf.apache.org/xmlns/features/v1.5.0" name="odl-akka-leveldb-0.7">
<feature version="0.0.0">
- <feature prerequisite="false" dependency="false">odl-guava-23</feature>
- <feature prerequisite="false" dependency="false">wrap</feature>
+ <feature>odl-guava-23</feature>
+ <feature>wrap</feature>
<bundle>mvn:org.fusesource.leveldbjni/leveldbjni-all/1.8-odl</bundle>
<bundle>wrap:mvn:org.iq80.leveldb/leveldb/0.7</bundle>
</feature>
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<features xmlns="http://karaf.apache.org/xmlns/features/v1.4.0" name="odl-akka-persistence-2.5">
+<features xmlns="http://karaf.apache.org/xmlns/features/v1.5.0" name="odl-akka-persistence-2.5">
<feature version="0.0.0">
- <feature prerequisite="false" dependency="false">odl-akka-leveldb-0.7</feature>
- <feature prerequisite="false" dependency="false">odl-akka-system-2.5</feature>
+ <feature>odl-akka-leveldb-0.7</feature>
+ <feature>odl-akka-system-2.5</feature>
<bundle>mvn:com.typesafe.akka/akka-persistence_2.12/2.5.11</bundle>
<bundle>mvn:com.typesafe.akka/akka-protobuf_2.12/2.5.11</bundle>
</feature>
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<features xmlns="http://karaf.apache.org/xmlns/features/v1.4.0" name="odl-akka-scala-2.12">
+<features xmlns="http://karaf.apache.org/xmlns/features/v1.5.0" name="odl-akka-scala-2.12">
<feature version="0.0.0">
<bundle>mvn:org.scala-lang.modules/scala-java8-compat_2.12/0.8.0</bundle>
<bundle>mvn:org.scala-lang/scala-library/2.12.5</bundle>
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<features xmlns="http://karaf.apache.org/xmlns/features/v1.4.0" name="odl-akka-system-2.5">
+<features xmlns="http://karaf.apache.org/xmlns/features/v1.5.0" name="odl-akka-system-2.5">
<feature version="0.0.0">
- <feature prerequisite="false" dependency="false">odl-akka-scala-2.12</feature>
+ <feature>odl-akka-scala-2.12</feature>
<bundle>mvn:com.typesafe.akka/akka-actor_2.12/2.5.11</bundle>
<bundle>mvn:com.typesafe.akka/akka-osgi_2.12/2.5.11</bundle>
<bundle>mvn:com.typesafe.akka/akka-slf4j_2.12/2.5.11</bundle>
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<features xmlns="http://karaf.apache.org/xmlns/features/v1.4.0" name="odl-apache-commons-codec">
+<features xmlns="http://karaf.apache.org/xmlns/features/v1.5.0" name="odl-apache-commons-codec">
<feature version="0.0.0">
<bundle>mvn:commons-codec/commons-codec/1.11</bundle>
</feature>
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<features xmlns="http://karaf.apache.org/xmlns/features/v1.4.0" name="odl-apache-commons-lang3">
+<features xmlns="http://karaf.apache.org/xmlns/features/v1.5.0" name="odl-apache-commons-lang3">
<feature version="0.0.0">
<bundle>mvn:org.apache.commons/commons-lang3/3.7</bundle>
</feature>
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<features xmlns="http://karaf.apache.org/xmlns/features/v1.4.0" name="odl-apache-commons-net">
+<features xmlns="http://karaf.apache.org/xmlns/features/v1.5.0" name="odl-apache-commons-net">
<feature version="0.0.0">
<bundle>mvn:commons-net/commons-net/3.6</bundle>
</feature>
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<features xmlns="http://karaf.apache.org/xmlns/features/v1.4.0" name="odl-apache-commons-text">
+<features xmlns="http://karaf.apache.org/xmlns/features/v1.5.0" name="odl-apache-commons-text">
<feature version="0.0.0">
- <feature prerequisite="false" dependency="false">odl-apache-commons-lang3</feature>
+ <feature>odl-apache-commons-lang3</feature>
<bundle>mvn:org.apache.commons/commons-text/1.1</bundle>
</feature>
</features>
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<features xmlns="http://karaf.apache.org/xmlns/features/v1.4.0" name="odl-guava-23">
+<features xmlns="http://karaf.apache.org/xmlns/features/v1.5.0" name="odl-guava-23">
<feature version="0.0.0">
- <feature prerequisite="false" dependency="false">wrap</feature>
+ <feature>wrap</feature>
<bundle>mvn:com.google.guava/guava/23.6-jre</bundle>
<bundle>wrap:mvn:com.google.errorprone/error_prone_annotations/2.1.3</bundle>
<bundle>wrap:mvn:com.google.j2objc/j2objc-annotations/1.1</bundle>
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<features xmlns="http://karaf.apache.org/xmlns/features/v1.4.0" name="odl-jackson-2.8">
+<features xmlns="http://karaf.apache.org/xmlns/features/v1.5.0" name="odl-jackson-2.8">
<feature version="0.0.0">
<bundle>mvn:com.fasterxml.jackson.core/jackson-annotations/2.8.0</bundle>
<bundle>mvn:com.fasterxml.jackson.core/jackson-core/2.8.9</bundle>
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<features xmlns="http://karaf.apache.org/xmlns/features/v1.4.0" name="odl-javassist-3">
+<features xmlns="http://karaf.apache.org/xmlns/features/v1.5.0" name="odl-javassist-3">
<feature version="0.0.0">
<bundle>mvn:org.javassist/javassist/3.22.0-GA</bundle>
</feature>
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<features xmlns="http://karaf.apache.org/xmlns/features/v1.4.0" name="odl-jersey-1">
+<features xmlns="http://karaf.apache.org/xmlns/features/v1.5.0" name="odl-jersey-1">
<feature version="0.0.0">
<bundle>mvn:com.sun.jersey/jersey-core/1.19.4</bundle>
<bundle>mvn:com.sun.jersey/jersey-server/1.19.4</bundle>
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<features xmlns="http://karaf.apache.org/xmlns/features/v1.4.0" name="odl-jung-2.1">
+<features xmlns="http://karaf.apache.org/xmlns/features/v1.5.0" name="odl-jung-2.1">
<feature version="0.0.0">
- <feature prerequisite="false" dependency="false">odl-guava-23</feature>
- <feature prerequisite="false" dependency="false">wrap</feature>
+ <feature>odl-guava-23</feature>
+ <feature>wrap</feature>
<bundle>wrap:mvn:net.sf.jung/jung-algorithms/2.1.1</bundle>
<bundle>wrap:mvn:net.sf.jung/jung-api/2.1.1</bundle>
<bundle>wrap:mvn:net.sf.jung/jung-graph-impl/2.1.1</bundle>
<type>xml</type>
<scope>runtime</scope>
</dependency>
+ <dependency>
+ <groupId>org.apache.karaf.jdbc</groupId>
+ <artifactId>org.apache.karaf.jdbc.core</artifactId>
+ <version>${karaf.version}</version>
+ <scope>provided</scope>
+ </dependency>
</dependencies>
<build>
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<features xmlns="http://karaf.apache.org/xmlns/features/v1.4.0" name="odl-lmax-3">
+<features xmlns="http://karaf.apache.org/xmlns/features/v1.5.0" name="odl-lmax-3">
<feature version="0.0.0">
<bundle>mvn:com.lmax/disruptor/3.4.1</bundle>
</feature>
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<features xmlns="http://karaf.apache.org/xmlns/features/v1.4.0" name="odl-netty-4">
+<features xmlns="http://karaf.apache.org/xmlns/features/v1.5.0" name="odl-netty-4">
<feature version="0.0.0">
- <feature prerequisite="false" dependency="false">odl-javassist-3</feature>
+ <feature>odl-javassist-3</feature>
<bundle>mvn:io.netty/netty-buffer/4.1.22.Final</bundle>
<bundle>mvn:io.netty/netty-codec-http/4.1.22.Final</bundle>
<bundle>mvn:io.netty/netty-codec/4.1.22.Final</bundle>
<patch patchfile="${project.basedir}/src/main/patches/karaf-quiesce-${karaf.version}.patch"
originalfile="${project.build.directory}/assembly/system/org/apache/karaf/features/standard/${karaf.version}/standard-${karaf.version}-features.xml"
failonerror="true"/>
- <patch patchfile="${project.basedir}/src/main/patches/karaf-javax-mail-${karaf.version}.patch"
- originalfile="${project.build.directory}/assembly/system/org/apache/karaf/features/standard/${karaf.version}/standard-${karaf.version}-features.xml"
- failonerror="true"/>
<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/6.0.9/pax-web-features-6.0.9-features.xml"
+ originalfile="${project.build.directory}/assembly/system/org/ops4j/pax/web/pax-web-features/7.0.0/pax-web-features-7.0.0-features.xml"
failonerror="true"/>
- <copy file="${project.build.directory}/assembly/system/org/ops4j/pax/web/pax-web-features/6.0.9/pax-web-features-6.0.9-features.xml"
- tofile="${project.build.directory}/classes/system/org/ops4j/pax/web/pax-web-features/6.0.9/pax-web-features-6.0.9-features.xml"/>
+ <copy file="${project.build.directory}/assembly/system/org/ops4j/pax/web/pax-web-features/7.0.0/pax-web-features-7.0.0-features.xml"
+ tofile="${project.build.directory}/classes/system/org/ops4j/pax/web/pax-web-features/7.0.0/pax-web-features-7.0.0-features.xml"/>
<!-- Add startup bundles to startup.properties — order is significant, bundles are wired in declaration order -->
<echo file="${project.build.directory}/assembly/etc/startup.properties" append="true">
# The following are added by opendaylight-karaf-resources
fi
fi
-}
-\ No newline at end of file
+}
+++ /dev/null
---- 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>
+++ /dev/null
---- 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
-
-+ # Use /dev/urandom to avoid blocking on /dev/random
-+ # See http://www.2uo.de/myths-about-urandom/ to understand why this is safe (as long as your VM provisioning seeds
-+ # the PRNG)
-+ # The /dev/./urandom workaround is necessary because of https://bugs.openjdk.java.net/browse/JDK-6202721
-+ NON_BLOCKING_PRNG=
-+ [ -c /dev/urandom -a -r /dev/urandom ] && NON_BLOCKING_PRNG=-Djava.security.egd=file:/dev/./urandom
-+
- debug=false
- nodebug=false
- while [ "${1}" != "" ]; do
-@@ -256,8 +263,12 @@
- fi
-
- if [ "${ROOT_INSTANCE_RUNNING}" = "false" ] || [ "${CHECK_ROOT_INSTANCE_RUNNING}" = "false" ] ; then
-+ # Using command line arguments as java arguments
-+ # (as opposed to arguments for $MAIN)
-+ # FIXME: document this in the user guide
- if [ "${VERSION}" -gt "80" ]; then
- ${KARAF_EXEC} "${JAVA}" ${JAVA_OPTS} \
-+ "$NON_BLOCKING_PRNG" \
- --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} \
-+ "$@" \
- -classpath "${CLASSPATH}" \
-- ${MAIN} "$@"
-+ ${MAIN}
- else
- ${KARAF_EXEC} "${JAVA}" ${JAVA_OPTS} \
-+ "$NON_BLOCKING_PRNG" \
- -Djava.endorsed.dirs="${JAVA_ENDORSED_DIRS}" \
- -Djava.ext.dirs="${JAVA_EXT_DIRS}" \
- -Dkaraf.instances="${KARAF_HOME}/instances" \
-@@ -297,8 +310,9 @@
- ${KARAF_SYSTEM_OPTS} \
- ${KARAF_OPTS} \
- ${OPTS} \
-+ "$@" \
- -classpath "${CLASSPATH}" \
-- ${MAIN} "$@"
-+ ${MAIN}
- fi
- else
- 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."
--- /dev/null
+--- target/assembly/bin/karaf.orig 2018-04-03 17:00:44.381395302 +0200
++++ target/assembly/bin/karaf 2018-04-03 17:11:52.346032789 +0200
+@@ -170,6 +170,13 @@
+ KARAF_EXEC=""
+ fi
+
++ # Use /dev/urandom to avoid blocking on /dev/random
++ # See http://www.2uo.de/myths-about-urandom/ to understand why this is safe (as long as your VM provisioning seeds
++ # the PRNG)
++ # The /dev/./urandom workaround is necessary because of https://bugs.openjdk.java.net/browse/JDK-6202721
++ NON_BLOCKING_PRNG=
++ [ -c /dev/urandom -a -r /dev/urandom ] && NON_BLOCKING_PRNG=-Djava.security.egd=file:/dev/./urandom
++
+ debug=false
+ debugs=false
+ nodebug=false
+@@ -271,8 +278,12 @@
+ fi
+
+ if [ "${ROOT_INSTANCE_RUNNING}" = "false" ] || [ "${CHECK_ROOT_INSTANCE_RUNNING}" = "false" ] ; then
++ # Using command line arguments as java arguments
++ # (as opposed to arguments for $MAIN)
++ # FIXME: document this in the user guide
+ if [ "${VERSION}" -gt "8" ]; then
+ ${KARAF_EXEC} "${JAVA}" ${JAVA_OPTS} \
++ "$NON_BLOCKING_PRNG" \
+ --add-exports=java.base/org.apache.karaf.specs.locator=java.xml,java.xml.ws,ALL-UNNAMED \
+ --patch-module java.base=lib/endorsed/org.apache.karaf.specs.locator-4.2.0.jar \
+ --patch-module java.xml=lib/endorsed/org.apache.karaf.specs.java.xml-4.2.0.jar \
+@@ -305,6 +316,7 @@
+ ${MAIN} "$@"
+ else
+ ${KARAF_EXEC} "${JAVA}" ${JAVA_OPTS} \
++ "$NON_BLOCKING_PRNG" \
+ -Djava.endorsed.dirs="${JAVA_ENDORSED_DIRS}" \
+ -Djava.ext.dirs="${JAVA_EXT_DIRS}" \
+ -Dkaraf.instances="${KARAF_HOME}/instances" \
---- target/assembly/system/org/ops4j/pax/web/pax-web-features/6.0.9/pax-web-features-6.0.9-features.xml 2017-09-19 11:18:05.698766852 +0200
-+++ target/assembly/system/org/ops4j/pax/web/pax-web-features/6.0.9/pax-web-features-6.0.9-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.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.3.21.v20170918</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>
-@@ -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>
-
-- <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>
-@@ -212,7 +212,7 @@
- <bundle dependency="true">mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.jsr250-1.0/2.5.0</bundle>
+--- target/assembly/system/org/ops4j/pax/web/pax-web-features/7.0.0/pax-web-features-7.0.0-features.xml.orig 2018-04-03 17:30:35.000000000 +0200
++++ target/assembly/system/org/ops4j/pax/web/pax-web-features/7.0.0/pax-web-features-7.0.0-features.xml 2018-04-03 17:37:22.895019563 +0200
+@@ -226,7 +226,7 @@
+ <bundle dependency="true">mvn:javax.validation/validation-api/1.1.0.Final</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>
- <bundle dependency="true">mvn:commons-collections/commons-collections/3.2.1</bundle>
<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>
---- 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 @@
+--- system/org/apache/karaf/features/standard/4.2.0/standard-4.2.0-features.xml.orig 2018-04-03 17:14:22.174264512 +0200
++++ system/org/apache/karaf/features/standard/4.2.0/standard-4.2.0-features.xml 2018-04-03 17:25:24.387151126 +0200
+@@ -48,6 +48,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.3</bundle>
+ <bundle start-level="20">mvn:org.apache.aries.blueprint/org.apache.aries.blueprint.cm/1.2.0</bundle>
+ <bundle start-level="20">mvn:org.apache.aries.blueprint/org.apache.aries.blueprint.core/1.9.0</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.3</bundle>
+ <bundle start-level="30">mvn:org.apache.karaf.bundle/org.apache.karaf.bundle.blueprintstate/4.2.0</bundle>
</dependency>
<dependency>
<groupId>org.ow2.asm</groupId>
- <artifactId>asm-all</artifactId>
+ <artifactId>asm</artifactId>
</dependency>
<dependency>
<groupId>org.powermock</groupId>
<!-- Used in aaa, alto, bgpcep, bier, controller, coretutorials, genius, infrautils, iotdm,
l2switch, lacp, netconf, netide, netvirt, nic, ocpplugin, ovsdb, persistence, snbi, sxp,
tsdr, unimgr, vtn -->
- <karaf.version>4.1.5</karaf.version>
+ <karaf.version>4.2.0</karaf.version>
<!-- Used in sxp -->
- <karaf.plugin.version>4.1.5</karaf.plugin.version>
+ <karaf.plugin.version>4.2.0</karaf.plugin.version>
<!-- Used in lispflowmapping, snmp4sdn, vtn -->
<projectinfo>2.8.1</projectinfo>
<!-- Used in of-config; see also snmp4sdn -->
</dependency>
<dependency>
<groupId>org.ow2.asm</groupId>
- <artifactId>asm-all</artifactId>
- <version>5.1</version>
+ <artifactId>asm</artifactId>
+ <version>6.0</version>
</dependency>
<!-- Configuration library -->
<dependency>
<groupId>org.apache.aries.blueprint</groupId>
<artifactId>org.apache.aries.blueprint.core</artifactId>
- <version>1.7.1</version>
+ <version>1.9.0</version>
</dependency>
</dependencies>
Code Review / odlparent.git / commitdiff