You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ac...@apache.org on 2023/03/03 12:36:01 UTC
[camel] branch camel-3.20.x updated: Upgrade freemarker, httpclient4, spring-batch, spring-security, and spring-ws to match versions in 2.7.9 spring-boot-dependencies
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch camel-3.20.x
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/camel-3.20.x by this push:
new 7c8d266fb6a Upgrade freemarker, httpclient4, spring-batch, spring-security, and spring-ws to match versions in 2.7.9 spring-boot-dependencies
7c8d266fb6a is described below
commit 7c8d266fb6a03dddcdbc1a43b28984b6db5e13a6
Author: Tom Cunningham <tc...@redhat.com>
AuthorDate: Fri Mar 3 06:59:50 2023 -0500
Upgrade freemarker, httpclient4, spring-batch, spring-security, and spring-ws to match versions in 2.7.9 spring-boot-dependencies
---
camel-dependencies/pom.xml | 35 +++++++++++-----------
.../camel/catalog/components/milo-client.json | 2 +-
.../main/camel-main-configuration-metadata.json | 1 +
.../dsl/MiloClientEndpointBuilderFactory.java | 18 +++++++----
parent/pom.xml | 14 ++++-----
5 files changed, 39 insertions(+), 31 deletions(-)
diff --git a/camel-dependencies/pom.xml b/camel-dependencies/pom.xml
index 4e522af082c..b9dfeba6494 100644
--- a/camel-dependencies/pom.xml
+++ b/camel-dependencies/pom.xml
@@ -17,7 +17,8 @@
limitations under the License.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache</groupId>
@@ -74,24 +75,24 @@
<box-java-sdk-version>2.58.0</box-java-sdk-version>
<braintree-gateway-version>3.19.0</braintree-gateway-version>
<brave-zipkin-version>5.13.3</brave-zipkin-version>
- <build-helper-maven-plugin-version>3.2.0</build-helper-maven-plugin-version>
+ <build-helper-maven-plugin-version>3.3.0</build-helper-maven-plugin-version>
<c3p0-version>0.9.5.5</c3p0-version>
<caffeine-version>3.1.2</caffeine-version>
<californium-scandium-version>2.7.4</californium-scandium-version>
<californium-version>2.7.2</californium-version>
<camel.failsafe.forkTimeout>600</camel.failsafe.forkTimeout>
- <camel.osgi.activator />
- <camel.osgi.dynamic />
+ <camel.osgi.activator></camel.osgi.activator>
+ <camel.osgi.dynamic></camel.osgi.dynamic>
<camel.osgi.exclude.dependencies>false</camel.osgi.exclude.dependencies>
<camel.osgi.export>${camel.osgi.export.pkg};-noimport:=true;${camel.osgi.version}</camel.osgi.export>
<camel.osgi.export.pkg>$${replace;{local-packages};;;\;}</camel.osgi.export.pkg>
<camel.osgi.failok>false</camel.osgi.failok>
<camel.osgi.import>${camel.osgi.import.pkg}</camel.osgi.import>
- <camel.osgi.import.additional />
- <camel.osgi.import.before.defaults />
+ <camel.osgi.import.additional></camel.osgi.import.additional>
+ <camel.osgi.import.before.defaults></camel.osgi.import.before.defaults>
<camel.osgi.import.camel.version>version="[$(version;==;${camel.osgi.version.clean}),$(version;=+;${camel.osgi.version.clean}))"</camel.osgi.import.camel.version>
<camel.osgi.import.default.version>[$(version;==;$(@)),$(version;+;$(@)))</camel.osgi.import.default.version>
- <camel.osgi.import.defaults />
+ <camel.osgi.import.defaults></camel.osgi.import.defaults>
<camel.osgi.import.pkg>org.apache.camel.*;${camel.osgi.import.camel.version},
${camel.osgi.import.before.defaults},
${camel.osgi.import.defaults},
@@ -100,8 +101,8 @@
<camel.osgi.import.strict.version>version="[$(version;===;${camel.osgi.version.clean}),$(version;==+;${camel.osgi.version.clean}))"</camel.osgi.import.strict.version>
<camel.osgi.manifest>${project.build.outputDirectory}/META-INF/MANIFEST.MF</camel.osgi.manifest>
<camel.osgi.private.pkg>!*</camel.osgi.private.pkg>
- <camel.osgi.provide.capability />
- <camel.osgi.require.capability />
+ <camel.osgi.provide.capability></camel.osgi.provide.capability>
+ <camel.osgi.require.capability></camel.osgi.require.capability>
<camel.osgi.symbolic.name>${project.groupId}.${project.artifactId}</camel.osgi.symbolic.name>
<camel.osgi.version>version=${project.version}</camel.osgi.version>
<camel.surefire.fork.vmargs>-XX:+ExitOnOutOfMemoryError</camel.surefire.fork.vmargs>
@@ -154,9 +155,9 @@
<cxf-version-range>[3.5,3.6)</cxf-version-range>
<cxf-xjc-plugin-version>3.3.2</cxf-xjc-plugin-version>
<cxf-xjc-utils-version>3.3.2</cxf-xjc-utils-version>
- <cxf.codegen.jvmArgs />
+ <cxf.codegen.jvmArgs></cxf.codegen.jvmArgs>
<cxf.codegenplugin.forkmode>true</cxf.codegenplugin.forkmode>
- <cxf.xjc.jvmArgs />
+ <cxf.xjc.jvmArgs></cxf.xjc.jvmArgs>
<datasonnet-mapper-version>2.1.4</datasonnet-mapper-version>
<debezium-mysql-connector-version>8.0.28</debezium-mysql-connector-version>
<debezium-version>1.9.6.Final</debezium-version>
@@ -190,7 +191,7 @@
<flink-version>1.16.0</flink-version>
<fop-version>2.7</fop-version>
<formatter-maven-plugin-version>2.17.1</formatter-maven-plugin-version>
- <freemarker-version>2.3.31</freemarker-version>
+ <freemarker-version>2.3.32</freemarker-version>
<ftpserver-version>1.1.2</ftpserver-version>
<geronimo-annotation-1.0-spec-version>1.1.1</geronimo-annotation-1.0-spec-version>
<geronimo-annotation-1.2-spec-version>1.0</geronimo-annotation-1.2-spec-version>
@@ -256,7 +257,7 @@
<hk2-version>2.6.1</hk2-version>
<hsqldb-version>2.7.1</hsqldb-version>
<httpasyncclient-version>4.1.5</httpasyncclient-version>
- <httpclient4-version>4.5.13</httpclient4-version>
+ <httpclient4-version>4.5.14</httpclient4-version>
<httpcore4-version>4.4.15</httpcore4-version>
<httpunit-version>1.7</httpunit-version>
<huaweicloud-obs-version>3.21.4.1</huaweicloud-obs-version>
@@ -512,16 +513,16 @@
<spark-version>3.2.2</spark-version>
<splunk-version>1.9.0_1</splunk-version>
<spock-version>2.1-groovy-3.0</spock-version>
- <spring-batch-version>4.3.7</spring-batch-version>
+ <spring-batch-version>4.3.8</spring-batch-version>
<spring-data-redis-version>2.6.2</spring-data-redis-version>
<spring-integration-version>5.5.16</spring-integration-version>
<spring-ldap-version>2.4.1</spring-ldap-version>
<spring-rabbitmq-version>2.4.7</spring-rabbitmq-version>
- <spring-security-version>5.7.5</spring-security-version>
+ <spring-security-version>5.7.7</spring-security-version>
<spring-vault-core-version>2.3.2</spring-vault-core-version>
<spring-version>${spring5-version}</spring-version>
<spring-version-range>[5,6)</spring-version-range>
- <spring-ws-version>3.1.4</spring-ws-version>
+ <spring-ws-version>3.1.5</spring-ws-version>
<spring5-version>5.3.24</spring5-version>
<sql-maven-plugin-version>1.5</sql-maven-plugin-version>
<squareup-okhttp-version>3.14.9</squareup-okhttp-version>
@@ -565,7 +566,7 @@
<xml-resolver-version>1.2</xml-resolver-version>
<xmlgraphics-batik-version>1.15</xmlgraphics-batik-version>
<xmlsec-version>2.2.3</xmlsec-version>
- <xmlunit-version>2.9.0</xmlunit-version>
+ <xmlunit-version>2.9.1</xmlunit-version>
<xpp3-version>1.1.4c</xpp3-version>
<xstream-version>1.4.20</xstream-version>
<yetus-audience-annotations-version>0.13.0</yetus-audience-annotations-version>
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/milo-client.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/milo-client.json
index 6bf9754f16f..8540c847e45 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/milo-client.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/milo-client.json
@@ -57,7 +57,7 @@
"clientId": { "kind": "parameter", "displayName": "Client Id", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.milo.client.MiloClientConfiguration", "configurationField": "configuration", "description": "A virtual client id to force the creation of a new connection instance" },
"dataChangeFilterDeadbandType": { "kind": "parameter", "displayName": "Data Change Filter Deadband Type", "group": "common", "label": "", "required": false, "type": "object", "javaType": "org.eclipse.milo.opcua.stack.core.types.builtin.unsigned.UInteger", "deprecated": false, "autowired": false, "secret": false, "defaultValue": "0", "configurationClass": "org.apache.camel.component.milo.client.MonitorFilterConfiguration", "configurationField": "monitorFilterConfiguration", "descripti [...]
"dataChangeFilterDeadbandValue": { "kind": "parameter", "displayName": "Data Change Filter Deadband Value", "group": "common", "label": "", "required": false, "type": "number", "javaType": "java.lang.Double", "deprecated": false, "autowired": false, "secret": false, "defaultValue": "0.0", "configurationClass": "org.apache.camel.component.milo.client.MonitorFilterConfiguration", "configurationField": "monitorFilterConfiguration", "description": "Deadband value for MonitorFilterType Da [...]
- "dataChangeFilterTrigger": { "kind": "parameter", "displayName": "Data Change Filter Trigger", "group": "common", "label": "", "required": false, "type": "object", "javaType": "org.eclipse.milo.opcua.stack.core.types.enumerated.DataChangeTrigger", "enum": [ "Status", "StatusValue", "StatusValueTimestamp" ], "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.milo.client.MonitorFilterConfiguration", "configurationField": "monitor [...]
+ "dataChangeFilterTrigger": { "kind": "parameter", "displayName": "Data Change Filter Trigger", "group": "common", "label": "", "required": false, "type": "object", "javaType": "org.eclipse.milo.opcua.stack.core.types.enumerated.DataChangeTrigger", "enum": [ "Status", "StatusValue", "StatusValueTimestamp" ], "deprecated": false, "autowired": false, "secret": false, "defaultValue": "StatusValueTimestamp", "configurationClass": "org.apache.camel.component.milo.client.MonitorFilterConfig [...]
"defaultAwaitWrites": { "kind": "parameter", "displayName": "Default Await Writes", "group": "common", "label": "", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Default await setting for writes" },
"discoveryEndpointSuffix": { "kind": "parameter", "displayName": "Discovery Endpoint Suffix", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.milo.client.MiloClientConfiguration", "configurationField": "configuration", "description": "A suffix for endpoint URI when discovering" },
"discoveryEndpointUri": { "kind": "parameter", "displayName": "Discovery Endpoint Uri", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.milo.client.MiloClientConfiguration", "configurationField": "configuration", "description": "An alternative discovery URI" },
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/main/camel-main-configuration-metadata.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/main/camel-main-configuration-metadata.json
index d2d09c2a980..76721b586ae 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/main/camel-main-configuration-metadata.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/main/camel-main-configuration-metadata.json
@@ -21,6 +21,7 @@
{ "name": "camel.main.autoStartup", "description": "Sets whether the object should automatically start when Camel starts. Important: Currently only routes can be disabled, as CamelContext's are always started. Note: When setting auto startup false on CamelContext then that takes precedence and no routes are started. You would need to start CamelContext explicit using the org.apache.camel.CamelContext.start() method, to start the context, and then you would need to start the routes ma [...]
{ "name": "camel.main.autowiredEnabled", "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. Default is true.", "sourceType": "org.apache.camel.main.DefaultConfiguration [...]
{ "name": "camel.main.backlogTracing", "description": "Sets whether backlog tracing is enabled or not. Default is false.", "sourceType": "org.apache.camel.main.DefaultConfigurationProperties", "type": "boolean", "javaType": "boolean", "defaultValue": "false" },
+ { "name": "camel.main.backlogTracingStandby", "description": "Whether to set backlog tracing on standby. If on standby then the backlog tracer is installed and made available. Then the backlog tracer can be enabled later at runtime via JMX or via Java API. Default is false.", "sourceType": "org.apache.camel.main.DefaultConfigurationProperties", "type": "boolean", "javaType": "boolean", "defaultValue": "false" },
{ "name": "camel.main.basePackageScan", "description": "Package name to use as base (offset) for classpath scanning of RouteBuilder , and org.apache.camel.TypeConverter classes. If you are using Spring Boot then it is instead recommended to use Spring Boots component scanning and annotate your route builder classes with Component. In other words only use this for Camel Main in standalone mode.", "sourceType": "org.apache.camel.main.MainConfigurationProperties", "type": "string", "jav [...]
{ "name": "camel.main.basePackageScanEnabled", "description": "Whether base package scan is enabled.", "sourceType": "org.apache.camel.main.MainConfigurationProperties", "type": "boolean", "javaType": "boolean", "defaultValue": true },
{ "name": "camel.main.beanIntrospectionExtendedStatistics", "description": "Sets whether bean introspection uses extended statistics. The default is false.", "sourceType": "org.apache.camel.main.DefaultConfigurationProperties", "type": "boolean", "javaType": "boolean", "defaultValue": "false" },
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/MiloClientEndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/MiloClientEndpointBuilderFactory.java
index 876182e6af3..cccf20d46ce 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/MiloClientEndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/MiloClientEndpointBuilderFactory.java
@@ -127,11 +127,12 @@ public interface MiloClientEndpointBuilderFactory {
return this;
}
/**
- * Daata change trigger for data change monitor filter type.
+ * Data change trigger for data change monitor filter type.
*
* The option is a:
* <code>org.eclipse.milo.opcua.stack.core.types.enumerated.DataChangeTrigger</code> type.
*
+ * Default: StatusValueTimestamp
* Group: common
*
* @param dataChangeFilterTrigger the value to set
@@ -143,11 +144,12 @@ public interface MiloClientEndpointBuilderFactory {
return this;
}
/**
- * Daata change trigger for data change monitor filter type.
+ * Data change trigger for data change monitor filter type.
*
* The option will be converted to a
* <code>org.eclipse.milo.opcua.stack.core.types.enumerated.DataChangeTrigger</code> type.
*
+ * Default: StatusValueTimestamp
* Group: common
*
* @param dataChangeFilterTrigger the value to set
@@ -939,11 +941,12 @@ public interface MiloClientEndpointBuilderFactory {
return this;
}
/**
- * Daata change trigger for data change monitor filter type.
+ * Data change trigger for data change monitor filter type.
*
* The option is a:
* <code>org.eclipse.milo.opcua.stack.core.types.enumerated.DataChangeTrigger</code> type.
*
+ * Default: StatusValueTimestamp
* Group: common
*
* @param dataChangeFilterTrigger the value to set
@@ -955,11 +958,12 @@ public interface MiloClientEndpointBuilderFactory {
return this;
}
/**
- * Daata change trigger for data change monitor filter type.
+ * Data change trigger for data change monitor filter type.
*
* The option will be converted to a
* <code>org.eclipse.milo.opcua.stack.core.types.enumerated.DataChangeTrigger</code> type.
*
+ * Default: StatusValueTimestamp
* Group: common
*
* @param dataChangeFilterTrigger the value to set
@@ -1686,11 +1690,12 @@ public interface MiloClientEndpointBuilderFactory {
return this;
}
/**
- * Daata change trigger for data change monitor filter type.
+ * Data change trigger for data change monitor filter type.
*
* The option is a:
* <code>org.eclipse.milo.opcua.stack.core.types.enumerated.DataChangeTrigger</code> type.
*
+ * Default: StatusValueTimestamp
* Group: common
*
* @param dataChangeFilterTrigger the value to set
@@ -1702,11 +1707,12 @@ public interface MiloClientEndpointBuilderFactory {
return this;
}
/**
- * Daata change trigger for data change monitor filter type.
+ * Data change trigger for data change monitor filter type.
*
* The option will be converted to a
* <code>org.eclipse.milo.opcua.stack.core.types.enumerated.DataChangeTrigger</code> type.
*
+ * Default: StatusValueTimestamp
* Group: common
*
* @param dataChangeFilterTrigger the value to set
diff --git a/parent/pom.xml b/parent/pom.xml
index bd94078d523..5b2c5fc243d 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -91,7 +91,7 @@
<box-java-sdk-version>2.58.0</box-java-sdk-version>
<braintree-gateway-version>3.19.0</braintree-gateway-version>
<brave-zipkin-version>5.13.3</brave-zipkin-version>
- <build-helper-maven-plugin-version>3.2.0</build-helper-maven-plugin-version>
+ <build-helper-maven-plugin-version>3.3.0</build-helper-maven-plugin-version>
<c3p0-version>0.9.5.5</c3p0-version>
<caffeine-version>3.1.2</caffeine-version>
<californium-version>2.7.2</californium-version>
@@ -174,7 +174,7 @@
<fop-version>2.7</fop-version>
<formatter-maven-plugin-version>2.17.1</formatter-maven-plugin-version>
<ftpserver-version>1.1.2</ftpserver-version>
- <freemarker-version>2.3.31</freemarker-version>
+ <freemarker-version>2.3.32</freemarker-version>
<geronimo-annotation-1.0-spec-version>1.1.1</geronimo-annotation-1.0-spec-version>
<geronimo-annotation-1.2-spec-version>1.0</geronimo-annotation-1.2-spec-version>
<geronimo-atinject-1.0-spec-version>1.0</geronimo-atinject-1.0-spec-version>
@@ -238,7 +238,7 @@
<hsqldb-version>2.7.1</hsqldb-version>
<httpunit-version>1.7</httpunit-version>
<httpcore4-version>4.4.15</httpcore4-version>
- <httpclient4-version>4.5.13</httpclient4-version>
+ <httpclient4-version>4.5.14</httpclient4-version>
<httpasyncclient-version>4.1.5</httpasyncclient-version>
<huaweicloud-obs-version>3.21.4.1</huaweicloud-obs-version>
<huaweicloud-sdk-version>3.0.76</huaweicloud-sdk-version>
@@ -501,7 +501,7 @@
<spark-version>3.2.2</spark-version>
<splunk-version>1.9.0_1</splunk-version>
<spock-version>2.1-groovy-3.0</spock-version>
- <spring-batch-version>4.3.7</spring-batch-version>
+ <spring-batch-version>4.3.8</spring-batch-version>
<spring-data-redis-version>2.6.2</spring-data-redis-version>
<spring-integration-version>5.5.16</spring-integration-version>
<spring-ldap-version>2.4.1</spring-ldap-version>
@@ -510,8 +510,8 @@
<spring-version>${spring5-version}</spring-version>
<spring5-version>5.3.24</spring5-version>
<spring-rabbitmq-version>2.4.7</spring-rabbitmq-version>
- <spring-security-version>5.7.5</spring-security-version>
- <spring-ws-version>3.1.4</spring-ws-version>
+ <spring-security-version>5.7.7</spring-security-version>
+ <spring-ws-version>3.1.5</spring-ws-version>
<sql-maven-plugin-version>1.5</sql-maven-plugin-version>
<squareup-okhttp-version>3.14.9</squareup-okhttp-version>
<squareup-okio-version>1.17.2</squareup-okio-version>
@@ -554,7 +554,7 @@
<xml-resolver-version>1.2</xml-resolver-version>
<xmlgraphics-batik-version>1.15</xmlgraphics-batik-version>
<xmlsec-version>2.2.3</xmlsec-version>
- <xmlunit-version>2.9.0</xmlunit-version>
+ <xmlunit-version>2.9.1</xmlunit-version>
<xpp3-version>1.1.4c</xpp3-version>
<xstream-version>1.4.20</xstream-version>
<yetus-audience-annotations-version>0.13.0</yetus-audience-annotations-version>