diff --git a/catalog/src/main/resources/component.roadmap b/catalog/src/main/resources/component.roadmap
index 118b7af0c8..27d59d70ca 100644
--- a/catalog/src/main/resources/component.roadmap
+++ b/catalog/src/main/resources/component.roadmap
@@ -24,7 +24,9 @@ file
 flatpack
 ftp
 ftps
+http
 http4
+https
 imap
 imaps
 infinispan
@@ -58,6 +60,7 @@ rest
 rest-api
 rss
 salesforce
+sap-netweaver
 scheduler
 schematron
 scp
@@ -127,8 +130,6 @@ hazelcast
 hbase
 hdfs
 hdfs2
-http
-https
 ibatis
 influxdb
 jbpm
@@ -144,7 +145,6 @@ netty4-http
 optaplanner
 paho
 rabbitmq
-sap-netweaver
 sjms
 sjms-batch
 snmp
diff --git a/catalog/src/main/resources/org/apache/camel/catalog/components.properties b/catalog/src/main/resources/org/apache/camel/catalog/components.properties
index 3df57d7657..14fa5dbaaf 100644
--- a/catalog/src/main/resources/org/apache/camel/catalog/components.properties
+++ b/catalog/src/main/resources/org/apache/camel/catalog/components.properties
@@ -23,7 +23,9 @@ file
 flatpack
 ftp
 ftps
+http
 http4
+https
 imap
 imaps
 infinispan
@@ -57,6 +59,7 @@ rest
 rest-api
 rss
 salesforce
+sap-netweaver
 scheduler
 schematron
 scp
diff --git a/catalog/src/main/resources/org/apache/camel/catalog/components/http.json b/catalog/src/main/resources/org/apache/camel/catalog/components/http.json
new file mode 100644
index 0000000000..4c8560a6b6
--- /dev/null
+++ b/catalog/src/main/resources/org/apache/camel/catalog/components/http.json
@@ -0,0 +1,55 @@
+{
+ "component": {
+    "kind": "component",
+    "scheme": "http",
+    "alternativeSchemes": "http,https",
+    "syntax": "http:httpUri",
+    "title": "HTTP",
+    "description": "For calling out to external HTTP servers using Apache HTTP Client 3.x.",
+    "label": "http",
+    "deprecated": "false",
+    "async": "false",
+    "producerOnly": "true",
+    "lenientProperties": "true",
+    "javaType": "org.apache.camel.component.http.HttpComponent",
+    "groupId": "org.apache.camel",
+    "artifactId": "camel-http",
+    "version": "2.18.1"
+  },
+  "componentProperties": {
+    "httpClientConfigurer": { "kind": "property", "type": "object", "javaType": "org.apache.camel.component.http.HttpClientConfigurer", "deprecated": "false", "secret": "false", "description": "To use the custom HttpClientConfigurer to perform configuration of the HttpClient that will be used." },
+    "httpConnectionManager": { "kind": "property", "type": "object", "javaType": "org.apache.commons.httpclient.HttpConnectionManager", "deprecated": "false", "secret": "false", "description": "To use a custom HttpConnectionManager to manage connections" },
+    "httpBinding": { "kind": "property", "type": "object", "javaType": "org.apache.camel.http.common.HttpBinding", "deprecated": "false", "secret": "false", "description": "To use a custom HttpBinding to control the mapping between Camel message and HttpClient." },
+    "httpConfiguration": { "kind": "property", "type": "object", "javaType": "org.apache.camel.http.common.HttpConfiguration", "deprecated": "false", "secret": "false", "description": "To use the shared HttpConfiguration as base configuration." },
+    "allowJavaSerializedObject": { "kind": "property", "type": "boolean", "javaType": "boolean", "deprecated": "false", "secret": "false", "description": "Whether to allow java serialization when a request uses context-type=application/x-java-serialized-object This is by default turned off. If you enable this then be aware that Java will deserialize the incoming data from the request to Java and that can be a potential security risk." },
+    "headerFilterStrategy": { "kind": "property", "type": "object", "javaType": "org.apache.camel.spi.HeaderFilterStrategy", "deprecated": "false", "secret": "false", "description": "To use a custom HeaderFilterStrategy to filter header to and from Camel message." }
+  },
+  "properties": {
+    "httpUri": { "kind": "path", "group": "producer", "label": "producer", "required": "true", "type": "string", "javaType": "java.net.URI", "deprecated": "false", "secret": "false", "description": "The url of the HTTP endpoint to call." },
+    "disableStreamCache": { "kind": "parameter", "group": "common", "label": "common", "type": "boolean", "javaType": "boolean", "deprecated": "false", "secret": "false", "defaultValue": "false", "description": "Determines whether or not the raw input stream from Servlet is cached or not (Camel will read the stream into a in memory/overflow to file Stream caching) cache. By default Camel will cache the Servlet input stream to support reading it multiple times to ensure it Camel can retrieve all data from the stream. However you can set this option to true when you for example need to access the raw stream such as streaming it directly to a file or other persistent store. DefaultHttpBinding will copy the request input stream into a stream cache and put it into message body if this option is false to support reading the stream multiple times. If you use Servlet to bridge/proxy an endpoint then consider enabling this option to improve performance in case you do not need to read the message payload multiple times. The http/http4 producer will by default cache the response body stream. If setting this option to true then the producers will not cache the response body stream but use the response stream as-is as the message body." },
+    "authMethodPriority": { "kind": "parameter", "group": "producer", "label": "producer", "type": "string", "javaType": "java.lang.String", "enum": [ "Basic", "Digest", "NTLM" ], "deprecated": "false", "secret": "false", "description": "Authentication method for proxy either as Basic Digest or NTLM." },
+    "bridgeEndpoint": { "kind": "parameter", "group": "producer", "label": "producer", "type": "boolean", "javaType": "boolean", "deprecated": "false", "secret": "false", "defaultValue": "false", "description": "If the option is true HttpProducer will ignore the Exchange.HTTP_URI header and use the endpoint's URI for request. You may also set the option throwExceptionOnFailure to be false to let the HttpProducer send all the fault response back." },
+    "chunked": { "kind": "parameter", "group": "producer", "type": "boolean", "javaType": "boolean", "deprecated": "false", "secret": "false", "defaultValue": "true", "description": "If this option is false the Servlet will disable the HTTP streaming and set the content-length header on the response" },
+    "connectionClose": { "kind": "parameter", "group": "producer", "label": "producer", "type": "boolean", "javaType": "boolean", "deprecated": "false", "secret": "false", "defaultValue": "false", "description": "Specifies whether a Connection Close header must be added to HTTP Request. By default connectionClose is false." },
+    "copyHeaders": { "kind": "parameter", "group": "producer", "label": "producer", "type": "boolean", "javaType": "boolean", "deprecated": "false", "secret": "false", "defaultValue": "true", "description": "If this option is true then IN exchange headers will be copied to OUT exchange headers according to copy strategy. Setting this to false allows to only include the headers from the HTTP response (not propagating IN headers)." },
+    "headerFilterStrategy": { "kind": "parameter", "group": "producer", "type": "object", "javaType": "org.apache.camel.spi.HeaderFilterStrategy", "deprecated": "false", "secret": "false", "description": "To use a custom HeaderFilterStrategy to filter header to and from Camel message." },
+    "httpBinding": { "kind": "parameter", "group": "producer", "type": "object", "javaType": "org.apache.camel.http.common.HttpBinding", "deprecated": "false", "secret": "false", "description": "To use a custom HttpBinding to control the mapping between Camel message and HttpClient." },
+    "ignoreResponseBody": { "kind": "parameter", "group": "producer", "label": "producer", "type": "boolean", "javaType": "boolean", "deprecated": "false", "secret": "false", "defaultValue": "false", "description": "If this option is true The http producer won't read response body and cache the input stream" },
+    "okStatusCodeRange": { "kind": "parameter", "group": "producer", "label": "producer", "type": "string", "javaType": "java.lang.String", "deprecated": "false", "secret": "false", "defaultValue": "200-299", "description": "The status codes which is considered a success response. The values are inclusive. The range must be defined as from-to with the dash included." },
+    "preserveHostHeader": { "kind": "parameter", "group": "producer", "label": "producer", "type": "boolean", "javaType": "boolean", "deprecated": "false", "secret": "false", "defaultValue": "false", "description": "If the option is true HttpProducer will set the Host header to the value contained in the current exchange Host header useful in reverse proxy applications where you want the Host header received by the downstream server to reflect the URL called by the upstream client this allows applications which use the Host header to generate accurate URL's for a proxied service" },
+    "proxyHost": { "kind": "parameter", "group": "producer", "label": "producer", "type": "string", "javaType": "java.lang.String", "deprecated": "false", "secret": "false", "description": "The proxy host name" },
+    "proxyPort": { "kind": "parameter", "group": "producer", "label": "producer", "type": "integer", "javaType": "int", "deprecated": "false", "secret": "false", "description": "The proxy port number" },
+    "throwExceptionOnFailure": { "kind": "parameter", "group": "producer", "label": "producer", "type": "boolean", "javaType": "boolean", "deprecated": "false", "secret": "false", "defaultValue": "true", "description": "Option to disable throwing the HttpOperationFailedException in case of failed responses from the remote server. This allows you to get all responses regardless of the HTTP status code." },
+    "transferException": { "kind": "parameter", "group": "producer", "type": "boolean", "javaType": "boolean", "deprecated": "false", "secret": "false", "defaultValue": "false", "description": "If enabled and an Exchange failed processing on the consumer side and if the caused Exception was send back serialized in the response as a application/x-java-serialized-object content type. On the producer side the exception will be deserialized and thrown as is instead of the HttpOperationFailedException. The caused exception is required to be serialized. This is by default turned off. If you enable this then be aware that Java will deserialize the incoming data from the request to Java and that can be a potential security risk." },
+    "urlRewrite": { "kind": "parameter", "group": "producer (advanced)", "label": "producer,advanced", "type": "object", "javaType": "org.apache.camel.http.common.UrlRewrite", "deprecated": "false", "secret": "false", "description": "Refers to a custom org.apache.camel.component.http.UrlRewrite which allows you to rewrite urls when you bridge/proxy endpoints. See more details at http://camel.apache.org/urlrewrite.html" },
+    "httpClientConfigurer": { "kind": "parameter", "group": "advanced", "label": "advanced", "type": "object", "javaType": "org.apache.camel.component.http.HttpClientConfigurer", "deprecated": "false", "secret": "false", "description": "Register a custom configuration strategy for new HttpClient instances created by producers or consumers such as to configure authentication mechanisms etc" },
+    "httpClientOptions": { "kind": "parameter", "group": "advanced", "label": "advanced", "type": "object", "javaType": "java.util.Map<java.lang.String,java.lang.Object>", "prefix": "httpClient.", "multiValue": "true", "deprecated": "false", "secret": "false", "description": "To configure the HttpClient using the key/values from the Map." },
+    "httpConnectionManager": { "kind": "parameter", "group": "advanced", "label": "advanced", "type": "object", "javaType": "org.apache.commons.httpclient.HttpConnectionManager", "deprecated": "false", "secret": "false", "description": "To use a custom HttpConnectionManager to manage connections" },
+    "httpConnectionManagerOptions": { "kind": "parameter", "group": "advanced", "label": "advanced", "type": "object", "javaType": "java.util.Map<java.lang.String,java.lang.Object>", "prefix": "httpConnectionManager.", "multiValue": "true", "deprecated": "false", "secret": "false", "description": "To configure the HttpConnectionManager using the key/values from the Map." },
+    "mapHttpMessageBody": { "kind": "parameter", "group": "advanced", "label": "advanced", "type": "boolean", "javaType": "boolean", "deprecated": "false", "secret": "false", "defaultValue": "true", "description": "If this option is true then IN exchange Body of the exchange will be mapped to HTTP body. Setting this to false will avoid the HTTP mapping." },
+    "mapHttpMessageFormUrlEncodedBody": { "kind": "parameter", "group": "advanced", "label": "advanced", "type": "boolean", "javaType": "boolean", "deprecated": "false", "secret": "false", "defaultValue": "true", "description": "If this option is true then IN exchange Form Encoded body of the exchange will be mapped to HTTP. Setting this to false will avoid the HTTP Form Encoded body mapping." },
+    "mapHttpMessageHeaders": { "kind": "parameter", "group": "advanced", "label": "advanced", "type": "boolean", "javaType": "boolean", "deprecated": "false", "secret": "false", "defaultValue": "true", "description": "If this option is true then IN exchange Headers of the exchange will be mapped to HTTP headers. Setting this to false will avoid the HTTP Headers mapping." },
+    "synchronous": { "kind": "parameter", "group": "advanced", "label": "advanced", "type": "boolean", "javaType": "boolean", "deprecated": "false", "secret": "false", "defaultValue": "false", "description": "Sets whether synchronous processing should be strictly used or Camel is allowed to use asynchronous processing (if supported)." }
+  }
+}
+
diff --git a/catalog/src/main/resources/org/apache/camel/catalog/components/https.json b/catalog/src/main/resources/org/apache/camel/catalog/components/https.json
new file mode 100644
index 0000000000..93d747f475
--- /dev/null
+++ b/catalog/src/main/resources/org/apache/camel/catalog/components/https.json
@@ -0,0 +1,55 @@
+{
+ "component": {
+    "kind": "component",
+    "scheme": "https",
+    "alternativeSchemes": "http,https",
+    "syntax": "https:httpUri",
+    "title": "HTTPS",
+    "description": "For calling out to external HTTP servers using Apache HTTP Client 3.x.",
+    "label": "http",
+    "deprecated": "false",
+    "async": "false",
+    "producerOnly": "true",
+    "lenientProperties": "true",
+    "javaType": "org.apache.camel.component.http.HttpComponent",
+    "groupId": "org.apache.camel",
+    "artifactId": "camel-http",
+    "version": "2.18.1"
+  },
+  "componentProperties": {
+    "httpClientConfigurer": { "kind": "property", "type": "object", "javaType": "org.apache.camel.component.http.HttpClientConfigurer", "deprecated": "false", "secret": "false", "description": "To use the custom HttpClientConfigurer to perform configuration of the HttpClient that will be used." },
+    "httpConnectionManager": { "kind": "property", "type": "object", "javaType": "org.apache.commons.httpclient.HttpConnectionManager", "deprecated": "false", "secret": "false", "description": "To use a custom HttpConnectionManager to manage connections" },
+    "httpBinding": { "kind": "property", "type": "object", "javaType": "org.apache.camel.http.common.HttpBinding", "deprecated": "false", "secret": "false", "description": "To use a custom HttpBinding to control the mapping between Camel message and HttpClient." },
+    "httpConfiguration": { "kind": "property", "type": "object", "javaType": "org.apache.camel.http.common.HttpConfiguration", "deprecated": "false", "secret": "false", "description": "To use the shared HttpConfiguration as base configuration." },
+    "allowJavaSerializedObject": { "kind": "property", "type": "boolean", "javaType": "boolean", "deprecated": "false", "secret": "false", "description": "Whether to allow java serialization when a request uses context-type=application/x-java-serialized-object This is by default turned off. If you enable this then be aware that Java will deserialize the incoming data from the request to Java and that can be a potential security risk." },
+    "headerFilterStrategy": { "kind": "property", "type": "object", "javaType": "org.apache.camel.spi.HeaderFilterStrategy", "deprecated": "false", "secret": "false", "description": "To use a custom HeaderFilterStrategy to filter header to and from Camel message." }
+  },
+  "properties": {
+    "httpUri": { "kind": "path", "group": "producer", "label": "producer", "required": "true", "type": "string", "javaType": "java.net.URI", "deprecated": "false", "secret": "false", "description": "The url of the HTTP endpoint to call." },
+    "disableStreamCache": { "kind": "parameter", "group": "common", "label": "common", "type": "boolean", "javaType": "boolean", "deprecated": "false", "secret": "false", "defaultValue": "false", "description": "Determines whether or not the raw input stream from Servlet is cached or not (Camel will read the stream into a in memory/overflow to file Stream caching) cache. By default Camel will cache the Servlet input stream to support reading it multiple times to ensure it Camel can retrieve all data from the stream. However you can set this option to true when you for example need to access the raw stream such as streaming it directly to a file or other persistent store. DefaultHttpBinding will copy the request input stream into a stream cache and put it into message body if this option is false to support reading the stream multiple times. If you use Servlet to bridge/proxy an endpoint then consider enabling this option to improve performance in case you do not need to read the message payload multiple times. The http/http4 producer will by default cache the response body stream. If setting this option to true then the producers will not cache the response body stream but use the response stream as-is as the message body." },
+    "authMethodPriority": { "kind": "parameter", "group": "producer", "label": "producer", "type": "string", "javaType": "java.lang.String", "enum": [ "Basic", "Digest", "NTLM" ], "deprecated": "false", "secret": "false", "description": "Authentication method for proxy either as Basic Digest or NTLM." },
+    "bridgeEndpoint": { "kind": "parameter", "group": "producer", "label": "producer", "type": "boolean", "javaType": "boolean", "deprecated": "false", "secret": "false", "defaultValue": "false", "description": "If the option is true HttpProducer will ignore the Exchange.HTTP_URI header and use the endpoint's URI for request. You may also set the option throwExceptionOnFailure to be false to let the HttpProducer send all the fault response back." },
+    "chunked": { "kind": "parameter", "group": "producer", "type": "boolean", "javaType": "boolean", "deprecated": "false", "secret": "false", "defaultValue": "true", "description": "If this option is false the Servlet will disable the HTTP streaming and set the content-length header on the response" },
+    "connectionClose": { "kind": "parameter", "group": "producer", "label": "producer", "type": "boolean", "javaType": "boolean", "deprecated": "false", "secret": "false", "defaultValue": "false", "description": "Specifies whether a Connection Close header must be added to HTTP Request. By default connectionClose is false." },
+    "copyHeaders": { "kind": "parameter", "group": "producer", "label": "producer", "type": "boolean", "javaType": "boolean", "deprecated": "false", "secret": "false", "defaultValue": "true", "description": "If this option is true then IN exchange headers will be copied to OUT exchange headers according to copy strategy. Setting this to false allows to only include the headers from the HTTP response (not propagating IN headers)." },
+    "headerFilterStrategy": { "kind": "parameter", "group": "producer", "type": "object", "javaType": "org.apache.camel.spi.HeaderFilterStrategy", "deprecated": "false", "secret": "false", "description": "To use a custom HeaderFilterStrategy to filter header to and from Camel message." },
+    "httpBinding": { "kind": "parameter", "group": "producer", "type": "object", "javaType": "org.apache.camel.http.common.HttpBinding", "deprecated": "false", "secret": "false", "description": "To use a custom HttpBinding to control the mapping between Camel message and HttpClient." },
+    "ignoreResponseBody": { "kind": "parameter", "group": "producer", "label": "producer", "type": "boolean", "javaType": "boolean", "deprecated": "false", "secret": "false", "defaultValue": "false", "description": "If this option is true The http producer won't read response body and cache the input stream" },
+    "okStatusCodeRange": { "kind": "parameter", "group": "producer", "label": "producer", "type": "string", "javaType": "java.lang.String", "deprecated": "false", "secret": "false", "defaultValue": "200-299", "description": "The status codes which is considered a success response. The values are inclusive. The range must be defined as from-to with the dash included." },
+    "preserveHostHeader": { "kind": "parameter", "group": "producer", "label": "producer", "type": "boolean", "javaType": "boolean", "deprecated": "false", "secret": "false", "defaultValue": "false", "description": "If the option is true HttpProducer will set the Host header to the value contained in the current exchange Host header useful in reverse proxy applications where you want the Host header received by the downstream server to reflect the URL called by the upstream client this allows applications which use the Host header to generate accurate URL's for a proxied service" },
+    "proxyHost": { "kind": "parameter", "group": "producer", "label": "producer", "type": "string", "javaType": "java.lang.String", "deprecated": "false", "secret": "false", "description": "The proxy host name" },
+    "proxyPort": { "kind": "parameter", "group": "producer", "label": "producer", "type": "integer", "javaType": "int", "deprecated": "false", "secret": "false", "description": "The proxy port number" },
+    "throwExceptionOnFailure": { "kind": "parameter", "group": "producer", "label": "producer", "type": "boolean", "javaType": "boolean", "deprecated": "false", "secret": "false", "defaultValue": "true", "description": "Option to disable throwing the HttpOperationFailedException in case of failed responses from the remote server. This allows you to get all responses regardless of the HTTP status code." },
+    "transferException": { "kind": "parameter", "group": "producer", "type": "boolean", "javaType": "boolean", "deprecated": "false", "secret": "false", "defaultValue": "false", "description": "If enabled and an Exchange failed processing on the consumer side and if the caused Exception was send back serialized in the response as a application/x-java-serialized-object content type. On the producer side the exception will be deserialized and thrown as is instead of the HttpOperationFailedException. The caused exception is required to be serialized. This is by default turned off. If you enable this then be aware that Java will deserialize the incoming data from the request to Java and that can be a potential security risk." },
+    "urlRewrite": { "kind": "parameter", "group": "producer (advanced)", "label": "producer,advanced", "type": "object", "javaType": "org.apache.camel.http.common.UrlRewrite", "deprecated": "false", "secret": "false", "description": "Refers to a custom org.apache.camel.component.http.UrlRewrite which allows you to rewrite urls when you bridge/proxy endpoints. See more details at http://camel.apache.org/urlrewrite.html" },
+    "httpClientConfigurer": { "kind": "parameter", "group": "advanced", "label": "advanced", "type": "object", "javaType": "org.apache.camel.component.http.HttpClientConfigurer", "deprecated": "false", "secret": "false", "description": "Register a custom configuration strategy for new HttpClient instances created by producers or consumers such as to configure authentication mechanisms etc" },
+    "httpClientOptions": { "kind": "parameter", "group": "advanced", "label": "advanced", "type": "object", "javaType": "java.util.Map<java.lang.String,java.lang.Object>", "prefix": "httpClient.", "multiValue": "true", "deprecated": "false", "secret": "false", "description": "To configure the HttpClient using the key/values from the Map." },
+    "httpConnectionManager": { "kind": "parameter", "group": "advanced", "label": "advanced", "type": "object", "javaType": "org.apache.commons.httpclient.HttpConnectionManager", "deprecated": "false", "secret": "false", "description": "To use a custom HttpConnectionManager to manage connections" },
+    "httpConnectionManagerOptions": { "kind": "parameter", "group": "advanced", "label": "advanced", "type": "object", "javaType": "java.util.Map<java.lang.String,java.lang.Object>", "prefix": "httpConnectionManager.", "multiValue": "true", "deprecated": "false", "secret": "false", "description": "To configure the HttpConnectionManager using the key/values from the Map." },
+    "mapHttpMessageBody": { "kind": "parameter", "group": "advanced", "label": "advanced", "type": "boolean", "javaType": "boolean", "deprecated": "false", "secret": "false", "defaultValue": "true", "description": "If this option is true then IN exchange Body of the exchange will be mapped to HTTP body. Setting this to false will avoid the HTTP mapping." },
+    "mapHttpMessageFormUrlEncodedBody": { "kind": "parameter", "group": "advanced", "label": "advanced", "type": "boolean", "javaType": "boolean", "deprecated": "false", "secret": "false", "defaultValue": "true", "description": "If this option is true then IN exchange Form Encoded body of the exchange will be mapped to HTTP. Setting this to false will avoid the HTTP Form Encoded body mapping." },
+    "mapHttpMessageHeaders": { "kind": "parameter", "group": "advanced", "label": "advanced", "type": "boolean", "javaType": "boolean", "deprecated": "false", "secret": "false", "defaultValue": "true", "description": "If this option is true then IN exchange Headers of the exchange will be mapped to HTTP headers. Setting this to false will avoid the HTTP Headers mapping." },
+    "synchronous": { "kind": "parameter", "group": "advanced", "label": "advanced", "type": "boolean", "javaType": "boolean", "deprecated": "false", "secret": "false", "defaultValue": "false", "description": "Sets whether synchronous processing should be strictly used or Camel is allowed to use asynchronous processing (if supported)." }
+  }
+}
+
diff --git a/catalog/src/main/resources/org/apache/camel/catalog/components/sap-netweaver.json b/catalog/src/main/resources/org/apache/camel/catalog/components/sap-netweaver.json
new file mode 100644
index 0000000000..b5820cd767
--- /dev/null
+++ b/catalog/src/main/resources/org/apache/camel/catalog/components/sap-netweaver.json
@@ -0,0 +1,29 @@
+{
+ "component": {
+    "kind": "component",
+    "scheme": "sap-netweaver",
+    "syntax": "sap-netweaver:url",
+    "title": "SAP NetWeaver",
+    "description": "The sap-netweaver component integrates with the SAP NetWeaver Gateway using HTTP transports.",
+    "label": "sap",
+    "deprecated": "false",
+    "async": "false",
+    "producerOnly": "true",
+    "javaType": "org.apache.camel.component.sap.netweaver.NetWeaverComponent",
+    "groupId": "org.apache.camel",
+    "artifactId": "camel-sap-netweaver",
+    "version": "2.18.1"
+  },
+  "componentProperties": {
+  },
+  "properties": {
+    "url": { "kind": "path", "group": "producer", "required": "true", "type": "string", "javaType": "java.lang.String", "deprecated": "false", "secret": "false", "description": "Url to the SAP net-weaver gateway server." },
+    "flatternMap": { "kind": "parameter", "group": "producer", "type": "boolean", "javaType": "boolean", "deprecated": "false", "secret": "false", "defaultValue": "true", "description": "If the JSON Map contains only a single entry then flattern by storing that single entry value as the message body." },
+    "json": { "kind": "parameter", "group": "producer", "type": "boolean", "javaType": "boolean", "deprecated": "false", "secret": "false", "defaultValue": "true", "description": "Whether to return data in JSON format. If this option is false then XML is returned in Atom format." },
+    "jsonAsMap": { "kind": "parameter", "group": "producer", "type": "boolean", "javaType": "boolean", "deprecated": "false", "secret": "false", "defaultValue": "true", "description": "To transform the JSON from a String to a Map in the message body." },
+    "password": { "kind": "parameter", "group": "producer", "required": "true", "type": "string", "javaType": "java.lang.String", "deprecated": "false", "secret": "false", "description": "Password for account." },
+    "username": { "kind": "parameter", "group": "producer", "required": "true", "type": "string", "javaType": "java.lang.String", "deprecated": "false", "secret": "false", "description": "Username for account." },
+    "synchronous": { "kind": "parameter", "group": "advanced", "label": "advanced", "type": "boolean", "javaType": "boolean", "deprecated": "false", "secret": "false", "defaultValue": "false", "description": "Sets whether synchronous processing should be strictly used or Camel is allowed to use asynchronous processing (if supported)." }
+  }
+}
+
diff --git a/docs/guide/components/camel-sap-netweaver.adoc b/docs/guide/components/camel-sap-netweaver.adoc
new file mode 100644
index 0000000000..c30f16fb2e
--- /dev/null
+++ b/docs/guide/components/camel-sap-netweaver.adoc
@@ -0,0 +1,9 @@
+### camel-sap-netweaver
+
+The http://camel.apache.org/sap-netweaver.html[camel-sap-netweaver,window=_blank]
+component integrates with the https://www.sap.com/community/topic/gateway.html[SAP Gateway,window=_blank].
+
+[NOTE]
+====
+You will need a valid SAP account in order to use this component. You can sign up https://www.sap.com/community/topic/gateway.html[here,window=_blank].
+====
\ No newline at end of file
diff --git a/docs/guide/components/index.adoc b/docs/guide/components/index.adoc
index 5caff95327..ff96b35119 100644
--- a/docs/guide/components/index.adoc
+++ b/docs/guide/components/index.adoc
@@ -51,6 +51,7 @@ include::camel-rest.adoc[]
 include::camel-rss.adoc[]
 include::camel-salesforce.adoc[]
 include::camel-sap.adoc[]
+include::camel-sap-netweaver.adoc[]
 include::camel-saxon.adoc[]
 include::camel-schematron.adoc[]
 include::camel-script.adoc[]
diff --git a/feature/etc/managed/wildfly/modules/system/layers/fuse/org/apache/camel/component/main/module.xml b/feature/etc/managed/wildfly/modules/system/layers/fuse/org/apache/camel/component/main/module.xml
index 8f019913f1..b9c5973c0a 100644
--- a/feature/etc/managed/wildfly/modules/system/layers/fuse/org/apache/camel/component/main/module.xml
+++ b/feature/etc/managed/wildfly/modules/system/layers/fuse/org/apache/camel/component/main/module.xml
@@ -91,6 +91,7 @@
         <module name="org.apache.camel.component.quartz2" export="true" services="export" optional="true" />
         <module name="org.apache.camel.component.rss" export="true" services="export" optional="true" />
         <module name="org.apache.camel.component.salesforce" export="true" services="export" optional="true" />
+        <module name="org.apache.camel.component.sap.netweaver" export="true" services="export" optional="true" />
         <module name="org.apache.camel.component.saxon" export="true" services="export" optional="true" />
         <module name="org.apache.camel.component.schematron" export="true" services="export" optional="true" />
         <module name="org.apache.camel.component.script" export="true" services="export" optional="true" />
diff --git a/feature/etc/smartics/camel-modules.xml b/feature/etc/smartics/camel-modules.xml
index a29a9a1b11..418f5e311a 100644
--- a/feature/etc/smartics/camel-modules.xml
+++ b/feature/etc/smartics/camel-modules.xml
@@ -1013,6 +1013,20 @@
         </exports>
     </module>
 
+    <module name="org.apache.camel.component.sap.netweaver">
+        <include artifact="org.apache.camel:camel-sap-netweaver" />
+        <apply-to-dependencies skip="true">
+            <include module="org.apache.camel.apt" />
+            <include module="org.apache.camel.http" />
+            <include module="org.springframework.boot" />
+        </apply-to-dependencies>
+        <dependencies>
+            <module name="javax.api" />
+            <module name="org.apache.camel.component.http4" />
+            <module name="org.slf4j"/>
+        </dependencies>
+    </module>
+
     <module name="org.apache.camel.component.saxon">
         <include artifact="org.apache.camel:camel-saxon" />
         <apply-to-dependencies skip="true">
diff --git a/feature/etc/smartics/skipped-modules.xml b/feature/etc/smartics/skipped-modules.xml
index 0d611eaec0..544583fad5 100644
--- a/feature/etc/smartics/skipped-modules.xml
+++ b/feature/etc/smartics/skipped-modules.xml
@@ -148,11 +148,15 @@
     <module name="org.apache.camel.blueprint" skip="true">
         <include artifact="org.apache.camel:camel-blueprint" />
     </module>
-    
+
+    <module name="org.apache.camel.http" skip="true">
+        <include artifact="org.apache.camel:camel-http" />
+    </module>
+
     <module name="org.apache.camel.spi-annotations" skip="true">
         <include artifact="org.apache.camel:spi-annotations" />
     </module>
-    
+
     <module name="org.apache.felix" skip="true">
         <include artifact="org.apache.felix:org.apache.felix.http.proxy" />
         <include artifact="org.apache.felix:org.apache.felix.gogo.runtime" />
diff --git a/feature/pom.xml b/feature/pom.xml
index 212af2f039..63aacec790 100644
--- a/feature/pom.xml
+++ b/feature/pom.xml
@@ -338,6 +338,10 @@
             <groupId>org.apache.camel</groupId>
             <artifactId>camel-salesforce</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.apache.camel</groupId>
+            <artifactId>camel-sap-netweaver</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.apache.camel</groupId>
             <artifactId>camel-saxon</artifactId>
diff --git a/feature/src/main/resources/modules/system/layers/fuse/org/apache/camel/component/main/module.xml b/feature/src/main/resources/modules/system/layers/fuse/org/apache/camel/component/main/module.xml
index 8f019913f1..b9c5973c0a 100644
--- a/feature/src/main/resources/modules/system/layers/fuse/org/apache/camel/component/main/module.xml
+++ b/feature/src/main/resources/modules/system/layers/fuse/org/apache/camel/component/main/module.xml
@@ -91,6 +91,7 @@
         <module name="org.apache.camel.component.quartz2" export="true" services="export" optional="true" />
         <module name="org.apache.camel.component.rss" export="true" services="export" optional="true" />
         <module name="org.apache.camel.component.salesforce" export="true" services="export" optional="true" />
+        <module name="org.apache.camel.component.sap.netweaver" export="true" services="export" optional="true" />
         <module name="org.apache.camel.component.saxon" export="true" services="export" optional="true" />
         <module name="org.apache.camel.component.schematron" export="true" services="export" optional="true" />
         <module name="org.apache.camel.component.script" export="true" services="export" optional="true" />
diff --git a/feature/src/main/resources/modules/system/layers/fuse/org/apache/camel/component/sap/netweaver/main/module.xml b/feature/src/main/resources/modules/system/layers/fuse/org/apache/camel/component/sap/netweaver/main/module.xml
new file mode 100644
index 0000000000..3ba0124376
--- /dev/null
+++ b/feature/src/main/resources/modules/system/layers/fuse/org/apache/camel/component/sap/netweaver/main/module.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module xmlns="urn:jboss:module:1.1" name="org.apache.camel.component.sap.netweaver">
+  <resources>
+    <artifact name="${org.apache.camel:camel-sap-netweaver}" />
+  </resources>
+  <dependencies>
+    <module name="javax.api" />
+    <module name="org.apache.camel.component.http4" />
+    <module name="org.slf4j" />
+    <module name="javax.xml.bind.api" />
+    <module name="org.apache.camel.core" />
+    <module name="org.codehaus.jackson.jackson-mapper-asl" />
+  </dependencies>
+</module>
diff --git a/itests/standalone/extra/src/main/java/org/wildfly/camel/test/sap/netweaver/SAPNetweaverIntegrationTest.java b/itests/standalone/extra/src/main/java/org/wildfly/camel/test/sap/netweaver/SAPNetweaverIntegrationTest.java
new file mode 100644
index 0000000000..311afd0dff
--- /dev/null
+++ b/itests/standalone/extra/src/main/java/org/wildfly/camel/test/sap/netweaver/SAPNetweaverIntegrationTest.java
@@ -0,0 +1,80 @@
+/*
+ * #%L
+ * Wildfly Camel :: Testsuite
+ * %%
+ * Copyright (C) 2013 - 2016 RedHat
+ * %%
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * #L%
+ */
+package org.wildfly.camel.test.sap.netweaver;
+
+import org.apache.camel.CamelContext;
+import org.apache.camel.ProducerTemplate;
+import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.component.sap.netweaver.NetWeaverConstants;
+import org.apache.camel.impl.DefaultCamelContext;
+import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.arquillian.junit.Arquillian;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.Assert;
+import org.junit.Assume;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.wildfly.extension.camel.CamelAware;
+
+/*
+ * To run this test you need to set the following environment variables:
+ *
+ *   SAP_USERNAME
+ *   SAP_PASSWORD
+ */
+@CamelAware
+@RunWith(Arquillian.class)
+public class SAPNetweaverIntegrationTest {
+
+    private static final String SAP_GATEWAY_URL = "https4://sapes4.sapdevcenter.com/sap/opu/odata/IWFND/RMTSAMPLEFLIGHT";
+    private static final String SAP_COMMAND = "FlightCollection(carrid='AA',connid='0017',fldate=datetime'2016-04-20T00%3A00%3A00')";
+
+    @Deployment
+    public static JavaArchive createDeployment() {
+        return ShrinkWrap.create(JavaArchive.class, "camel-sap-netweaver-tests.jar");
+    }
+
+    @Test
+    public void testSAPNetweaverEndpoint() throws Exception {
+        String username = System.getenv("SAP_USERNAME");
+        String password = System.getenv("SAP_PASSWORD");
+
+        Assume.assumeTrue(username != null && password != null);
+
+        CamelContext camelctx = new DefaultCamelContext();
+        camelctx.addRoutes(new RouteBuilder() {
+            @Override
+            public void configure() throws Exception {
+                from("direct:start")
+                .toF("sap-netweaver:%s?username=%s&password=%s", SAP_GATEWAY_URL, username, password);
+            }
+        });
+
+        camelctx.start();
+        try {
+            ProducerTemplate template = camelctx.createProducerTemplate();
+            String result = template.requestBodyAndHeader("direct:start", null, NetWeaverConstants.COMMAND, SAP_COMMAND, String.class);
+            Assert.assertTrue(result.contains("PRICE=422.94, CURRENCY=USD"));
+        } finally {
+            camelctx.stop();
+        }
+    }
+}
diff --git a/itests/standalone/extra/src/main/resources/classloading/exported-paths.txt b/itests/standalone/extra/src/main/resources/classloading/exported-paths.txt
index ca9390b245..5b022f1668 100644
--- a/itests/standalone/extra/src/main/resources/classloading/exported-paths.txt
+++ b/itests/standalone/extra/src/main/resources/classloading/exported-paths.txt
@@ -651,6 +651,8 @@ org/apache/camel/component/salesforce/api/dto/analytics
 org/apache/camel/component/salesforce/api/dto/analytics/reports
 org/apache/camel/component/salesforce/api/dto/bulk
 org/apache/camel/component/salesforce/api/utils
+org/apache/camel/component/sap
+org/apache/camel/component/sap/netweaver
 org/apache/camel/component/schematron
 org/apache/camel/component/schematron/constant
 org/apache/camel/component/schematron/exception
diff --git a/patch/etc/baseline/module-list.txt b/patch/etc/baseline/module-list.txt
index d0ae10e090..8a470b7974 100644
--- a/patch/etc/baseline/module-list.txt
+++ b/patch/etc/baseline/module-list.txt
@@ -119,6 +119,7 @@
 /org/apache/camel/component/salesforce/main/camel-salesforce-2.18.1.jar
 /org/apache/camel/component/salesforce/main/cometd-java-client-3.0.10.jar
 /org/apache/camel/component/salesforce/main/cometd-java-common-3.0.10.jar
+/org/apache/camel/component/sap/netweaver/main/camel-sap-netweaver-2.18.1.jar
 /org/apache/camel/component/saxon/main/camel-saxon-2.18.1.jar
 /org/apache/camel/component/schematron/main/camel-schematron-2.18.1.jar
 /org/apache/camel/component/script/main/camel-script-2.18.1.jar