Merge pull request #58 from drasil/revert-57-revert-52-dependenciesBr…

…anch Updated project dependencies (fixed)
Bluelock · Sep 1, 2014 · 42ba4b5 · 42ba4b5
2 parents b178a6f + 9529fc2
commit 42ba4b5
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 19 deletions.
diff --git a/pom.xml b/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.sonatype.oss</groupId>
         <artifactId>oss-parent</artifactId>
-        <version>7</version>
+        <version>9</version>
     </parent>
 
     <groupId>com.bluelock</groupId>
@@ -66,30 +66,30 @@
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <org.apache.camel.version>2.11.2</org.apache.camel.version>
-        <org.springframework.amqp.version>1.2.0.RELEASE</org.springframework.amqp.version>
-        <org.springframework.retry.version>1.0.2.RELEASE</org.springframework.retry.version>
-        <!-- Apache Camel 2.11.x moved to Spring Framework 3.1.x -->
-        <org.springframework.version>3.1.4.RELEASE</org.springframework.version>
-        <ch.qos.logback.version>1.0.0</ch.qos.logback.version>
+        <org.apache.camel.version>2.13.2</org.apache.camel.version>
+        <org.springframework.amqp.version>1.3.4.RELEASE</org.springframework.amqp.version>
+        <org.springframework.retry.version>1.1.0.RELEASE</org.springframework.retry.version>
+        <!-- Keep this in line with the version referenced by Camel and Spring-AMQP -->
+        <org.springframework.version>3.2.8.RELEASE</org.springframework.version>
+        <ch.qos.logback.version>1.1.2</ch.qos.logback.version>
     </properties>
 
     <dependencies>
         <!-- Marshalling -->
         <dependency>
             <groupId>com.thoughtworks.xstream</groupId>
             <artifactId>xstream</artifactId>
-            <version>1.4.2</version>
+            <version>1.4.7</version>
         </dependency>
         <dependency>
             <groupId>org.codehaus.jettison</groupId>
             <artifactId>jettison</artifactId>
-            <version>1.3</version>
+            <version>1.3.5</version>
         </dependency>
         <dependency>
             <groupId>org.codehaus.jackson</groupId>
             <artifactId>jackson-mapper-asl</artifactId>
-            <version>1.9.1</version>
+            <version>1.9.13</version>
             <scope>compile</scope>
         </dependency>
 
@@ -185,7 +185,7 @@
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
-            <version>4.10</version>
+            <version>4.11</version>
             <scope>test</scope>
         </dependency>
     </dependencies>
@@ -201,7 +201,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
-                <version>2.3.2</version>
+                <version>3.1</version>
                 <configuration>
                     <source>1.6</source>
                     <target>1.6</target>
@@ -211,7 +211,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-dependency-plugin</artifactId>
-                <version>2.2</version>
+                <version>2.8</version>
                 <executions>
                     <execution>
                         <id>install</id>
@@ -225,12 +225,12 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-javadoc-plugin</artifactId>
-                <version>2.8</version>
+                <version>2.9.1</version>
             </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-source-plugin</artifactId>
-                <version>2.1.2</version>
+                <version>2.2.1</version>
                 <executions>
                     <execution>
                         <id>attach-sources</id>
@@ -243,13 +243,13 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-site-plugin</artifactId>
-                <version>3.0</version>
+                <version>3.3</version>
                 <configuration>
                     <reportPlugins>
                         <plugin>
                             <groupId>org.codehaus.mojo</groupId>
                             <artifactId>cobertura-maven-plugin</artifactId>
-                            <version>2.5.1</version>
+                            <version>2.6</version>
                             <configuration>
                                 <formats>
                                     <format>html</format>
@@ -261,7 +261,7 @@
                         <plugin>
                             <groupId>org.codehaus.mojo</groupId>
                             <artifactId>findbugs-maven-plugin</artifactId>
-                            <version>2.3</version>
+                            <version>2.5.4</version>
                             <configuration>
                                 <findbugsXmlOutput>true</findbugsXmlOutput>
                             </configuration>

diff --git a/src/main/java/amqp/spring/camel/component/SpringAMQPConsumer.java b/src/main/java/amqp/spring/camel/component/SpringAMQPConsumer.java
@@ -181,7 +181,7 @@ public final Advice[] getAdviceChain() {
 
             StatefulRetryOperationsInterceptorFactoryBean retryOperation = new StatefulRetryOperationsInterceptorFactoryBean();
             retryOperation.setRetryOperations(retryRule);
-            retryOperation.setMessageKeyGeneretor(new DefaultKeyGenerator());
+            retryOperation.setMessageKeyGenerator(new DefaultKeyGenerator());
 
             return new Advice[] { retryOperation.getObject() };
         }