diff --git a/components/camel/camel-mail/src/main/java/org/switchyard/component/camel/mail/model/v1/V1CamelMailProducerBindingModel.java b/components/camel/camel-mail/src/main/java/org/switchyard/component/camel/mail/model/v1/V1CamelMailProducerBindingModel.java
index d834f3a..5c7488b 100644
--- a/components/camel/camel-mail/src/main/java/org/switchyard/component/camel/mail/model/v1/V1CamelMailProducerBindingModel.java
+++ b/components/camel/camel-mail/src/main/java/org/switchyard/component/camel/mail/model/v1/V1CamelMailProducerBindingModel.java
@@ -32,8 +32,8 @@ public class V1CamelMailProducerBindingModel extends V1BaseCamelModel
private static final String SUBJECT = "subject";
private static final String FROM = "from";
private static final String TO = "to";
- private static final String CC = "CC";
- private static final String BCC = "BCC";
+ private static final String CC = "cc";
+ private static final String BCC = "bcc";
private static final String REPLY_TO = "replyTo";
/**
diff --git a/components/camel/camel-mail/src/main/resources/org/switchyard/component/camel/mail/model/v1/camel-mail_1_0.xsd b/components/camel/camel-mail/src/main/resources/org/switchyard/component/camel/mail/model/v1/camel-mail_1_0.xsd
index 56a9d93..8925a8b 100644
--- a/components/camel/camel-mail/src/main/resources/org/switchyard/component/camel/mail/model/v1/camel-mail_1_0.xsd
+++ b/components/camel/camel-mail/src/main/resources/org/switchyard/component/camel/mail/model/v1/camel-mail_1_0.xsd
@@ -46,8 +46,8 @@
-
-
+
+
diff --git a/components/camel/camel-mail/src/main/resources/org/switchyard/component/camel/mail/model/v1/camel-mail_1_1.xsd b/components/camel/camel-mail/src/main/resources/org/switchyard/component/camel/mail/model/v1/camel-mail_1_1.xsd
index 178aa07..94b9c42 100644
--- a/components/camel/camel-mail/src/main/resources/org/switchyard/component/camel/mail/model/v1/camel-mail_1_1.xsd
+++ b/components/camel/camel-mail/src/main/resources/org/switchyard/component/camel/mail/model/v1/camel-mail_1_1.xsd
@@ -46,8 +46,8 @@
-
-
+
+
diff --git a/components/camel/camel-mail/src/main/resources/org/switchyard/component/camel/mail/model/v2/camel-mail_2_0.xsd b/components/camel/camel-mail/src/main/resources/org/switchyard/component/camel/mail/model/v2/camel-mail_2_0.xsd
index ec54239..591984d 100644
--- a/components/camel/camel-mail/src/main/resources/org/switchyard/component/camel/mail/model/v2/camel-mail_2_0.xsd
+++ b/components/camel/camel-mail/src/main/resources/org/switchyard/component/camel/mail/model/v2/camel-mail_2_0.xsd
@@ -46,8 +46,8 @@
-
-
+
+
diff --git a/components/camel/camel-mail/src/test/java/org/switchyard/component/camel/mail/model/v1/V1CamelMailProducerBindingModelTest.java b/components/camel/camel-mail/src/test/java/org/switchyard/component/camel/mail/model/v1/V1CamelMailProducerBindingModelTest.java
index 64a300e..ba48021 100644
--- a/components/camel/camel-mail/src/test/java/org/switchyard/component/camel/mail/model/v1/V1CamelMailProducerBindingModelTest.java
+++ b/components/camel/camel-mail/src/test/java/org/switchyard/component/camel/mail/model/v1/V1CamelMailProducerBindingModelTest.java
@@ -36,7 +36,7 @@ public class V1CamelMailProducerBindingModelTest extends V1BaseCamelReferenceBin
private static final String REPLY_TO = "camel@camel";
private static final String CAMEL_URI = "smtps://rider?subject=Desert ride&" +
- "from=rider@camel&to=camel@rider&CC=mule@rider&BCC=rider@mule&replyTo=camel@camel";
+ "from=rider@camel&to=camel@rider&cc=mule@rider&bcc=rider@mule&replyTo=camel@camel";
public V1CamelMailProducerBindingModelTest() {
super(MailEndpoint.class, CAMEL_XML);
diff --git a/components/camel/camel-mail/src/test/resources/v1/switchyard-mail-binding-producer-beans.xml b/components/camel/camel-mail/src/test/resources/v1/switchyard-mail-binding-producer-beans.xml
index 6486870..e25be65 100644
--- a/components/camel/camel-mail/src/test/resources/v1/switchyard-mail-binding-producer-beans.xml
+++ b/components/camel/camel-mail/src/test/resources/v1/switchyard-mail-binding-producer-beans.xml
@@ -24,8 +24,8 @@
Desert ride
rider@camel
camel@rider
- mule@rider
- rider@mule
+ mule@rider
+ rider@mule
camel@camel
diff --git a/pom.xml b/pom.xml
index 2f16c37..e1bb767 100644
--- a/pom.xml
+++ b/pom.xml
@@ -58,10 +58,10 @@
1.21
1.9
- 6.3.0.redhat-045
+ 6.3.0.redhat-047
1.6
- 2.4.0.redhat-630045
+ 2.4.0.redhat-630047
1.2.2.Final-redhat-2
2.0.18.Final-redhat-2
@@ -82,9 +82,9 @@
2.6
2.6
- 2.16.1
- 5.11.0.redhat-630045
- 2.4.0.redhat-630045
+ 2.17.0.redhat-630047
+ 5.11.0.redhat-630047
+ 2.4.0.redhat-630047
2.2.11
diff --git a/release/karaf/deploy/src/main/java/org/switchyard/deploy/osgi/internal/OsgiSwitchYardCamelContextImpl.java b/release/karaf/deploy/src/main/java/org/switchyard/deploy/osgi/internal/OsgiSwitchYardCamelContextImpl.java
index 8c529ec..97782ec 100644
--- a/release/karaf/deploy/src/main/java/org/switchyard/deploy/osgi/internal/OsgiSwitchYardCamelContextImpl.java
+++ b/release/karaf/deploy/src/main/java/org/switchyard/deploy/osgi/internal/OsgiSwitchYardCamelContextImpl.java
@@ -52,7 +52,7 @@ public class OsgiSwitchYardCamelContextImpl extends SwitchYardCamelContextImpl {
ctx = _bundleContext;
}
FactoryFinder finder = new OsgiFactoryFinderResolver(_bundleContext).resolveDefaultFactoryFinder(getClassResolver());
- return new OsgiTypeConverter(ctx, getInjector(), finder);
+ return new OsgiTypeConverter(ctx, this, getInjector(), finder);
}
}