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.git
The following commit(s) were added to refs/heads/main by this push:
new c180c2094e5 CAMEL-18153: Upgrade to spring boot 2.7.0 then upgrade
other dependencies
c180c2094e5 is described below
commit c180c2094e536510ffb31a545c36def7477ce35a
Author: Claus Ibsen <[email protected]>
AuthorDate: Tue May 31 20:44:56 2022 +0200
CAMEL-18153: Upgrade to spring boot 2.7.0 then upgrade other dependencies
---
camel-dependencies/pom.xml | 4 ++--
components/camel-spring-ldap/pom.xml | 5 -----
.../org/apache/camel/component/springldap/SpringLdapProducer.java | 6 +++---
.../org/apache/camel/dsl/jbang/core/commands/ExportSpringBoot.java | 2 +-
parent/pom.xml | 4 ++--
5 files changed, 8 insertions(+), 13 deletions(-)
diff --git a/camel-dependencies/pom.xml b/camel-dependencies/pom.xml
index 647772d8be6..7bbd667043c 100644
--- a/camel-dependencies/pom.xml
+++ b/camel-dependencies/pom.xml
@@ -251,7 +251,7 @@
<hapi-version>2.3</hapi-version>
<hawtbuf-version>1.11</hawtbuf-version>
<hawtdispatch-version>1.22</hawtdispatch-version>
- <hazelcast-version>5.1</hazelcast-version>
+ <hazelcast-version>5.1.1</hazelcast-version>
<hbase-version>2.4.10</hbase-version>
<hdrhistrogram-version>2.1.11</hdrhistrogram-version>
<hibernate-validator-version>6.2.3.Final</hibernate-validator-version>
@@ -501,7 +501,7 @@
<spring-batch-version>4.3.6</spring-batch-version>
<spring-data-redis-version>2.6.2</spring-data-redis-version>
<spring-integration-version>5.5.12</spring-integration-version>
- <spring-ldap-version>2.3.7.RELEASE</spring-ldap-version>
+ <spring-ldap-version>2.4.0</spring-ldap-version>
<spring-rabbitmq-version>2.4.2</spring-rabbitmq-version>
<spring-security-version>5.7.1</spring-security-version>
<spring-version>${spring5-version}</spring-version>
diff --git a/components/camel-spring-ldap/pom.xml
b/components/camel-spring-ldap/pom.xml
index 21fdd34a46c..07a144c0b77 100644
--- a/components/camel-spring-ldap/pom.xml
+++ b/components/camel-spring-ldap/pom.xml
@@ -59,11 +59,6 @@
<artifactId>spring-ldap-ldif-core</artifactId>
<version>${spring-ldap-version}</version>
</dependency>
- <dependency>
- <groupId>org.springframework.ldap</groupId>
- <artifactId>spring-ldap-ldif-batch</artifactId>
- <version>${spring-ldap-version}</version>
- </dependency>
<!-- testing -->
<dependency>
diff --git
a/components/camel-spring-ldap/src/main/java/org/apache/camel/component/springldap/SpringLdapProducer.java
b/components/camel-spring-ldap/src/main/java/org/apache/camel/component/springldap/SpringLdapProducer.java
index a2254fb805c..47735631f8b 100644
---
a/components/camel-spring-ldap/src/main/java/org/apache/camel/component/springldap/SpringLdapProducer.java
+++
b/components/camel-spring-ldap/src/main/java/org/apache/camel/component/springldap/SpringLdapProducer.java
@@ -25,7 +25,7 @@ import javax.naming.directory.ModificationItem;
import org.apache.camel.Exchange;
import org.apache.camel.support.DefaultProducer;
-import org.apache.commons.lang.StringUtils;
+import org.apache.camel.util.ObjectHelper;
import org.springframework.ldap.core.AttributesMapper;
import org.springframework.ldap.core.ContextSource;
import org.springframework.ldap.core.LdapOperations;
@@ -93,13 +93,13 @@ public class SpringLdapProducer extends DefaultProducer {
LdapTemplate ldapTemplate = endpoint.getLdapTemplate();
String dn = (String) body.get(DN);
- if (StringUtils.isBlank(dn)) {
+ if (ObjectHelper.isEmpty(dn)) {
ContextSource contextSource = ldapTemplate.getContextSource();
if (contextSource instanceof BaseLdapPathContextSource) {
dn = ((BaseLdapPathContextSource)
contextSource).getBaseLdapPathAsString();
}
}
- if (operation != LdapOperation.FUNCTION_DRIVEN &&
(StringUtils.isBlank(dn))) {
+ if (operation != LdapOperation.FUNCTION_DRIVEN &&
(ObjectHelper.isEmpty(dn))) {
throw new UnsupportedOperationException("DN must not be empty, but
you provided an empty DN");
}
diff --git
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/ExportSpringBoot.java
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/ExportSpringBoot.java
index bbd7e605880..f9b03f6d8a1 100644
---
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/ExportSpringBoot.java
+++
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/ExportSpringBoot.java
@@ -65,7 +65,7 @@ class ExportSpringBoot extends CamelCommand {
private String javaVersion;
@CommandLine.Option(names = { "--spring-boot-version" }, description =
"Spring Boot version",
- defaultValue = "2.6.8")
+ defaultValue = "2.7.0")
private String springBootVersion;
@CommandLine.Option(names = { "--kamelets-version" }, description =
"Apache Camel Kamelets version",
diff --git a/parent/pom.xml b/parent/pom.xml
index 8aaf3c83ab0..895363b86e7 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -232,7 +232,7 @@
<hapi-fhir-version>4.2.0</hapi-fhir-version>
<hawtbuf-version>1.11</hawtbuf-version>
<hawtdispatch-version>1.22</hawtdispatch-version>
- <hazelcast-version>5.1</hazelcast-version>
+ <hazelcast-version>5.1.1</hazelcast-version>
<hbase-version>2.4.10</hbase-version>
<hdrhistrogram-version>2.1.11</hdrhistrogram-version>
<hibernate-validator-version>6.2.3.Final</hibernate-validator-version>
@@ -489,7 +489,7 @@
<spring-batch-version>4.3.6</spring-batch-version>
<spring-data-redis-version>2.6.2</spring-data-redis-version>
<spring-integration-version>5.5.12</spring-integration-version>
- <spring-ldap-version>2.3.7.RELEASE</spring-ldap-version>
+ <spring-ldap-version>2.4.0</spring-ldap-version>
<spring-version-range>[5,6)</spring-version-range>
<spring-version>${spring5-version}</spring-version>
<spring5-version>5.3.20</spring5-version>
