From ed7ce0c7a432cd2d8fec68d1d5b3da2affd99694 Mon Sep 17 00:00:00 2001 From: Seth Leger Date: Wed, 9 Apr 2014 17:08:42 -0400 Subject: [PATCH] Upgraded Karaf to version 2.3.4 and upgraded Spring to 3.2.4 to match Karaf's version. --- container/karaf/README.markdown | 15 + .../filtered-resources/etc/custom.properties | 1 + .../etc/org.apache.karaf.features.cfg | 2 +- .../etc/org.ops4j.pax.logging.cfg | 3 + .../filtered-resources/features/features.xml | 309 ++++++++++-------- features/sms-reflector/poms/pom.xml | 2 +- features/sms-reflector/provision/pom.xml | 2 +- features/sms-reflector/sms-ping/pom.xml | 2 +- pom.xml | 4 +- 9 files changed, 190 insertions(+), 150 deletions(-) create mode 100644 container/karaf/README.markdown diff --git a/container/karaf/README.markdown b/container/karaf/README.markdown new file mode 100644 index 000000000000..12f07b59c01e --- /dev/null +++ b/container/karaf/README.markdown @@ -0,0 +1,15 @@ +Upgrading Karaf +=============== + +To upgrade our container to use a new base Karaf version, follow these steps. + +1. Download and unpack the new Karaf tar.gz file. +1. Run this command to see the differences in the Karaf etc files: + diff -r $KARAF_DIR/etc $SRC_DIR/container/karaf/src/main/filtered-resources/etc +1. Apply any relevent changes to the files inside $SRC_DIR/container/karaf/src/main/filtered-resources/etc. +1. Copy the new Karaf features.xml file into the container project: + cp $KARAF_DIR/system/org/apache/karaf/assemblies/features/standard/$KARAF_VERSION/standard-$KARAF_VERSION-features.xml $SRC_DIR/container/karaf/src/main/filtered-resources/features/features.xml +1. Restore the HTTP bridge changes to the features.xml file by making all of the changes between the OPENNMS CUSTOMIZATION comment blocks. +1. Update $SRC_DIR/pom.xml with new value for property. + +See commit dea910701c3f48e367636b507fc575b59e70b843 for an example of an upgrade. diff --git a/container/karaf/src/main/filtered-resources/etc/custom.properties b/container/karaf/src/main/filtered-resources/etc/custom.properties index b243e57c521a..b7464fe78161 100644 --- a/container/karaf/src/main/filtered-resources/etc/custom.properties +++ b/container/karaf/src/main/filtered-resources/etc/custom.properties @@ -30,6 +30,7 @@ karaf.systemBundlesStartLevel=50 org.osgi.framework.system.packages.extra=org.apache.karaf.branding,\ sun.net.spi.nameservice,\ + javax.jms,\ javax.servlet;javax.servlet.http;javax.servlet.resources;version=2.5,\ javax.xml.bind;version=${springJaxbVersion},\ javax.xml.bind.annotation;version=${springJaxbVersion},\ diff --git a/container/karaf/src/main/filtered-resources/etc/org.apache.karaf.features.cfg b/container/karaf/src/main/filtered-resources/etc/org.apache.karaf.features.cfg index df88746e3c0c..1d8b850c20f0 100644 --- a/container/karaf/src/main/filtered-resources/etc/org.apache.karaf.features.cfg +++ b/container/karaf/src/main/filtered-resources/etc/org.apache.karaf.features.cfg @@ -22,7 +22,7 @@ respectStartLvlDuringFeatureStartup=false # # Comma separated list of features repositories to register by default # -#featuresRepositories=mvn:org.apache.karaf.assemblies.features/standard/2.3.2/xml/features,mvn:org.apache.karaf.assemblies.features/enterprise/2.3.2/xml/features +#featuresRepositories=mvn:org.apache.karaf.assemblies.features/standard/2.3.4/xml/features,mvn:org.apache.karaf.assemblies.features/enterprise/2.3.4/xml/features featuresRepositories=mvn:${project.groupId}/${project.artifactId}/${project.version}/xml/features # diff --git a/container/karaf/src/main/filtered-resources/etc/org.ops4j.pax.logging.cfg b/container/karaf/src/main/filtered-resources/etc/org.ops4j.pax.logging.cfg index d8a622da3fac..1b1fc0a61602 100644 --- a/container/karaf/src/main/filtered-resources/etc/org.ops4j.pax.logging.cfg +++ b/container/karaf/src/main/filtered-resources/etc/org.ops4j.pax.logging.cfg @@ -21,6 +21,9 @@ log4j.rootLogger=INFO, out, osgi:* log4j.throwableRenderer=org.apache.log4j.OsgiThrowableRenderer +# To avoid flooding the log when using DEBUG level on an ssh connection and doing log:tail +log4j.logger.org.apache.sshd.server.channel.ChannelSession = INFO + # Display all DEBUG logs for our code log4j.category.org.opennms=DEBUG, out, osgi:* log4j.additivity.org.opennms=false diff --git a/container/karaf/src/main/filtered-resources/features/features.xml b/container/karaf/src/main/filtered-resources/features/features.xml index c404cdd69ace..38bc4bee3a23 100644 --- a/container/karaf/src/main/filtered-resources/features/features.xml +++ b/container/karaf/src/main/filtered-resources/features/features.xml @@ -16,35 +16,35 @@ See the License for the specific language governing permissions and limitations under the License. --> - + - - mvn:org.ops4j.pax.url/pax-url-mvn/1.3.6 - mvn:org.ops4j.pax.url/pax-url-wrap/1.3.6 - mvn:org.ops4j.pax.logging/pax-logging-api/1.7.0 - mvn:org.ops4j.pax.logging/pax-logging-service/1.7.0 + + mvn:org.ops4j.pax.url/pax-url-mvn/1.3.7 + mvn:org.ops4j.pax.url/pax-url-wrap/1.3.7 + mvn:org.ops4j.pax.logging/pax-logging-api/1.7.2 + mvn:org.ops4j.pax.logging/pax-logging-service/1.7.2 mvn:org.apache.felix/org.apache.felix.configadmin/1.6.0 - mvn:org.apache.felix/org.apache.felix.fileinstall/3.2.6 + mvn:org.apache.felix/org.apache.felix.fileinstall/3.2.8 mvn:org.ow2.asm/asm-all/4.1 mvn:org.apache.aries/org.apache.aries.util/1.1.0 mvn:org.apache.aries.proxy/org.apache.aries.proxy.api/1.0.0 - mvn:org.apache.aries.proxy/org.apache.aries.proxy.impl/1.0.1 + mvn:org.apache.aries.proxy/org.apache.aries.proxy.impl/1.0.2 mvn:org.apache.aries.blueprint/org.apache.aries.blueprint.api/1.0.0 - mvn:org.apache.aries.blueprint/org.apache.aries.blueprint.core/1.1.0 - mvn:org.apache.aries.blueprint/org.apache.aries.blueprint.cm/1.0.1 - mvn:org.apache.karaf.shell/org.apache.karaf.shell.console/2.3.2 - mvn:org.apache.karaf.shell/org.apache.karaf.shell.osgi/2.3.2 - mvn:org.apache.karaf.shell/org.apache.karaf.shell.log/2.3.2 - mvn:org.apache.karaf.shell/org.apache.karaf.shell.packages/2.3.2 - mvn:org.apache.karaf.shell/org.apache.karaf.shell.commands/2.3.2 - mvn:org.apache.karaf.shell/org.apache.karaf.shell.dev/2.3.2 - mvn:org.apache.karaf.jaas/org.apache.karaf.jaas.config/2.3.2 - mvn:org.apache.karaf.jaas/org.apache.karaf.jaas.modules/2.3.2 - mvn:org.apache.karaf.jaas/org.apache.karaf.jaas.command/2.3.2 - mvn:org.apache.karaf.features/org.apache.karaf.features.core/2.3.2 - mvn:org.apache.karaf.features/org.apache.karaf.features.command/2.3.2 - mvn:org.apache.karaf.features/org.apache.karaf.features.management/2.3.2 - mvn:org.apache.karaf.management/org.apache.karaf.management.server/2.3.2 + mvn:org.apache.aries.blueprint/org.apache.aries.blueprint.core/1.4.0 + mvn:org.apache.aries.blueprint/org.apache.aries.blueprint.cm/1.0.3 + mvn:org.apache.karaf.shell/org.apache.karaf.shell.console/2.3.4 + mvn:org.apache.karaf.shell/org.apache.karaf.shell.osgi/2.3.4 + mvn:org.apache.karaf.shell/org.apache.karaf.shell.log/2.3.4 + mvn:org.apache.karaf.shell/org.apache.karaf.shell.packages/2.3.4 + mvn:org.apache.karaf.shell/org.apache.karaf.shell.commands/2.3.4 + mvn:org.apache.karaf.shell/org.apache.karaf.shell.dev/2.3.4 + mvn:org.apache.karaf.jaas/org.apache.karaf.jaas.config/2.3.4 + mvn:org.apache.karaf.jaas/org.apache.karaf.jaas.modules/2.3.4 + mvn:org.apache.karaf.jaas/org.apache.karaf.jaas.command/2.3.4 + mvn:org.apache.karaf.features/org.apache.karaf.features.core/2.3.4 + mvn:org.apache.karaf.features/org.apache.karaf.features.command/2.3.4 + mvn:org.apache.karaf.features/org.apache.karaf.features.management/2.3.4 + mvn:org.apache.karaf.management/org.apache.karaf.management.server/2.3.4 mvn:org.apache.aries.jmx/org.apache.aries.jmx.api/1.1.0 mvn:org.apache.aries.jmx/org.apache.aries.jmx.core/1.1.1 mvn:org.apache.aries.jmx/org.apache.aries.jmx.blueprint.api/1.1.0 @@ -77,7 +77,7 @@ mvn:org.springframework.osgi/spring-osgi-core/1.2.1 mvn:org.springframework.osgi/spring-osgi-extender/1.2.1 mvn:org.springframework.osgi/spring-osgi-annotation/1.2.1 - mvn:org.apache.karaf.deployer/org.apache.karaf.deployer.spring/2.3.2 + mvn:org.apache.karaf.deployer/org.apache.karaf.deployer.spring/2.3.4 @@ -127,7 +127,7 @@ spring-web war mvn:commons-collections/commons-collections/3.2.1 - mvn:commons-beanutils/commons-beanutils/1.8.3 + mvn:commons-beanutils/commons-beanutils/1.9.1 mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.struts/1.3.10_1 mvn:org.springframework/spring-struts/3.0.7.RELEASE @@ -205,7 +205,7 @@ spring-web war mvn:commons-collections/commons-collections/3.2.1 - mvn:commons-beanutils/commons-beanutils/1.8.3 + mvn:commons-beanutils/commons-beanutils/1.9.1 mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.struts/1.3.10_1 mvn:org.springframework/spring-struts/3.1.4.RELEASE @@ -245,117 +245,133 @@ - + mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.aopalliance/1.0_6 - mvn:org.springframework/org.springframework.core/3.2.3.RELEASE - mvn:org.springframework/org.springframework.expression/3.2.3.RELEASE - mvn:org.springframework/org.springframework.beans/3.2.3.RELEASE - mvn:org.springframework/org.springframework.aop/3.2.3.RELEASE - mvn:org.springframework/org.springframework.context/3.2.3.RELEASE - mvn:org.springframework/org.springframework.context.support/3.2.3.RELEASE + mvn:org.springframework/org.springframework.core/3.2.4.RELEASE + mvn:org.springframework/org.springframework.expression/3.2.4.RELEASE + mvn:org.springframework/org.springframework.beans/3.2.4.RELEASE + mvn:org.springframework/org.springframework.aop/3.2.4.RELEASE + mvn:org.springframework/org.springframework.context/3.2.4.RELEASE + mvn:org.springframework/org.springframework.context.support/3.2.4.RELEASE - - spring - mvn:org.springframework/org.springframework.aspects/3.2.3.RELEASE + + spring + mvn:org.springframework/org.springframework.aspects/3.2.4.RELEASE - - spring - mvn:org.springframework/org.springframework.instrument/3.2.3.RELEASE + + spring + mvn:org.springframework/org.springframework.instrument/3.2.4.RELEASE - - spring-tx - mvn:org.springframework/org.springframework.jdbc/3.2.3.RELEASE + + spring-tx + mvn:org.springframework/org.springframework.jdbc/3.2.4.RELEASE - - spring-tx + + spring-tx mvn:org.apache.geronimo.specs/geronimo-jta_1.1_spec/1.1.1 mvn:org.apache.geronimo.specs/geronimo-jms_1.1_spec/1.1.1 - mvn:org.springframework/org.springframework.jms/3.2.3.RELEASE + mvn:org.springframework/org.springframework.jms/3.2.4.RELEASE - - spring-web + + spring-web war mvn:commons-collections/commons-collections/3.2.1 - mvn:commons-beanutils/commons-beanutils/1.8.3 + mvn:commons-beanutils/commons-beanutils/1.9.1 mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.struts/1.3.10_1 - mvn:org.springframework/org.springframework.web.struts/3.2.3.RELEASE + mvn:org.springframework/org.springframework.web.struts/3.2.4.RELEASE - - spring - mvn:org.springframework/org.springframework.test/3.2.3.RELEASE + + spring + mvn:org.springframework/org.springframework.test/3.2.4.RELEASE - - spring-jdbc - mvn:org.springframework/org.springframework.orm/3.2.3.RELEASE + + spring-jdbc + mvn:org.springframework/org.springframework.orm/3.2.4.RELEASE - - spring - mvn:org.springframework/org.springframework.oxm/3.2.3.RELEASE + + spring + mvn:org.springframework/org.springframework.oxm/3.2.4.RELEASE - - spring - mvn:org.springframework/org.springframework.transaction/3.2.3.RELEASE + + spring + mvn:org.springframework/org.springframework.transaction/3.2.4.RELEASE - - spring + + spring http - mvn:org.springframework/org.springframework.web/3.2.3.RELEASE - mvn:org.springframework/org.springframework.web.servlet/3.2.3.RELEASE + mvn:org.springframework/org.springframework.web/3.2.4.RELEASE + mvn:org.springframework/org.springframework.web.servlet/3.2.4.RELEASE - - spring-web + + spring-web mvn:javax.portlet/portlet-api/2.0 - mvn:org.springframework/org.springframework.web.portlet/3.2.3.RELEASE + mvn:org.springframework/org.springframework.web.portlet/3.2.4.RELEASE - - mvn:org.apache.karaf.shell/org.apache.karaf.shell.wrapper/2.3.2 + + + + war + spring-dm-web + mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.aspectj/1.7.4_1 + mvn:org.springframework.security/spring-security-core/3.1.4.RELEASE + mvn:org.springframework.security/spring-security-config/3.1.4.RELEASE + mvn:org.springframework.security/spring-security-web/3.1.4.RELEASE + mvn:org.springframework.security/spring-security-acl/3.1.4.RELEASE + mvn:org.springframework.security/spring-security-taglibs/3.1.4.RELEASE + + + + mvn:org.apache.karaf.shell/org.apache.karaf.shell.wrapper/2.3.4 + + + wrapper - + mvn:org.apache.felix/org.osgi.service.obr/1.0.2 mvn:org.apache.felix/org.apache.felix.bundlerepository/1.6.6 - mvn:org.apache.karaf.shell/org.apache.karaf.shell.obr/2.3.2 - mvn:org.apache.karaf.features/org.apache.karaf.features.obr/2.3.2 - mvn:org.apache.karaf.management.mbeans/org.apache.karaf.management.mbeans.obr/2.3.2 - mvn:org.ops4j.pax.url/pax-url-obr/1.3.6 + mvn:org.apache.karaf.shell/org.apache.karaf.shell.obr/2.3.4 + mvn:org.apache.karaf.features/org.apache.karaf.features.obr/2.3.4 + mvn:org.apache.karaf.management.mbeans/org.apache.karaf.management.mbeans.obr/2.3.4 + mvn:org.ops4j.pax.url/pax-url-obr/1.3.7 - - mvn:org.apache.karaf.shell/org.apache.karaf.shell.config/2.3.2 + + mvn:org.apache.karaf.shell/org.apache.karaf.shell.config/2.3.4 - - mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.activation-api-1.1/2.2.0 + + mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.activation-api-1.1/2.4.0 mvn:org.apache.geronimo.specs/geronimo-servlet_2.5_spec/1.2 mvn:javax.mail/mail/1.4.5 mvn:org.apache.geronimo.specs/geronimo-jta_1.1_spec/1.1.1 - mvn:org.eclipse.jetty/jetty-util/7.6.8.v20121106 - mvn:org.eclipse.jetty/jetty-io/7.6.8.v20121106 - mvn:org.eclipse.jetty/jetty-http/7.6.8.v20121106 - mvn:org.eclipse.jetty/jetty-client/7.6.8.v20121106 - mvn:org.eclipse.jetty/jetty-continuation/7.6.8.v20121106 - mvn:org.eclipse.jetty/jetty-jmx/7.6.8.v20121106 - mvn:org.eclipse.jetty/jetty-server/7.6.8.v20121106 - mvn:org.eclipse.jetty/jetty-security/7.6.8.v20121106 - mvn:org.eclipse.jetty/jetty-servlet/7.6.8.v20121106 - mvn:org.eclipse.jetty/jetty-servlets/7.6.8.v20121106 - mvn:org.eclipse.jetty/jetty-xml/7.6.8.v20121106 - mvn:org.eclipse.jetty/jetty-webapp/7.6.8.v20121106 - mvn:org.eclipse.jetty/jetty-jndi/7.6.8.v20121106 - mvn:org.eclipse.jetty/jetty-plus/7.6.8.v20121106 - mvn:org.eclipse.jetty/jetty-websocket/7.6.8.v20121106 + mvn:org.eclipse.jetty/jetty-util/7.6.9.v20130131 + mvn:org.eclipse.jetty/jetty-io/7.6.9.v20130131 + mvn:org.eclipse.jetty/jetty-http/7.6.9.v20130131 + mvn:org.eclipse.jetty/jetty-client/7.6.9.v20130131 + mvn:org.eclipse.jetty/jetty-continuation/7.6.9.v20130131 + mvn:org.eclipse.jetty/jetty-jmx/7.6.9.v20130131 + mvn:org.eclipse.jetty/jetty-server/7.6.9.v20130131 + mvn:org.eclipse.jetty/jetty-security/7.6.9.v20130131 + mvn:org.eclipse.jetty/jetty-servlet/7.6.9.v20130131 + mvn:org.eclipse.jetty/jetty-servlets/7.6.9.v20130131 + mvn:org.eclipse.jetty/jetty-xml/7.6.9.v20130131 + mvn:org.eclipse.jetty/jetty-webapp/7.6.9.v20130131 + mvn:org.eclipse.jetty/jetty-jndi/7.6.9.v20130131 + mvn:org.eclipse.jetty/jetty-plus/7.6.9.v20130131 + mvn:org.eclipse.jetty/jetty-websocket/7.6.9.v20130131 @@ -366,109 +382,114 @@ - + http - mvn:org.ops4j.pax.web/pax-web-extender-whiteboard/1.1.14 + mvn:org.ops4j.pax.web/pax-web-extender-whiteboard/1.1.16 - + org.ops4j.pax.url.war.importPaxLoggingPackages=true http-whiteboard - mvn:org.apache.karaf.shell/org.apache.karaf.shell.web/2.3.2 - mvn:org.apache.karaf.management.mbeans/org.apache.karaf.management.mbeans.web/2.3.2 - mvn:org.ops4j.pax.web/pax-web-jsp/1.1.14 - mvn:org.ops4j.pax.web/pax-web-extender-war/1.1.14 - mvn:org.ops4j.pax.web/pax-web-deployer/1.1.14 - mvn:org.ops4j.pax.url/pax-url-war/1.3.6 + mvn:org.apache.karaf.shell/org.apache.karaf.shell.web/2.3.4 + mvn:org.apache.karaf.management.mbeans/org.apache.karaf.management.mbeans.web/2.3.4 + mvn:org.ops4j.pax.web/pax-web-jsp/1.1.16 + mvn:org.ops4j.pax.web/pax-web-extender-war/1.1.16 + mvn:org.ops4j.pax.web/pax-web-deployer/1.1.16 + mvn:org.ops4j.pax.url/pax-url-war/1.3.7 - - mvn:org.apache.karaf.deployer/org.apache.karaf.deployer.kar/2.3.2 + + mvn:org.apache.karaf.deployer/org.apache.karaf.deployer.kar/2.3.4 - + realm=karaf role=${karaf.admin.role} http - mvn:org.apache.felix/org.apache.felix.metatype/1.0.6 - mvn:org.apache.karaf.webconsole/org.apache.karaf.webconsole.branding/2.3.2 - mvn:org.apache.karaf.webconsole/org.apache.karaf.webconsole.console/2.3.2 + mvn:org.apache.felix/org.apache.felix.metatype/1.0.10 + mvn:org.apache.karaf.webconsole/org.apache.karaf.webconsole.branding/2.3.4 + mvn:org.apache.karaf.webconsole/org.apache.karaf.webconsole.console/2.3.4 - - webconsole-base - mvn:org.apache.karaf.webconsole/org.apache.karaf.webconsole.admin/2.3.2 - mvn:org.apache.karaf.webconsole/org.apache.karaf.webconsole.features/2.3.2 - mvn:org.apache.karaf.webconsole/org.apache.karaf.webconsole.gogo/2.3.2 - mvn:org.apache.felix/org.apache.felix.webconsole.plugins.event/1.0.2 + + webconsole-base + mvn:org.apache.karaf.webconsole/org.apache.karaf.webconsole.admin/2.3.4 + mvn:org.apache.karaf.webconsole/org.apache.karaf.webconsole.features/2.3.4 + mvn:org.apache.karaf.webconsole/org.apache.karaf.webconsole.gogo/2.3.4 + mvn:org.apache.felix/org.apache.felix.webconsole.plugins.event/1.1.0 - + sshPort=8101 - sshHost=127.0.0.1 + sshHost=0.0.0.0 sshRealm=karaf hostKey=${karaf.base}/etc/host.key mvn:org.apache.mina/mina-core/2.0.7 mvn:org.apache.sshd/sshd-core/0.8.0 - mvn:org.apache.karaf.shell/org.apache.karaf.shell.ssh/2.3.2 + mvn:org.apache.karaf.shell/org.apache.karaf.shell.ssh/2.3.4 - - mvn:org.apache.karaf.management/org.apache.karaf.management.server/2.3.2 + + mvn:org.apache.karaf.management/org.apache.karaf.management.server/2.3.4 mvn:org.apache.aries.jmx/org.apache.aries.jmx.api/1.1.0 mvn:org.apache.aries.jmx/org.apache.aries.jmx.core/1.1.1 mvn:org.apache.aries.jmx/org.apache.aries.jmx.blueprint.api/1.1.0 mvn:org.apache.aries.jmx/org.apache.aries.jmx.blueprint.core/1.1.0 - mvn:org.apache.karaf.management.mbeans/org.apache.karaf.management.mbeans.system/2.3.2 - mvn:org.apache.karaf.management.mbeans/org.apache.karaf.management.mbeans.bundles/2.3.2 - mvn:org.apache.karaf.management.mbeans/org.apache.karaf.management.mbeans.services/2.3.2 - mvn:org.apache.karaf.management.mbeans/org.apache.karaf.management.mbeans.config/2.3.2 - mvn:org.apache.karaf.management.mbeans/org.apache.karaf.management.mbeans.log/2.3.2 - mvn:org.apache.karaf.management.mbeans/org.apache.karaf.management.mbeans.packages/2.3.2 - mvn:org.apache.karaf.management.mbeans/org.apache.karaf.management.mbeans.dev/2.3.2 + mvn:org.apache.karaf.management.mbeans/org.apache.karaf.management.mbeans.system/2.3.4 + mvn:org.apache.karaf.management.mbeans/org.apache.karaf.management.mbeans.bundles/2.3.4 + mvn:org.apache.karaf.management.mbeans/org.apache.karaf.management.mbeans.services/2.3.4 + mvn:org.apache.karaf.management.mbeans/org.apache.karaf.management.mbeans.config/2.3.4 + mvn:org.apache.karaf.management.mbeans/org.apache.karaf.management.mbeans.log/2.3.4 + mvn:org.apache.karaf.management.mbeans/org.apache.karaf.management.mbeans.packages/2.3.4 + mvn:org.apache.karaf.management.mbeans/org.apache.karaf.management.mbeans.dev/2.3.4 - + mvn:org.apache.felix/org.apache.felix.eventadmin/1.3.2 - - mvn:commons-codec/commons-codec/1.7 + + mvn:commons-codec/commons-codec/1.9 mvn:commons-lang/commons-lang/2.6 - mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jasypt/1.9.0_1 - mvn:org.apache.karaf.jaas/org.apache.karaf.jaas.jasypt/2.3.2 + mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jasypt/1.9.1_1 + mvn:org.apache.karaf.jaas/org.apache.karaf.jaas.jasypt/2.3.4 + + + + war + mvn:org.apache.aries.blueprint/org.apache.aries.blueprint.webosgi/1.0.1 - + eventadmin - mvn:org.apache.felix/org.apache.felix.metatype/1.0.6 - mvn:org.apache.felix/org.apache.felix.scr/1.6.2 - mvn:org.apache.karaf.shell/org.apache.karaf.shell.scr/2.3.2 - mvn:org.apache.karaf.management.mbeans/org.apache.karaf.management.mbeans.scr/2.3.2 + mvn:org.apache.felix/org.apache.felix.metatype/1.0.10 + mvn:org.apache.felix/org.apache.felix.scr/1.8.2 + mvn:org.apache.karaf.shell/org.apache.karaf.shell.scr/2.3.4 + mvn:org.apache.karaf.management.mbeans/org.apache.karaf.management.mbeans.scr/2.3.4 - + scr webconsole mvn:org.apache.felix/org.apache.felix.webconsole.plugins.ds/1.0.0 diff --git a/features/sms-reflector/poms/pom.xml b/features/sms-reflector/poms/pom.xml index 461cb58635fb..5116a0d47b81 100644 --- a/features/sms-reflector/poms/pom.xml +++ b/features/sms-reflector/poms/pom.xml @@ -15,7 +15,7 @@ compiled - 3.2.3.RELEASE + 3.2.4.RELEASE 1.2.1 diff --git a/features/sms-reflector/provision/pom.xml b/features/sms-reflector/provision/pom.xml index d9f3342d3571..c71c8e6c4413 100644 --- a/features/sms-reflector/provision/pom.xml +++ b/features/sms-reflector/provision/pom.xml @@ -16,7 +16,7 @@ | with true --> - 3.2.3.RELEASE + 3.2.4.RELEASE 1.2.1 diff --git a/features/sms-reflector/sms-ping/pom.xml b/features/sms-reflector/sms-ping/pom.xml index a2348e8634ce..4cee4f1ead48 100644 --- a/features/sms-reflector/sms-ping/pom.xml +++ b/features/sms-reflector/sms-ping/pom.xml @@ -9,7 +9,7 @@ org.opennms.features.sms-reflector.sms-ping org.opennms.sms.ping - 3.2.3.RELEASE + 3.2.4.RELEASE 4.0.0 org.opennms.features.sms-reflector diff --git a/pom.xml b/pom.xml index 7f9d47a643cf..e4991fa45cc5 100644 --- a/pom.xml +++ b/pom.xml @@ -984,7 +984,7 @@ 1.9.13 3.7.6 7.6.12.v20130726 - 2.3.2 + 2.3.4 2.2.0 2.0.5 99.99.99-use-log4j2 @@ -1000,7 +1000,7 @@ 2.9.1 1.4.01 - 3.2.3.RELEASE + 3.2.4.RELEASE 1.7.1 2.3.0.RELEASE