You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2023/12/04 17:52:27 UTC
(camel-spring-boot) branch main updated: CAMEL-19991: Jetty and SB upgrades
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-spring-boot.git
The following commit(s) were added to refs/heads/main by this push:
new a40f413b66a CAMEL-19991: Jetty and SB upgrades
a40f413b66a is described below
commit a40f413b66ad94dd24e953a2e23391a2f8d69dd6
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Mon Dec 4 18:52:17 2023 +0100
CAMEL-19991: Jetty and SB upgrades
---
.../camel/springboot/catalog/components/jetty.json | 4 +-
.../camel-jetty-starter/src/main/docs/jetty.json | 80 +++++++++++-----------
.../JettyHttpComponentAutoConfiguration12.java} | 18 ++---
.../JettyHttpComponentConfiguration12.java} | 6 +-
.../springboot/JettyHttpComponentConverter12.java} | 4 +-
...rk.boot.autoconfigure.AutoConfiguration.imports | 4 +-
6 files changed, 58 insertions(+), 58 deletions(-)
diff --git a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/jetty.json b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/jetty.json
index e56a850403b..78c6160c554 100644
--- a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/jetty.json
+++ b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/jetty.json
@@ -3,11 +3,11 @@
"kind": "component",
"name": "jetty",
"title": "Jetty",
- "description": "Expose HTTP endpoints using Jetty 11.",
+ "description": "Expose HTTP endpoints using Jetty 12.",
"deprecated": false,
"firstVersion": "1.2.0",
"label": "http",
- "javaType": "org.apache.camel.component.jetty11.JettyHttpComponent11",
+ "javaType": "org.apache.camel.component.jetty12.JettyHttpComponent12",
"supportLevel": "Stable",
"groupId": "org.apache.camel.springboot",
"artifactId": "camel-jetty-starter",
diff --git a/components-starter/camel-jetty-starter/src/main/docs/jetty.json b/components-starter/camel-jetty-starter/src/main/docs/jetty.json
index a0092169afc..b62a471507e 100644
--- a/components-starter/camel-jetty-starter/src/main/docs/jetty.json
+++ b/components-starter/camel-jetty-starter/src/main/docs/jetty.json
@@ -2,13 +2,13 @@
"groups": [
{
"name": "camel.component.jetty",
- "type": "org.apache.camel.component.jetty11.springboot.JettyHttpComponentConfiguration11",
- "sourceType": "org.apache.camel.component.jetty11.springboot.JettyHttpComponentConfiguration11"
+ "type": "org.apache.camel.component.jetty12.springboot.JettyHttpComponentConfiguration12",
+ "sourceType": "org.apache.camel.component.jetty12.springboot.JettyHttpComponentConfiguration12"
},
{
"name": "camel.component.jetty.customizer",
"type": "org.apache.camel.spring.boot.ComponentConfigurationPropertiesCommon$CustomizerProperties",
- "sourceType": "org.apache.camel.component.jetty11.springboot.JettyHttpComponentConfiguration11",
+ "sourceType": "org.apache.camel.component.jetty12.springboot.JettyHttpComponentConfiguration12",
"sourceMethod": "getCustomizer()"
}
],
@@ -17,28 +17,28 @@
"name": "camel.component.jetty.allow-java-serialized-object",
"type": "java.lang.Boolean",
"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.",
- "sourceType": "org.apache.camel.component.jetty11.springboot.JettyHttpComponentConfiguration11",
+ "sourceType": "org.apache.camel.component.jetty12.springboot.JettyHttpComponentConfiguration12",
"defaultValue": false
},
{
"name": "camel.component.jetty.autowired-enabled",
"type": "java.lang.Boolean",
"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
- "sourceType": "org.apache.camel.component.jetty11.springboot.JettyHttpComponentConfiguration11",
+ "sourceType": "org.apache.camel.component.jetty12.springboot.JettyHttpComponentConfiguration12",
"defaultValue": true
},
{
"name": "camel.component.jetty.bridge-error-handler",
"type": "java.lang.Boolean",
"description": "Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions (if possible) occurred while the Camel consumer is trying to pickup incoming messages, or the likes, will now be processed as a message and handled by the routing Error Handler. Important: This is only possible if the 3rd party component allows Camel to be alerted if an exception was thrown. Some components handle this internally only, and therefore bridgeErrorHandler is n [...]
- "sourceType": "org.apache.camel.component.jetty11.springboot.JettyHttpComponentConfiguration11",
+ "sourceType": "org.apache.camel.component.jetty12.springboot.JettyHttpComponentConfiguration12",
"defaultValue": false
},
{
"name": "camel.component.jetty.continuation-timeout",
"type": "java.lang.Long",
"description": "Allows to set a timeout in millis when using Jetty as consumer (server). By default Jetty uses 30000. You can use a value of = 0 to never expire. If a timeout occurs then the request will be expired and Jetty will return back a http error 503 to the client. This option is only in use when using Jetty with the Asynchronous Routing Engine.",
- "sourceType": "org.apache.camel.component.jetty11.springboot.JettyHttpComponentConfiguration11",
+ "sourceType": "org.apache.camel.component.jetty12.springboot.JettyHttpComponentConfiguration12",
"defaultValue": 30000
},
{
@@ -50,207 +50,207 @@
"name": "camel.component.jetty.enable-jmx",
"type": "java.lang.Boolean",
"description": "If this option is true, Jetty JMX support will be enabled for this endpoint.",
- "sourceType": "org.apache.camel.component.jetty11.springboot.JettyHttpComponentConfiguration11",
+ "sourceType": "org.apache.camel.component.jetty12.springboot.JettyHttpComponentConfiguration12",
"defaultValue": false
},
{
"name": "camel.component.jetty.enabled",
"type": "java.lang.Boolean",
"description": "Whether to enable auto configuration of the jetty component. This is enabled by default.",
- "sourceType": "org.apache.camel.component.jetty11.springboot.JettyHttpComponentConfiguration11"
+ "sourceType": "org.apache.camel.component.jetty12.springboot.JettyHttpComponentConfiguration12"
},
{
"name": "camel.component.jetty.error-handler",
"type": "org.eclipse.jetty.server.handler.ErrorHandler",
"description": "This option is used to set the ErrorHandler that Jetty server uses. The option is a org.eclipse.jetty.server.handler.ErrorHandler type.",
- "sourceType": "org.apache.camel.component.jetty11.springboot.JettyHttpComponentConfiguration11"
+ "sourceType": "org.apache.camel.component.jetty12.springboot.JettyHttpComponentConfiguration12"
},
{
"name": "camel.component.jetty.file-size-threshold",
"type": "java.lang.Integer",
"description": "The size threshold after which files will be written to disk for multipart\/form-data requests. By default the files are not written to disk",
- "sourceType": "org.apache.camel.component.jetty11.springboot.JettyHttpComponentConfiguration11",
+ "sourceType": "org.apache.camel.component.jetty12.springboot.JettyHttpComponentConfiguration12",
"defaultValue": 0
},
{
"name": "camel.component.jetty.files-location",
"type": "java.lang.String",
"description": "The directory location where files will be store for multipart\/form-data requests. By default the files are written in the system temporary folder",
- "sourceType": "org.apache.camel.component.jetty11.springboot.JettyHttpComponentConfiguration11"
+ "sourceType": "org.apache.camel.component.jetty12.springboot.JettyHttpComponentConfiguration12"
},
{
"name": "camel.component.jetty.header-filter-strategy",
"type": "org.apache.camel.spi.HeaderFilterStrategy",
"description": "To use a custom org.apache.camel.spi.HeaderFilterStrategy to filter header to and from Camel message. The option is a org.apache.camel.spi.HeaderFilterStrategy type.",
- "sourceType": "org.apache.camel.component.jetty11.springboot.JettyHttpComponentConfiguration11"
+ "sourceType": "org.apache.camel.component.jetty12.springboot.JettyHttpComponentConfiguration12"
},
{
"name": "camel.component.jetty.http-binding",
"type": "org.apache.camel.http.common.HttpBinding",
"description": "Not to be used - use JettyHttpBinding instead. The option is a org.apache.camel.http.common.HttpBinding type.",
- "sourceType": "org.apache.camel.component.jetty11.springboot.JettyHttpComponentConfiguration11"
+ "sourceType": "org.apache.camel.component.jetty12.springboot.JettyHttpComponentConfiguration12"
},
{
"name": "camel.component.jetty.http-configuration",
"type": "org.apache.camel.http.common.HttpConfiguration",
"description": "Jetty component does not use HttpConfiguration. The option is a org.apache.camel.http.common.HttpConfiguration type.",
- "sourceType": "org.apache.camel.component.jetty11.springboot.JettyHttpComponentConfiguration11"
+ "sourceType": "org.apache.camel.component.jetty12.springboot.JettyHttpComponentConfiguration12"
},
{
"name": "camel.component.jetty.keystore",
"type": "java.lang.String",
"description": "Specifies the location of the Java keystore file, which contains the Jetty server's own X.509 certificate in a key entry.",
- "sourceType": "org.apache.camel.component.jetty11.springboot.JettyHttpComponentConfiguration11"
+ "sourceType": "org.apache.camel.component.jetty12.springboot.JettyHttpComponentConfiguration12"
},
{
"name": "camel.component.jetty.max-file-size",
"type": "java.lang.Long",
"description": "The maximum size allowed for uploaded files. -1 means no limit",
- "sourceType": "org.apache.camel.component.jetty11.springboot.JettyHttpComponentConfiguration11",
+ "sourceType": "org.apache.camel.component.jetty12.springboot.JettyHttpComponentConfiguration12",
"defaultValue": -1
},
{
"name": "camel.component.jetty.max-request-size",
"type": "java.lang.Long",
"description": "The maximum size allowed for multipart\/form-data requests. -1 means no limit",
- "sourceType": "org.apache.camel.component.jetty11.springboot.JettyHttpComponentConfiguration11",
+ "sourceType": "org.apache.camel.component.jetty12.springboot.JettyHttpComponentConfiguration12",
"defaultValue": -1
},
{
"name": "camel.component.jetty.max-threads",
"type": "java.lang.Integer",
"description": "To set a value for maximum number of threads in server thread pool. Notice that both a min and max size must be configured.",
- "sourceType": "org.apache.camel.component.jetty11.springboot.JettyHttpComponentConfiguration11"
+ "sourceType": "org.apache.camel.component.jetty12.springboot.JettyHttpComponentConfiguration12"
},
{
"name": "camel.component.jetty.mb-container",
"type": "org.eclipse.jetty.jmx.MBeanContainer",
"description": "To use a existing configured org.eclipse.jetty.jmx.MBeanContainer if JMX is enabled that Jetty uses for registering mbeans. The option is a org.eclipse.jetty.jmx.MBeanContainer type.",
- "sourceType": "org.apache.camel.component.jetty11.springboot.JettyHttpComponentConfiguration11"
+ "sourceType": "org.apache.camel.component.jetty12.springboot.JettyHttpComponentConfiguration12"
},
{
"name": "camel.component.jetty.min-threads",
"type": "java.lang.Integer",
"description": "To set a value for minimum number of threads in server thread pool. Notice that both a min and max size must be configured.",
- "sourceType": "org.apache.camel.component.jetty11.springboot.JettyHttpComponentConfiguration11"
+ "sourceType": "org.apache.camel.component.jetty12.springboot.JettyHttpComponentConfiguration12"
},
{
"name": "camel.component.jetty.mute-exception",
"type": "java.lang.Boolean",
"description": "If enabled and an Exchange failed processing on the consumer side the response's body won't contain the exception's stack trace.",
- "sourceType": "org.apache.camel.component.jetty11.springboot.JettyHttpComponentConfiguration11",
+ "sourceType": "org.apache.camel.component.jetty12.springboot.JettyHttpComponentConfiguration12",
"defaultValue": true
},
{
"name": "camel.component.jetty.proxy-host",
"type": "java.lang.String",
"description": "To use a http proxy to configure the hostname.",
- "sourceType": "org.apache.camel.component.jetty11.springboot.JettyHttpComponentConfiguration11"
+ "sourceType": "org.apache.camel.component.jetty12.springboot.JettyHttpComponentConfiguration12"
},
{
"name": "camel.component.jetty.proxy-port",
"type": "java.lang.Integer",
"description": "To use a http proxy to configure the port number.",
- "sourceType": "org.apache.camel.component.jetty11.springboot.JettyHttpComponentConfiguration11"
+ "sourceType": "org.apache.camel.component.jetty12.springboot.JettyHttpComponentConfiguration12"
},
{
"name": "camel.component.jetty.request-buffer-size",
"type": "java.lang.Integer",
"description": "Allows to configure a custom value of the request buffer size on the Jetty connectors.",
- "sourceType": "org.apache.camel.component.jetty11.springboot.JettyHttpComponentConfiguration11"
+ "sourceType": "org.apache.camel.component.jetty12.springboot.JettyHttpComponentConfiguration12"
},
{
"name": "camel.component.jetty.request-header-size",
"type": "java.lang.Integer",
"description": "Allows to configure a custom value of the request header size on the Jetty connectors.",
- "sourceType": "org.apache.camel.component.jetty11.springboot.JettyHttpComponentConfiguration11"
+ "sourceType": "org.apache.camel.component.jetty12.springboot.JettyHttpComponentConfiguration12"
},
{
"name": "camel.component.jetty.response-buffer-size",
"type": "java.lang.Integer",
"description": "Allows to configure a custom value of the response buffer size on the Jetty connectors.",
- "sourceType": "org.apache.camel.component.jetty11.springboot.JettyHttpComponentConfiguration11"
+ "sourceType": "org.apache.camel.component.jetty12.springboot.JettyHttpComponentConfiguration12"
},
{
"name": "camel.component.jetty.response-header-size",
"type": "java.lang.Integer",
"description": "Allows to configure a custom value of the response header size on the Jetty connectors.",
- "sourceType": "org.apache.camel.component.jetty11.springboot.JettyHttpComponentConfiguration11"
+ "sourceType": "org.apache.camel.component.jetty12.springboot.JettyHttpComponentConfiguration12"
},
{
"name": "camel.component.jetty.send-server-version",
"type": "java.lang.Boolean",
"description": "If the option is true, jetty will send the server header with the jetty version information to the client which sends the request. NOTE please make sure there is no any other camel-jetty endpoint is share the same port, otherwise this option may not work as expected.",
- "sourceType": "org.apache.camel.component.jetty11.springboot.JettyHttpComponentConfiguration11",
+ "sourceType": "org.apache.camel.component.jetty12.springboot.JettyHttpComponentConfiguration12",
"defaultValue": true
},
{
"name": "camel.component.jetty.socket-connector-properties",
"type": "java.util.Map<java.lang.String,java.lang.Object>",
"description": "A map which contains general HTTP connector properties. Uses the same principle as sslSocketConnectorProperties.",
- "sourceType": "org.apache.camel.component.jetty11.springboot.JettyHttpComponentConfiguration11"
+ "sourceType": "org.apache.camel.component.jetty12.springboot.JettyHttpComponentConfiguration12"
},
{
"name": "camel.component.jetty.socket-connectors",
"type": "java.util.Map<java.lang.Integer,org.eclipse.jetty.server.Connector>",
"description": "A map which contains per port number specific HTTP connectors. Uses the same principle as sslSocketConnectors.",
- "sourceType": "org.apache.camel.component.jetty11.springboot.JettyHttpComponentConfiguration11"
+ "sourceType": "org.apache.camel.component.jetty12.springboot.JettyHttpComponentConfiguration12"
},
{
"name": "camel.component.jetty.ssl-context-parameters",
"type": "org.apache.camel.support.jsse.SSLContextParameters",
"description": "To configure security using SSLContextParameters. The option is a org.apache.camel.support.jsse.SSLContextParameters type.",
- "sourceType": "org.apache.camel.component.jetty11.springboot.JettyHttpComponentConfiguration11"
+ "sourceType": "org.apache.camel.component.jetty12.springboot.JettyHttpComponentConfiguration12"
},
{
"name": "camel.component.jetty.ssl-key-password",
"type": "java.lang.String",
"description": "The key password, which is used to access the certificate's key entry in the keystore (this is the same password that is supplied to the keystore command's -keypass option).",
- "sourceType": "org.apache.camel.component.jetty11.springboot.JettyHttpComponentConfiguration11"
+ "sourceType": "org.apache.camel.component.jetty12.springboot.JettyHttpComponentConfiguration12"
},
{
"name": "camel.component.jetty.ssl-password",
"type": "java.lang.String",
"description": "The ssl password, which is required to access the keystore file (this is the same password that is supplied to the keystore command's -storepass option).",
- "sourceType": "org.apache.camel.component.jetty11.springboot.JettyHttpComponentConfiguration11"
+ "sourceType": "org.apache.camel.component.jetty12.springboot.JettyHttpComponentConfiguration12"
},
{
"name": "camel.component.jetty.ssl-socket-connector-properties",
"type": "java.util.Map<java.lang.String,java.lang.Object>",
"description": "A map which contains general SSL connector properties.",
- "sourceType": "org.apache.camel.component.jetty11.springboot.JettyHttpComponentConfiguration11"
+ "sourceType": "org.apache.camel.component.jetty12.springboot.JettyHttpComponentConfiguration12"
},
{
"name": "camel.component.jetty.ssl-socket-connectors",
"type": "java.util.Map<java.lang.Integer,org.eclipse.jetty.server.Connector>",
"description": "A map which contains per port number specific SSL connectors.",
- "sourceType": "org.apache.camel.component.jetty11.springboot.JettyHttpComponentConfiguration11"
+ "sourceType": "org.apache.camel.component.jetty12.springboot.JettyHttpComponentConfiguration12"
},
{
"name": "camel.component.jetty.thread-pool",
"type": "org.eclipse.jetty.util.thread.ThreadPool",
"description": "To use a custom thread pool for the server. This option should only be used in special circumstances. The option is a org.eclipse.jetty.util.thread.ThreadPool type.",
- "sourceType": "org.apache.camel.component.jetty11.springboot.JettyHttpComponentConfiguration11"
+ "sourceType": "org.apache.camel.component.jetty12.springboot.JettyHttpComponentConfiguration12"
},
{
"name": "camel.component.jetty.use-continuation",
"type": "java.lang.Boolean",
"description": "Whether or not to use Jetty continuations for the Jetty Server.",
- "sourceType": "org.apache.camel.component.jetty11.springboot.JettyHttpComponentConfiguration11",
+ "sourceType": "org.apache.camel.component.jetty12.springboot.JettyHttpComponentConfiguration12",
"defaultValue": true
},
{
"name": "camel.component.jetty.use-global-ssl-context-parameters",
"type": "java.lang.Boolean",
"description": "Enable usage of global SSL context parameters",
- "sourceType": "org.apache.camel.component.jetty11.springboot.JettyHttpComponentConfiguration11",
+ "sourceType": "org.apache.camel.component.jetty12.springboot.JettyHttpComponentConfiguration12",
"defaultValue": false
},
{
"name": "camel.component.jetty.use-x-forwarded-for-header",
"type": "java.lang.Boolean",
"description": "To use the X-Forwarded-For header in HttpServletRequest.getRemoteAddr.",
- "sourceType": "org.apache.camel.component.jetty11.springboot.JettyHttpComponentConfiguration11",
+ "sourceType": "org.apache.camel.component.jetty12.springboot.JettyHttpComponentConfiguration12",
"defaultValue": false
}
],
diff --git a/components-starter/camel-jetty-starter/src/main/java/org/apache/camel/component/jetty11/springboot/JettyHttpComponentAutoConfiguration11.java b/components-starter/camel-jetty-starter/src/main/java/org/apache/camel/component/jetty12/springboot/JettyHttpComponentAutoConfiguration12.java
similarity index 86%
rename from components-starter/camel-jetty-starter/src/main/java/org/apache/camel/component/jetty11/springboot/JettyHttpComponentAutoConfiguration11.java
rename to components-starter/camel-jetty-starter/src/main/java/org/apache/camel/component/jetty12/springboot/JettyHttpComponentAutoConfiguration12.java
index 78605e4b191..36c86875071 100644
--- a/components-starter/camel-jetty-starter/src/main/java/org/apache/camel/component/jetty11/springboot/JettyHttpComponentAutoConfiguration11.java
+++ b/components-starter/camel-jetty-starter/src/main/java/org/apache/camel/component/jetty12/springboot/JettyHttpComponentAutoConfiguration12.java
@@ -14,11 +14,11 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.component.jetty11.springboot;
+package org.apache.camel.component.jetty12.springboot;
import org.apache.camel.CamelContext;
import org.apache.camel.Component;
-import org.apache.camel.component.jetty11.JettyHttpComponent11;
+import org.apache.camel.component.jetty12.JettyHttpComponent12;
import org.apache.camel.spi.ComponentCustomizer;
import org.apache.camel.spring.boot.CamelAutoConfiguration;
import org.apache.camel.spring.boot.ComponentConfigurationProperties;
@@ -40,25 +40,25 @@ import org.springframework.context.annotation.Lazy;
*/
@Configuration(proxyBeanMethods = false)
@Conditional(ConditionalOnCamelContextAndAutoConfigurationBeans.class)
-@EnableConfigurationProperties({ComponentConfigurationProperties.class,JettyHttpComponentConfiguration11.class})
+@EnableConfigurationProperties({ComponentConfigurationProperties.class,JettyHttpComponentConfiguration12.class})
@ConditionalOnHierarchicalProperties({"camel.component", "camel.component.jetty"})
-@AutoConfigureAfter({CamelAutoConfiguration.class, JettyHttpComponentConverter11.class})
-public class JettyHttpComponentAutoConfiguration11 {
+@AutoConfigureAfter({CamelAutoConfiguration.class, JettyHttpComponentConverter12.class})
+public class JettyHttpComponentAutoConfiguration12 {
@Autowired
private ApplicationContext applicationContext;
private final CamelContext camelContext;
@Autowired
- private JettyHttpComponentConfiguration11 configuration;
+ private JettyHttpComponentConfiguration12 configuration;
- public JettyHttpComponentAutoConfiguration11(
+ public JettyHttpComponentAutoConfiguration12(
org.apache.camel.CamelContext camelContext) {
this.camelContext = camelContext;
}
@Lazy
@Bean
- public ComponentCustomizer configureJettyHttpComponent11() {
+ public ComponentCustomizer configureJettyHttpComponent12() {
return new ComponentCustomizer() {
@Override
public void configure(String name, Component target) {
@@ -70,7 +70,7 @@ public class JettyHttpComponentAutoConfiguration11 {
applicationContext,
"camel.component.customizer",
"camel.component.jetty.customizer")
- && target instanceof JettyHttpComponent11;
+ && target instanceof JettyHttpComponent12;
}
};
}
diff --git a/components-starter/camel-jetty-starter/src/main/java/org/apache/camel/component/jetty11/springboot/JettyHttpComponentConfiguration11.java b/components-starter/camel-jetty-starter/src/main/java/org/apache/camel/component/jetty12/springboot/JettyHttpComponentConfiguration12.java
similarity index 99%
rename from components-starter/camel-jetty-starter/src/main/java/org/apache/camel/component/jetty11/springboot/JettyHttpComponentConfiguration11.java
rename to components-starter/camel-jetty-starter/src/main/java/org/apache/camel/component/jetty12/springboot/JettyHttpComponentConfiguration12.java
index 3e9a10f9f6c..547c772ddf1 100644
--- a/components-starter/camel-jetty-starter/src/main/java/org/apache/camel/component/jetty11/springboot/JettyHttpComponentConfiguration11.java
+++ b/components-starter/camel-jetty-starter/src/main/java/org/apache/camel/component/jetty12/springboot/JettyHttpComponentConfiguration12.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.component.jetty11.springboot;
+package org.apache.camel.component.jetty12.springboot;
import java.util.Map;
import org.apache.camel.http.common.HttpBinding;
@@ -29,12 +29,12 @@ import org.eclipse.jetty.util.thread.ThreadPool;
import org.springframework.boot.context.properties.ConfigurationProperties;
/**
- * Expose HTTP endpoints using Jetty 11.
+ * Expose HTTP endpoints using Jetty 12.
*
* Generated by camel-package-maven-plugin - do not edit this file!
*/
@ConfigurationProperties(prefix = "camel.component.jetty")
-public class JettyHttpComponentConfiguration11
+public class JettyHttpComponentConfiguration12
extends
ComponentConfigurationPropertiesCommon {
diff --git a/components-starter/camel-jetty-starter/src/main/java/org/apache/camel/component/jetty11/springboot/JettyHttpComponentConverter11.java b/components-starter/camel-jetty-starter/src/main/java/org/apache/camel/component/jetty12/springboot/JettyHttpComponentConverter12.java
similarity index 97%
rename from components-starter/camel-jetty-starter/src/main/java/org/apache/camel/component/jetty11/springboot/JettyHttpComponentConverter11.java
rename to components-starter/camel-jetty-starter/src/main/java/org/apache/camel/component/jetty12/springboot/JettyHttpComponentConverter12.java
index 680035ca8ee..f901ab1b647 100644
--- a/components-starter/camel-jetty-starter/src/main/java/org/apache/camel/component/jetty11/springboot/JettyHttpComponentConverter11.java
+++ b/components-starter/camel-jetty-starter/src/main/java/org/apache/camel/component/jetty12/springboot/JettyHttpComponentConverter12.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.component.jetty11.springboot;
+package org.apache.camel.component.jetty12.springboot;
import java.util.LinkedHashSet;
import java.util.Set;
@@ -32,7 +32,7 @@ import org.springframework.stereotype.Component;
@Configuration(proxyBeanMethods = false)
@ConfigurationPropertiesBinding
@Component
-public class JettyHttpComponentConverter11 implements GenericConverter {
+public class JettyHttpComponentConverter12 implements GenericConverter {
@Autowired
private ApplicationContext applicationContext;
diff --git a/components-starter/camel-jetty-starter/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/components-starter/camel-jetty-starter/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
index 966500f3556..8e74dde34d8 100644
--- a/components-starter/camel-jetty-starter/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
+++ b/components-starter/camel-jetty-starter/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
@@ -15,5 +15,5 @@
## limitations under the License.
## ---------------------------------------------------------------------------
-org.apache.camel.component.jetty11.springboot.JettyHttpComponentConverter11
-org.apache.camel.component.jetty11.springboot.JettyHttpComponentAutoConfiguration11
+org.apache.camel.component.jetty12.springboot.JettyHttpComponentConverter12
+org.apache.camel.component.jetty12.springboot.JettyHttpComponentAutoConfiguration12