Upgraded Karaf to version 2.3.4 and upgraded Spring to 3.2.4 to match

Karaf's version.
OpenNMS · Apr 9, 2014 · ed7ce0c · ed7ce0c
1 parent 8c461b9
commit ed7ce0c
Show file tree

Hide file tree

Showing 9 changed files with 190 additions and 150 deletions.
diff --git a/container/karaf/README.markdown 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 <karafVersion/> 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
@@ -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
@@ -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
@@ -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
diff --git a/features/sms-reflector/poms/pom.xml b/features/sms-reflector/poms/pom.xml
@@ -15,7 +15,7 @@
     <module>compiled</module>
   </modules>
   <properties>
-    <spring.version>3.2.3.RELEASE</spring.version>
+    <spring.version>3.2.4.RELEASE</spring.version>
     <spring.osgi.version>1.2.1</spring.osgi.version>
   </properties>
   <build>

diff --git a/features/sms-reflector/provision/pom.xml b/features/sms-reflector/provision/pom.xml
@@ -16,7 +16,7 @@
    | with <optional>true</optional>
   -->
   <properties>
-    <spring.version>3.2.3.RELEASE</spring.version>
+    <spring.version>3.2.4.RELEASE</spring.version>
     <spring.osgi.version>1.2.1</spring.osgi.version>
   </properties>
   <dependencies>

diff --git a/features/sms-reflector/sms-ping/pom.xml b/features/sms-reflector/sms-ping/pom.xml
@@ -9,7 +9,7 @@
   <properties>
     <bundle.symbolicName>org.opennms.features.sms-reflector.sms-ping</bundle.symbolicName>
     <bundle.namespace>org.opennms.sms.ping</bundle.namespace>
-    <spring.maven.artifact.version>3.2.3.RELEASE</spring.maven.artifact.version>
+    <spring.maven.artifact.version>3.2.4.RELEASE</spring.maven.artifact.version>
   </properties>
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.opennms.features.sms-reflector</groupId>

diff --git a/pom.xml b/pom.xml
@@ -984,7 +984,7 @@
     <jacksonVersion>1.9.13</jacksonVersion>
     <jasperreportsVersion>3.7.6</jasperreportsVersion>
     <jettyVersion>7.6.12.v20130726</jettyVersion>
-    <karafVersion>2.3.2</karafVersion>
+    <karafVersion>2.3.4</karafVersion>
     <felixVersion>2.2.0</felixVersion>
     <liquibaseVersion>2.0.5</liquibaseVersion>
     <log4jVersion>99.99.99-use-log4j2</log4jVersion>
@@ -1000,7 +1000,7 @@
     <xercesVersion>2.9.1</xercesVersion>
     <xmlApisVersion>1.4.01</xmlApisVersion>
 
-    <springVersion>3.2.3.RELEASE</springVersion>
+    <springVersion>3.2.4.RELEASE</springVersion>
     <!-- ALWAYS change aspectj to match the version referenced in the spring poms -->
     <aspectjVersion>1.7.1</aspectjVersion>
     <springWebFlowVersion>2.3.0.RELEASE</springWebFlowVersion>