Repository: camel
Updated Branches:
  refs/heads/master 5e0bc855c -> 48c411b2a


CAMEL-11653 - Camel-Nagios: Switch to jsendnsca ported library


Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/2586982e
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/2586982e
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/2586982e

Branch: refs/heads/master
Commit: 2586982eb6c2b15ab1cf761ebdcccd33fbaab843
Parents: 5e0bc85
Author: Andrea Cosentino <anco...@gmail.com>
Authored: Wed Aug 9 10:42:49 2017 +0200
Committer: Andrea Cosentino <anco...@gmail.com>
Committed: Wed Aug 9 10:42:49 2017 +0200

----------------------------------------------------------------------
 components/camel-nagios/pom.xml                 |  4 ++--
 .../component/nagios/NagiosConfiguration.java   | 11 +++++-----
 .../camel/component/nagios/NagiosEndpoint.java  | 13 ++++++-----
 .../component/nagios/NagiosEventNotifier.java   | 16 ++++++++------
 .../camel/component/nagios/NagiosProducer.java  | 16 ++++++++------
 .../component/nagios/NagiosAsyncSendTest.java   |  4 +++-
 .../nagios/NagiosEventNotifierTest.java         |  8 ++++---
 .../camel/component/nagios/NagiosTest.java      | 23 ++++++++++----------
 .../nagios/NagiosXorEncryptionTest.java         | 13 ++++++-----
 parent/pom.xml                                  |  2 +-
 .../features/src/main/resources/features.xml    |  2 +-
 .../NagiosComponentConfiguration.java           |  2 +-
 12 files changed, 64 insertions(+), 50 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/camel/blob/2586982e/components/camel-nagios/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-nagios/pom.xml b/components/camel-nagios/pom.xml
index ea44384..f15a48e 100644
--- a/components/camel-nagios/pom.xml
+++ b/components/camel-nagios/pom.xml
@@ -60,8 +60,8 @@
     </dependency>
 
     <dependency>
-      <groupId>com.googlecode</groupId>
-      <artifactId>jsendnsca-core</artifactId>
+      <groupId>com.github.jsendnsca</groupId>
+      <artifactId>jsendnsca</artifactId>
       <version>${jsendnsca-version}</version>
     </dependency>
 

http://git-wip-us.apache.org/repos/asf/camel/blob/2586982e/components/camel-nagios/src/main/java/org/apache/camel/component/nagios/NagiosConfiguration.java
----------------------------------------------------------------------
diff --git 
a/components/camel-nagios/src/main/java/org/apache/camel/component/nagios/NagiosConfiguration.java
 
b/components/camel-nagios/src/main/java/org/apache/camel/component/nagios/NagiosConfiguration.java
index 73e9172..8792a27 100644
--- 
a/components/camel-nagios/src/main/java/org/apache/camel/component/nagios/NagiosConfiguration.java
+++ 
b/components/camel-nagios/src/main/java/org/apache/camel/component/nagios/NagiosConfiguration.java
@@ -18,8 +18,6 @@ package org.apache.camel.component.nagios;
 
 import java.net.URI;
 
-import com.googlecode.jsendnsca.core.Encryption;
-import com.googlecode.jsendnsca.core.NagiosSettings;
 import org.apache.camel.RuntimeCamelException;
 import org.apache.camel.spi.Metadata;
 import org.apache.camel.spi.UriParam;
@@ -27,6 +25,9 @@ import org.apache.camel.spi.UriParams;
 import org.apache.camel.spi.UriPath;
 import org.apache.camel.util.ObjectHelper;
 
+import com.googlecode.jsendnsca.NagiosSettings;
+import com.googlecode.jsendnsca.encryption.Encryption;
+
 /**
  * @version 
  */
@@ -90,11 +91,11 @@ public class NagiosConfiguration implements Cloneable {
 
             if (encryptionMethod != null) {
                 if (NagiosEncryptionMethod.No == encryptionMethod) {
-                    
nagiosSettings.setEncryptionMethod(Encryption.NO_ENCRYPTION);
+                    nagiosSettings.setEncryption(Encryption.NONE);
                 } else if (NagiosEncryptionMethod.Xor == encryptionMethod) {
-                    
nagiosSettings.setEncryptionMethod(Encryption.XOR_ENCRYPTION);
+                    nagiosSettings.setEncryption(Encryption.XOR);
                 } else if (NagiosEncryptionMethod.TripleDes == 
encryptionMethod) {
-                    
nagiosSettings.setEncryptionMethod(Encryption.TRIPLE_DES_ENCRYPTION);
+                    nagiosSettings.setEncryption(Encryption.TRIPLE_DES);
                 } else {
                     throw new IllegalArgumentException("Unknown encryption 
method: " + encryptionMethod);
                 }

http://git-wip-us.apache.org/repos/asf/camel/blob/2586982e/components/camel-nagios/src/main/java/org/apache/camel/component/nagios/NagiosEndpoint.java
----------------------------------------------------------------------
diff --git 
a/components/camel-nagios/src/main/java/org/apache/camel/component/nagios/NagiosEndpoint.java
 
b/components/camel-nagios/src/main/java/org/apache/camel/component/nagios/NagiosEndpoint.java
index aecd19f..637cd8b 100644
--- 
a/components/camel-nagios/src/main/java/org/apache/camel/component/nagios/NagiosEndpoint.java
+++ 
b/components/camel-nagios/src/main/java/org/apache/camel/component/nagios/NagiosEndpoint.java
@@ -16,9 +16,6 @@
  */
 package org.apache.camel.component.nagios;
 
-import com.googlecode.jsendnsca.core.INagiosPassiveCheckSender;
-import com.googlecode.jsendnsca.core.NagiosPassiveCheckSender;
-import com.googlecode.jsendnsca.core.NonBlockingNagiosPassiveCheckSender;
 import org.apache.camel.Component;
 import org.apache.camel.Consumer;
 import org.apache.camel.Processor;
@@ -28,13 +25,17 @@ import org.apache.camel.spi.UriEndpoint;
 import org.apache.camel.spi.UriParam;
 import org.apache.camel.util.ObjectHelper;
 
+import com.googlecode.jsendnsca.NagiosPassiveCheckSender;
+import com.googlecode.jsendnsca.NonBlockingNagiosPassiveCheckSender;
+import com.googlecode.jsendnsca.PassiveCheckSender;
+
 /**
  * To send passive checks to Nagios using JSendNSCA.
  */
 @UriEndpoint(firstVersion = "2.3.0", scheme = "nagios", title = "Nagios", 
syntax = "nagios:host:port", producerOnly = true, label = "monitoring")
 public class NagiosEndpoint extends DefaultEndpoint {
 
-    private INagiosPassiveCheckSender sender;
+    private PassiveCheckSender sender;
     @UriParam
     private NagiosConfiguration configuration;
     @UriParam(defaultValue = "true")
@@ -80,7 +81,7 @@ public class NagiosEndpoint extends DefaultEndpoint {
         this.sendSync = sendSync;
     }
 
-    public synchronized INagiosPassiveCheckSender getSender() {
+    public synchronized PassiveCheckSender getSender() {
         if (sender == null) {
             if (isSendSync()) {
                 sender = new 
NagiosPassiveCheckSender(getConfiguration().getNagiosSettings());
@@ -92,7 +93,7 @@ public class NagiosEndpoint extends DefaultEndpoint {
         return sender;
     }
 
-    public void setSender(INagiosPassiveCheckSender sender) {
+    public void setSender(PassiveCheckSender sender) {
         this.sender = sender;
     }
 }

http://git-wip-us.apache.org/repos/asf/camel/blob/2586982e/components/camel-nagios/src/main/java/org/apache/camel/component/nagios/NagiosEventNotifier.java
----------------------------------------------------------------------
diff --git 
a/components/camel-nagios/src/main/java/org/apache/camel/component/nagios/NagiosEventNotifier.java
 
b/components/camel-nagios/src/main/java/org/apache/camel/component/nagios/NagiosEventNotifier.java
index 3f99f7f..ad411a3 100644
--- 
a/components/camel-nagios/src/main/java/org/apache/camel/component/nagios/NagiosEventNotifier.java
+++ 
b/components/camel-nagios/src/main/java/org/apache/camel/component/nagios/NagiosEventNotifier.java
@@ -18,10 +18,6 @@ package org.apache.camel.component.nagios;
 
 import java.util.EventObject;
 
-import com.googlecode.jsendnsca.core.Level;
-import com.googlecode.jsendnsca.core.MessagePayload;
-import com.googlecode.jsendnsca.core.NagiosPassiveCheckSender;
-import com.googlecode.jsendnsca.core.NagiosSettings;
 import org.apache.camel.management.event.CamelContextStartupFailureEvent;
 import org.apache.camel.management.event.CamelContextStopFailureEvent;
 import org.apache.camel.management.event.ExchangeFailedEvent;
@@ -31,6 +27,12 @@ import 
org.apache.camel.management.event.ServiceStartupFailureEvent;
 import org.apache.camel.management.event.ServiceStopFailureEvent;
 import org.apache.camel.support.EventNotifierSupport;
 
+import com.googlecode.jsendnsca.Level;
+import com.googlecode.jsendnsca.MessagePayload;
+import com.googlecode.jsendnsca.NagiosPassiveCheckSender;
+import com.googlecode.jsendnsca.NagiosSettings;
+import com.googlecode.jsendnsca.PassiveCheckSender;
+
 /**
  * An {@link org.apache.camel.spi.EventNotifier} which sends alters to Nagios.
  *
@@ -40,7 +42,7 @@ public class NagiosEventNotifier extends EventNotifierSupport 
{
 
     private NagiosSettings nagiosSettings;
     private NagiosConfiguration configuration;
-    private NagiosPassiveCheckSender sender;
+    private PassiveCheckSender sender;
     private String serviceName = "Camel";
     private String hostName = "localhost";
 
@@ -48,7 +50,7 @@ public class NagiosEventNotifier extends EventNotifierSupport 
{
 
     }
 
-    public NagiosEventNotifier(NagiosPassiveCheckSender sender) {
+    public NagiosEventNotifier(PassiveCheckSender sender) {
         this.sender = sender;
     }
 
@@ -56,7 +58,7 @@ public class NagiosEventNotifier extends EventNotifierSupport 
{
         // create message payload to send
         String message = eventObject.toString();
         Level level = determineLevel(eventObject);
-        MessagePayload payload = new MessagePayload(getHostName(), 
level.ordinal(), getServiceName(), message);
+        MessagePayload payload = new MessagePayload(getHostName(), level, 
getServiceName(), message);
 
         if (log.isInfoEnabled()) {
             log.info("Sending notification to Nagios: {}", 
payload.getMessage());

http://git-wip-us.apache.org/repos/asf/camel/blob/2586982e/components/camel-nagios/src/main/java/org/apache/camel/component/nagios/NagiosProducer.java
----------------------------------------------------------------------
diff --git 
a/components/camel-nagios/src/main/java/org/apache/camel/component/nagios/NagiosProducer.java
 
b/components/camel-nagios/src/main/java/org/apache/camel/component/nagios/NagiosProducer.java
index ecf3b9d..5a78e8c 100644
--- 
a/components/camel-nagios/src/main/java/org/apache/camel/component/nagios/NagiosProducer.java
+++ 
b/components/camel-nagios/src/main/java/org/apache/camel/component/nagios/NagiosProducer.java
@@ -18,13 +18,15 @@ package org.apache.camel.component.nagios;
 
 import java.util.concurrent.ExecutorService;
 
-import com.googlecode.jsendnsca.core.INagiosPassiveCheckSender;
-import com.googlecode.jsendnsca.core.Level;
-import com.googlecode.jsendnsca.core.MessagePayload;
-import com.googlecode.jsendnsca.core.NonBlockingNagiosPassiveCheckSender;
 import org.apache.camel.Exchange;
 import org.apache.camel.impl.DefaultProducer;
 
+import com.googlecode.jsendnsca.Level;
+import com.googlecode.jsendnsca.MessagePayload;
+import com.googlecode.jsendnsca.NagiosPassiveCheckSender;
+import com.googlecode.jsendnsca.NonBlockingNagiosPassiveCheckSender;
+import com.googlecode.jsendnsca.PassiveCheckSender;
+
 import static org.apache.camel.component.nagios.NagiosConstants.HOST_NAME;
 import static org.apache.camel.component.nagios.NagiosConstants.LEVEL;
 import static org.apache.camel.component.nagios.NagiosConstants.SERVICE_NAME;
@@ -34,9 +36,9 @@ import static 
org.apache.camel.component.nagios.NagiosConstants.SERVICE_NAME;
  */
 public class NagiosProducer extends DefaultProducer {
 
-    private final INagiosPassiveCheckSender sender;
+    private final PassiveCheckSender sender;
 
-    public NagiosProducer(NagiosEndpoint endpoint, INagiosPassiveCheckSender 
sender) {
+    public NagiosProducer(NagiosEndpoint endpoint, PassiveCheckSender sender) {
         super(endpoint);
         this.sender = sender;
     }
@@ -52,7 +54,7 @@ public class NagiosProducer extends DefaultProducer {
         String serviceName = exchange.getIn().getHeader(SERVICE_NAME, 
exchange.getContext().getName(), String.class);
         String hostName = exchange.getIn().getHeader(HOST_NAME, "localhost", 
String.class);
 
-        MessagePayload payload = new MessagePayload(hostName, level.ordinal(), 
serviceName, message);
+        MessagePayload payload = new MessagePayload(hostName, level, 
serviceName, message);
 
         if (log.isDebugEnabled()) {
             log.debug("Sending notification to Nagios: {}", 
payload.getMessage());

http://git-wip-us.apache.org/repos/asf/camel/blob/2586982e/components/camel-nagios/src/test/java/org/apache/camel/component/nagios/NagiosAsyncSendTest.java
----------------------------------------------------------------------
diff --git 
a/components/camel-nagios/src/test/java/org/apache/camel/component/nagios/NagiosAsyncSendTest.java
 
b/components/camel-nagios/src/test/java/org/apache/camel/component/nagios/NagiosAsyncSendTest.java
index 4020557..66d5c43 100644
--- 
a/components/camel-nagios/src/test/java/org/apache/camel/component/nagios/NagiosAsyncSendTest.java
+++ 
b/components/camel-nagios/src/test/java/org/apache/camel/component/nagios/NagiosAsyncSendTest.java
@@ -16,12 +16,14 @@
  */
 package org.apache.camel.component.nagios;
 
-import com.googlecode.jsendnsca.core.NonBlockingNagiosPassiveCheckSender;
+
 import org.apache.camel.Producer;
 import org.apache.camel.builder.RouteBuilder;
 import org.junit.BeforeClass;
 import org.mockito.Mockito;
 
+import com.googlecode.jsendnsca.NonBlockingNagiosPassiveCheckSender;
+
 /**
  * @version 
  */

http://git-wip-us.apache.org/repos/asf/camel/blob/2586982e/components/camel-nagios/src/test/java/org/apache/camel/component/nagios/NagiosEventNotifierTest.java
----------------------------------------------------------------------
diff --git 
a/components/camel-nagios/src/test/java/org/apache/camel/component/nagios/NagiosEventNotifierTest.java
 
b/components/camel-nagios/src/test/java/org/apache/camel/component/nagios/NagiosEventNotifierTest.java
index 52f8962..9ce34ed 100644
--- 
a/components/camel-nagios/src/test/java/org/apache/camel/component/nagios/NagiosEventNotifierTest.java
+++ 
b/components/camel-nagios/src/test/java/org/apache/camel/component/nagios/NagiosEventNotifierTest.java
@@ -16,8 +16,6 @@
  */
 package org.apache.camel.component.nagios;
 
-import com.googlecode.jsendnsca.core.MessagePayload;
-import com.googlecode.jsendnsca.core.NagiosPassiveCheckSender;
 import org.apache.camel.CamelContext;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.test.junit4.CamelTestSupport;
@@ -26,6 +24,10 @@ import org.junit.Test;
 import org.mockito.Mock;
 import org.mockito.Mockito;
 
+import com.googlecode.jsendnsca.MessagePayload;
+import com.googlecode.jsendnsca.NagiosPassiveCheckSender;
+import com.googlecode.jsendnsca.PassiveCheckSender;
+
 import static org.mockito.Mockito.*;
 /**
  * @version 
@@ -34,7 +36,7 @@ public class NagiosEventNotifierTest extends CamelTestSupport 
{
     protected boolean canRun;
 
     @Mock
-    private NagiosPassiveCheckSender nagiosPassiveCheckSender = 
Mockito.mock(NagiosPassiveCheckSender.class);
+    private PassiveCheckSender nagiosPassiveCheckSender = 
Mockito.mock(NagiosPassiveCheckSender.class);
 
 
     @Override

http://git-wip-us.apache.org/repos/asf/camel/blob/2586982e/components/camel-nagios/src/test/java/org/apache/camel/component/nagios/NagiosTest.java
----------------------------------------------------------------------
diff --git 
a/components/camel-nagios/src/test/java/org/apache/camel/component/nagios/NagiosTest.java
 
b/components/camel-nagios/src/test/java/org/apache/camel/component/nagios/NagiosTest.java
index 9e0c87c..e93189c 100644
--- 
a/components/camel-nagios/src/test/java/org/apache/camel/component/nagios/NagiosTest.java
+++ 
b/components/camel-nagios/src/test/java/org/apache/camel/component/nagios/NagiosTest.java
@@ -19,10 +19,6 @@ package org.apache.camel.component.nagios;
 import java.util.HashMap;
 import java.util.Map;
 
-import com.googlecode.jsendnsca.core.INagiosPassiveCheckSender;
-import com.googlecode.jsendnsca.core.Level;
-import com.googlecode.jsendnsca.core.MessagePayload;
-import com.googlecode.jsendnsca.core.NagiosPassiveCheckSender;
 import org.apache.camel.Producer;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.component.mock.MockEndpoint;
@@ -33,6 +29,11 @@ import org.junit.Test;
 import org.mockito.Mock;
 import org.mockito.Mockito;
 
+import com.googlecode.jsendnsca.Level;
+import com.googlecode.jsendnsca.MessagePayload;
+import com.googlecode.jsendnsca.NagiosPassiveCheckSender;
+import com.googlecode.jsendnsca.PassiveCheckSender;
+
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
 
@@ -42,7 +43,7 @@ import static org.mockito.Mockito.verify;
  */
 public class NagiosTest extends CamelTestSupport {
     @Mock
-    protected static INagiosPassiveCheckSender nagiosPassiveCheckSender;
+    protected static PassiveCheckSender nagiosPassiveCheckSender;
 
     protected boolean canRun;
 
@@ -65,7 +66,7 @@ public class NagiosTest extends CamelTestSupport {
             return;
         }
 
-        MessagePayload expectedPayload = new MessagePayload("localhost", 
Level.OK.ordinal(), context.getName(),  "Hello Nagios");
+        MessagePayload expectedPayload = new MessagePayload("localhost", 
Level.OK, context.getName(),  "Hello Nagios");
 
         MockEndpoint mock = getMockEndpoint("mock:result");
         mock.expectedMessageCount(1);
@@ -85,8 +86,8 @@ public class NagiosTest extends CamelTestSupport {
             return;
         }
 
-        MessagePayload expectedPayload1 = new MessagePayload("localhost", 
Level.OK.ordinal(), context.getName(),  "Hello Nagios");
-        MessagePayload expectedPayload2 = new MessagePayload("localhost", 
Level.OK.ordinal(), context.getName(),  "Bye Nagios");
+        MessagePayload expectedPayload1 = new MessagePayload("localhost", 
Level.OK, context.getName(),  "Hello Nagios");
+        MessagePayload expectedPayload2 = new MessagePayload("localhost", 
Level.OK, context.getName(),  "Bye Nagios");
 
         MockEndpoint mock = getMockEndpoint("mock:result");
         mock.expectedMessageCount(2);
@@ -108,7 +109,7 @@ public class NagiosTest extends CamelTestSupport {
             return;
         }
 
-        MessagePayload expectedPayload1 = new MessagePayload("localhost", 
Level.WARNING.ordinal(), context.getName(),  "Hello Nagios");
+        MessagePayload expectedPayload1 = new MessagePayload("localhost", 
Level.WARNING, context.getName(),  "Hello Nagios");
 
         MockEndpoint mock = getMockEndpoint("mock:result");
         mock.expectedMessageCount(1);
@@ -126,7 +127,7 @@ public class NagiosTest extends CamelTestSupport {
             return;
         }
 
-        MessagePayload expectedPayload1 = new MessagePayload("localhost", 
Level.WARNING.ordinal(), context.getName(),  "Hello Nagios");
+        MessagePayload expectedPayload1 = new MessagePayload("localhost", 
Level.WARNING, context.getName(),  "Hello Nagios");
         MockEndpoint mock = getMockEndpoint("mock:result");
         mock.expectedMessageCount(1);
         mock.expectedBodiesReceived("Hello Nagios");
@@ -144,7 +145,7 @@ public class NagiosTest extends CamelTestSupport {
             return;
         }
 
-        MessagePayload expectedPayload1 = new MessagePayload("myHost", 
Level.CRITICAL.ordinal(), "myService",  "Hello Nagios");
+        MessagePayload expectedPayload1 = new MessagePayload("myHost", 
Level.CRITICAL, "myService",  "Hello Nagios");
         MockEndpoint mock = getMockEndpoint("mock:result");
         mock.expectedMessageCount(1);
         mock.expectedBodiesReceived("Hello Nagios");

http://git-wip-us.apache.org/repos/asf/camel/blob/2586982e/components/camel-nagios/src/test/java/org/apache/camel/component/nagios/NagiosXorEncryptionTest.java
----------------------------------------------------------------------
diff --git 
a/components/camel-nagios/src/test/java/org/apache/camel/component/nagios/NagiosXorEncryptionTest.java
 
b/components/camel-nagios/src/test/java/org/apache/camel/component/nagios/NagiosXorEncryptionTest.java
index f13a625..5a2021b 100644
--- 
a/components/camel-nagios/src/test/java/org/apache/camel/component/nagios/NagiosXorEncryptionTest.java
+++ 
b/components/camel-nagios/src/test/java/org/apache/camel/component/nagios/NagiosXorEncryptionTest.java
@@ -16,9 +16,7 @@
  */
 package org.apache.camel.component.nagios;
 
-import com.googlecode.jsendnsca.core.Level;
-import com.googlecode.jsendnsca.core.MessagePayload;
-import com.googlecode.jsendnsca.core.NagiosPassiveCheckSender;
+
 import org.apache.camel.Producer;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.component.mock.MockEndpoint;
@@ -28,6 +26,11 @@ import org.junit.Test;
 import org.mockito.Mock;
 import org.mockito.Mockito;
 
+import com.googlecode.jsendnsca.Level;
+import com.googlecode.jsendnsca.MessagePayload;
+import com.googlecode.jsendnsca.NagiosPassiveCheckSender;
+import com.googlecode.jsendnsca.PassiveCheckSender;
+
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
 
@@ -38,7 +41,7 @@ public class NagiosXorEncryptionTest extends CamelTestSupport 
{
     protected boolean canRun;
 
     @Mock
-    private NagiosPassiveCheckSender nagiosPassiveCheckSender = 
Mockito.mock(NagiosPassiveCheckSender.class);
+    private PassiveCheckSender nagiosPassiveCheckSender = 
Mockito.mock(NagiosPassiveCheckSender.class);
 
     @Before
     @Override
@@ -53,7 +56,7 @@ public class NagiosXorEncryptionTest extends CamelTestSupport 
{
             return;
         }
 
-        MessagePayload expectedPayload = new MessagePayload("localhost", 
Level.OK.ordinal(), context.getName(),  "Hello Nagios");
+        MessagePayload expectedPayload = new MessagePayload("localhost", 
Level.OK, context.getName(),  "Hello Nagios");
         MockEndpoint mock = getMockEndpoint("mock:result");
         mock.expectedMessageCount(1);
         mock.allMessages().body().isInstanceOf(String.class);

http://git-wip-us.apache.org/repos/asf/camel/blob/2586982e/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index 5b48222..778958a 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -396,7 +396,7 @@
     <josql-version>1.5</josql-version>
     <!-- Upgrade to 1.7.26 causes stability issues. See CAMEL-10477 -->
     <jruby-version>1.7.18</jruby-version>
-    <jsendnsca-version>1.3.1</jsendnsca-version>
+    <jsendnsca-version>2.1.1</jsendnsca-version>
     <jsmpp-version>2.3.4</jsmpp-version>
     <jsch-version>0.1.54</jsch-version>
     <jsch-bundle-version>0.1.54_1</jsch-bundle-version>

http://git-wip-us.apache.org/repos/asf/camel/blob/2586982e/platforms/karaf/features/src/main/resources/features.xml
----------------------------------------------------------------------
diff --git a/platforms/karaf/features/src/main/resources/features.xml 
b/platforms/karaf/features/src/main/resources/features.xml
index 01b7862..d264214 100644
--- a/platforms/karaf/features/src/main/resources/features.xml
+++ b/platforms/karaf/features/src/main/resources/features.xml
@@ -1379,7 +1379,7 @@
   </feature>
   <feature name='camel-nagios' version='${project.version}' resolver='(obr)' 
start-level='50'>
     <feature version='${project.version}'>camel-core</feature>
-    <bundle 
dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jsendnsca-core/${jsendnsca-bundle-version}</bundle>
+    <bundle 
dependency='true'>wrap:mvn:com.github.jsendnsca/jsendnsca/${jsendnsca-version}</bundle>
     <bundle>mvn:org.apache.camel/camel-nagios/${project.version}</bundle>
   </feature>
   <feature name='camel-nats' version='${project.version}' resolver='(obr)' 
start-level='50'>

http://git-wip-us.apache.org/repos/asf/camel/blob/2586982e/platforms/spring-boot/components-starter/camel-nagios-starter/src/main/java/org/apache/camel/component/nagios/springboot/NagiosComponentConfiguration.java
----------------------------------------------------------------------
diff --git 
a/platforms/spring-boot/components-starter/camel-nagios-starter/src/main/java/org/apache/camel/component/nagios/springboot/NagiosComponentConfiguration.java
 
b/platforms/spring-boot/components-starter/camel-nagios-starter/src/main/java/org/apache/camel/component/nagios/springboot/NagiosComponentConfiguration.java
index d171aef..cf7611c 100644
--- 
a/platforms/spring-boot/components-starter/camel-nagios-starter/src/main/java/org/apache/camel/component/nagios/springboot/NagiosComponentConfiguration.java
+++ 
b/platforms/spring-boot/components-starter/camel-nagios-starter/src/main/java/org/apache/camel/component/nagios/springboot/NagiosComponentConfiguration.java
@@ -17,7 +17,7 @@
 package org.apache.camel.component.nagios.springboot;
 
 import javax.annotation.Generated;
-import com.googlecode.jsendnsca.core.NagiosSettings;
+import com.googlecode.jsendnsca.NagiosSettings;
 import org.apache.camel.component.nagios.NagiosEncryptionMethod;
 import org.apache.camel.spring.boot.ComponentConfigurationPropertiesCommon;
 import org.springframework.boot.context.properties.ConfigurationProperties;

Reply via email to