From b6b4158fad40356f61c108de8e1f4b201b049dda Mon Sep 17 00:00:00 2001
From: Josh Cummings <3627351+jzheaux@users.noreply.github.com>
Date: Mon, 16 Jun 2025 14:07:58 -0600
Subject: [PATCH 01/67] Prepare for 4.0 Development
---
.../main/resources/META-INF/spring.schemas | 2 +-
.../ldap/config/spring-ldap-4.0.xsd | 685 ++++++++++++++++++
gradle.properties | 2 +-
3 files changed, 687 insertions(+), 2 deletions(-)
create mode 100644 core/src/main/resources/org/springframework/ldap/config/spring-ldap-4.0.xsd
diff --git a/core/src/main/resources/META-INF/spring.schemas b/core/src/main/resources/META-INF/spring.schemas
index 752edee1d9..7377496dd1 100644
--- a/core/src/main/resources/META-INF/spring.schemas
+++ b/core/src/main/resources/META-INF/spring.schemas
@@ -1,4 +1,4 @@
-http\://www.springframework.org/schema/ldap/spring-ldap.xsd=org/springframework/ldap/config/spring-ldap-2.2.xsd
+http\://www.springframework.org/schema/ldap/spring-ldap.xsd=org/springframework/ldap/config/spring-ldap-4.0.xsd
http\://www.springframework.org/schema/ldap/spring-ldap-2.0.xsd=org/springframework/ldap/config/spring-ldap-2.0.xsd
http\://www.springframework.org/schema/ldap/spring-ldap-2.1.xsd=org/springframework/ldap/config/spring-ldap-2.1.xsd
http\://www.springframework.org/schema/ldap/spring-ldap-2.2.xsd=org/springframework/ldap/config/spring-ldap-2.2.xsd
\ No newline at end of file
diff --git a/core/src/main/resources/org/springframework/ldap/config/spring-ldap-4.0.xsd b/core/src/main/resources/org/springframework/ldap/config/spring-ldap-4.0.xsd
new file mode 100644
index 0000000000..142b29b65a
--- /dev/null
+++ b/core/src/main/resources/org/springframework/ldap/config/spring-ldap-4.0.xsd
@@ -0,0 +1,685 @@
+
+
+
+
+
+
+
+
+
+ A bean identifier, used for referring to the bean elsewhere in the context.
+ "contextSource".
+
+
+
+
+
+
+ Defines whether read-only operations will be performed using an anonymous (unauthenticated) context.
+
+
+
+
+
+
+ Id of the AuthenticationSource instance to use. If not specified, a SimpleAuthenticationSource will
+ be used.
+
+
+
+
+
+
+ Id of the DirContextAuthenticationStrategy instance to use. If not specified, a SimpleDirContextAuthenticationStrategy
+ will be used.
+
+
+
+
+
+
+ The base DN. If configured, all LDAP operations on contexts retrieved from this ContextSource will
+ be relative to this DN. Default is an empty distinguished name (i.e. all operations will be
+ relative to the directory root).
+
+
+
+
+
+
+ The password to use for authentication.
+
+
+
+
+
+
+ Specify whether native Java LDAP connection pooling should be used. Default is false.
+
+
+
+
+
+
+ Defines the strategy to handle referrals, as described on https://docs.oracle.com/javase/jndi/tutorial/ldap/referral/jndi.html.
+ Default is null.
+
+
+
+
+
+
+
+
+
+
+
+
+
+ URL of the LDAP server to use. If fail-over functionality is desired, more than one URL can
+ be specified, separated using comma (,).
+
+
+
+
+
+
+ The username (principal) to use for authentication. This will normally be the distinguished name
+ of an admin user.
+
+
+
+
+
+
+ Reference to a Map of custom environment properties that should supplied with the environment
+ sent to the DirContext on construction.
+
+
+
+
+
+
+
+
+
+ The maximum number of active connections of each type (read-only|read-write)
+ that can be allocated from the pool at the same time, or non-positive for no limit.
+ Default is 8.
+
+
+
+
+
+
+ The overall maximum number of active connections (for all types) that can be allocated from
+ this pool at the same time, or non-positive for no limit. Default is -1 (no limit).
+
+
+
+
+
+
+ The maximum number of active connections of each type (read-only|read-write) that can remain idle in the pool,
+ without extra ones being released, or non-positive for no limit. Default is 8.
+
+
+
+
+
+
+ The minimum number of active connections of each type (read-only|read-write) that can remain
+ idle in the pool, without extra ones being created, or zero to create none. Default is 0.
+
+
+
+
+
+
+ The maximum number of milliseconds that the pool will wait (when there are no available connections)
+ for a connection to be returned before throwing an exception, or non-positive to wait indefinitely.
+ Default is -1.
+
+
+
+
+
+
+ Specifies the behaviour when the pool is exhausted.
+
+
+
+
+
+
+
+ Throw a NoSuchElementException when the pool is exhausted
+
+
+
+
+
+
+ Wait until a new object is available. If max-wait is positive a NoSuchElementException
+ is thrown if no new object is available after the maxWait time expires.
+
+
+
+
+
+
+ Create and return a new object (essentially making maxActive meaningless).
+
+
+
+
+
+
+
+
+
+ The indication of whether objects will be validated before being borrowed from the pool.
+ If the object fails to validate, it will be dropped from the pool, and an attempt to borrow another will be made.
+ Default is false.
+
+
+
+
+
+
+ The indication of whether objects will be validated before being returned to the pool.
+ Default is false.
+
+
+
+
+
+
+ The indication of whether objects will be validated by the idle object evictor (if any).
+ If an object fails to validate, it will be dropped from the pool.
+ Default is false.
+
+
+
+
+
+
+ The number of milliseconds to sleep between runs of the idle object evictor thread. When non-positive,
+ no idle object evictor thread will be run. Default is -1.
+
+
+
+
+
+
+ The number of objects to examine during each run of the idle object evictor thread (if any).
+ Default is 3.
+
+
+
+
+
+
+ The minimum amount of time an object may sit idle in the pool before it is eligible
+ for eviction by the idle object evictor (if any). Default is 1000 * 60 * 30.
+
+
+
+
+
+
+ The base dn to use for validation searches. Default is LdapUtils.emptyPath().
+
+
+
+
+
+
+ The filter to use for validation queries. Default is (objectclass=*).
+
+
+
+
+
+
+ Id of the SearchControls instance to use for searches. Default is searchScope=OBJECT_SCOPE;
+ countLimit: 1; timeLimit: 500; returningAttributes: [objectclass].
+
+
+
+
+
+
+ Id of the SearchControls instance to use for searches. Default is searchScope=OBJECT_SCOPE;
+ countLimit: 1; timeLimit: 500; returningAttributes: [objectclass].
+
+
+
+
+
+
+
+
+
+ The overall maximum number of active connections (for all types) that can be allocated from
+ this pool at the same time, or non-positive for no limit. Default is -1 (no limit).
+
+
+
+
+
+
+ The limit on the number of object instances allocated by the pool (checked out or idle),
+ per key. When the limit is reached, the sub-pool is said to be exhausted. A negative value
+ indicates no limit. Default is 8.
+
+
+
+
+
+
+ The maximum number of active connections per type (read-only|read-write) that can remain idle in the pool,
+ without extra ones being released, or non-positive for no limit. Default is 8.
+
+
+
+
+
+
+ The minimum number of active connections per type (read-only|read-write) that can remain
+ idle in the pool, without extra ones being created, or zero to create none. Default is 0.
+
+
+
+
+
+
+ The maximum number of milliseconds that the pool will wait (when there are no available connections)
+ for a connection to be returned before throwing an exception, or non-positive to wait indefinitely.
+ Default is -1.
+
+
+
+
+
+
+ Sets to wait until a new object is available. If max-wait is positive a NoSuchElementException
+ is thrown if no new object is available after the maxWait time expires. Default is true.
+
+
+
+
+
+
+ Sets whether objects created for the pool will be validated before borrowing. If the object
+ fails to validate, then borrowing will fail. Default is false.
+
+
+
+
+
+
+ The indication of whether objects will be validated before being borrowed from the pool.
+ If the object fails to validate, it will be dropped from the pool, and an attempt to borrow another will be made.
+ Default is false.
+
+
+
+
+
+
+ The indication of whether objects will be validated before being returned to the pool.
+ Default is false.
+
+
+
+
+
+
+ The indication of whether objects will be validated by the idle object evictor (if any).
+ If an object fails to validate, it will be dropped from the pool.
+ Default is false.
+
+
+
+
+
+
+ The number of milliseconds to sleep between runs of the idle object evictor thread. When non-positive,
+ no idle object evictor thread will be run. Default is -1.
+
+
+
+
+
+
+ The number of objects to examine during each run of the idle object evictor thread (if any).
+ Default is 3.
+
+
+
+
+
+
+ The minimum amount of time an object may sit idle in the pool before it is eligible
+ for eviction by the idle object evictor (if any). Default is 1000 * 60 * 30.
+
+
+
+
+
+
+ The minimum amount of time an object may sit idle in the pool before it is eligible for
+ eviction by the idle object evictor, with the extra condition that at least minimum number
+ of object instances per key remain in the pool. This settings is overridden by min-evictable-time-millis if
+ it is set to a positive value. Default is -1.
+
+
+
+
+
+
+ The name of the eviction policy implementation that is used by this pool. The Pool will
+ attempt to load the class using the thread context class loader. If that fails, the Pool
+ will attempt to load the class using the class loader that loaded this class. Default is
+ org.apache.commons.pool2.impl.DefaultEvictionPolicy.
+
+
+
+
+
+
+ Sets whether or not the pool serves threads waiting to borrow connections fairly.
+ True means that waiting threads are served as if waiting in a FIFO queue. Default is false.
+
+
+
+
+
+
+ Sets whether JMX will be enabled with the platform MBean server for the pool. Default
+ is true.
+
+
+
+
+
+
+ The value of the JMX name base that will be used as part of the name assigned
+ to JMX enabled pools. Default is null.
+
+
+
+
+
+
+ The value of the JMX name prefix that will be used as part of the name assigned
+ to JMX enabled pools. Default value is pool.
+
+
+
+
+
+
+ Sets whether the pool has LIFO (last in, first out) behaviour with
+ respect to idle objects - always returning the most recently used object
+ from the pool, or as a FIFO (first in, first out) queue, where the pool
+ always returns the oldest object in the idle object pool. Default is true.
+
+
+
+
+
+
+ The base dn to use for validation searches. Default is LdapUtils.emptyPath().
+
+
+
+
+
+
+ The filter to use for validation queries. Default is (objectclass=*).
+
+
+
+
+
+
+ Id of the SearchControls instance to use for searches. Default is searchScope=OBJECT_SCOPE;
+ countLimit: 1; timeLimit: 500; returningAttributes: [objectclass].
+
+
+
+
+
+
+ Id of the SearchControls instance to use for searches. Default is searchScope=OBJECT_SCOPE;
+ countLimit: 1; timeLimit: 500; returningAttributes: [objectclass].
+
+
+
+
+
+
+
+
+ Creates a ContextSource instance to be used to get LdapContexts for communicating with an LDAP server.
+
+
+
+
+
+
+
+
+ Defines the settings to use for the Spring LDAP connection pooling support.
+
+
+
+
+
+
+
+
+
+
+
+ Defines the settings to use for the Spring LDAP connection pooling support based on commons-pool2 library.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ A bean identifier, used for referring to the bean elsewhere in the context.
+ Default is "ldapTemplate".
+
+
+
+
+
+
+ Id of the ContextSource instance to use. Default is "contextSource".
+
+
+
+
+
+
+ The default count limit for searches. Default is 0 (no limit).
+
+
+
+
+
+
+ The default time limit for searches. Default is 0 (no limit).
+
+
+
+
+
+
+ The default search scope for searches. Default is SUBTREE.
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Specifies whether NameNotFoundException should be ignored in searches. Setting this
+ attribute to true will cause errors caused by invalid search base to be silently swallowed.
+ Default is false.
+
+
+
+
+
+
+ Specifies whether PartialResultException should be ignored in searches. Some LDAP servers
+ have problems with referrals; these should normally be followed automatically, but if this
+ doesn't work it will manifest itself with a PartialResultException. Setting this attribute
+ to true presents a work-around to this problem. Default is false.
+
+
+
+
+
+
+ Id of the ObjectDirectoryMapper instance to use. Default is a default-configured DefaultObjectDirectoryMapper.
+
+
+
+
+
+
+
+
+ Creates an LdapTemplate instance.
+
+
+
+
+
+
+
+
+
+
+
+ Id of this instance. Default is "transactionManager".
+
+
+
+
+
+
+ Id of the ContextSource instance to use. "contextSource".
+
+
+
+
+
+
+ Id of the DataSource instance to use.
+
+
+
+
+
+
+ Id of the Hibernate SessionFactory instance to use.
+
+
+
+
+
+
+
+
+ Creates an ContextSourceTransactionManager. If data-source-ref or session-factory-ref is specified,
+ a DataSourceAndContextSourceTransactionManager/HibernateAndContextSourceTransactionManager will be
+ created.
+
+
+
+
+
+
+
+ The default (simplistic) TempEntryRenamingStrategy. Please note that this
+ strategy will not work for more advanced scenarios. See reference documentation
+ for details.
+
+
+
+
+
+
+ The default suffix that will be added to modified entries.
+ Default is "_temp".
+
+
+
+
+
+
+
+
+ TempEntryRenamingStrategy that moves the entry to a different subtree than
+ the original entry.
+
+
+
+
+
+
+ The subtree base where changed entries should be moved.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ The reference to an LdapTemplate. Will default to 'ldapTemplate'.
+
+
+
+
+
+
+
+
diff --git a/gradle.properties b/gradle.properties
index b1981b323d..5dc9e988d9 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,3 +1,3 @@
-version=3.3.1
+version=4.0.0-SNAPSHOT
springJavaformatVersion=0.0.38
org.gradle.caching=true
From 32a866f86844c61e0c64be412d229bf3638684fd Mon Sep 17 00:00:00 2001
From: Josh Cummings <3627351+jzheaux@users.noreply.github.com>
Date: Mon, 16 Jun 2025 14:06:38 -0600
Subject: [PATCH 02/67] Remove LDAP + Data Source Transaction Wrappers
Closes gh-1109
---
.../ldap/config/TransactionManagerParser.java | 21 +-
...SourceAndDataSourceTransactionManager.java | 218 ----------
...tSourceAndHibernateTransactionManager.java | 221 ----------
.../ldap/config/spring-ldap-4.0.xsd | 18 +-
.../LdapTemplateNamespaceHandlerTests.java | 9 +-
.../ContextSourceTransactionManagerTests.java | 3 +-
modules/ROOT/pages/transaction-support.adoc | 29 +-
.../DummyDaoLdapAndHibernateImpl.java | 120 ------
...rceTransactionManagerIntegrationTests.java | 358 -----------------
...sactionManagerLdap179IntegrationTests.java | 96 -----
...urceTransactionManagerNamespaceITests.java | 359 -----------------
...ateTransactionManagerIntegrationTests.java | 375 -----------------
...sactionManagerLdap179IntegrationTests.java | 89 -----
...nateTransactionManagerNamespaceITests.java | 376 ------------------
.../src/test/resources/conf/OrgPerson.hbm.xml | 16 -
...bernateTransactionNamespaceTestContext.xml | 51 ---
...ldapAndHibernateTransactionTestContext.xml | 63 ---
...AndJdbcTransactionNamespaceTestContext.xml | 52 ---
.../ldapAndJdbcTransactionTestContext.xml | 49 ---
...LdapAndHibernateTransactionTestContext.xml | 80 ----
...ssingLdapAndJdbcTransactionTestContext.xml | 66 ---
21 files changed, 11 insertions(+), 2658 deletions(-)
delete mode 100644 core/src/main/java/org/springframework/ldap/transaction/compensating/manager/ContextSourceAndDataSourceTransactionManager.java
delete mode 100755 core/src/main/java/org/springframework/ldap/transaction/compensating/manager/ContextSourceAndHibernateTransactionManager.java
delete mode 100755 test/integration-tests/src/main/java/org/springframework/ldap/itest/transaction/compensating/manager/hibernate/DummyDaoLdapAndHibernateImpl.java
delete mode 100644 test/integration-tests/src/test/java/org/springframework/ldap/itest/manager/ContextSourceAndDataSourceTransactionManagerIntegrationTests.java
delete mode 100644 test/integration-tests/src/test/java/org/springframework/ldap/itest/manager/ContextSourceAndDataSourceTransactionManagerLdap179IntegrationTests.java
delete mode 100644 test/integration-tests/src/test/java/org/springframework/ldap/itest/manager/ContextSourceAndDataSourceTransactionManagerNamespaceITests.java
delete mode 100644 test/integration-tests/src/test/java/org/springframework/ldap/itest/manager/hibernate/ContextSourceAndHibernateTransactionManagerIntegrationTests.java
delete mode 100644 test/integration-tests/src/test/java/org/springframework/ldap/itest/manager/hibernate/ContextSourceAndHibernateTransactionManagerLdap179IntegrationTests.java
delete mode 100644 test/integration-tests/src/test/java/org/springframework/ldap/itest/manager/hibernate/ContextSourceAndHibernateTransactionManagerNamespaceITests.java
delete mode 100755 test/integration-tests/src/test/resources/conf/OrgPerson.hbm.xml
delete mode 100755 test/integration-tests/src/test/resources/conf/ldapAndHibernateTransactionNamespaceTestContext.xml
delete mode 100755 test/integration-tests/src/test/resources/conf/ldapAndHibernateTransactionTestContext.xml
delete mode 100644 test/integration-tests/src/test/resources/conf/ldapAndJdbcTransactionNamespaceTestContext.xml
delete mode 100644 test/integration-tests/src/test/resources/conf/ldapAndJdbcTransactionTestContext.xml
delete mode 100755 test/integration-tests/src/test/resources/conf/missingLdapAndHibernateTransactionTestContext.xml
delete mode 100644 test/integration-tests/src/test/resources/conf/missingLdapAndJdbcTransactionTestContext.xml
diff --git a/core/src/main/java/org/springframework/ldap/config/TransactionManagerParser.java b/core/src/main/java/org/springframework/ldap/config/TransactionManagerParser.java
index 550a2904ae..37078544da 100644
--- a/core/src/main/java/org/springframework/ldap/config/TransactionManagerParser.java
+++ b/core/src/main/java/org/springframework/ldap/config/TransactionManagerParser.java
@@ -24,8 +24,6 @@
import org.springframework.beans.factory.xml.AbstractBeanDefinitionParser;
import org.springframework.beans.factory.xml.BeanDefinitionParser;
import org.springframework.beans.factory.xml.ParserContext;
-import org.springframework.ldap.transaction.compensating.manager.ContextSourceAndDataSourceTransactionManager;
-import org.springframework.ldap.transaction.compensating.manager.ContextSourceAndHibernateTransactionManager;
import org.springframework.ldap.transaction.compensating.manager.ContextSourceTransactionManager;
import org.springframework.ldap.transaction.compensating.support.DefaultTempEntryRenamingStrategy;
import org.springframework.ldap.transaction.compensating.support.DifferentSubtreeTempEntryRenamingStrategy;
@@ -58,24 +56,13 @@ public BeanDefinition parse(Element element, ParserContext parserContext) {
String dataSourceRef = element.getAttribute(ATT_DATA_SOURCE_REF);
String sessionFactoryRef = element.getAttribute(ATT_SESSION_FACTORY_REF);
- if (StringUtils.hasText(dataSourceRef) && StringUtils.hasText(sessionFactoryRef)) {
- throw new IllegalArgumentException(String.format("Only one of %s and %s can be specified",
+ if (StringUtils.hasText(dataSourceRef) || StringUtils.hasText(sessionFactoryRef)) {
+ throw new IllegalArgumentException(String.format(
+ "ContextSourceAndHibernateTransactionManager and ContextSourceAndDataSourceTransactionManager are removed in Spring LDAP 4.0. Please remove your usage of data-source-ref and session-factory-ref.",
ATT_DATA_SOURCE_REF, ATT_SESSION_FACTORY_REF));
}
- BeanDefinitionBuilder builder;
- if (StringUtils.hasText(dataSourceRef)) {
- builder = BeanDefinitionBuilder.rootBeanDefinition(ContextSourceAndDataSourceTransactionManager.class);
- builder.addPropertyReference("dataSource", dataSourceRef);
- }
- else if (StringUtils.hasText(sessionFactoryRef)) {
- builder = BeanDefinitionBuilder.rootBeanDefinition(ContextSourceAndHibernateTransactionManager.class);
- builder.addPropertyReference("sessionFactory", sessionFactoryRef);
- }
- else {
- // Standard transaction manager
- builder = BeanDefinitionBuilder.rootBeanDefinition(ContextSourceTransactionManager.class);
- }
+ BeanDefinitionBuilder builder = BeanDefinitionBuilder.rootBeanDefinition(ContextSourceTransactionManager.class);
builder.addPropertyReference("contextSource", contextSourceRef);
diff --git a/core/src/main/java/org/springframework/ldap/transaction/compensating/manager/ContextSourceAndDataSourceTransactionManager.java b/core/src/main/java/org/springframework/ldap/transaction/compensating/manager/ContextSourceAndDataSourceTransactionManager.java
deleted file mode 100644
index 37562b4bef..0000000000
--- a/core/src/main/java/org/springframework/ldap/transaction/compensating/manager/ContextSourceAndDataSourceTransactionManager.java
+++ /dev/null
@@ -1,218 +0,0 @@
-/*
- * Copyright 2005-2013 the original author or authors.
- *
- * 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
- *
- * https://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.
- */
-
-package org.springframework.ldap.transaction.compensating.manager;
-
-import org.springframework.jdbc.datasource.DataSourceTransactionManager;
-import org.springframework.ldap.core.ContextSource;
-import org.springframework.ldap.transaction.compensating.TempEntryRenamingStrategy;
-import org.springframework.transaction.TransactionDefinition;
-import org.springframework.transaction.TransactionException;
-import org.springframework.transaction.TransactionSuspensionNotSupportedException;
-import org.springframework.transaction.support.DefaultTransactionStatus;
-
-/**
- * A Transaction Manager to manage LDAP and JDBC operations within the same transaction.
- * Note that even though the same logical transaction is used, this is not a JTA XA
- * transaction; no two-phase commit will be performed, and thus commit and rollback may
- * yield unexpected results.
- *
- * Note that nested transactions are not supported.
- *
- * @author Mattias Hellborg Arthursson
- * @since 1.2
- * @deprecated The idea of wrapping two transaction managers without actual XA support is
- * probably not such a good idea after all. AbstractPlatformTransactionManager is not
- * designed for this usage.
- */
-@Deprecated
-public class ContextSourceAndDataSourceTransactionManager extends DataSourceTransactionManager {
-
- private static final long serialVersionUID = 6832868697460384648L;
-
- private ContextSourceTransactionManagerDelegate ldapManagerDelegate = new ContextSourceTransactionManagerDelegate();
-
- public ContextSourceAndDataSourceTransactionManager() {
- super();
- // Override the default behaviour.
- setNestedTransactionAllowed(false);
- }
-
- /*
- * @see org.springframework.jdbc.datasource.DataSourceTransactionManager#
- * isExistingTransaction(java.lang.Object)
- */
- @Override
- protected boolean isExistingTransaction(Object transaction) {
- // We don't support nested transactions here
- return false;
- }
-
- /*
- * @see
- * org.springframework.jdbc.datasource.DataSourceTransactionManager#doGetTransaction()
- */
- @Override
- protected Object doGetTransaction() {
- Object dataSourceTransactionObject = super.doGetTransaction();
- Object contextSourceTransactionObject = this.ldapManagerDelegate.doGetTransaction();
-
- return new ContextSourceAndDataSourceTransactionObject(contextSourceTransactionObject,
- dataSourceTransactionObject);
- }
-
- /*
- * @see
- * org.springframework.jdbc.datasource.DataSourceTransactionManager#doBegin(java.lang.
- * Object, org.springframework.transaction.TransactionDefinition)
- */
- @Override
- protected void doBegin(Object transaction, TransactionDefinition definition) {
- ContextSourceAndDataSourceTransactionObject actualTransactionObject = (ContextSourceAndDataSourceTransactionObject) transaction;
-
- super.doBegin(actualTransactionObject.getDataSourceTransactionObject(), definition);
- try {
- this.ldapManagerDelegate.doBegin(actualTransactionObject.getLdapTransactionObject(), definition);
- }
- catch (TransactionException ex) {
- // Failed to start LDAP transaction - make sure we clean up properly
- super.doCleanupAfterCompletion(actualTransactionObject.getDataSourceTransactionObject());
- throw ex;
- }
- }
-
- /*
- * @see org.springframework.jdbc.datasource.DataSourceTransactionManager#
- * doCleanupAfterCompletion(java.lang.Object)
- */
- @Override
- protected void doCleanupAfterCompletion(Object transaction) {
- ContextSourceAndDataSourceTransactionObject actualTransactionObject = (ContextSourceAndDataSourceTransactionObject) transaction;
-
- super.doCleanupAfterCompletion(actualTransactionObject.getDataSourceTransactionObject());
- this.ldapManagerDelegate.doCleanupAfterCompletion(actualTransactionObject.getLdapTransactionObject());
- }
-
- /*
- * @see org.springframework.jdbc.datasource.DataSourceTransactionManager#doCommit(org.
- * springframework.transaction.support.DefaultTransactionStatus)
- */
- @Override
- protected void doCommit(DefaultTransactionStatus status) {
-
- ContextSourceAndDataSourceTransactionObject actualTransactionObject = (ContextSourceAndDataSourceTransactionObject) status
- .getTransaction();
-
- try {
- super.doCommit(new DefaultTransactionStatus(actualTransactionObject.getDataSourceTransactionObject(),
- status.isNewTransaction(), status.isNewSynchronization(), status.isReadOnly(), status.isDebug(),
- status.getSuspendedResources()));
- }
- catch (TransactionException ex) {
- if (isRollbackOnCommitFailure()) {
- logger.debug("Failed to commit db resource, rethrowing", ex);
- // If we are to rollback on commit failure, just rethrow the
- // exception - this will cause a rollback to be performed on
- // both resources.
- throw ex;
- }
- else {
- logger.warn("Failed to commit and resource is rollbackOnCommit not set -"
- + " proceeding to commit ldap resource.");
- }
- }
- this.ldapManagerDelegate.doCommit(new DefaultTransactionStatus(
- actualTransactionObject.getLdapTransactionObject(), status.isNewTransaction(),
- status.isNewSynchronization(), status.isReadOnly(), status.isDebug(), status.getSuspendedResources()));
- }
-
- /*
- * @see
- * org.springframework.jdbc.datasource.DataSourceTransactionManager#doRollback(org.
- * springframework.transaction.support.DefaultTransactionStatus)
- */
- @Override
- protected void doRollback(DefaultTransactionStatus status) {
- ContextSourceAndDataSourceTransactionObject actualTransactionObject = (ContextSourceAndDataSourceTransactionObject) status
- .getTransaction();
-
- super.doRollback(new DefaultTransactionStatus(actualTransactionObject.getDataSourceTransactionObject(),
- status.isNewTransaction(), status.isNewSynchronization(), status.isReadOnly(), status.isDebug(),
- status.getSuspendedResources()));
- this.ldapManagerDelegate.doRollback(new DefaultTransactionStatus(
- actualTransactionObject.getLdapTransactionObject(), status.isNewTransaction(),
- status.isNewSynchronization(), status.isReadOnly(), status.isDebug(), status.getSuspendedResources()));
- }
-
- public ContextSource getContextSource() {
- return this.ldapManagerDelegate.getContextSource();
- }
-
- public void setContextSource(ContextSource contextSource) {
- this.ldapManagerDelegate.setContextSource(contextSource);
- }
-
- public void setRenamingStrategy(TempEntryRenamingStrategy renamingStrategy) {
- this.ldapManagerDelegate.setRenamingStrategy(renamingStrategy);
- }
-
- /*
- * @see
- * org.springframework.jdbc.datasource.DataSourceTransactionManager#doSuspend(java.
- * lang.Object)
- */
- protected Object doSuspend(Object transaction) {
- throw new TransactionSuspensionNotSupportedException(
- "Transaction manager [" + getClass().getName() + "] does not support transaction suspension");
- }
-
- /*
- * @see
- * org.springframework.jdbc.datasource.DataSourceTransactionManager#doResume(java.lang
- * .Object, java.lang.Object)
- */
- protected void doResume(Object transaction, Object suspendedResources) {
- throw new TransactionSuspensionNotSupportedException(
- "Transaction manager [" + getClass().getName() + "] does not support transaction suspension");
- }
-
- public void afterPropertiesSet() {
- super.afterPropertiesSet();
- this.ldapManagerDelegate.checkRenamingStrategy();
- }
-
- private static final class ContextSourceAndDataSourceTransactionObject {
-
- private Object ldapTransactionObject;
-
- private Object dataSourceTransactionObject;
-
- ContextSourceAndDataSourceTransactionObject(Object ldapTransactionObject, Object dataSourceTransactionObject) {
- this.ldapTransactionObject = ldapTransactionObject;
- this.dataSourceTransactionObject = dataSourceTransactionObject;
- }
-
- Object getDataSourceTransactionObject() {
- return this.dataSourceTransactionObject;
- }
-
- Object getLdapTransactionObject() {
- return this.ldapTransactionObject;
- }
-
- }
-
-}
diff --git a/core/src/main/java/org/springframework/ldap/transaction/compensating/manager/ContextSourceAndHibernateTransactionManager.java b/core/src/main/java/org/springframework/ldap/transaction/compensating/manager/ContextSourceAndHibernateTransactionManager.java
deleted file mode 100755
index 3d32dc72cb..0000000000
--- a/core/src/main/java/org/springframework/ldap/transaction/compensating/manager/ContextSourceAndHibernateTransactionManager.java
+++ /dev/null
@@ -1,221 +0,0 @@
-/*
- * Copyright 2005-2013 the original author or authors.
- *
- * 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
- *
- * https://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.
- */
-
-package org.springframework.ldap.transaction.compensating.manager;
-
-import org.springframework.ldap.core.ContextSource;
-import org.springframework.ldap.transaction.compensating.TempEntryRenamingStrategy;
-import org.springframework.orm.hibernate5.HibernateTransactionManager;
-import org.springframework.transaction.TransactionDefinition;
-import org.springframework.transaction.TransactionException;
-import org.springframework.transaction.TransactionSuspensionNotSupportedException;
-import org.springframework.transaction.support.DefaultTransactionStatus;
-
-/**
- * A Transaction Manager to manage LDAP and Hibernate 3 operations within the same
- * transaction. Note that even though the same logical transaction is used, this is
- * not a JTA XA transaction; no two-phase commit will be performed, and thus commit
- * and rollback may yield unexpected results.
- * This Transaction Manager is as good as it gets when you are using in LDAP in
- * combination with a Hibernate 3 and unable to use XA transactions because LDAP is not
- * transactional by design to begin with.
- *
- * Furthermore, this manager does not support nested transactions
- *
- * @author Hans Westerbeek
- * @since 1.2.2
- * @deprecated The idea of wrapping two transaction managers without actual XA support is
- * probably not such a good idea after all. AbstractPlatformTransactionManager is not
- * designed for this usage.
- */
-@Deprecated
-public class ContextSourceAndHibernateTransactionManager extends HibernateTransactionManager {
-
- /**
- *
- */
- private static final long serialVersionUID = 1L;
-
- private ContextSourceTransactionManagerDelegate ldapManagerDelegate = new ContextSourceTransactionManagerDelegate();
-
- /*
- * @see org.springframework.orm.hibernate5.HibernateTransactionManager#
- * isExistingTransaction(java.lang.Object)
- */
- @Override
- protected boolean isExistingTransaction(Object transaction) {
- ContextSourceAndHibernateTransactionObject actualTransactionObject = (ContextSourceAndHibernateTransactionObject) transaction;
-
- return super.isExistingTransaction(actualTransactionObject.getHibernateTransactionObject());
- }
-
- /*
- * @see
- * org.springframework.orm.hibernate5.HibernateTransactionManager#doGetTransaction()
- */
- @Override
- protected Object doGetTransaction() {
- Object dataSourceTransactionObject = super.doGetTransaction();
- Object contextSourceTransactionObject = this.ldapManagerDelegate.doGetTransaction();
-
- return new ContextSourceAndHibernateTransactionObject(contextSourceTransactionObject,
- dataSourceTransactionObject);
- }
-
- /*
- * @see
- * org.springframework.orm.hibernate5.HibernateTransactionManager#doBegin(java.lang.
- * Object, org.springframework.transaction.TransactionDefinition)
- */
- @Override
- protected void doBegin(Object transaction, TransactionDefinition definition) {
- ContextSourceAndHibernateTransactionObject actualTransactionObject = (ContextSourceAndHibernateTransactionObject) transaction;
-
- super.doBegin(actualTransactionObject.getHibernateTransactionObject(), definition);
- try {
- this.ldapManagerDelegate.doBegin(actualTransactionObject.getLdapTransactionObject(), definition);
- }
- catch (TransactionException ex) {
- // Failed to start LDAP transaction - make sure we clean up properly
- super.doCleanupAfterCompletion(actualTransactionObject.getHibernateTransactionObject());
- throw ex;
- }
- }
-
- /*
- * @see org.springframework.orm.hibernate5.HibernateTransactionManager#
- * doCleanupAfterCompletion(java.lang.Object)
- */
- @Override
- protected void doCleanupAfterCompletion(Object transaction) {
- ContextSourceAndHibernateTransactionObject actualTransactionObject = (ContextSourceAndHibernateTransactionObject) transaction;
-
- super.doCleanupAfterCompletion(actualTransactionObject.getHibernateTransactionObject());
- this.ldapManagerDelegate.doCleanupAfterCompletion(actualTransactionObject.getLdapTransactionObject());
- }
-
- /*
- * @see org.springframework.orm.hibernate5.HibernateTransactionManager#doCommit(org.
- * springframework.transaction.support.DefaultTransactionStatus)
- */
- @Override
- protected void doCommit(DefaultTransactionStatus status) {
-
- ContextSourceAndHibernateTransactionObject actualTransactionObject = (ContextSourceAndHibernateTransactionObject) status
- .getTransaction();
-
- try {
- super.doCommit(new DefaultTransactionStatus(actualTransactionObject.getHibernateTransactionObject(),
- status.isNewTransaction(), status.isNewSynchronization(), status.isReadOnly(), status.isDebug(),
- status.getSuspendedResources()));
- }
- catch (TransactionException ex) {
- if (isRollbackOnCommitFailure()) {
- logger.debug("Failed to commit db resource, rethrowing", ex);
- // If we are to rollback on commit failure, just rethrow the
- // exception - this will cause a rollback to be performed on
- // both resources.
- throw ex;
- }
- else {
- logger.warn("Failed to commit and resource is rollbackOnCommit not set -"
- + " proceeding to commit ldap resource.");
- }
- }
- this.ldapManagerDelegate.doCommit(new DefaultTransactionStatus(
- actualTransactionObject.getLdapTransactionObject(), status.isNewTransaction(),
- status.isNewSynchronization(), status.isReadOnly(), status.isDebug(), status.getSuspendedResources()));
- }
-
- /*
- * @see org.springframework.orm.hibernate5.HibernateTransactionManager#doRollback(org.
- * springframework.transaction.support.DefaultTransactionStatus)
- */
- @Override
- protected void doRollback(DefaultTransactionStatus status) {
- ContextSourceAndHibernateTransactionObject actualTransactionObject = (ContextSourceAndHibernateTransactionObject) status
- .getTransaction();
-
- super.doRollback(new DefaultTransactionStatus(actualTransactionObject.getHibernateTransactionObject(),
- status.isNewTransaction(), status.isNewSynchronization(), status.isReadOnly(), status.isDebug(),
- status.getSuspendedResources()));
- this.ldapManagerDelegate.doRollback(new DefaultTransactionStatus(
- actualTransactionObject.getLdapTransactionObject(), status.isNewTransaction(),
- status.isNewSynchronization(), status.isReadOnly(), status.isDebug(), status.getSuspendedResources()));
- }
-
- public ContextSource getContextSource() {
- return this.ldapManagerDelegate.getContextSource();
- }
-
- public void setContextSource(ContextSource contextSource) {
- this.ldapManagerDelegate.setContextSource(contextSource);
- }
-
- public void setRenamingStrategy(TempEntryRenamingStrategy renamingStrategy) {
- this.ldapManagerDelegate.setRenamingStrategy(renamingStrategy);
- }
-
- /*
- * @see
- * org.springframework.orm.hibernate5.HibernateTransactionManager#doSuspend(java.lang.
- * Object)
- */
- @Override
- protected Object doSuspend(Object transaction) {
- throw new TransactionSuspensionNotSupportedException(
- "Transaction manager [" + getClass().getName() + "] does not support transaction suspension");
- }
-
- /*
- * @see
- * org.springframework.orm.hibernate5.HibernateTransactionManager#doResume(java.lang.
- * Object, java.lang.Object)
- */
- @Override
- protected void doResume(Object transaction, Object suspendedResources) {
- throw new TransactionSuspensionNotSupportedException(
- "Transaction manager [" + getClass().getName() + "] does not support transaction suspension");
- }
-
- @Override
- public void afterPropertiesSet() {
- super.afterPropertiesSet();
- this.ldapManagerDelegate.checkRenamingStrategy();
- }
-
- private static final class ContextSourceAndHibernateTransactionObject {
-
- private Object ldapTransactionObject;
-
- private Object hibernateTransactionObject;
-
- ContextSourceAndHibernateTransactionObject(Object ldapTransactionObject, Object hibernateTransactionObject) {
- this.ldapTransactionObject = ldapTransactionObject;
- this.hibernateTransactionObject = hibernateTransactionObject;
- }
-
- Object getHibernateTransactionObject() {
- return this.hibernateTransactionObject;
- }
-
- Object getLdapTransactionObject() {
- return this.ldapTransactionObject;
- }
-
- }
-
-}
diff --git a/core/src/main/resources/org/springframework/ldap/config/spring-ldap-4.0.xsd b/core/src/main/resources/org/springframework/ldap/config/spring-ldap-4.0.xsd
index 142b29b65a..16919e283e 100644
--- a/core/src/main/resources/org/springframework/ldap/config/spring-ldap-4.0.xsd
+++ b/core/src/main/resources/org/springframework/ldap/config/spring-ldap-4.0.xsd
@@ -600,28 +600,12 @@
-
-
-
- Id of the DataSource instance to use.
-
-
-
-
-
-
- Id of the Hibernate SessionFactory instance to use.
-
-
-
- Creates an ContextSourceTransactionManager. If data-source-ref or session-factory-ref is specified,
- a DataSourceAndContextSourceTransactionManager/HibernateAndContextSourceTransactionManager will be
- created.
+ Creates an ContextSourceTransactionManager
diff --git a/core/src/test/java/org/springframework/ldap/config/LdapTemplateNamespaceHandlerTests.java b/core/src/test/java/org/springframework/ldap/config/LdapTemplateNamespaceHandlerTests.java
index a645098dce..a528d91e02 100644
--- a/core/src/test/java/org/springframework/ldap/config/LdapTemplateNamespaceHandlerTests.java
+++ b/core/src/test/java/org/springframework/ldap/config/LdapTemplateNamespaceHandlerTests.java
@@ -42,7 +42,6 @@
import org.springframework.ldap.pool2.factory.PooledContextSource;
import org.springframework.ldap.support.LdapUtils;
import org.springframework.ldap.transaction.compensating.TempEntryRenamingStrategy;
-import org.springframework.ldap.transaction.compensating.manager.ContextSourceAndDataSourceTransactionManager;
import org.springframework.ldap.transaction.compensating.manager.ContextSourceTransactionManager;
import org.springframework.ldap.transaction.compensating.manager.TransactionAwareContextSourceProxy;
import org.springframework.ldap.transaction.compensating.support.DefaultTempEntryRenamingStrategy;
@@ -51,6 +50,7 @@
import org.springframework.util.ReflectionUtils;
import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
/**
* @author Mattias Hellborg Arthursson
@@ -238,11 +238,8 @@ public void verifyParseWithDefaultTransactions() {
@Test
public void verifyParseTransactionWithDataSource() {
- ClassPathXmlApplicationContext ctx = new ClassPathXmlApplicationContext(
- "/ldap-namespace-config-transactional-datasource.xml");
- PlatformTransactionManager transactionManager = ctx.getBean(PlatformTransactionManager.class);
-
- assertThat(transactionManager instanceof ContextSourceAndDataSourceTransactionManager).isTrue();
+ assertThatExceptionOfType(BeansException.class).isThrownBy(
+ () -> new ClassPathXmlApplicationContext("/ldap-namespace-config-transactional-datasource.xml"));
}
@Test
diff --git a/core/src/test/java/org/springframework/ldap/transaction/compensating/manager/ContextSourceTransactionManagerTests.java b/core/src/test/java/org/springframework/ldap/transaction/compensating/manager/ContextSourceTransactionManagerTests.java
index f977107193..c6b9ae774d 100644
--- a/core/src/test/java/org/springframework/ldap/transaction/compensating/manager/ContextSourceTransactionManagerTests.java
+++ b/core/src/test/java/org/springframework/ldap/transaction/compensating/manager/ContextSourceTransactionManagerTests.java
@@ -114,7 +114,8 @@ public void testDoRollback() {
CompensatingTransactionObject transactionObject = new CompensatingTransactionObject(null);
transactionObject.setHolder(expectedContextHolder);
- this.tested.doRollback(new DefaultTransactionStatus(transactionObject, false, false, false, false, null));
+ this.tested.doRollback(
+ new DefaultTransactionStatus("name", transactionObject, false, false, false, false, false, null));
verify(this.transactionDataManagerMock).rollback();
}
diff --git a/modules/ROOT/pages/transaction-support.adoc b/modules/ROOT/pages/transaction-support.adoc
index cfe27a0b5c..f847ce5785 100644
--- a/modules/ROOT/pages/transaction-support.adoc
+++ b/modules/ROOT/pages/transaction-support.adoc
@@ -62,34 +62,7 @@ In a real-world situation, you would probably apply the transactions on the serv
[[spring-ldap-jdbc-transaction-integration]]
== JDBC Transaction Integration
-A common use case when working against LDAP is that some of the data is stored in the LDAP tree but other data is stored in a relational database. In this case, transaction support becomes even more important, since the update of the different resources should be synchronized.
-
-While actual XA transactions is not supported, support is provided to conceptually wrap JDBC and LDAP access within the same transaction by supplying a `data-source-ref` attribute to the `` element. This creates a `ContextSourceAndDataSourceTransactionManager`, which then manages the two transactions virtually as if they were one. When performing a commit, the LDAP part of the operation is always performed first, letting both transactions be rolled back should the LDAP commit fail. The JDBC part of the transaction is managed exactly as in `DataSourceTransactionManager`, except that nested transactions are not supported. The following example shows an `ldap:transaction-manager` element with a `data-source-ref` attribute:
-
-====
-[source,java]
-[subs="verbatim,quotes"]
-----
-
-
-
-----
-====
-
-NOTE: The provided support is all client-side.
-The wrapped transaction is not an XA transaction. No two-phase commit is performed, as the LDAP server cannot vote on its outcome.
-
-You can accomplish the same thing for Hibernate integration by supplying a `session-factory-ref` attribute to the `` element, as follows:
-
-====
-[source,xml]
-[subs="verbatim,quotes"]
-----
-
-
-
-----
-====
+This support was removed in Spring LDAP 4.0.
[[ldap-compensating-transactions-explained]]
== LDAP Compensating Transactions Explained
diff --git a/test/integration-tests/src/main/java/org/springframework/ldap/itest/transaction/compensating/manager/hibernate/DummyDaoLdapAndHibernateImpl.java b/test/integration-tests/src/main/java/org/springframework/ldap/itest/transaction/compensating/manager/hibernate/DummyDaoLdapAndHibernateImpl.java
deleted file mode 100755
index 3b263add01..0000000000
--- a/test/integration-tests/src/main/java/org/springframework/ldap/itest/transaction/compensating/manager/hibernate/DummyDaoLdapAndHibernateImpl.java
+++ /dev/null
@@ -1,120 +0,0 @@
-/*
- * Copyright 2005-2023 the original author or authors.
- *
- * 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
- *
- * https://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.
- */
-
-package org.springframework.ldap.itest.transaction.compensating.manager.hibernate;
-
-import org.springframework.ldap.core.DirContextAdapter;
-import org.springframework.ldap.core.DistinguishedName;
-import org.springframework.ldap.core.LdapTemplate;
-import org.springframework.ldap.itest.transaction.compensating.manager.DummyException;
-import org.springframework.orm.hibernate5.support.HibernateDaoSupport;
-import org.springframework.transaction.annotation.Transactional;
-
-/**
- * @author Hans Westerbeek
- */
-@Transactional
-public class DummyDaoLdapAndHibernateImpl extends HibernateDaoSupport implements OrgPersonDao {
-
- private LdapTemplate ldapTemplate;
-
- public void create(OrgPerson person) {
- DistinguishedName dn = new DistinguishedName();
- dn.add("ou", person.getCountry());
- dn.add("ou", person.getCompany());
- dn.add("cn", person.getFullname());
-
- DirContextAdapter ctx = new DirContextAdapter();
- ctx.setAttributeValues("objectclass", new String[] { "top", "person" });
- ctx.setAttributeValue("cn", person.getFullname());
- ctx.setAttributeValue("sn", person.getLastname());
- ctx.setAttributeValue("description", person.getDescription());
- this.ldapTemplate.bind(dn, ctx, null);
- this.getHibernateTemplate().saveOrUpdate(person);
-
- }
-
- public void createWithException(OrgPerson person) {
- this.create(person);
- throw new DummyException("This method failed");
-
- }
-
- public void modifyAttributes(String dn, String lastName, String description) {
- DirContextAdapter ctx = (DirContextAdapter) this.ldapTemplate.lookup(dn);
- ctx.setAttributeValue("sn", lastName);
- ctx.setAttributeValue("description", description);
-
- this.ldapTemplate.modifyAttributes(dn, ctx.getModificationItems());
- }
-
- public void modifyAttributesWithException(String dn, String lastName, String description) {
- modifyAttributes(dn, lastName, description);
- throw new DummyException("This method failed.");
- }
-
- public void unbind(OrgPerson person) {
- String dn = prepareDn(person);
- this.ldapTemplate.unbind(dn);
- this.getHibernateTemplate().delete(person);
-
- }
-
- public void unbindWithException(OrgPerson person) {
- this.unbind(person);
- throw new DummyException("This method failed");
- }
-
- public void update(OrgPerson person) {
- String dn = prepareDn(person);
- DirContextAdapter ctx = (DirContextAdapter) this.ldapTemplate.lookup(dn);
- ctx.setAttributeValue("sn", person.getLastname());
- ctx.setAttributeValue("description", person.getDescription());
-
- this.ldapTemplate.modifyAttributes(ctx);
- this.getHibernateTemplate().saveOrUpdate(person);
-
- }
-
- public void updateWithException(OrgPerson person) {
- this.update(person);
- throw new DummyException("This method failed");
- }
-
- public void updateAndRename(String dn, String newDn, String updatedDescription) {
-
- DirContextAdapter ctx = (DirContextAdapter) this.ldapTemplate.lookup(dn);
- ctx.setAttributeValue("description", updatedDescription);
-
- this.ldapTemplate.modifyAttributes(ctx);
- this.ldapTemplate.rename(dn, newDn);
-
- }
-
- public void updateAndRenameWithException(String dn, String newDn, String updatedDescription) {
- this.updateAndRename(dn, newDn, updatedDescription);
- throw new DummyException("This method failed");
- }
-
- public void setLdapTemplate(LdapTemplate ldapTemplate) {
- this.ldapTemplate = ldapTemplate;
- }
-
- private String prepareDn(OrgPerson person) {
- return "cn=" + person.getFullname() + ",ou=" + person.getCompany() + ",ou=" + person.getCountry();
- }
-
-}
diff --git a/test/integration-tests/src/test/java/org/springframework/ldap/itest/manager/ContextSourceAndDataSourceTransactionManagerIntegrationTests.java b/test/integration-tests/src/test/java/org/springframework/ldap/itest/manager/ContextSourceAndDataSourceTransactionManagerIntegrationTests.java
deleted file mode 100644
index 83b8561d1b..0000000000
--- a/test/integration-tests/src/test/java/org/springframework/ldap/itest/manager/ContextSourceAndDataSourceTransactionManagerIntegrationTests.java
+++ /dev/null
@@ -1,358 +0,0 @@
-/*
- * Copyright 2005-2016 the original author or authors.
- *
- * 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
- *
- * https://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.
- */
-
-package org.springframework.ldap.itest.manager;
-
-import java.sql.ResultSet;
-import java.sql.SQLException;
-
-import javax.naming.NamingException;
-import javax.naming.directory.Attributes;
-
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Qualifier;
-import org.springframework.dao.EmptyResultDataAccessException;
-import org.springframework.jdbc.core.JdbcTemplate;
-import org.springframework.jdbc.core.RowMapper;
-import org.springframework.ldap.NameNotFoundException;
-import org.springframework.ldap.core.AttributesMapper;
-import org.springframework.ldap.core.LdapTemplate;
-import org.springframework.ldap.itest.AbstractLdapTemplateIntegrationTests;
-import org.springframework.ldap.itest.transaction.compensating.manager.DummyDao;
-import org.springframework.ldap.itest.transaction.compensating.manager.DummyException;
-import org.springframework.test.context.ContextConfiguration;
-import org.springframework.transaction.support.TransactionSynchronizationManager;
-
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.assertj.core.api.Assertions.fail;
-
-/**
- * Integration tests for
- * {@link org.springframework.ldap.transaction.compensating.manager.ContextSourceAndDataSourceTransactionManager}.
- *
- * @author Mattias Hellborg Arthursson
- */
-@ContextConfiguration(locations = { "/conf/ldapAndJdbcTransactionTestContext.xml" })
-public class ContextSourceAndDataSourceTransactionManagerIntegrationTests extends AbstractLdapTemplateIntegrationTests {
-
- private static Logger log = LoggerFactory
- .getLogger(ContextSourceAndDataSourceTransactionManagerIntegrationTests.class);
-
- @Autowired
- @Qualifier("dummyDao")
- private DummyDao dummyDao;
-
- @Autowired
- private LdapTemplate ldapTemplate;
-
- @Autowired
- private JdbcTemplate jdbcTemplate;
-
- @Before
- public void prepareTestedInstance() throws Exception {
- if (TransactionSynchronizationManager.isSynchronizationActive()) {
- TransactionSynchronizationManager.clearSynchronization();
- }
-
- this.jdbcTemplate.execute("drop table PERSON if exists");
- this.jdbcTemplate
- .execute("create table PERSON(fullname VARCHAR(256), lastname VARCHAR(256), description VARCHAR(256))");
- this.jdbcTemplate.update("insert into PERSON values(?, ?, ?)",
- new Object[] { "Some Person", "Person", "Sweden, Company1, Some Person" });
- }
-
- @After
- public void cleanup() throws Exception {
- this.jdbcTemplate.execute("drop table PERSON if exists");
- }
-
- @Test
- public void testCreateWithException() {
- try {
- this.dummyDao.createWithException("Sweden", "company1", "some testperson", "testperson",
- "some description");
- fail("DummyException expected");
- }
- catch (DummyException expected) {
- assertThat(true).isTrue();
- }
-
- log.debug("Verifying result");
-
- // Verify that no entry was created
- try {
- this.ldapTemplate.lookup("cn=some testperson, ou=company1, ou=Sweden");
- fail("NameNotFoundException expected");
- }
- catch (NameNotFoundException expected) {
- assertThat(true).isTrue();
- }
-
- try {
- this.jdbcTemplate.queryForObject("select * from PERSON where fullname='some testperson'", new RowMapper() {
- public Object mapRow(ResultSet rs, int rowNum) throws SQLException {
- return null;
- }
- });
- fail("EmptyResultDataAccessException expected");
- }
- catch (EmptyResultDataAccessException expected) {
- assertThat(true).isTrue();
- }
- }
-
- @Test
- public void testCreate() {
- this.dummyDao.create("Sweden", "company1", "some testperson", "testperson", "some description");
-
- log.debug("Verifying result");
- Object ldapResult = this.ldapTemplate.lookup("cn=some testperson, ou=company1, ou=Sweden");
- Object dbResult = this.jdbcTemplate.queryForObject("select * from PERSON where fullname='some testperson'",
- new RowMapper() {
- public Object mapRow(ResultSet rs, int rowNum) throws SQLException {
- return new Object();
- }
- });
- assertThat(ldapResult).isNotNull();
- assertThat(dbResult).isNotNull();
-
- this.ldapTemplate.unbind("cn=some testperson, ou=company1, ou=Sweden");
- }
-
- @Test
- public void testUpdateWithException() {
- String dn = "cn=Some Person,ou=company1,ou=Sweden";
- try {
- this.dummyDao.updateWithException(dn, "Some Person", "Updated Person", "Updated description");
- fail("DummyException expected");
- }
- catch (DummyException expected) {
- assertThat(true).isTrue();
- }
-
- log.debug("Verifying result");
-
- Object ldapResult = this.ldapTemplate.lookup(dn, new AttributesMapper() {
- public Object mapFromAttributes(Attributes attributes) throws NamingException {
- assertThat(attributes.get("sn").get()).isEqualTo("Person");
- assertThat(attributes.get("description").get()).isEqualTo("Sweden, Company1, Some Person");
- return new Object();
- }
- });
-
- Object jdbcResult = this.jdbcTemplate.queryForObject("select * from PERSON where fullname=?",
- new Object[] { "Some Person" }, new RowMapper() {
- public Object mapRow(ResultSet rs, int rowNum) throws SQLException {
- assertThat(rs.getString("lastname")).isEqualTo("Person");
- assertThat(rs.getString("description")).isEqualTo("Sweden, Company1, Some Person");
- return new Object();
- }
- });
-
- assertThat(ldapResult).isNotNull();
- assertThat(jdbcResult).isNotNull();
- }
-
- @Test
- public void testUpdate() {
- String dn = "cn=Some Person,ou=company1,ou=Sweden";
- this.dummyDao.update(dn, "Some Person", "Updated Person", "Updated description");
-
- log.debug("Verifying result");
- Object ldapResult = this.ldapTemplate.lookup(dn, new AttributesMapper() {
- public Object mapFromAttributes(Attributes attributes) throws NamingException {
- assertThat(attributes.get("sn").get()).isEqualTo("Updated Person");
- assertThat(attributes.get("description").get()).isEqualTo("Updated description");
- return new Object();
- }
- });
-
- Object jdbcResult = this.jdbcTemplate.queryForObject("select * from PERSON where fullname=?",
- new Object[] { "Some Person" }, new RowMapper() {
- public Object mapRow(ResultSet rs, int rowNum) throws SQLException {
- assertThat(rs.getString("lastname")).isEqualTo("Updated Person");
- assertThat(rs.getString("description")).isEqualTo("Updated description");
- return new Object();
- }
- });
-
- assertThat(ldapResult).isNotNull();
- assertThat(jdbcResult).isNotNull();
- this.dummyDao.update(dn, "Some Person", "Person", "Sweden, Company1, Some Person");
- }
-
- @Test
- public void testUpdateAndRenameWithException() {
- String dn = "cn=Some Person2,ou=company1,ou=Sweden";
- String newDn = "cn=Some Person2,ou=company2,ou=Sweden";
- try {
- // Perform test
- this.dummyDao.updateAndRenameWithException(dn, newDn, "Updated description");
- fail("DummyException expected");
- }
- catch (DummyException expected) {
- assertThat(true).isTrue();
- }
-
- // Verify that entry was not moved.
- try {
- this.ldapTemplate.lookup(newDn);
- fail("NameNotFoundException expected");
- }
- catch (NameNotFoundException expected) {
- assertThat(true).isTrue();
- }
-
- // Verify that original entry was not updated.
- Object object = this.ldapTemplate.lookup(dn, new AttributesMapper() {
- public Object mapFromAttributes(Attributes attributes) throws NamingException {
- assertThat(attributes.get("description").get()).isEqualTo("Sweden, Company1, Some Person2");
- return new Object();
- }
- });
- assertThat(object).isNotNull();
- }
-
- @Test
- public void testUpdateAndRename() {
- String dn = "cn=Some Person2,ou=company1,ou=Sweden";
- String newDn = "cn=Some Person2,ou=company2,ou=Sweden";
- // Perform test
- this.dummyDao.updateAndRename(dn, newDn, "Updated description");
-
- // Verify that entry was moved and updated.
- Object object = this.ldapTemplate.lookup(newDn, new AttributesMapper() {
- public Object mapFromAttributes(Attributes attributes) throws NamingException {
- assertThat(attributes.get("description").get()).isEqualTo("Updated description");
- return new Object();
- }
- });
-
- assertThat(object).isNotNull();
- this.dummyDao.updateAndRename(newDn, dn, "Sweden, Company1, Some Person2");
- }
-
- @Test
- public void testModifyAttributesWithException() {
- String dn = "cn=Some Person,ou=company1,ou=Sweden";
- try {
- // Perform test
- this.dummyDao.modifyAttributesWithException(dn, "Updated lastname", "Updated description");
- fail("DummyException expected");
- }
- catch (DummyException expected) {
- assertThat(true).isTrue();
- }
-
- // Verify result - check that the operation was properly rolled back
- Object result = this.ldapTemplate.lookup(dn, new AttributesMapper() {
- public Object mapFromAttributes(Attributes attributes) throws NamingException {
- assertThat(attributes.get("sn").get()).isEqualTo("Person");
- assertThat(attributes.get("description").get()).isEqualTo("Sweden, Company1, Some Person");
- return new Object();
- }
- });
-
- assertThat(result).isNotNull();
- }
-
- @Test
- public void testModifyAttributes() {
- String dn = "cn=Some Person,ou=company1,ou=Sweden";
- // Perform test
- this.dummyDao.modifyAttributes(dn, "Updated lastname", "Updated description");
-
- // Verify result - check that the operation was not rolled back
- Object result = this.ldapTemplate.lookup(dn, new AttributesMapper() {
- public Object mapFromAttributes(Attributes attributes) throws NamingException {
- assertThat(attributes.get("sn").get()).isEqualTo("Updated lastname");
- assertThat(attributes.get("description").get()).isEqualTo("Updated description");
- return new Object();
- }
- });
-
- assertThat(result).isNotNull();
- this.dummyDao.update(dn, "Some Person", "Person", "Sweden, Company1, Some Person");
- }
-
- @Test
- public void testUnbindWithException() {
- String dn = "cn=Some Person,ou=company1,ou=Sweden";
- try {
- // Perform test
- this.dummyDao.unbindWithException(dn, "Some Person");
- fail("DummyException expected");
- }
- catch (DummyException expected) {
- assertThat(true).isTrue();
- }
-
- // Verify result - check that the operation was properly rolled back
- Object ldapResult = this.ldapTemplate.lookup(dn, new AttributesMapper() {
- public Object mapFromAttributes(Attributes attributes) throws NamingException {
- // Just verify that the entry still exists.
- return new Object();
- }
- });
-
- Object jdbcResult = this.jdbcTemplate.queryForObject("select * from PERSON where fullname=?",
- new Object[] { "Some Person" }, new RowMapper() {
- public Object mapRow(ResultSet rs, int rowNum) throws SQLException {
- // Just verify that the entry still exists.
- return new Object();
- }
- });
-
- assertThat(ldapResult).isNotNull();
- assertThat(jdbcResult).isNotNull();
- }
-
- @Test
- public void testUnbind() {
- String dn = "cn=Some Person,ou=company1,ou=Sweden";
- // Perform test
- this.dummyDao.unbind(dn, "Some Person");
-
- try {
- // Verify result - check that the operation was not rolled back
- this.ldapTemplate.lookup(dn);
- fail("NameNotFoundException expected");
- }
- catch (NameNotFoundException expected) {
- assertThat(true).isTrue();
- }
-
- try {
- this.jdbcTemplate.queryForObject("select * from PERSON where fullname=?", new Object[] { "Some Person" },
- new RowMapper() {
- public Object mapRow(ResultSet rs, int rowNum) throws SQLException {
- return null;
- }
- });
- fail("EmptyResultDataAccessException expected");
- }
- catch (EmptyResultDataAccessException expected) {
- assertThat(true).isTrue();
- }
- }
-
-}
diff --git a/test/integration-tests/src/test/java/org/springframework/ldap/itest/manager/ContextSourceAndDataSourceTransactionManagerLdap179IntegrationTests.java b/test/integration-tests/src/test/java/org/springframework/ldap/itest/manager/ContextSourceAndDataSourceTransactionManagerLdap179IntegrationTests.java
deleted file mode 100644
index ba76a91468..0000000000
--- a/test/integration-tests/src/test/java/org/springframework/ldap/itest/manager/ContextSourceAndDataSourceTransactionManagerLdap179IntegrationTests.java
+++ /dev/null
@@ -1,96 +0,0 @@
-/*
- * Copyright 2005-2016 the original author or authors.
- *
- * 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
- *
- * https://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.
- */
-
-package org.springframework.ldap.itest.manager;
-
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Qualifier;
-import org.springframework.jdbc.core.JdbcTemplate;
-import org.springframework.ldap.CommunicationException;
-import org.springframework.ldap.core.LdapTemplate;
-import org.springframework.ldap.itest.transaction.compensating.manager.DummyDao;
-import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit4.AbstractJUnit4SpringContextTests;
-import org.springframework.transaction.CannotCreateTransactionException;
-import org.springframework.transaction.support.TransactionSynchronizationManager;
-
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.assertj.core.api.Assertions.fail;
-
-/**
- * Integration tests for
- * {@link org.springframework.ldap.transaction.compensating.manager.ContextSourceAndDataSourceTransactionManager}.
- *
- * @author Mattias Hellborg Arthursson
- */
-@ContextConfiguration(locations = { "/conf/missingLdapAndJdbcTransactionTestContext.xml" })
-public class ContextSourceAndDataSourceTransactionManagerLdap179IntegrationTests
- extends AbstractJUnit4SpringContextTests {
-
- private static Logger log = LoggerFactory
- .getLogger(ContextSourceAndDataSourceTransactionManagerLdap179IntegrationTests.class);
-
- @Autowired
- @Qualifier("dummyDao")
- private DummyDao dummyDao;
-
- @Autowired
- private LdapTemplate ldapTemplate;
-
- @Autowired
- private JdbcTemplate jdbcTemplate;
-
- @Before
- public void prepareTestedInstance() throws Exception {
- if (TransactionSynchronizationManager.isSynchronizationActive()) {
- TransactionSynchronizationManager.clearSynchronization();
- }
- }
-
- @After
- public void cleanup() throws Exception {
- this.jdbcTemplate.execute("drop table PERSON if exists");
- }
-
- @Test
- public void verifyThatJdbcTransactionIsClosedIfLdapServerUnavailable_ldap179() {
- try {
- this.dummyDao.create("Sweden", "company1", "some testperson", "testperson", "some description");
- fail("CannotCreateTransactionException expected");
- }
- catch (CannotCreateTransactionException expected) {
- assertThat(expected.getCause() instanceof CommunicationException).isTrue();
- }
-
- // Make sure there is no transaction synchronization
- assertThat(TransactionSynchronizationManager.isSynchronizationActive()).isFalse();
-
- try {
- this.dummyDao.create("Sweden", "company1", "some testperson", "testperson", "some description");
- fail("CannotCreateTransactionException expected");
- }
- catch (CannotCreateTransactionException expected) {
- assertThat(expected.getCause() instanceof CommunicationException).isTrue();
- }
- }
-
-}
diff --git a/test/integration-tests/src/test/java/org/springframework/ldap/itest/manager/ContextSourceAndDataSourceTransactionManagerNamespaceITests.java b/test/integration-tests/src/test/java/org/springframework/ldap/itest/manager/ContextSourceAndDataSourceTransactionManagerNamespaceITests.java
deleted file mode 100644
index e83cedbaf2..0000000000
--- a/test/integration-tests/src/test/java/org/springframework/ldap/itest/manager/ContextSourceAndDataSourceTransactionManagerNamespaceITests.java
+++ /dev/null
@@ -1,359 +0,0 @@
-/*
- * Copyright 2005-2016 the original author or authors.
- *
- * 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
- *
- * https://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.
- */
-
-package org.springframework.ldap.itest.manager;
-
-import java.sql.ResultSet;
-import java.sql.SQLException;
-
-import javax.naming.NamingException;
-import javax.naming.directory.Attributes;
-
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Qualifier;
-import org.springframework.dao.EmptyResultDataAccessException;
-import org.springframework.jdbc.core.JdbcTemplate;
-import org.springframework.jdbc.core.RowMapper;
-import org.springframework.ldap.NameNotFoundException;
-import org.springframework.ldap.core.AttributesMapper;
-import org.springframework.ldap.core.LdapTemplate;
-import org.springframework.ldap.itest.AbstractLdapTemplateIntegrationTests;
-import org.springframework.ldap.itest.transaction.compensating.manager.DummyDao;
-import org.springframework.ldap.itest.transaction.compensating.manager.DummyException;
-import org.springframework.test.context.ContextConfiguration;
-import org.springframework.transaction.support.TransactionSynchronizationManager;
-
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.assertj.core.api.Assertions.fail;
-
-/**
- * Integration tests for
- * {@link org.springframework.ldap.transaction.compensating.manager.ContextSourceAndDataSourceTransactionManager}
- * with namespace configuration.
- *
- * @author Mattias Hellborg Arthursson
- */
-@ContextConfiguration(locations = { "/conf/ldapAndJdbcTransactionNamespaceTestContext.xml" })
-public class ContextSourceAndDataSourceTransactionManagerNamespaceITests extends AbstractLdapTemplateIntegrationTests {
-
- private static Logger log = LoggerFactory
- .getLogger(ContextSourceAndDataSourceTransactionManagerNamespaceITests.class);
-
- @Autowired
- @Qualifier("dummyDao")
- private DummyDao dummyDao;
-
- @Autowired
- private LdapTemplate ldapTemplate;
-
- @Autowired
- private JdbcTemplate jdbcTemplate;
-
- @Before
- public void prepareTestedInstance() throws Exception {
- if (TransactionSynchronizationManager.isSynchronizationActive()) {
- TransactionSynchronizationManager.clearSynchronization();
- }
-
- this.jdbcTemplate.execute("drop table PERSON if exists");
- this.jdbcTemplate
- .execute("create table PERSON(fullname VARCHAR(256), lastname VARCHAR(256), description VARCHAR(256))");
- this.jdbcTemplate.update("insert into PERSON values(?, ?, ?)",
- new Object[] { "Some Person", "Person", "Sweden, Company1, Some Person" });
- }
-
- @After
- public void cleanup() throws Exception {
- this.jdbcTemplate.execute("drop table PERSON if exists");
- }
-
- @Test
- public void testCreateWithException() {
- try {
- this.dummyDao.createWithException("Sweden", "company1", "some testperson", "testperson",
- "some description");
- fail("DummyException expected");
- }
- catch (DummyException expected) {
- assertThat(true).isTrue();
- }
-
- log.debug("Verifying result");
-
- // Verify that no entry was created
- try {
- this.ldapTemplate.lookup("cn=some testperson, ou=company1, ou=Sweden");
- fail("NameNotFoundException expected");
- }
- catch (NameNotFoundException expected) {
- assertThat(true).isTrue();
- }
-
- try {
- this.jdbcTemplate.queryForObject("select * from PERSON where fullname='some testperson'", new RowMapper() {
- public Object mapRow(ResultSet rs, int rowNum) throws SQLException {
- return null;
- }
- });
- fail("EmptyResultDataAccessException expected");
- }
- catch (EmptyResultDataAccessException expected) {
- assertThat(true).isTrue();
- }
- }
-
- @Test
- public void testCreate() {
- this.dummyDao.create("Sweden", "company1", "some testperson", "testperson", "some description");
-
- log.debug("Verifying result");
- Object ldapResult = this.ldapTemplate.lookup("cn=some testperson, ou=company1, ou=Sweden");
- Object dbResult = this.jdbcTemplate.queryForObject("select * from PERSON where fullname='some testperson'",
- new RowMapper() {
- public Object mapRow(ResultSet rs, int rowNum) throws SQLException {
- return new Object();
- }
- });
- assertThat(ldapResult).isNotNull();
- assertThat(dbResult).isNotNull();
-
- this.ldapTemplate.unbind("cn=some testperson, ou=company1, ou=Sweden");
- }
-
- @Test
- public void testUpdateWithException() {
- String dn = "cn=Some Person,ou=company1,ou=Sweden";
- try {
- this.dummyDao.updateWithException(dn, "Some Person", "Updated Person", "Updated description");
- fail("DummyException expected");
- }
- catch (DummyException expected) {
- assertThat(true).isTrue();
- }
-
- log.debug("Verifying result");
-
- Object ldapResult = this.ldapTemplate.lookup(dn, new AttributesMapper() {
- public Object mapFromAttributes(Attributes attributes) throws NamingException {
- assertThat(attributes.get("sn").get()).isEqualTo("Person");
- assertThat(attributes.get("description").get()).isEqualTo("Sweden, Company1, Some Person");
- return new Object();
- }
- });
-
- Object jdbcResult = this.jdbcTemplate.queryForObject("select * from PERSON where fullname=?",
- new Object[] { "Some Person" }, new RowMapper() {
- public Object mapRow(ResultSet rs, int rowNum) throws SQLException {
- assertThat(rs.getString("lastname")).isEqualTo("Person");
- assertThat(rs.getString("description")).isEqualTo("Sweden, Company1, Some Person");
- return new Object();
- }
- });
-
- assertThat(ldapResult).isNotNull();
- assertThat(jdbcResult).isNotNull();
- }
-
- @Test
- public void testUpdate() {
- String dn = "cn=Some Person,ou=company1,ou=Sweden";
- this.dummyDao.update(dn, "Some Person", "Updated Person", "Updated description");
-
- log.debug("Verifying result");
- Object ldapResult = this.ldapTemplate.lookup(dn, new AttributesMapper() {
- public Object mapFromAttributes(Attributes attributes) throws NamingException {
- assertThat(attributes.get("sn").get()).isEqualTo("Updated Person");
- assertThat(attributes.get("description").get()).isEqualTo("Updated description");
- return new Object();
- }
- });
-
- Object jdbcResult = this.jdbcTemplate.queryForObject("select * from PERSON where fullname=?",
- new Object[] { "Some Person" }, new RowMapper() {
- public Object mapRow(ResultSet rs, int rowNum) throws SQLException {
- assertThat(rs.getString("lastname")).isEqualTo("Updated Person");
- assertThat(rs.getString("description")).isEqualTo("Updated description");
- return new Object();
- }
- });
-
- assertThat(ldapResult).isNotNull();
- assertThat(jdbcResult).isNotNull();
- this.dummyDao.update(dn, "Some Person", "Person", "Sweden, Company1, Some Person");
- }
-
- @Test
- public void testUpdateAndRenameWithException() {
- String dn = "cn=Some Person2,ou=company1,ou=Sweden";
- String newDn = "cn=Some Person2,ou=company2,ou=Sweden";
- try {
- // Perform test
- this.dummyDao.updateAndRenameWithException(dn, newDn, "Updated description");
- fail("DummyException expected");
- }
- catch (DummyException expected) {
- assertThat(true).isTrue();
- }
-
- // Verify that entry was not moved.
- try {
- this.ldapTemplate.lookup(newDn);
- fail("NameNotFoundException expected");
- }
- catch (NameNotFoundException expected) {
- assertThat(true).isTrue();
- }
-
- // Verify that original entry was not updated.
- Object object = this.ldapTemplate.lookup(dn, new AttributesMapper() {
- public Object mapFromAttributes(Attributes attributes) throws NamingException {
- assertThat(attributes.get("description").get()).isEqualTo("Sweden, Company1, Some Person2");
- return new Object();
- }
- });
- assertThat(object).isNotNull();
- }
-
- @Test
- public void testUpdateAndRename() {
- String dn = "cn=Some Person2,ou=company1,ou=Sweden";
- String newDn = "cn=Some Person2,ou=company2,ou=Sweden";
- // Perform test
- this.dummyDao.updateAndRename(dn, newDn, "Updated description");
-
- // Verify that entry was moved and updated.
- Object object = this.ldapTemplate.lookup(newDn, new AttributesMapper() {
- public Object mapFromAttributes(Attributes attributes) throws NamingException {
- assertThat(attributes.get("description").get()).isEqualTo("Updated description");
- return new Object();
- }
- });
-
- assertThat(object).isNotNull();
- this.dummyDao.updateAndRename(newDn, dn, "Sweden, Company1, Some Person2");
- }
-
- @Test
- public void testModifyAttributesWithException() {
- String dn = "cn=Some Person,ou=company1,ou=Sweden";
- try {
- // Perform test
- this.dummyDao.modifyAttributesWithException(dn, "Updated lastname", "Updated description");
- fail("DummyException expected");
- }
- catch (DummyException expected) {
- assertThat(true).isTrue();
- }
-
- // Verify result - check that the operation was properly rolled back
- Object result = this.ldapTemplate.lookup(dn, new AttributesMapper() {
- public Object mapFromAttributes(Attributes attributes) throws NamingException {
- assertThat(attributes.get("sn").get()).isEqualTo("Person");
- assertThat(attributes.get("description").get()).isEqualTo("Sweden, Company1, Some Person");
- return new Object();
- }
- });
-
- assertThat(result).isNotNull();
- }
-
- @Test
- public void testModifyAttributes() {
- String dn = "cn=Some Person,ou=company1,ou=Sweden";
- // Perform test
- this.dummyDao.modifyAttributes(dn, "Updated lastname", "Updated description");
-
- // Verify result - check that the operation was not rolled back
- Object result = this.ldapTemplate.lookup(dn, new AttributesMapper() {
- public Object mapFromAttributes(Attributes attributes) throws NamingException {
- assertThat(attributes.get("sn").get()).isEqualTo("Updated lastname");
- assertThat(attributes.get("description").get()).isEqualTo("Updated description");
- return new Object();
- }
- });
-
- assertThat(result).isNotNull();
- this.dummyDao.update(dn, "Some Person", "Person", "Sweden, Company1, Some Person");
- }
-
- @Test
- public void testUnbindWithException() {
- String dn = "cn=Some Person,ou=company1,ou=Sweden";
- try {
- // Perform test
- this.dummyDao.unbindWithException(dn, "Some Person");
- fail("DummyException expected");
- }
- catch (DummyException expected) {
- assertThat(true).isTrue();
- }
-
- // Verify result - check that the operation was properly rolled back
- Object ldapResult = this.ldapTemplate.lookup(dn, new AttributesMapper() {
- public Object mapFromAttributes(Attributes attributes) throws NamingException {
- // Just verify that the entry still exists.
- return new Object();
- }
- });
-
- Object jdbcResult = this.jdbcTemplate.queryForObject("select * from PERSON where fullname=?",
- new Object[] { "Some Person" }, new RowMapper() {
- public Object mapRow(ResultSet rs, int rowNum) throws SQLException {
- // Just verify that the entry still exists.
- return new Object();
- }
- });
-
- assertThat(ldapResult).isNotNull();
- assertThat(jdbcResult).isNotNull();
- }
-
- @Test
- public void testUnbind() {
- String dn = "cn=Some Person,ou=company1,ou=Sweden";
- // Perform test
- this.dummyDao.unbind(dn, "Some Person");
-
- try {
- // Verify result - check that the operation was not rolled back
- this.ldapTemplate.lookup(dn);
- fail("NameNotFoundException expected");
- }
- catch (NameNotFoundException expected) {
- assertThat(true).isTrue();
- }
-
- try {
- this.jdbcTemplate.queryForObject("select * from PERSON where fullname=?", new Object[] { "Some Person" },
- new RowMapper() {
- public Object mapRow(ResultSet rs, int rowNum) throws SQLException {
- return null;
- }
- });
- fail("EmptyResultDataAccessException expected");
- }
- catch (EmptyResultDataAccessException expected) {
- assertThat(true).isTrue();
- }
- }
-
-}
diff --git a/test/integration-tests/src/test/java/org/springframework/ldap/itest/manager/hibernate/ContextSourceAndHibernateTransactionManagerIntegrationTests.java b/test/integration-tests/src/test/java/org/springframework/ldap/itest/manager/hibernate/ContextSourceAndHibernateTransactionManagerIntegrationTests.java
deleted file mode 100644
index bb844578ba..0000000000
--- a/test/integration-tests/src/test/java/org/springframework/ldap/itest/manager/hibernate/ContextSourceAndHibernateTransactionManagerIntegrationTests.java
+++ /dev/null
@@ -1,375 +0,0 @@
-/*
- * Copyright 2005-2016 the original author or authors.
- *
- * 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
- *
- * https://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.
- */
-
-package org.springframework.ldap.itest.manager.hibernate;
-
-import java.util.List;
-
-import javax.naming.NamingException;
-import javax.naming.directory.Attributes;
-
-import org.hibernate.Query;
-import org.hibernate.Session;
-import org.hibernate.SessionFactory;
-import org.hibernate.Transaction;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Qualifier;
-import org.springframework.ldap.NameNotFoundException;
-import org.springframework.ldap.core.AttributesMapper;
-import org.springframework.ldap.core.LdapTemplate;
-import org.springframework.ldap.itest.AbstractLdapTemplateIntegrationTests;
-import org.springframework.ldap.itest.transaction.compensating.manager.DummyException;
-import org.springframework.ldap.itest.transaction.compensating.manager.hibernate.OrgPerson;
-import org.springframework.ldap.itest.transaction.compensating.manager.hibernate.OrgPersonDao;
-import org.springframework.ldap.transaction.compensating.manager.ContextSourceAndHibernateTransactionManager;
-import org.springframework.orm.hibernate5.HibernateTemplate;
-import org.springframework.test.context.ContextConfiguration;
-import org.springframework.transaction.support.TransactionSynchronizationManager;
-
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.assertj.core.api.Assertions.fail;
-
-/**
- * Integration tests for {@link ContextSourceAndHibernateTransactionManager}.
- *
- * @author Hans Westerbeek
- */
-@ContextConfiguration(locations = { "/conf/ldapAndHibernateTransactionTestContext.xml" })
-public class ContextSourceAndHibernateTransactionManagerIntegrationTests extends AbstractLdapTemplateIntegrationTests {
-
- private static Logger log = LoggerFactory
- .getLogger(ContextSourceAndHibernateTransactionManagerIntegrationTests.class);
-
- @Autowired
- @Qualifier("dummyDao")
- private OrgPersonDao dummyDao;
-
- @Autowired
- private LdapTemplate ldapTemplate;
-
- @Autowired
- private HibernateTemplate hibernateTemplate;
-
- @Autowired
- private SessionFactory sessionFactory;
-
- @Before
- public void prepareTest() throws Exception {
- if (TransactionSynchronizationManager.isSynchronizationActive()) {
- TransactionSynchronizationManager.clearSynchronization();
- }
-
- OrgPerson person = new OrgPerson();
- person.setId(1);
- person.setLastname("Person");
- person.setFullname("Some Person");
- person.setDescription("Sweden, Company1, Some Person");
- person.setCountry("Sweden");
- person.setCompany("Company1");
- // "Some Person", "Person", "Sweden, Company1, Some Person"
- // avoid the transaction manager we have configured, do it manually
- Session session = this.sessionFactory.openSession();
- Transaction tx = session.beginTransaction();
- session.saveOrUpdate(person);
- tx.commit();
- session.close();
-
- }
-
- @After
- public void cleanup() throws Exception {
- // probably the wrong idea, this will use the thing i am trying to
- // test..
-
- Session session = this.sessionFactory.openSession();
- Transaction tx = session.beginTransaction();
- Query query = session.createQuery("delete from OrgPerson");
- query.executeUpdate();
- tx.commit();
- session.close();
- }
-
- @Test
- public void testCreateWithException() {
- OrgPerson person = new OrgPerson();
-
- person.setId(2);
- person.setDescription("some description");
- person.setFullname("Some testperson");
- person.setLastname("testperson");
- person.setCountry("Sweden");
- person.setCompany("company1");
-
- try {
- this.dummyDao.createWithException(person);
- fail("DummyException expected");
- }
- catch (DummyException expected) {
- assertThat(true).isTrue();
- }
-
- log.debug("Verifying result");
-
- // Verify that no entry was created in ldap or hibernate db
- try {
- this.ldapTemplate.lookup("cn=some testperson, ou=company1, ou=Sweden");
- fail("NameNotFoundException expected");
- }
- catch (NameNotFoundException expected) {
- assertThat(true).isTrue();
- }
-
- List result = this.hibernateTemplate.findByNamedParam("from OrgPerson person where person.lastname = :lastname",
- "lastname", person.getLastname());
- assertThat(result.size() == 0).isTrue();
-
- }
-
- @Test
- public void testCreate() {
- OrgPerson person = new OrgPerson();
-
- person.setId(2);
- person.setDescription("some description");
- person.setFullname("Some testperson");
- person.setLastname("testperson");
- person.setCountry("Sweden");
- person.setCompany("company1");
- // dummyDao.create("Sweden", "company1", "some testperson",
- // "testperson", "some description");
-
- this.dummyDao.create(person);
- person = null;
- log.debug("Verifying result");
- Object ldapResult = this.ldapTemplate.lookup("cn=some testperson, ou=company1, ou=Sweden");
- OrgPerson fromDb = (OrgPerson) this.hibernateTemplate.get(OrgPerson.class, 2);
- assertThat(ldapResult).isNotNull();
- assertThat(fromDb).isNotNull();
- }
-
- @Test
- public void testUpdateWithException() {
- String dn = "cn=Some Person,ou=company1,ou=Sweden";
- OrgPerson originalPerson = (OrgPerson) this.hibernateTemplate.load(OrgPerson.class, 1);
- originalPerson.setLastname("fooo");
- try {
- this.dummyDao.updateWithException(originalPerson);
- fail("DummyException expected");
- }
- catch (DummyException expected) {
- assertThat(true).isTrue();
- }
-
- log.debug("Verifying result");
-
- Object ldapResult = this.ldapTemplate.lookup(dn, new AttributesMapper() {
- public Object mapFromAttributes(Attributes attributes) throws NamingException {
- assertThat(attributes.get("sn").get()).as("Person").isNotNull();
- assertThat(attributes.get("description").get()).isEqualTo("Sweden, Company1, Some Person");
- return new Object();
- }
- });
-
- OrgPerson notUpdatedPerson = (OrgPerson) this.hibernateTemplate.load(OrgPerson.class, 1);
- assertThat(notUpdatedPerson.getLastname()).isEqualTo("Person");
- assertThat(notUpdatedPerson.getDescription()).isEqualTo("Sweden, Company1, Some Person");
-
- assertThat(ldapResult).isNotNull();
- // no need to assert if notUpdatedPerson exists
- }
-
- @Test
- public void testUpdate() {
- String dn = "cn=Some Person,ou=company1,ou=Sweden";
- OrgPerson person = (OrgPerson) this.hibernateTemplate.load(OrgPerson.class, 1);
- person.setLastname("Updated Person");
- person.setDescription("Updated description");
-
- this.dummyDao.update(person);
-
- log.debug("Verifying result");
- Object ldapResult = this.ldapTemplate.lookup(dn, new AttributesMapper() {
- public Object mapFromAttributes(Attributes attributes) throws NamingException {
- assertThat(attributes.get("sn").get()).isEqualTo("Updated Person");
- assertThat(attributes.get("description").get()).isEqualTo("Updated description");
- return new Object();
- }
- });
-
- OrgPerson updatedPerson = (OrgPerson) this.hibernateTemplate.load(OrgPerson.class, 1);
- assertThat(updatedPerson.getLastname()).isEqualTo("Updated Person");
- assertThat(updatedPerson.getDescription()).isEqualTo("Updated description");
- assertThat(ldapResult).isNotNull();
- }
-
- @Test
- public void testUpdateAndRenameWithException() {
- String dn = "cn=Some Person2,ou=company1,ou=Sweden";
- String newDn = "cn=Some Person2,ou=company2,ou=Sweden";
- OrgPerson person = (OrgPerson) this.hibernateTemplate.load(OrgPerson.class, 1);
- person.setLastname("Updated Person");
- person.setDescription("Updated description");
-
- try {
- // Perform test
- this.dummyDao.updateAndRenameWithException(dn, newDn, "Updated description");
- fail("DummyException expected");
- }
- catch (DummyException expected) {
- assertThat(true).isTrue();
- }
-
- // Verify that entry was not moved.
- try {
- this.ldapTemplate.lookup(newDn);
- fail("NameNotFoundException expected");
- }
- catch (NameNotFoundException expected) {
- assertThat(true).isTrue();
- }
-
- // Verify that original entry was not updated.
- Object object = this.ldapTemplate.lookup(dn, new AttributesMapper() {
- public Object mapFromAttributes(Attributes attributes) throws NamingException {
- assertThat(attributes.get("description").get()).isEqualTo("Sweden, Company1, Some Person2");
- return new Object();
- }
- });
- assertThat(object).isNotNull();
- }
-
- @Test
- public void testUpdateAndRename() {
- String dn = "cn=Some Person2,ou=company1,ou=Sweden";
- String newDn = "cn=Some Person2,ou=company2,ou=Sweden";
- // Perform test
- this.dummyDao.updateAndRename(dn, newDn, "Updated description");
-
- // Verify that entry was moved and updated.
- Object object = this.ldapTemplate.lookup(newDn, new AttributesMapper() {
- public Object mapFromAttributes(Attributes attributes) throws NamingException {
- assertThat(attributes.get("description").get()).isEqualTo("Updated description");
- return new Object();
- }
- });
-
- assertThat(object).isNotNull();
- }
-
- @Test
- public void testModifyAttributesWithException() {
- String dn = "cn=Some Person,ou=company1,ou=Sweden";
- try {
- // Perform test
- this.dummyDao.modifyAttributesWithException(dn, "Updated lastname", "Updated description");
- fail("DummyException expected");
- }
- catch (DummyException expected) {
- assertThat(true).isTrue();
- }
-
- // Verify result - check that the operation was properly rolled back
- Object result = this.ldapTemplate.lookup(dn, new AttributesMapper() {
- public Object mapFromAttributes(Attributes attributes) throws NamingException {
- assertThat(attributes.get("sn").get()).isEqualTo("Person");
- assertThat(attributes.get("description").get()).isEqualTo("Sweden, Company1, Some Person");
- return new Object();
- }
- });
-
- assertThat(result).isNotNull();
- }
-
- @Test
- public void testModifyAttributes() {
- String dn = "cn=Some Person,ou=company1,ou=Sweden";
- // Perform test
- this.dummyDao.modifyAttributes(dn, "Updated lastname", "Updated description");
-
- // Verify result - check that the operation was not rolled back
- Object result = this.ldapTemplate.lookup(dn, new AttributesMapper() {
- public Object mapFromAttributes(Attributes attributes) throws NamingException {
- assertThat(attributes.get("sn").get()).isEqualTo("Updated lastname");
- assertThat(attributes.get("description").get()).isEqualTo("Updated description");
- return new Object();
- }
- });
-
- assertThat(result).isNotNull();
- }
-
- @Test
- public void testUnbindWithException() {
- String dn = "cn=Some Person,ou=company1,ou=Sweden";
- OrgPerson person = (OrgPerson) this.hibernateTemplate.load(OrgPerson.class, 1);
-
- try {
- // Perform test
- this.dummyDao.unbindWithException(person);
- fail("DummyException expected");
- }
- catch (DummyException expected) {
- assertThat(true).isTrue();
- }
-
- person = null;
- // Verify result - check that the operation was properly rolled back
- Object ldapResult = this.ldapTemplate.lookup(dn, new AttributesMapper() {
- public Object mapFromAttributes(Attributes attributes) throws NamingException {
- // Just verify that the entry still exists.
- return new Object();
- }
- });
-
- person = (OrgPerson) this.hibernateTemplate.load(OrgPerson.class, 1); // will
- // throw
- // exception
- // of
- // person
- // does
- // not
- // exist
-
- assertThat(ldapResult).isNotNull();
- }
-
- @Test
- public void testUnbind() {
- String dn = "cn=Some Person,ou=company1,ou=Sweden";
- // Perform test
- OrgPerson person = (OrgPerson) this.hibernateTemplate.load(OrgPerson.class, 1);
- this.dummyDao.unbind(person);
-
- try {
- // Verify result - check that the operation was not rolled back
- this.ldapTemplate.lookup(dn);
- fail("NameNotFoundException expected");
- }
- catch (NameNotFoundException expected) {
- assertThat(true).isTrue();
- }
-
- person = (OrgPerson) this.hibernateTemplate.get(OrgPerson.class, 1);
- assertThat(person).isNull();
- }
-
-}
diff --git a/test/integration-tests/src/test/java/org/springframework/ldap/itest/manager/hibernate/ContextSourceAndHibernateTransactionManagerLdap179IntegrationTests.java b/test/integration-tests/src/test/java/org/springframework/ldap/itest/manager/hibernate/ContextSourceAndHibernateTransactionManagerLdap179IntegrationTests.java
deleted file mode 100644
index 0f73056b8e..0000000000
--- a/test/integration-tests/src/test/java/org/springframework/ldap/itest/manager/hibernate/ContextSourceAndHibernateTransactionManagerLdap179IntegrationTests.java
+++ /dev/null
@@ -1,89 +0,0 @@
-/*
- * Copyright 2005-2016 the original author or authors.
- *
- * 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
- *
- * https://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.
- */
-
-package org.springframework.ldap.itest.manager.hibernate;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Qualifier;
-import org.springframework.ldap.CommunicationException;
-import org.springframework.ldap.itest.transaction.compensating.manager.hibernate.OrgPerson;
-import org.springframework.ldap.itest.transaction.compensating.manager.hibernate.OrgPersonDao;
-import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit4.AbstractJUnit4SpringContextTests;
-import org.springframework.transaction.CannotCreateTransactionException;
-import org.springframework.transaction.support.TransactionSynchronizationManager;
-
-import static org.assertj.core.api.Assertions.assertThat;
-
-/**
- * Integration tests for
- * {@link org.springframework.ldap.transaction.compensating.manager.ContextSourceAndHibernateTransactionManager}.
- *
- * @author Hans Westerbeek
- */
-@ContextConfiguration(locations = { "/conf/missingLdapAndHibernateTransactionTestContext.xml" })
-public class ContextSourceAndHibernateTransactionManagerLdap179IntegrationTests
- extends AbstractJUnit4SpringContextTests {
-
- private static Logger log = LoggerFactory
- .getLogger(ContextSourceAndHibernateTransactionManagerLdap179IntegrationTests.class);
-
- @Autowired
- @Qualifier("dummyDao")
- private OrgPersonDao dummyDao;
-
- @Before
- public void prepareTest() throws Exception {
- if (TransactionSynchronizationManager.isSynchronizationActive()) {
- TransactionSynchronizationManager.clearSynchronization();
- }
- }
-
- @Test
- public void testCreate() {
- OrgPerson person = new OrgPerson();
-
- person.setId(2);
- person.setDescription("some description");
- person.setFullname("Some testperson");
- person.setLastname("testperson");
- person.setCountry("Sweden");
- person.setCompany("company1");
-
- try {
- this.dummyDao.create(person);
- }
- catch (CannotCreateTransactionException expected) {
- assertThat(expected.getCause() instanceof CommunicationException).isTrue();
- }
-
- // Make sure there is no transaction synchronization
- assertThat(TransactionSynchronizationManager.isSynchronizationActive()).isFalse();
-
- try {
- this.dummyDao.create(person);
- }
- catch (CannotCreateTransactionException expected) {
- assertThat(expected.getCause() instanceof CommunicationException).isTrue();
- }
- }
-
-}
diff --git a/test/integration-tests/src/test/java/org/springframework/ldap/itest/manager/hibernate/ContextSourceAndHibernateTransactionManagerNamespaceITests.java b/test/integration-tests/src/test/java/org/springframework/ldap/itest/manager/hibernate/ContextSourceAndHibernateTransactionManagerNamespaceITests.java
deleted file mode 100644
index 97f4bf254c..0000000000
--- a/test/integration-tests/src/test/java/org/springframework/ldap/itest/manager/hibernate/ContextSourceAndHibernateTransactionManagerNamespaceITests.java
+++ /dev/null
@@ -1,376 +0,0 @@
-/*
- * Copyright 2005-2016 the original author or authors.
- *
- * 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
- *
- * https://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.
- */
-
-package org.springframework.ldap.itest.manager.hibernate;
-
-import java.util.List;
-
-import javax.naming.NamingException;
-import javax.naming.directory.Attributes;
-
-import org.hibernate.Query;
-import org.hibernate.Session;
-import org.hibernate.SessionFactory;
-import org.hibernate.Transaction;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Qualifier;
-import org.springframework.ldap.NameNotFoundException;
-import org.springframework.ldap.core.AttributesMapper;
-import org.springframework.ldap.core.LdapTemplate;
-import org.springframework.ldap.itest.AbstractLdapTemplateIntegrationTests;
-import org.springframework.ldap.itest.transaction.compensating.manager.DummyException;
-import org.springframework.ldap.itest.transaction.compensating.manager.hibernate.OrgPerson;
-import org.springframework.ldap.itest.transaction.compensating.manager.hibernate.OrgPersonDao;
-import org.springframework.orm.hibernate5.HibernateTemplate;
-import org.springframework.test.context.ContextConfiguration;
-import org.springframework.transaction.support.TransactionSynchronizationManager;
-
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.assertj.core.api.Assertions.fail;
-
-/**
- * Integration tests for
- * {@link org.springframework.ldap.transaction.compensating.manager.ContextSourceAndHibernateTransactionManager}
- * with namespace configuration.
- *
- * @author Hans Westerbeek
- */
-@ContextConfiguration(locations = { "/conf/ldapAndHibernateTransactionNamespaceTestContext.xml" })
-public class ContextSourceAndHibernateTransactionManagerNamespaceITests extends AbstractLdapTemplateIntegrationTests {
-
- private static Logger log = LoggerFactory
- .getLogger(ContextSourceAndHibernateTransactionManagerNamespaceITests.class);
-
- @Autowired
- @Qualifier("dummyDao")
- private OrgPersonDao dummyDao;
-
- @Autowired
- private LdapTemplate ldapTemplate;
-
- @Autowired
- private HibernateTemplate hibernateTemplate;
-
- @Autowired
- private SessionFactory sessionFactory;
-
- @Before
- public void prepareTest() throws Exception {
- if (TransactionSynchronizationManager.isSynchronizationActive()) {
- TransactionSynchronizationManager.clearSynchronization();
- }
-
- OrgPerson person = new OrgPerson();
- person.setId(1);
- person.setLastname("Person");
- person.setFullname("Some Person");
- person.setDescription("Sweden, Company1, Some Person");
- person.setCountry("Sweden");
- person.setCompany("Company1");
- // "Some Person", "Person", "Sweden, Company1, Some Person"
- // avoid the transaction manager we have configured, do it manually
- Session session = this.sessionFactory.openSession();
- Transaction tx = session.beginTransaction();
- session.saveOrUpdate(person);
- tx.commit();
- session.close();
-
- }
-
- @After
- public void cleanup() throws Exception {
- // probably the wrong idea, this will use the thing i am trying to
- // test..
-
- Session session = this.sessionFactory.openSession();
- Transaction tx = session.beginTransaction();
- Query query = session.createQuery("delete from OrgPerson");
- query.executeUpdate();
- tx.commit();
- session.close();
- }
-
- @Test
- public void testCreateWithException() {
- OrgPerson person = new OrgPerson();
-
- person.setId(2);
- person.setDescription("some description");
- person.setFullname("Some testperson");
- person.setLastname("testperson");
- person.setCountry("Sweden");
- person.setCompany("company1");
-
- try {
- this.dummyDao.createWithException(person);
- fail("DummyException expected");
- }
- catch (DummyException expected) {
- assertThat(true).isTrue();
- }
-
- log.debug("Verifying result");
-
- // Verify that no entry was created in ldap or hibernate db
- try {
- this.ldapTemplate.lookup("cn=some testperson, ou=company1, ou=Sweden");
- fail("NameNotFoundException expected");
- }
- catch (NameNotFoundException expected) {
- assertThat(true).isTrue();
- }
-
- List result = this.hibernateTemplate.findByNamedParam("from OrgPerson person where person.lastname = :lastname",
- "lastname", person.getLastname());
- assertThat(result.size() == 0).isTrue();
-
- }
-
- @Test
- public void testCreate() {
- OrgPerson person = new OrgPerson();
-
- person.setId(2);
- person.setDescription("some description");
- person.setFullname("Some testperson");
- person.setLastname("testperson");
- person.setCountry("Sweden");
- person.setCompany("company1");
- // dummyDao.create("Sweden", "company1", "some testperson",
- // "testperson", "some description");
-
- this.dummyDao.create(person);
- person = null;
- log.debug("Verifying result");
- Object ldapResult = this.ldapTemplate.lookup("cn=some testperson, ou=company1, ou=Sweden");
- OrgPerson fromDb = (OrgPerson) this.hibernateTemplate.get(OrgPerson.class, 2);
- assertThat(ldapResult).isNotNull();
- assertThat(fromDb).isNotNull();
- }
-
- @Test
- public void testUpdateWithException() {
- String dn = "cn=Some Person,ou=company1,ou=Sweden";
- OrgPerson originalPerson = (OrgPerson) this.hibernateTemplate.load(OrgPerson.class, 1);
- originalPerson.setLastname("fooo");
- try {
- this.dummyDao.updateWithException(originalPerson);
- fail("DummyException expected");
- }
- catch (DummyException expected) {
- assertThat(true).isTrue();
- }
-
- log.debug("Verifying result");
-
- Object ldapResult = this.ldapTemplate.lookup(dn, new AttributesMapper() {
- public Object mapFromAttributes(Attributes attributes) throws NamingException {
- assertThat(attributes.get("sn").get()).as("Person").isNotNull();
- assertThat(attributes.get("description").get()).isEqualTo("Sweden, Company1, Some Person");
- return new Object();
- }
- });
-
- OrgPerson notUpdatedPerson = (OrgPerson) this.hibernateTemplate.load(OrgPerson.class, 1);
- assertThat(notUpdatedPerson.getLastname()).isEqualTo("Person");
- assertThat(notUpdatedPerson.getDescription()).isEqualTo("Sweden, Company1, Some Person");
-
- assertThat(ldapResult).isNotNull();
- // no need to assert if notUpdatedPerson exists
- }
-
- @Test
- public void testUpdate() {
- String dn = "cn=Some Person,ou=company1,ou=Sweden";
- OrgPerson person = (OrgPerson) this.hibernateTemplate.load(OrgPerson.class, 1);
- person.setLastname("Updated Person");
- person.setDescription("Updated description");
-
- this.dummyDao.update(person);
-
- log.debug("Verifying result");
- Object ldapResult = this.ldapTemplate.lookup(dn, new AttributesMapper() {
- public Object mapFromAttributes(Attributes attributes) throws NamingException {
- assertThat(attributes.get("sn").get()).isEqualTo("Updated Person");
- assertThat(attributes.get("description").get()).isEqualTo("Updated description");
- return new Object();
- }
- });
-
- OrgPerson updatedPerson = (OrgPerson) this.hibernateTemplate.load(OrgPerson.class, 1);
- assertThat(updatedPerson.getLastname()).isEqualTo("Updated Person");
- assertThat(updatedPerson.getDescription()).isEqualTo("Updated description");
- assertThat(ldapResult).isNotNull();
- }
-
- @Test
- public void testUpdateAndRenameWithException() {
- String dn = "cn=Some Person2,ou=company1,ou=Sweden";
- String newDn = "cn=Some Person2,ou=company2,ou=Sweden";
- OrgPerson person = (OrgPerson) this.hibernateTemplate.load(OrgPerson.class, 1);
- person.setLastname("Updated Person");
- person.setDescription("Updated description");
-
- try {
- // Perform test
- this.dummyDao.updateAndRenameWithException(dn, newDn, "Updated description");
- fail("DummyException expected");
- }
- catch (DummyException expected) {
- assertThat(true).isTrue();
- }
-
- // Verify that entry was not moved.
- try {
- this.ldapTemplate.lookup(newDn);
- fail("NameNotFoundException expected");
- }
- catch (NameNotFoundException expected) {
- assertThat(true).isTrue();
- }
-
- // Verify that original entry was not updated.
- Object object = this.ldapTemplate.lookup(dn, new AttributesMapper() {
- public Object mapFromAttributes(Attributes attributes) throws NamingException {
- assertThat(attributes.get("description").get()).isEqualTo("Sweden, Company1, Some Person2");
- return new Object();
- }
- });
- assertThat(object).isNotNull();
- }
-
- @Test
- public void testUpdateAndRename() {
- String dn = "cn=Some Person2,ou=company1,ou=Sweden";
- String newDn = "cn=Some Person2,ou=company2,ou=Sweden";
- // Perform test
- this.dummyDao.updateAndRename(dn, newDn, "Updated description");
-
- // Verify that entry was moved and updated.
- Object object = this.ldapTemplate.lookup(newDn, new AttributesMapper() {
- public Object mapFromAttributes(Attributes attributes) throws NamingException {
- assertThat(attributes.get("description").get()).isEqualTo("Updated description");
- return new Object();
- }
- });
-
- assertThat(object).isNotNull();
- }
-
- @Test
- public void testModifyAttributesWithException() {
- String dn = "cn=Some Person,ou=company1,ou=Sweden";
- try {
- // Perform test
- this.dummyDao.modifyAttributesWithException(dn, "Updated lastname", "Updated description");
- fail("DummyException expected");
- }
- catch (DummyException expected) {
- assertThat(true).isTrue();
- }
-
- // Verify result - check that the operation was properly rolled back
- Object result = this.ldapTemplate.lookup(dn, new AttributesMapper() {
- public Object mapFromAttributes(Attributes attributes) throws NamingException {
- assertThat(attributes.get("sn").get()).isEqualTo("Person");
- assertThat(attributes.get("description").get()).isEqualTo("Sweden, Company1, Some Person");
- return new Object();
- }
- });
-
- assertThat(result).isNotNull();
- }
-
- @Test
- public void testModifyAttributes() {
- String dn = "cn=Some Person,ou=company1,ou=Sweden";
- // Perform test
- this.dummyDao.modifyAttributes(dn, "Updated lastname", "Updated description");
-
- // Verify result - check that the operation was not rolled back
- Object result = this.ldapTemplate.lookup(dn, new AttributesMapper() {
- public Object mapFromAttributes(Attributes attributes) throws NamingException {
- assertThat(attributes.get("sn").get()).isEqualTo("Updated lastname");
- assertThat(attributes.get("description").get()).isEqualTo("Updated description");
- return new Object();
- }
- });
-
- assertThat(result).isNotNull();
- }
-
- @Test
- public void testUnbindWithException() {
- String dn = "cn=Some Person,ou=company1,ou=Sweden";
- OrgPerson person = (OrgPerson) this.hibernateTemplate.load(OrgPerson.class, 1);
-
- try {
- // Perform test
- this.dummyDao.unbindWithException(person);
- fail("DummyException expected");
- }
- catch (DummyException expected) {
- assertThat(true).isTrue();
- }
-
- person = null;
- // Verify result - check that the operation was properly rolled back
- Object ldapResult = this.ldapTemplate.lookup(dn, new AttributesMapper() {
- public Object mapFromAttributes(Attributes attributes) throws NamingException {
- // Just verify that the entry still exists.
- return new Object();
- }
- });
-
- person = (OrgPerson) this.hibernateTemplate.load(OrgPerson.class, 1); // will
- // throw
- // exception
- // of
- // person
- // does
- // not
- // exist
-
- assertThat(ldapResult).isNotNull();
- }
-
- @Test
- public void testUnbind() {
- String dn = "cn=Some Person,ou=company1,ou=Sweden";
- // Perform test
- OrgPerson person = (OrgPerson) this.hibernateTemplate.load(OrgPerson.class, 1);
- this.dummyDao.unbind(person);
-
- try {
- // Verify result - check that the operation was not rolled back
- this.ldapTemplate.lookup(dn);
- fail("NameNotFoundException expected");
- }
- catch (NameNotFoundException expected) {
- assertThat(true).isTrue();
- }
-
- person = (OrgPerson) this.hibernateTemplate.get(OrgPerson.class, 1);
- assertThat(person).isNull();
- }
-
-}
diff --git a/test/integration-tests/src/test/resources/conf/OrgPerson.hbm.xml b/test/integration-tests/src/test/resources/conf/OrgPerson.hbm.xml
deleted file mode 100755
index 543841471f..0000000000
--- a/test/integration-tests/src/test/resources/conf/OrgPerson.hbm.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/test/integration-tests/src/test/resources/conf/ldapAndHibernateTransactionNamespaceTestContext.xml b/test/integration-tests/src/test/resources/conf/ldapAndHibernateTransactionNamespaceTestContext.xml
deleted file mode 100755
index b7c100cbac..0000000000
--- a/test/integration-tests/src/test/resources/conf/ldapAndHibernateTransactionNamespaceTestContext.xml
+++ /dev/null
@@ -1,51 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- conf/OrgPerson.hbm.xml
-
-
-
-
- hibernate.dialect=org.hibernate.dialect.HSQLDialect
- hibernate.hbm2ddl.auto=create
-
-
-
-
-
-
-
-
-
-
-
diff --git a/test/integration-tests/src/test/resources/conf/ldapAndHibernateTransactionTestContext.xml b/test/integration-tests/src/test/resources/conf/ldapAndHibernateTransactionTestContext.xml
deleted file mode 100755
index 4b0546ed6d..0000000000
--- a/test/integration-tests/src/test/resources/conf/ldapAndHibernateTransactionTestContext.xml
+++ /dev/null
@@ -1,63 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- conf/OrgPerson.hbm.xml
-
-
-
-
- hibernate.dialect=org.hibernate.dialect.HSQLDialect
- hibernate.hbm2ddl.auto=create
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/test/integration-tests/src/test/resources/conf/ldapAndJdbcTransactionNamespaceTestContext.xml b/test/integration-tests/src/test/resources/conf/ldapAndJdbcTransactionNamespaceTestContext.xml
deleted file mode 100644
index 4957f3e27f..0000000000
--- a/test/integration-tests/src/test/resources/conf/ldapAndJdbcTransactionNamespaceTestContext.xml
+++ /dev/null
@@ -1,52 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/test/integration-tests/src/test/resources/conf/ldapAndJdbcTransactionTestContext.xml b/test/integration-tests/src/test/resources/conf/ldapAndJdbcTransactionTestContext.xml
deleted file mode 100644
index 80f105c43c..0000000000
--- a/test/integration-tests/src/test/resources/conf/ldapAndJdbcTransactionTestContext.xml
+++ /dev/null
@@ -1,49 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/test/integration-tests/src/test/resources/conf/missingLdapAndHibernateTransactionTestContext.xml b/test/integration-tests/src/test/resources/conf/missingLdapAndHibernateTransactionTestContext.xml
deleted file mode 100755
index 3d04bcdb40..0000000000
--- a/test/integration-tests/src/test/resources/conf/missingLdapAndHibernateTransactionTestContext.xml
+++ /dev/null
@@ -1,80 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- conf/OrgPerson.hbm.xml
-
-
-
-
- hibernate.dialect=org.hibernate.dialect.HSQLDialect
- hibernate.hbm2ddl.auto=create
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- PROPAGATION_REQUIRES_NEW
-
-
-
-
diff --git a/test/integration-tests/src/test/resources/conf/missingLdapAndJdbcTransactionTestContext.xml b/test/integration-tests/src/test/resources/conf/missingLdapAndJdbcTransactionTestContext.xml
deleted file mode 100644
index deee2666f9..0000000000
--- a/test/integration-tests/src/test/resources/conf/missingLdapAndJdbcTransactionTestContext.xml
+++ /dev/null
@@ -1,66 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- PROPAGATION_REQUIRES_NEW
-
-
-
-
From d1a7944579ba3f737c1937ca80819baa80bd58df Mon Sep 17 00:00:00 2001
From: Josh Cummings <3627351+jzheaux@users.noreply.github.com>
Date: Mon, 16 Jun 2025 14:08:13 -0600
Subject: [PATCH 03/67] Update to Spring Framework 7
Closes gh-1110
---
dependencies/build.gradle | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dependencies/build.gradle b/dependencies/build.gradle
index 31015d08d3..2cdf3de625 100644
--- a/dependencies/build.gradle
+++ b/dependencies/build.gradle
@@ -20,7 +20,7 @@ dependencies {
api platform("org.springframework:spring-framework-bom:$springFrameworkVersion")
api platform("org.springframework.data:spring-data-bom:$springDataVersion")
} else {
- api platform("org.springframework:spring-framework-bom:6.2.7")
+ api platform("org.springframework:spring-framework-bom:7.0.0-M6")
api platform("org.springframework.data:spring-data-bom:2021.2.18")
}
api platform("org.springframework.security:spring-security-bom:6.4.5")
From a2bc78bcf5910d00fa6d216785d89fb9dcc801ef Mon Sep 17 00:00:00 2001
From: Josh Cummings <3627351+jzheaux@users.noreply.github.com>
Date: Mon, 16 Jun 2025 14:37:20 -0600
Subject: [PATCH 04/67] Use DefaultConversionService
This commit changes DefaultObjectDirectoryMapper to use
DefaultConversionService, preserving standard converters
that were there previous to deprecating ConverterManager.
Closes gh-1101
---
.../core/impl/DefaultObjectDirectoryMapper.java | 4 ++--
.../impl/DefaultObjectDirectoryMapperTests.java | 16 +++++++++++++++-
.../UnitTestPersonWithIndexedDnAttributes.java | 14 +++++++++++++-
3 files changed, 30 insertions(+), 4 deletions(-)
diff --git a/core/src/main/java/org/springframework/ldap/odm/core/impl/DefaultObjectDirectoryMapper.java b/core/src/main/java/org/springframework/ldap/odm/core/impl/DefaultObjectDirectoryMapper.java
index cd69fabc17..b65bbd8efb 100644
--- a/core/src/main/java/org/springframework/ldap/odm/core/impl/DefaultObjectDirectoryMapper.java
+++ b/core/src/main/java/org/springframework/ldap/odm/core/impl/DefaultObjectDirectoryMapper.java
@@ -39,7 +39,7 @@
import org.springframework.LdapDataEntry;
import org.springframework.core.convert.ConversionService;
-import org.springframework.core.convert.support.GenericConversionService;
+import org.springframework.core.convert.support.DefaultConversionService;
import org.springframework.ldap.convert.ConverterUtils;
import org.springframework.ldap.filter.AndFilter;
import org.springframework.ldap.filter.EqualsFilter;
@@ -78,7 +78,7 @@ public DefaultObjectDirectoryMapper() {
}
private static ConverterManager createDefaultConverterManager() {
- GenericConversionService conversionService = new GenericConversionService();
+ DefaultConversionService conversionService = new DefaultConversionService();
ConverterUtils.addDefaultConverters(conversionService);
return new ConversionServiceConverterManager(conversionService);
}
diff --git a/core/src/test/java/org/springframework/ldap/odm/core/impl/DefaultObjectDirectoryMapperTests.java b/core/src/test/java/org/springframework/ldap/odm/core/impl/DefaultObjectDirectoryMapperTests.java
index f2ea363b42..595b48c2b0 100644
--- a/core/src/test/java/org/springframework/ldap/odm/core/impl/DefaultObjectDirectoryMapperTests.java
+++ b/core/src/test/java/org/springframework/ldap/odm/core/impl/DefaultObjectDirectoryMapperTests.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2023 the original author or authors.
+ * Copyright 2005-2025 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -143,6 +143,20 @@ public void mapToLdapDataEntryWhenCustomConversionServiceThenUses() {
verify(conversionService).convert(any(), any(Class.class));
}
+ // gh-1101
+ @Test
+ public void managerWhenEntityMapsLongThenConverts() {
+ this.tested.manageClass(UnitTestPersonWithIndexedDnAttributes.class);
+ UnitTestPersonWithIndexedDnAttributes testPerson = new UnitTestPersonWithIndexedDnAttributes();
+ testPerson.setFullName("Some Person");
+ testPerson.setAge(34L);
+ DirContextAdapter adapter = new DirContextAdapter("cn=Some Person, ou=Some Company, c=Sweden");
+ this.tested.mapToLdapDataEntry(testPerson, adapter);
+ assertThat(adapter.getStringAttribute("age")).isEqualTo("34");
+ testPerson = this.tested.mapFromLdapDataEntry(adapter, UnitTestPersonWithIndexedDnAttributes.class);
+ assertThat(testPerson.getAge()).isEqualTo(34L);
+ }
+
private void assertField(DefaultObjectDirectoryMapper.EntityData entityData, String fieldName,
String expectedAttributeName, String expectedDnAttributeName, boolean expectedBinary,
boolean expectedTransient, boolean expectedList, boolean expectedReadOnly) {
diff --git a/core/src/test/java/org/springframework/ldap/odm/core/impl/UnitTestPersonWithIndexedDnAttributes.java b/core/src/test/java/org/springframework/ldap/odm/core/impl/UnitTestPersonWithIndexedDnAttributes.java
index 4e82f0b869..370bc0af16 100644
--- a/core/src/test/java/org/springframework/ldap/odm/core/impl/UnitTestPersonWithIndexedDnAttributes.java
+++ b/core/src/test/java/org/springframework/ldap/odm/core/impl/UnitTestPersonWithIndexedDnAttributes.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2013 the original author or authors.
+ * Copyright 2005-2025 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -18,6 +18,7 @@
import javax.naming.Name;
+import org.springframework.ldap.odm.annotations.Attribute;
import org.springframework.ldap.odm.annotations.DnAttribute;
import org.springframework.ldap.odm.annotations.Entry;
import org.springframework.ldap.odm.annotations.Id;
@@ -40,6 +41,9 @@ public class UnitTestPersonWithIndexedDnAttributes {
@DnAttribute(value = "c", index = 0)
private String country;
+ @Attribute(name = "age")
+ private Long age;
+
public void setFullName(String fullName) {
this.fullName = fullName;
}
@@ -52,4 +56,12 @@ public void setCountry(String country) {
this.country = country;
}
+ public Long getAge() {
+ return this.age;
+ }
+
+ public void setAge(Long age) {
+ this.age = age;
+ }
+
}
From 56f5854c1e6948f33de77a18e6df8fedbedb789c Mon Sep 17 00:00:00 2001
From: Josh Cummings <3627351+jzheaux@users.noreply.github.com>
Date: Mon, 16 Jun 2025 14:48:51 -0600
Subject: [PATCH 05/67] Remove Unused Files
Issue gh-1109
---
.../manager/LdapAndJdbcDummyDaoImpl.java | 199 ------------------
.../manager/hibernate/OrgPerson.java | 152 -------------
.../manager/hibernate/OrgPersonDao.java | 41 ----
3 files changed, 392 deletions(-)
delete mode 100644 test/integration-tests/src/main/java/org/springframework/ldap/itest/transaction/compensating/manager/LdapAndJdbcDummyDaoImpl.java
delete mode 100755 test/integration-tests/src/main/java/org/springframework/ldap/itest/transaction/compensating/manager/hibernate/OrgPerson.java
delete mode 100755 test/integration-tests/src/main/java/org/springframework/ldap/itest/transaction/compensating/manager/hibernate/OrgPersonDao.java
diff --git a/test/integration-tests/src/main/java/org/springframework/ldap/itest/transaction/compensating/manager/LdapAndJdbcDummyDaoImpl.java b/test/integration-tests/src/main/java/org/springframework/ldap/itest/transaction/compensating/manager/LdapAndJdbcDummyDaoImpl.java
deleted file mode 100644
index 1893fb6f96..0000000000
--- a/test/integration-tests/src/main/java/org/springframework/ldap/itest/transaction/compensating/manager/LdapAndJdbcDummyDaoImpl.java
+++ /dev/null
@@ -1,199 +0,0 @@
-/*
- * Copyright 2005-2013 the original author or authors.
- *
- * 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
- *
- * https://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.
- */
-
-package org.springframework.ldap.itest.transaction.compensating.manager;
-
-import org.springframework.jdbc.core.JdbcTemplate;
-import org.springframework.ldap.core.DirContextAdapter;
-import org.springframework.ldap.core.DistinguishedName;
-import org.springframework.ldap.core.LdapTemplate;
-import org.springframework.transaction.annotation.Transactional;
-
-@Transactional
-public class LdapAndJdbcDummyDaoImpl implements DummyDao {
-
- private LdapTemplate ldapTemplate;
-
- private JdbcTemplate jdbcTemplate;
-
- public void setJdbcTemplate(JdbcTemplate jdbcTemplate) {
- this.jdbcTemplate = jdbcTemplate;
- }
-
- public void setLdapTemplate(LdapTemplate ldapTemplate) {
- this.ldapTemplate = ldapTemplate;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see
- * org.springframework.ldap.transaction.support.DummyDao#createWithException(java.lang
- * .String, java.lang.String, java.lang.String, java.lang.String, java.lang.String)
- */
- public void createWithException(String country, String company, String fullname, String lastname,
- String description) {
- create(country, company, fullname, lastname, description);
- throw new DummyException("This method failed");
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.springframework.ldap.transaction.support.DummyDao#create(java.lang.String,
- * java.lang.String, java.lang.String, java.lang.String, java.lang.String)
- */
- public void create(String country, String company, String fullname, String lastname, String description) {
- DistinguishedName dn = new DistinguishedName();
- dn.add("ou", country);
- dn.add("ou", company);
- dn.add("cn", fullname);
-
- DirContextAdapter ctx = new DirContextAdapter();
- ctx.setAttributeValues("objectclass", new String[] { "top", "person" });
- ctx.setAttributeValue("cn", fullname);
- ctx.setAttributeValue("sn", lastname);
- ctx.setAttributeValue("description", description);
- this.ldapTemplate.bind(dn, ctx, null);
- this.jdbcTemplate.update("insert into PERSON values(?, ?, ?)",
- new Object[] { fullname, lastname, description });
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.springframework.ldap.transaction.support.DummyDao#update(java.lang.String,
- * java.lang.String, java.lang.String)
- */
- public void update(String dn, String fullname, String lastname, String description) {
- DirContextAdapter ctx = (DirContextAdapter) this.ldapTemplate.lookup(dn);
- ctx.setAttributeValue("sn", lastname);
- ctx.setAttributeValue("description", description);
-
- this.ldapTemplate.modifyAttributes(ctx);
- this.jdbcTemplate.update("update PERSON set lastname=?, description = ? where fullname = ?",
- new Object[] { lastname, description, fullname });
- }
-
- /*
- * (non-Javadoc)
- *
- * @see
- * org.springframework.ldap.transaction.support.DummyDao#updateWithException(java.lang
- * .String, java.lang.String, java.lang.String)
- */
- public void updateWithException(String dn, String fullname, String lastname, String description) {
- update(dn, fullname, lastname, description);
- throw new DummyException("This method failed.");
- }
-
- /*
- * (non-Javadoc)
- *
- * @see
- * org.springframework.ldap.transaction.support.DummyDao#updateAndRename(java.lang.
- * String, java.lang.String, java.lang.String)
- */
- public void updateAndRename(String dn, String newDn, String description) {
- DirContextAdapter ctx = (DirContextAdapter) this.ldapTemplate.lookup(dn);
- ctx.setAttributeValue("description", description);
-
- this.ldapTemplate.modifyAttributes(ctx);
- this.ldapTemplate.rename(dn, newDn);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see
- * org.springframework.ldap.transaction.support.DummyDao#updateAndRenameWithException(
- * java.lang.String, java.lang.String, java.lang.String)
- */
- public void updateAndRenameWithException(String dn, String newDn, String description) {
- updateAndRename(dn, newDn, description);
- throw new DummyException("This method failed.");
- }
-
- /*
- * (non-Javadoc)
- *
- * @see
- * org.springframework.ldap.transaction.support.DummyDao#modifyAttributes(java.lang.
- * String, java.lang.String, java.lang.String)
- */
- public void modifyAttributes(String dn, String lastName, String description) {
- DirContextAdapter ctx = (DirContextAdapter) this.ldapTemplate.lookup(dn);
- ctx.setAttributeValue("sn", lastName);
- ctx.setAttributeValue("description", description);
-
- this.ldapTemplate.modifyAttributes(dn, ctx.getModificationItems());
- }
-
- /*
- * (non-Javadoc)
- *
- * @see
- * org.springframework.ldap.transaction.support.DummyDao#modifyAttributesWithException
- * (java.lang.String, java.lang.String, java.lang.String)
- */
- public void modifyAttributesWithException(String dn, String lastName, String description) {
- modifyAttributes(dn, lastName, description);
- throw new DummyException("This method failed.");
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.springframework.ldap.transaction.support.DummyDao#unbind(java.lang.String)
- */
- public void unbind(String dn, String fullname) {
- this.ldapTemplate.unbind(dn);
- this.jdbcTemplate.update("delete from PERSON where fullname=?", new Object[] { fullname });
- }
-
- /*
- * (non-Javadoc)
- *
- * @see
- * org.springframework.ldap.transaction.support.DummyDao#unbindWithException(java.lang
- * .String)
- */
- public void unbindWithException(String dn, String fullname) {
- unbind(dn, fullname);
- throw new DummyException("This operation failed.");
- }
-
- @Override
- public void deleteRecursively(String dn) {
- throw new UnsupportedOperationException();
- }
-
- @Override
- public void deleteRecursivelyWithException(String dn) {
- throw new UnsupportedOperationException();
- }
-
- @Override
- public void createRecursivelyAndUnbindSubnode() {
- throw new UnsupportedOperationException();
- }
-
- @Override
- public void createRecursivelyAndUnbindSubnodeWithException() {
- throw new UnsupportedOperationException();
- }
-
-}
diff --git a/test/integration-tests/src/main/java/org/springframework/ldap/itest/transaction/compensating/manager/hibernate/OrgPerson.java b/test/integration-tests/src/main/java/org/springframework/ldap/itest/transaction/compensating/manager/hibernate/OrgPerson.java
deleted file mode 100755
index 130734c961..0000000000
--- a/test/integration-tests/src/main/java/org/springframework/ldap/itest/transaction/compensating/manager/hibernate/OrgPerson.java
+++ /dev/null
@@ -1,152 +0,0 @@
-/*
- * Copyright 2005-2023 the original author or authors.
- *
- * 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
- *
- * https://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.
- */
-
-package org.springframework.ldap.itest.transaction.compensating.manager.hibernate;
-
-/**
- * Pojo for use with the ContextSourceAndHibernateTransactionManager integration tests
- *
- * @author Hans Westerbeek
- *
- */
-public class OrgPerson {
-
- private Integer id;
-
- private String fullname;
-
- private String lastname;
-
- private String company;
-
- private String country;
-
- private String description;
-
- public Integer getId() {
- return this.id;
- }
-
- public void setId(Integer id) {
- this.id = id;
- }
-
- public String getFullname() {
- return this.fullname;
- }
-
- public void setFullname(String fullname) {
- this.fullname = fullname;
- }
-
- public String getLastname() {
- return this.lastname;
- }
-
- public void setLastname(String lastname) {
- this.lastname = lastname;
- }
-
- public String getCountry() {
- return this.country;
- }
-
- public void setCountry(String country) {
- this.country = country;
- }
-
- public String getCompany() {
- return this.company;
- }
-
- public void setCompany(String company) {
- this.company = company;
- }
-
- public String getDescription() {
- return this.description;
- }
-
- public void setDescription(String description) {
- this.description = description;
- }
-
- public boolean equals(Object obj) {
- if (this == obj) {
- return true;
- }
- if (obj == null) {
- return false;
- }
- if (getClass() != obj.getClass()) {
- return false;
- }
- final OrgPerson other = (OrgPerson) obj;
- if (this.company == null) {
- if (other.company != null) {
- return false;
- }
- }
- else if (!this.company.equals(other.company)) {
- return false;
- }
- if (this.country == null) {
- if (other.country != null) {
- return false;
- }
- }
- else if (!this.country.equals(other.country)) {
- return false;
- }
- if (this.description == null) {
- if (other.description != null) {
- return false;
- }
- }
- else if (!this.description.equals(other.description)) {
- return false;
- }
- if (this.fullname == null) {
- if (other.fullname != null) {
- return false;
- }
- }
- else if (!this.fullname.equals(other.fullname)) {
- return false;
- }
- if (this.lastname == null) {
- if (other.lastname != null) {
- return false;
- }
- }
- else if (!this.lastname.equals(other.lastname)) {
- return false;
- }
- return true;
- }
-
- public int hashCode() {
- final int prime = 31;
- int result = 1;
- result = prime * result + ((this.company == null) ? 0 : this.company.hashCode());
- result = prime * result + ((this.country == null) ? 0 : this.country.hashCode());
- result = prime * result + ((this.description == null) ? 0 : this.description.hashCode());
- result = prime * result + ((this.fullname == null) ? 0 : this.fullname.hashCode());
- result = prime * result + ((this.lastname == null) ? 0 : this.lastname.hashCode());
- return result;
- }
-
-}
diff --git a/test/integration-tests/src/main/java/org/springframework/ldap/itest/transaction/compensating/manager/hibernate/OrgPersonDao.java b/test/integration-tests/src/main/java/org/springframework/ldap/itest/transaction/compensating/manager/hibernate/OrgPersonDao.java
deleted file mode 100755
index ddbdec7f76..0000000000
--- a/test/integration-tests/src/main/java/org/springframework/ldap/itest/transaction/compensating/manager/hibernate/OrgPersonDao.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Copyright 2005-2023 the original author or authors.
- *
- * 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
- *
- * https://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.
- */
-
-package org.springframework.ldap.itest.transaction.compensating.manager.hibernate;
-
-public interface OrgPersonDao {
-
- void createWithException(OrgPerson person);
-
- void create(OrgPerson person);
-
- void update(OrgPerson person);
-
- void updateWithException(OrgPerson person);
-
- void updateAndRename(String dn, String newDn, String updatedDescription);
-
- void updateAndRenameWithException(String dn, String newDn, String updatedDescription);
-
- void modifyAttributes(String dn, String lastName, String description);
-
- void modifyAttributesWithException(String dn, String lastName, String description);
-
- void unbind(OrgPerson person);
-
- void unbindWithException(OrgPerson person);
-
-}
From 9d0c616cd14fd3b2d45a54e2bac39fa29df47c12 Mon Sep 17 00:00:00 2001
From: Josh Cummings <3627351+jzheaux@users.noreply.github.com>
Date: Mon, 16 Jun 2025 15:48:04 -0600
Subject: [PATCH 06/67] Update Dependabot for 4.x
---
.github/dependabot.yml | 14 ++++++++++++++
1 file changed, 14 insertions(+)
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
index 3235155f83..a592f7610b 100644
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -2,6 +2,20 @@ version: 2
updates:
- package-ecosystem: gradle
target-branch: main
+ milestone: 97 # 4.0.x
+ directory: /
+ schedule:
+ interval: daily
+ time: '03:40'
+ timezone: Etc/UTC
+ labels:
+ - 'type: dependency-upgrade'
+ - 'in: build'
+ ignore:
+ - dependency-name: org.apache.directory.server:*
+ - dependency-name: org.apache.directory.shared:*
+ - package-ecosystem: gradle
+ target-branch: 3.3.x
milestone: 79 # 3.3.x
directory: /
schedule:
From 19205f46ded3a123ff27d3657e0b441fecc5745a Mon Sep 17 00:00:00 2001
From: Josh Cummings <3627351+jzheaux@users.noreply.github.com>
Date: Mon, 16 Jun 2025 15:49:40 -0600
Subject: [PATCH 07/67] Update to Gradle 8.14.2
Closes gh-1111
---
gradle/wrapper/gradle-wrapper.properties | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 1e2fbf0d45..0b55a3bd94 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.2-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
From cdc05aa3ada4d18ae16ec5f5eec78d134f7319d3 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 3 Jun 2025 03:32:31 +0000
Subject: [PATCH 08/67] Bump
io.spring.javaformat:spring-javaformat-gradle-plugin
Bumps [io.spring.javaformat:spring-javaformat-gradle-plugin](https://github.com/spring-io/spring-javaformat) from 0.0.44 to 0.0.46.
- [Release notes](https://github.com/spring-io/spring-javaformat/releases)
- [Commits](https://github.com/spring-io/spring-javaformat/compare/v0.0.44...v0.0.46)
---
updated-dependencies:
- dependency-name: io.spring.javaformat:spring-javaformat-gradle-plugin
dependency-version: 0.0.46
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot]
---
buildSrc/build.gradle | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/buildSrc/build.gradle b/buildSrc/build.gradle
index c17b2d54eb..ad5ea6e725 100644
--- a/buildSrc/build.gradle
+++ b/buildSrc/build.gradle
@@ -89,7 +89,7 @@ dependencies {
implementation 'com.apollographql.apollo:apollo-runtime:2.5.14'
implementation 'com.github.ben-manes:gradle-versions-plugin:0.52.0'
implementation 'com.github.spullara.mustache.java:compiler:0.9.14'
- implementation 'io.spring.javaformat:spring-javaformat-gradle-plugin:0.0.44'
+ implementation 'io.spring.javaformat:spring-javaformat-gradle-plugin:0.0.46'
implementation 'io.spring.gradle:spring-security-release-plugin:1.0.6'
implementation 'io.spring.nohttp:nohttp-gradle:0.0.11'
implementation 'net.sourceforge.htmlunit:htmlunit:2.70.0'
From c34960196f59f81ae409055d701c9471a9b7ccdc Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 4 Jun 2025 03:49:00 +0000
Subject: [PATCH 09/67] Bump io.spring.develocity.conventions from 0.0.22 to
0.0.23
Bumps [io.spring.develocity.conventions](https://github.com/spring-io/develocity-conventions) from 0.0.22 to 0.0.23.
- [Release notes](https://github.com/spring-io/develocity-conventions/releases)
- [Commits](https://github.com/spring-io/develocity-conventions/compare/v0.0.22...v0.0.23)
---
updated-dependencies:
- dependency-name: io.spring.develocity.conventions
dependency-version: 0.0.23
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot]
---
settings.gradle | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/settings.gradle b/settings.gradle
index 760c470ffa..61d487f8ee 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -9,7 +9,7 @@ pluginManagement {
}
plugins {
- id "io.spring.develocity.conventions" version "0.0.22"
+ id "io.spring.develocity.conventions" version "0.0.23"
}
dependencyResolutionManagement {
From 001750c504d5f805c88010a397027a57c4e3771b Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 10 Jun 2025 03:10:09 +0000
Subject: [PATCH 10/67] Bump io.micrometer:micrometer-bom from 1.14.7 to 1.14.8
Bumps [io.micrometer:micrometer-bom](https://github.com/micrometer-metrics/micrometer) from 1.14.7 to 1.14.8.
- [Release notes](https://github.com/micrometer-metrics/micrometer/releases)
- [Commits](https://github.com/micrometer-metrics/micrometer/compare/v1.14.7...v1.14.8)
---
updated-dependencies:
- dependency-name: io.micrometer:micrometer-bom
dependency-version: 1.14.8
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot]
---
dependencies/build.gradle | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dependencies/build.gradle b/dependencies/build.gradle
index 2cdf3de625..0346944094 100644
--- a/dependencies/build.gradle
+++ b/dependencies/build.gradle
@@ -25,7 +25,7 @@ dependencies {
}
api platform("org.springframework.security:spring-security-bom:6.4.5")
api platform('com.fasterxml.jackson:jackson-bom:2.18.4')
- api platform("io.micrometer:micrometer-bom:1.14.7")
+ api platform("io.micrometer:micrometer-bom:1.14.8")
api platform("io.micrometer:micrometer-tracing-bom:1.4.6")
api platform("org.junit:junit-bom:5.12.2")
constraints {
From 063567258ee9756d742b842cabd325d4efaf3437 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 20 May 2025 03:34:40 +0000
Subject: [PATCH 11/67] Bump org.springframework.security:spring-security-bom
Bumps [org.springframework.security:spring-security-bom](https://github.com/spring-projects/spring-security) from 6.4.5 to 6.4.6.
- [Release notes](https://github.com/spring-projects/spring-security/releases)
- [Changelog](https://github.com/spring-projects/spring-security/blob/main/RELEASE.adoc)
- [Commits](https://github.com/spring-projects/spring-security/compare/6.4.5...6.4.6)
---
updated-dependencies:
- dependency-name: org.springframework.security:spring-security-bom
dependency-version: 6.4.6
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot]
---
dependencies/build.gradle | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dependencies/build.gradle b/dependencies/build.gradle
index 0346944094..51f00678ae 100644
--- a/dependencies/build.gradle
+++ b/dependencies/build.gradle
@@ -23,7 +23,7 @@ dependencies {
api platform("org.springframework:spring-framework-bom:7.0.0-M6")
api platform("org.springframework.data:spring-data-bom:2021.2.18")
}
- api platform("org.springframework.security:spring-security-bom:6.4.5")
+ api platform("org.springframework.security:spring-security-bom:6.4.6")
api platform('com.fasterxml.jackson:jackson-bom:2.18.4')
api platform("io.micrometer:micrometer-bom:1.14.8")
api platform("io.micrometer:micrometer-tracing-bom:1.4.6")
From cb88ed8b03522a8c1bc5909eb9c30aa6f7720f89 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 10 Jun 2025 03:10:29 +0000
Subject: [PATCH 12/67] Bump io.micrometer:micrometer-tracing-bom from 1.4.6 to
1.4.7
Bumps [io.micrometer:micrometer-tracing-bom](https://github.com/micrometer-metrics/tracing) from 1.4.6 to 1.4.7.
- [Release notes](https://github.com/micrometer-metrics/tracing/releases)
- [Commits](https://github.com/micrometer-metrics/tracing/compare/v1.4.6...v1.4.7)
---
updated-dependencies:
- dependency-name: io.micrometer:micrometer-tracing-bom
dependency-version: 1.4.7
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot]
---
dependencies/build.gradle | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dependencies/build.gradle b/dependencies/build.gradle
index 51f00678ae..01b95bb5ff 100644
--- a/dependencies/build.gradle
+++ b/dependencies/build.gradle
@@ -26,7 +26,7 @@ dependencies {
api platform("org.springframework.security:spring-security-bom:6.4.6")
api platform('com.fasterxml.jackson:jackson-bom:2.18.4')
api platform("io.micrometer:micrometer-bom:1.14.8")
- api platform("io.micrometer:micrometer-tracing-bom:1.4.6")
+ api platform("io.micrometer:micrometer-tracing-bom:1.4.7")
api platform("org.junit:junit-bom:5.12.2")
constraints {
api "com.querydsl:querydsl-core:$queryDslVersion"
From 2cab480a761c7356762a55488258c4b17959ae08 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 16 Jun 2025 22:11:48 +0000
Subject: [PATCH 13/67] Bump com.fasterxml.jackson:jackson-bom from 2.18.4 to
2.19.1
Bumps [com.fasterxml.jackson:jackson-bom](https://github.com/FasterXML/jackson-bom) from 2.18.4 to 2.19.1.
- [Commits](https://github.com/FasterXML/jackson-bom/compare/jackson-bom-2.18.4...jackson-bom-2.19.1)
---
updated-dependencies:
- dependency-name: com.fasterxml.jackson:jackson-bom
dependency-version: 2.19.1
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot]
---
dependencies/build.gradle | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dependencies/build.gradle b/dependencies/build.gradle
index 01b95bb5ff..60bb03592e 100644
--- a/dependencies/build.gradle
+++ b/dependencies/build.gradle
@@ -24,7 +24,7 @@ dependencies {
api platform("org.springframework.data:spring-data-bom:2021.2.18")
}
api platform("org.springframework.security:spring-security-bom:6.4.6")
- api platform('com.fasterxml.jackson:jackson-bom:2.18.4')
+ api platform('com.fasterxml.jackson:jackson-bom:2.19.1')
api platform("io.micrometer:micrometer-bom:1.14.8")
api platform("io.micrometer:micrometer-tracing-bom:1.4.7")
api platform("org.junit:junit-bom:5.12.2")
From 14e63a537480d17382f3167b977aaca69eee3aec Mon Sep 17 00:00:00 2001
From: Josh Cummings <3627351+jzheaux@users.noreply.github.com>
Date: Thu, 17 Jul 2025 11:02:38 -0600
Subject: [PATCH 14/67] Fix Comment Typos
See gh-998
Co-Authored-By: kibeom lee <46297213+lkb85@users.noreply.github.com>
---
.../ldap/odm/typeconversion/impl/ConverterManagerImpl.java | 2 +-
.../apache/directory/server/core/avltree/ArrayMarshaller.java | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
mode change 100755 => 100644 core/src/main/java/org/springframework/ldap/odm/typeconversion/impl/ConverterManagerImpl.java
diff --git a/core/src/main/java/org/springframework/ldap/odm/typeconversion/impl/ConverterManagerImpl.java b/core/src/main/java/org/springframework/ldap/odm/typeconversion/impl/ConverterManagerImpl.java
old mode 100755
new mode 100644
index 3df19e20eb..c6a8dace79
--- a/core/src/main/java/org/springframework/ldap/odm/typeconversion/impl/ConverterManagerImpl.java
+++ b/core/src/main/java/org/springframework/ldap/odm/typeconversion/impl/ConverterManagerImpl.java
@@ -127,7 +127,7 @@ public boolean canConvert(Class fromClass, String syntax, Class toClass) {
public T convert(Object source, String syntax, Class toClass) {
Object result = null;
- // What are we converting form
+ // What are we converting from
Class fromClass = source.getClass();
// Deal with primitives
diff --git a/test/integration-tests/src/test/java/org/apache/directory/server/core/avltree/ArrayMarshaller.java b/test/integration-tests/src/test/java/org/apache/directory/server/core/avltree/ArrayMarshaller.java
index cdaa9d5fcb..42f05560b3 100644
--- a/test/integration-tests/src/test/java/org/apache/directory/server/core/avltree/ArrayMarshaller.java
+++ b/test/integration-tests/src/test/java/org/apache/directory/server/core/avltree/ArrayMarshaller.java
@@ -61,7 +61,7 @@ public ArrayMarshaller(Comparator comparator, Marshaller keyMarshaller) {
/**
* Creates a new instance of AvlTreeMarshaller with the default key Marshaller which
* uses Java Serialization.
- * @param comparator Comparator to be used for key comparision
+ * @param comparator Comparator to be used for key comparison
*/
public ArrayMarshaller(Comparator comparator) {
this.comparator = comparator;
From b5908cee7e06669af6211d1562f46eafd4c14f0d Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 16 Jun 2025 22:11:51 +0000
Subject: [PATCH 15/67] Bump org.slf4j:log4j-over-slf4j from 1.7.36 to 2.0.17
Bumps org.slf4j:log4j-over-slf4j from 1.7.36 to 2.0.17.
---
updated-dependencies:
- dependency-name: org.slf4j:log4j-over-slf4j
dependency-version: 2.0.17
dependency-type: direct:production
update-type: version-update:semver-major
...
Signed-off-by: dependabot[bot]
---
dependencies/build.gradle | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/dependencies/build.gradle b/dependencies/build.gradle
index 60bb03592e..40326cb695 100644
--- a/dependencies/build.gradle
+++ b/dependencies/build.gradle
@@ -57,10 +57,10 @@ dependencies {
api "junit:junit:4.13.2"
api "org.mockito:mockito-core:5.14.1"
api "org.mockito:mockito-junit-jupiter:5.14.1"
- api "org.slf4j:jcl-over-slf4j:1.7.36"
- api "org.slf4j:log4j-over-slf4j:1.7.36"
- api "org.slf4j:slf4j-api:1.7.36"
- api "org.slf4j:slf4j-log4j12:1.7.36"
+ api "org.slf4j:jcl-over-slf4j:2.0.17"
+ api "org.slf4j:log4j-over-slf4j:2.0.17"
+ api "org.slf4j:slf4j-api:2.0.17"
+ api "org.slf4j:slf4j-log4j12:2.0.17"
api "org.springframework.security:spring-security-config"
api "org.springframework.security:spring-security-core"
api "org.springframework.security:spring-security-ldap"
From 77ef6526ca89bd2131314c0b748cdb67673266c1 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 19 Jun 2025 03:18:48 +0000
Subject: [PATCH 16/67] Bump com.apollographql.apollo from 2.5.14 to 4.3.1
Bumps com.apollographql.apollo from 2.5.14 to 4.3.1.
---
updated-dependencies:
- dependency-name: com.apollographql.apollo
dependency-version: 4.3.1
dependency-type: direct:production
update-type: version-update:semver-major
...
Signed-off-by: dependabot[bot]
---
buildSrc/build.gradle | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/buildSrc/build.gradle b/buildSrc/build.gradle
index ad5ea6e725..f90d10b39a 100644
--- a/buildSrc/build.gradle
+++ b/buildSrc/build.gradle
@@ -2,7 +2,7 @@ plugins {
id "java-gradle-plugin"
id "java"
id "groovy"
- id 'com.apollographql.apollo' version '2.5.14'
+ id 'com.apollographql.apollo' version '4.3.1'
}
sourceCompatibility = JavaVersion.VERSION_17
From 8734656d73edfd7ee3180d6c0a43afa54cba1c14 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 17 Jul 2025 16:57:02 +0000
Subject: [PATCH 17/67] Bump io.micrometer:micrometer-tracing-bom from 1.4.6 to
1.5.2
---
updated-dependencies:
- dependency-name: io.micrometer:micrometer-tracing-bom
dependency-version: 1.5.2
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot]
---
dependencies/build.gradle | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dependencies/build.gradle b/dependencies/build.gradle
index 40326cb695..402fd5aaa3 100644
--- a/dependencies/build.gradle
+++ b/dependencies/build.gradle
@@ -26,7 +26,7 @@ dependencies {
api platform("org.springframework.security:spring-security-bom:6.4.6")
api platform('com.fasterxml.jackson:jackson-bom:2.19.1')
api platform("io.micrometer:micrometer-bom:1.14.8")
- api platform("io.micrometer:micrometer-tracing-bom:1.4.7")
+ api platform("io.micrometer:micrometer-tracing-bom:1.5.2")
api platform("org.junit:junit-bom:5.12.2")
constraints {
api "com.querydsl:querydsl-core:$queryDslVersion"
From 3d4f74aa3f0ede290c9edeb0e32955b4750fcb0b Mon Sep 17 00:00:00 2001
From: Josh Cummings <3627351+jzheaux@users.noreply.github.com>
Date: Thu, 17 Jul 2025 11:50:22 -0600
Subject: [PATCH 18/67] Update Core Tests to JUnit 5
Issue gh-1058
---
core/build.gradle | 7 +-
.../ldap/NamingExceptionTests.java | 2 +-
.../aot/hint/LdapCoreRuntimeHintsTests.java | 6 +-
...uesAuthenticationSourceDecoratorTests.java | 6 +-
.../LdapTemplateNamespaceHandlerTests.java | 32 ++++----
.../ldap/control/PagedResultTests.java | 2 +-
.../ldap/control/PagedResultsCookieTests.java | 2 +-
.../PagedResultsDirContextProcessorTests.java | 10 +--
...equestControlDirContextProcessorTests.java | 18 +++--
.../SortControlDirContextProcessorTests.java | 6 +-
...tingNameClassPairCallbackHandlerTests.java | 6 +-
.../ContextMapperCallbackHandlerTests.java | 22 +++---
.../ldap/core/DefaultLdapClientListTests.java | 6 +-
.../core/DefaultLdapClientLookupTests.java | 6 +-
.../core/DefaultLdapClientRenameTests.java | 6 +-
.../ldap/core/DefaultLdapClientTests.java | 6 +-
.../ldap/core/DirContextAdapterBugTests.java | 2 +-
.../ldap/core/DirContextAdapterTests.java | 6 +-
.../core/DistinguishedNameEditorTests.java | 6 +-
.../ldap/core/DistinguishedNameTests.java | 74 +++++++++++--------
.../ldap/core/LdapRdnComponentTests.java | 2 +-
.../ldap/core/LdapRdnTests.java | 31 ++++----
.../ldap/core/LdapTemplateListTests.java | 6 +-
.../ldap/core/LdapTemplateLookupTests.java | 6 +-
.../ldap/core/LdapTemplateOdmTests.java | 6 +-
.../ldap/core/LdapTemplateRenameTests.java | 6 +-
.../ldap/core/LdapTemplateTests.java | 6 +-
.../ldap/core/NameAwareAttributeTests.java | 2 +-
.../ldap/core/NameAwareAttributesTests.java | 2 +-
.../support/AbstractContextSourceTests.java | 2 +-
.../AggregateDirContextProcessorTests.java | 6 +-
.../BaseLdapPathBeanPostProcessorTests.java | 27 ++++---
...apperCallbackHandlerWithControlsTests.java | 22 +++---
...meClassPairResultCallbackHandlerTests.java | 6 +-
.../support/DefaultDirObjectFactoryTests.java | 6 +-
...faultIncrementalAttributesMapperTests.java | 6 +-
...DirContextAuthenticationStrategyTests.java | 11 ++-
.../core/support/LdapContextSourceTests.java | 25 ++++---
.../ldap/core/support/RangeOptionTests.java | 2 +-
...DirContextAuthenticationStrategyTests.java | 6 +-
.../support/SingleContextSourceTests.java | 6 +-
.../core/support/ldap294/Ldap294Tests.java | 2 +-
.../ldap/filter/AbstractFilterTests.java | 2 +-
.../ldap/filter/AndFilterTests.java | 2 +-
.../ldap/filter/EqualsFilterTests.java | 2 +-
.../GreaterThanOrEqualsFilterTests.java | 2 +-
.../ldap/filter/HardcodedFilterTests.java | 2 +-
.../filter/LessThanOrEqualsFilterTests.java | 2 +-
.../ldap/filter/LikeFilterTests.java | 2 +-
.../ldap/filter/NotFilterTests.java | 2 +-
.../ldap/filter/NotPresentFilterTests.java | 2 +-
.../ldap/filter/OrFilterTests.java | 2 +-
.../ldap/filter/PresentFilterTests.java | 2 +-
.../ldap/filter/ProximityFilterTests.java | 2 +-
.../WhitespaceWildcardsFilterTests.java | 2 +-
.../DefaultObjectDirectoryMapperTests.java | 21 ++++--
.../ldap/pool/AbstractPoolTestCase.java | 4 +-
.../ldap/pool/DelegatingContextTests.java | 2 +-
.../ldap/pool/DelegatingDirContextTests.java | 2 +-
.../ldap/pool/DelegatingLdapContextTests.java | 2 +-
.../MutableDelegatingLdapContextTests.java | 2 +-
.../DirContextPoolableObjectFactoryTests.java | 2 +-
.../MutablePoolingContextSourceTests.java | 2 +-
.../factory/PoolingContextSourceTests.java | 2 +-
.../DefaultDirContextValidatorTests.java | 6 +-
.../ldap/pool2/AbstractPoolTestCase.java | 4 +-
.../ldap/pool2/DelegatingContextTests.java | 2 +-
.../ldap/pool2/DelegatingDirContextTests.java | 2 +-
.../pool2/DelegatingLdapContextTests.java | 2 +-
.../MutableDelegatingLdapContextTests.java | 2 +-
.../DirContextPooledObjectFactoryTests.java | 2 +-
.../MutablePooledContextSourceTests.java | 2 +-
.../ldap/pool2/factory/PoolConfigTests.java | 2 +-
.../factory/PooledContextSourceTests.java | 2 +-
.../ldap/query/LdapQueryBuilderTests.java | 57 ++++++++------
.../ldap/support/LdapEncoderTests.java | 7 +-
.../ldap/support/LdapNameBuilderTests.java | 2 +-
.../ldap/support/LdapUtilsTests.java | 6 +-
.../BindOperationExecutorTests.java | 6 +-
.../BindOperationRecorderTests.java | 19 +++--
...atingTransactionOperationFactoryTests.java | 6 +-
.../LdapTransactionUtilsTests.java | 6 +-
...odifyAttributesOperationExecutorTests.java | 6 +-
...odifyAttributesOperationRecorderTests.java | 6 +-
.../RebindOperationExecutorTests.java | 6 +-
.../RebindOperationRecorderTests.java | 6 +-
.../RenameOperationExecutorTests.java | 6 +-
.../RenameOperationRecorderTests.java | 6 +-
.../UnbindOperationExecutorTests.java | 6 +-
.../UnbindOperationRecorderTests.java | 6 +-
.../CompensatingTransactionUtilsTests.java | 6 +-
.../ContextSourceTransactionManagerTests.java | 6 +-
...ansactionAwareContextSourceProxyTests.java | 6 +-
...AwareDirContextInvocationHandlerTests.java | 6 +-
...DefaultTempEntryRenamingStrategyTests.java | 2 +-
...SubtreeTempEntryRenamingStrategyTests.java | 2 +-
.../ldap/util/ListComparatorTests.java | 6 +-
...atingTransactionOperationManagerTests.java | 35 +++++----
98 files changed, 409 insertions(+), 333 deletions(-)
diff --git a/core/build.gradle b/core/build.gradle
index 5b5b03d0e4..17dcc002ce 100644
--- a/core/build.gradle
+++ b/core/build.gradle
@@ -38,13 +38,13 @@ dependencies {
exclude group: 'org.assertj'
}
testImplementation platform('org.junit:junit-bom')
- testImplementation "org.junit.vintage:junit-vintage-engine"
+ testImplementation "org.junit.jupiter:junit-jupiter-api"
+ testImplementation "org.junit.jupiter:junit-jupiter-engine"
testRuntimeOnly("org.junit.platform:junit-platform-launcher")
-
- testImplementation "junit:junit"
testImplementation "commons-lang:commons-lang"
testImplementation "gsbase:gsbase"
testImplementation "org.mockito:mockito-core"
+ testImplementation "org.mockito:mockito-junit-jupiter:4.11.0"
testImplementation "org.springframework:spring-test"
testImplementation "org.assertj:assertj-core"
testImplementation "com.unboundid:unboundid-ldapsdk"
@@ -60,6 +60,7 @@ compileTestJava {
test {
jvmArgs '--add-exports', 'java.naming/com.sun.jndi.ldap=ALL-UNNAMED'
+ useJUnitPlatform()
}
checkFormatMain {
diff --git a/core/src/test/java/org/springframework/ldap/NamingExceptionTests.java b/core/src/test/java/org/springframework/ldap/NamingExceptionTests.java
index ff231a1b35..fba3e0dd3a 100644
--- a/core/src/test/java/org/springframework/ldap/NamingExceptionTests.java
+++ b/core/src/test/java/org/springframework/ldap/NamingExceptionTests.java
@@ -24,7 +24,7 @@
import javax.naming.directory.InitialDirContext;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.assertj.core.api.Assertions.assertThat;
diff --git a/core/src/test/java/org/springframework/ldap/aot/hint/LdapCoreRuntimeHintsTests.java b/core/src/test/java/org/springframework/ldap/aot/hint/LdapCoreRuntimeHintsTests.java
index 4ebbf12f28..05072cbc69 100644
--- a/core/src/test/java/org/springframework/ldap/aot/hint/LdapCoreRuntimeHintsTests.java
+++ b/core/src/test/java/org/springframework/ldap/aot/hint/LdapCoreRuntimeHintsTests.java
@@ -22,8 +22,8 @@
import javax.naming.ldap.SortResponseControl;
import javax.net.ssl.SSLSocketFactory;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import org.springframework.aot.hint.MemberCategory;
import org.springframework.aot.hint.RuntimeHints;
@@ -44,7 +44,7 @@ public class LdapCoreRuntimeHintsTests {
private final RuntimeHints hints = new RuntimeHints();
- @Before
+ @BeforeEach
public void setup() {
SpringFactoriesLoader.forResourceLocation("META-INF/spring/aot.factories")
.load(RuntimeHintsRegistrar.class)
diff --git a/core/src/test/java/org/springframework/ldap/authentication/DefaultValuesAuthenticationSourceDecoratorTests.java b/core/src/test/java/org/springframework/ldap/authentication/DefaultValuesAuthenticationSourceDecoratorTests.java
index a462368155..5e5f54b874 100644
--- a/core/src/test/java/org/springframework/ldap/authentication/DefaultValuesAuthenticationSourceDecoratorTests.java
+++ b/core/src/test/java/org/springframework/ldap/authentication/DefaultValuesAuthenticationSourceDecoratorTests.java
@@ -16,8 +16,8 @@
package org.springframework.ldap.authentication;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import org.springframework.ldap.core.AuthenticationSource;
@@ -36,7 +36,7 @@ public class DefaultValuesAuthenticationSourceDecoratorTests {
private AuthenticationSource authenticationSourceMock;
- @Before
+ @BeforeEach
public void setUp() throws Exception {
this.authenticationSourceMock = mock(AuthenticationSource.class);
this.tested = new DefaultValuesAuthenticationSourceDecorator();
diff --git a/core/src/test/java/org/springframework/ldap/config/LdapTemplateNamespaceHandlerTests.java b/core/src/test/java/org/springframework/ldap/config/LdapTemplateNamespaceHandlerTests.java
index a528d91e02..10dd308ef5 100644
--- a/core/src/test/java/org/springframework/ldap/config/LdapTemplateNamespaceHandlerTests.java
+++ b/core/src/test/java/org/springframework/ldap/config/LdapTemplateNamespaceHandlerTests.java
@@ -28,7 +28,7 @@
import org.apache.commons.pool.impl.GenericKeyedObjectPool;
import org.apache.commons.pool2.impl.GenericKeyedObjectPoolConfig;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.springframework.beans.BeansException;
import org.springframework.context.support.ClassPathXmlApplicationContext;
@@ -97,19 +97,22 @@ public void verifyThatAnonymousReadOnlyContextWillNotBeWrappedInProxy() {
assertThat(Boolean.TRUE).isEqualTo(getInternalState(contextSource, "anonymousReadOnly"));
}
- @Test(expected = BeansException.class)
+ @Test
public void verifyThatAnonymousReadOnlyAndTransactionalThrowsException() {
- new ClassPathXmlApplicationContext("/ldap-namespace-config-anonymous-read-only-and-transactions.xml");
+ assertThatExceptionOfType(BeansException.class).isThrownBy(() -> new ClassPathXmlApplicationContext(
+ "/ldap-namespace-config-anonymous-read-only-and-transactions.xml"));
}
- @Test(expected = BeansException.class)
+ @Test
public void verifyThatMissingUsernameThrowsException() {
- new ClassPathXmlApplicationContext("/ldap-namespace-config-missing-username.xml");
+ assertThatExceptionOfType(BeansException.class)
+ .isThrownBy(() -> new ClassPathXmlApplicationContext("/ldap-namespace-config-missing-username.xml"));
}
- @Test(expected = BeansException.class)
+ @Test
public void verifyThatMissingPasswordThrowsException() {
- new ClassPathXmlApplicationContext("/ldap-namespace-config-missing-password.xml");
+ assertThatExceptionOfType(BeansException.class)
+ .isThrownBy(() -> new ClassPathXmlApplicationContext("/ldap-namespace-config-missing-password.xml"));
}
@Test
@@ -366,9 +369,10 @@ public void verifyParsePoolingValidationSet() {
assertThat(nonTransientExceptions.contains(CannotProceedException.class)).isTrue();
}
- @Test(expected = BeansException.class)
+ @Test
public void verifyParseWithPoolingAndNativePoolingWillFail() {
- new ClassPathXmlApplicationContext("/ldap-namespace-config-pooling-with-native.xml");
+ assertThatExceptionOfType(BeansException.class)
+ .isThrownBy(() -> new ClassPathXmlApplicationContext("/ldap-namespace-config-pooling-with-native.xml"));
}
@Test
@@ -494,14 +498,16 @@ public void verifyParsePool2ValidationSet() {
assertThat(nonTransientExceptions.contains(CannotProceedException.class)).isTrue();
}
- @Test(expected = BeansException.class)
+ @Test
public void verifyParseWithPool2AndNativePoolingWillFail() {
- new ClassPathXmlApplicationContext("/ldap-namespace-config-pool2-with-native.xml");
+ assertThatExceptionOfType(BeansException.class)
+ .isThrownBy(() -> new ClassPathXmlApplicationContext("/ldap-namespace-config-pool2-with-native.xml"));
}
- @Test(expected = BeansException.class)
+ @Test
public void verifyParseWithPool1AndPool2WillFail() {
- new ClassPathXmlApplicationContext("/ldap-namespace-config-pool2-with-pool1.xml");
+ assertThatExceptionOfType(BeansException.class)
+ .isThrownBy(() -> new ClassPathXmlApplicationContext("/ldap-namespace-config-pool2-with-pool1.xml"));
}
@Test
diff --git a/core/src/test/java/org/springframework/ldap/control/PagedResultTests.java b/core/src/test/java/org/springframework/ldap/control/PagedResultTests.java
index 86766f4ac1..811f68f878 100644
--- a/core/src/test/java/org/springframework/ldap/control/PagedResultTests.java
+++ b/core/src/test/java/org/springframework/ldap/control/PagedResultTests.java
@@ -22,7 +22,7 @@
import javax.naming.ldap.PagedResultsControl;
import com.gargoylesoftware.base.testing.EqualsTester;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* Unit tests for the PagedResult class. {@link PagedResultsControl}
diff --git a/core/src/test/java/org/springframework/ldap/control/PagedResultsCookieTests.java b/core/src/test/java/org/springframework/ldap/control/PagedResultsCookieTests.java
index ef9b19cde6..03f4cc8228 100644
--- a/core/src/test/java/org/springframework/ldap/control/PagedResultsCookieTests.java
+++ b/core/src/test/java/org/springframework/ldap/control/PagedResultsCookieTests.java
@@ -17,7 +17,7 @@
package org.springframework.ldap.control;
import com.gargoylesoftware.base.testing.EqualsTester;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
public class PagedResultsCookieTests {
diff --git a/core/src/test/java/org/springframework/ldap/control/PagedResultsDirContextProcessorTests.java b/core/src/test/java/org/springframework/ldap/control/PagedResultsDirContextProcessorTests.java
index 7bad249f85..74fe5857d3 100644
--- a/core/src/test/java/org/springframework/ldap/control/PagedResultsDirContextProcessorTests.java
+++ b/core/src/test/java/org/springframework/ldap/control/PagedResultsDirContextProcessorTests.java
@@ -27,9 +27,9 @@
import com.sun.jndi.ldap.BerDecoder;
import com.sun.jndi.ldap.BerEncoder;
import com.sun.jndi.ldap.ctl.DirSyncResponseControl;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import static org.assertj.core.api.Assertions.assertThat;
import static org.mockito.BDDMockito.given;
@@ -41,7 +41,7 @@ public class PagedResultsDirContextProcessorTests {
private PagedResultsDirContextProcessor tested;
- @Before
+ @BeforeEach
public void setUp() throws Exception {
this.tested = new PagedResultsDirContextProcessor(20);
@@ -50,7 +50,7 @@ public void setUp() throws Exception {
this.ldapContextMock = mock(LdapContext.class);
}
- @After
+ @AfterEach
public void tearDown() throws Exception {
this.tested = null;
diff --git a/core/src/test/java/org/springframework/ldap/control/RequestControlDirContextProcessorTests.java b/core/src/test/java/org/springframework/ldap/control/RequestControlDirContextProcessorTests.java
index d4c6a1b833..de245284f5 100644
--- a/core/src/test/java/org/springframework/ldap/control/RequestControlDirContextProcessorTests.java
+++ b/core/src/test/java/org/springframework/ldap/control/RequestControlDirContextProcessorTests.java
@@ -22,10 +22,11 @@
import javax.naming.ldap.LdapContext;
import javax.naming.ldap.SortControl;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
import static org.mockito.BDDMockito.given;
import static org.mockito.BDDMockito.mock;
import static org.mockito.BDDMockito.verify;
@@ -42,7 +43,7 @@ public class RequestControlDirContextProcessorTests {
private DirContext dirContextMock;
- @Before
+ @BeforeEach
public void setUp() throws Exception {
// Create requestControl mock
this.requestControlMock = mock(Control.class);
@@ -68,7 +69,7 @@ public void postProcess(DirContext ctx) throws NamingException {
};
}
- @After
+ @AfterEach
public void tearDown() throws Exception {
this.requestControlMock = null;
this.requestControl2Mock = null;
@@ -125,9 +126,10 @@ public void testPreProcessWithNullControlsShouldAdd() throws NamingException {
verify(this.ldapContextMock).setRequestControls(new Control[] { this.requestControlMock });
}
- @Test(expected = IllegalArgumentException.class)
- public void testPreProcessWhenNotLdapContextShouldFail() throws Exception {
- this.tested.preProcess(this.dirContextMock);
+ @Test
+ public void testPreProcessWhenNotLdapContextShouldFail() {
+ assertThatExceptionOfType(IllegalArgumentException.class)
+ .isThrownBy(() -> this.tested.preProcess(this.dirContextMock));
}
}
diff --git a/core/src/test/java/org/springframework/ldap/control/SortControlDirContextProcessorTests.java b/core/src/test/java/org/springframework/ldap/control/SortControlDirContextProcessorTests.java
index 9c6ae6ae8e..b83816b961 100644
--- a/core/src/test/java/org/springframework/ldap/control/SortControlDirContextProcessorTests.java
+++ b/core/src/test/java/org/springframework/ldap/control/SortControlDirContextProcessorTests.java
@@ -27,8 +27,8 @@
import com.sun.jndi.ldap.BerDecoder;
import com.sun.jndi.ldap.BerEncoder;
import com.sun.jndi.ldap.ctl.DirSyncResponseControl;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import static org.assertj.core.api.Assertions.assertThat;
import static org.mockito.BDDMockito.given;
@@ -45,7 +45,7 @@ public class SortControlDirContextProcessorTests {
private SortControlDirContextProcessor tested;
- @Before
+ @BeforeEach
public void setUp() throws Exception {
this.tested = new SortControlDirContextProcessor("key");
diff --git a/core/src/test/java/org/springframework/ldap/core/CollectingNameClassPairCallbackHandlerTests.java b/core/src/test/java/org/springframework/ldap/core/CollectingNameClassPairCallbackHandlerTests.java
index f999df231e..38f038b3e9 100644
--- a/core/src/test/java/org/springframework/ldap/core/CollectingNameClassPairCallbackHandlerTests.java
+++ b/core/src/test/java/org/springframework/ldap/core/CollectingNameClassPairCallbackHandlerTests.java
@@ -21,8 +21,8 @@
import javax.naming.NameClassPair;
import javax.naming.NamingException;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import static org.assertj.core.api.Assertions.assertThat;
@@ -34,7 +34,7 @@ public class CollectingNameClassPairCallbackHandlerTests {
private NameClassPair expectedNameClassPair;
- @Before
+ @BeforeEach
public void setUp() throws Exception {
this.expectedResult = new Object();
this.expectedNameClassPair = new NameClassPair(null, null);
diff --git a/core/src/test/java/org/springframework/ldap/core/ContextMapperCallbackHandlerTests.java b/core/src/test/java/org/springframework/ldap/core/ContextMapperCallbackHandlerTests.java
index 598b081ff4..f436fed404 100644
--- a/core/src/test/java/org/springframework/ldap/core/ContextMapperCallbackHandlerTests.java
+++ b/core/src/test/java/org/springframework/ldap/core/ContextMapperCallbackHandlerTests.java
@@ -19,10 +19,11 @@
import javax.naming.Binding;
import javax.naming.NamingException;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
import static org.mockito.BDDMockito.given;
import static org.mockito.BDDMockito.mock;
@@ -32,15 +33,16 @@ public class ContextMapperCallbackHandlerTests {
private ContextMapperCallbackHandler tested;
- @Before
+ @BeforeEach
public void setUp() throws Exception {
this.mapperMock = mock(ContextMapper.class);
this.tested = new ContextMapperCallbackHandler(this.mapperMock);
}
- @Test(expected = IllegalArgumentException.class)
+ @Test
public void testConstructorWithEmptyArgument() {
- new ContextMapperCallbackHandler(null);
+ assertThatExceptionOfType(IllegalArgumentException.class)
+ .isThrownBy(() -> new ContextMapperCallbackHandler(null));
}
@Test
@@ -54,10 +56,12 @@ public void testGetObjectFromNameClassPair() throws NamingException {
assertThat(actualResult).isEqualTo(expectedResult);
}
- @Test(expected = ObjectRetrievalException.class)
- public void testGetObjectFromNameClassPairObjectRetrievalException() throws NamingException {
- Binding expectedBinding = new Binding("some name", null);
- this.tested.getObjectFromNameClassPair(expectedBinding);
+ @Test
+ public void testGetObjectFromNameClassPairObjectRetrievalException() {
+ assertThatExceptionOfType(ObjectRetrievalException.class).isThrownBy(() -> {
+ Binding expectedBinding = new Binding("some name", null);
+ this.tested.getObjectFromNameClassPair(expectedBinding);
+ });
}
}
diff --git a/core/src/test/java/org/springframework/ldap/core/DefaultLdapClientListTests.java b/core/src/test/java/org/springframework/ldap/core/DefaultLdapClientListTests.java
index 5d82e7e28c..da3e6ff92e 100644
--- a/core/src/test/java/org/springframework/ldap/core/DefaultLdapClientListTests.java
+++ b/core/src/test/java/org/springframework/ldap/core/DefaultLdapClientListTests.java
@@ -28,8 +28,8 @@
import javax.naming.directory.DirContext;
import javax.naming.ldap.LdapContext;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import org.springframework.ldap.LimitExceededException;
import org.springframework.ldap.PartialResultException;
@@ -64,7 +64,7 @@ public class DefaultLdapClientListTests {
private DefaultLdapClient tested;
- @Before
+ @BeforeEach
public void setUp() throws Exception {
// Setup ContextSource mock
this.contextSourceMock = mock(ContextSource.class);
diff --git a/core/src/test/java/org/springframework/ldap/core/DefaultLdapClientLookupTests.java b/core/src/test/java/org/springframework/ldap/core/DefaultLdapClientLookupTests.java
index 5108dff5de..4bddd0e8de 100644
--- a/core/src/test/java/org/springframework/ldap/core/DefaultLdapClientLookupTests.java
+++ b/core/src/test/java/org/springframework/ldap/core/DefaultLdapClientLookupTests.java
@@ -27,8 +27,8 @@
import javax.naming.directory.SearchResult;
import javax.naming.ldap.LdapContext;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import org.mockito.BDDMockito;
import org.springframework.LdapDataEntry;
@@ -56,7 +56,7 @@ public class DefaultLdapClientLookupTests {
private LdapClient tested;
- @Before
+ @BeforeEach
public void setUp() throws Exception {
this.contextSourceMock = mock(ContextSource.class);
this.dirContextMock = mock(LdapContext.class);
diff --git a/core/src/test/java/org/springframework/ldap/core/DefaultLdapClientRenameTests.java b/core/src/test/java/org/springframework/ldap/core/DefaultLdapClientRenameTests.java
index 678061a724..2de2d22ea9 100644
--- a/core/src/test/java/org/springframework/ldap/core/DefaultLdapClientRenameTests.java
+++ b/core/src/test/java/org/springframework/ldap/core/DefaultLdapClientRenameTests.java
@@ -20,8 +20,8 @@
import javax.naming.directory.DirContext;
import javax.naming.ldap.LdapContext;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import org.springframework.ldap.NameAlreadyBoundException;
import org.springframework.ldap.UncategorizedLdapException;
@@ -51,7 +51,7 @@ public class DefaultLdapClientRenameTests {
private LdapClient tested;
- @Before
+ @BeforeEach
public void setUp() throws Exception {
// Setup ContextSource mock
this.contextSourceMock = mock(ContextSource.class);
diff --git a/core/src/test/java/org/springframework/ldap/core/DefaultLdapClientTests.java b/core/src/test/java/org/springframework/ldap/core/DefaultLdapClientTests.java
index 82d8b52bd3..0638699849 100644
--- a/core/src/test/java/org/springframework/ldap/core/DefaultLdapClientTests.java
+++ b/core/src/test/java/org/springframework/ldap/core/DefaultLdapClientTests.java
@@ -30,8 +30,8 @@
import javax.naming.ldap.LdapContext;
import javax.naming.ldap.LdapName;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import org.mockito.ArgumentMatcher;
import org.springframework.dao.EmptyResultDataAccessException;
@@ -102,7 +102,7 @@ public class DefaultLdapClientTests {
private AuthenticatedLdapEntryContextMapper authContextMapperMock;
- @Before
+ @BeforeEach
public void setUp() throws Exception {
// Setup ContextSource mock
diff --git a/core/src/test/java/org/springframework/ldap/core/DirContextAdapterBugTests.java b/core/src/test/java/org/springframework/ldap/core/DirContextAdapterBugTests.java
index 32e7423fac..71ab412bd3 100644
--- a/core/src/test/java/org/springframework/ldap/core/DirContextAdapterBugTests.java
+++ b/core/src/test/java/org/springframework/ldap/core/DirContextAdapterBugTests.java
@@ -20,7 +20,7 @@
import javax.naming.directory.Attributes;
import javax.naming.directory.BasicAttributes;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.springframework.ldap.support.LdapUtils;
diff --git a/core/src/test/java/org/springframework/ldap/core/DirContextAdapterTests.java b/core/src/test/java/org/springframework/ldap/core/DirContextAdapterTests.java
index f8ab26f3e8..a73a2830a2 100644
--- a/core/src/test/java/org/springframework/ldap/core/DirContextAdapterTests.java
+++ b/core/src/test/java/org/springframework/ldap/core/DirContextAdapterTests.java
@@ -30,8 +30,8 @@
import javax.naming.directory.ModificationItem;
import javax.naming.ldap.LdapName;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import org.springframework.ldap.support.LdapUtils;
@@ -53,7 +53,7 @@ public class DirContextAdapterTests {
private DirContextAdapter tested;
- @Before
+ @BeforeEach
public void setUp() throws Exception {
this.tested = new DirContextAdapter();
}
diff --git a/core/src/test/java/org/springframework/ldap/core/DistinguishedNameEditorTests.java b/core/src/test/java/org/springframework/ldap/core/DistinguishedNameEditorTests.java
index 74532b5d06..5816ad564e 100644
--- a/core/src/test/java/org/springframework/ldap/core/DistinguishedNameEditorTests.java
+++ b/core/src/test/java/org/springframework/ldap/core/DistinguishedNameEditorTests.java
@@ -16,8 +16,8 @@
package org.springframework.ldap.core;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.fail;
@@ -31,7 +31,7 @@ public class DistinguishedNameEditorTests {
private DistinguishedNameEditor tested;
- @Before
+ @BeforeEach
public void setUp() throws Exception {
this.tested = new DistinguishedNameEditor();
}
diff --git a/core/src/test/java/org/springframework/ldap/core/DistinguishedNameTests.java b/core/src/test/java/org/springframework/ldap/core/DistinguishedNameTests.java
index 6bc526d316..d62b8a213c 100644
--- a/core/src/test/java/org/springframework/ldap/core/DistinguishedNameTests.java
+++ b/core/src/test/java/org/springframework/ldap/core/DistinguishedNameTests.java
@@ -23,11 +23,12 @@
import javax.naming.Name;
import com.gargoylesoftware.base.testing.EqualsTester;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.springframework.ldap.BadLdapGrammarException;
import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
import static org.assertj.core.api.Assertions.fail;
/**
@@ -469,10 +470,12 @@ public void testGetLdapRdnForKey() throws Exception {
assertThat(ldapRdn).isEqualTo(new LdapRdn("ou=Some company"));
}
- @Test(expected = IllegalArgumentException.class)
- public void testGetLdapRdnForKeyNoMatchingKeyThrowsException() throws Exception {
- DistinguishedName dn = new DistinguishedName("cn=john doe, ou=Some company, c=SE");
- dn.getLdapRdn("nosuchkey");
+ @Test
+ public void testGetLdapRdnForKeyNoMatchingKeyThrowsException() {
+ assertThatExceptionOfType(IllegalArgumentException.class).isThrownBy(() -> {
+ DistinguishedName dn = new DistinguishedName("cn=john doe, ou=Some company, c=SE");
+ dn.getLdapRdn("nosuchkey");
+ });
}
@Test
@@ -482,10 +485,12 @@ public void testGetValue() throws Exception {
assertThat(value).isEqualTo("Some company");
}
- @Test(expected = IllegalArgumentException.class)
- public void testGetValueNoMatchingKeyThrowsException() throws Exception {
- DistinguishedName dn = new DistinguishedName("cn=john doe, ou=Some company, c=SE");
- dn.getValue("nosuchkey");
+ @Test
+ public void testGetValueNoMatchingKeyThrowsException() {
+ assertThatExceptionOfType(IllegalArgumentException.class).isThrownBy(() -> {
+ DistinguishedName dn = new DistinguishedName("cn=john doe, ou=Some company, c=SE");
+ dn.getValue("nosuchkey");
+ });
}
@Test
@@ -515,9 +520,10 @@ public void testParseAtSign2() {
/**
* Test case to verify correct parsing for issue on forums.
*/
- @Test(expected = BadLdapGrammarException.class)
+ @Test
public void testParseInvalidPlus() {
- new DistinguishedName("cn=te+stname@example.com");
+ assertThatExceptionOfType(BadLdapGrammarException.class)
+ .isThrownBy(() -> new DistinguishedName("cn=te+stname@example.com"));
}
/**
@@ -537,34 +543,42 @@ public void testAppendChained() {
assertThat(tested.toString()).isEqualTo("cn=john doe,ou=company1,dc=mycompany,dc=com");
}
- @Test(expected = UnsupportedOperationException.class)
- public void testUnmodifiableDistinguishedNameFailsToAddRdn() throws Exception {
- DistinguishedName result = DistinguishedName.immutableDistinguishedName("cn=john doe");
- result.add(new LdapRdn("somekey", "somevalue"));
+ @Test
+ public void testUnmodifiableDistinguishedNameFailsToAddRdn() {
+ assertThatExceptionOfType(UnsupportedOperationException.class).isThrownBy(() -> {
+ DistinguishedName result = DistinguishedName.immutableDistinguishedName("cn=john doe");
+ result.add(new LdapRdn("somekey", "somevalue"));
+ });
}
- @Test(expected = UnsupportedOperationException.class)
- public void testUnmodifiableDistinguishedNameFailsToModifyRdn() throws Exception {
- DistinguishedName result = DistinguishedName.immutableDistinguishedName("cn=john doe");
- LdapRdn ldapRdn = result.getLdapRdn(0);
+ @Test
+ public void testUnmodifiableDistinguishedNameFailsToModifyRdn() {
+ assertThatExceptionOfType(UnsupportedOperationException.class).isThrownBy(() -> {
+ DistinguishedName result = DistinguishedName.immutableDistinguishedName("cn=john doe");
+ LdapRdn ldapRdn = result.getLdapRdn(0);
- ldapRdn.addComponent(new LdapRdnComponent("somekey", "somevalue"));
+ ldapRdn.addComponent(new LdapRdnComponent("somekey", "somevalue"));
+ });
}
- @Test(expected = UnsupportedOperationException.class)
- public void testUnmodifiableDistinguishedNameFailsToModifyRdnComponentKey() throws Exception {
- DistinguishedName result = DistinguishedName.immutableDistinguishedName("cn=john doe");
- LdapRdnComponent component = result.getLdapRdn(0).getComponent();
+ @Test
+ public void testUnmodifiableDistinguishedNameFailsToModifyRdnComponentKey() {
+ assertThatExceptionOfType(UnsupportedOperationException.class).isThrownBy(() -> {
+ DistinguishedName result = DistinguishedName.immutableDistinguishedName("cn=john doe");
+ LdapRdnComponent component = result.getLdapRdn(0).getComponent();
- component.setKey("somekey");
+ component.setKey("somekey");
+ });
}
- @Test(expected = UnsupportedOperationException.class)
- public void testUnmodifiableDistinguishedNameFailsToModifyRdnComponentValue() throws Exception {
- DistinguishedName result = DistinguishedName.immutableDistinguishedName("cn=john doe");
- LdapRdnComponent component = result.getLdapRdn(0).getComponent();
+ @Test
+ public void testUnmodifiableDistinguishedNameFailsToModifyRdnComponentValue() {
+ assertThatExceptionOfType(UnsupportedOperationException.class).isThrownBy(() -> {
+ DistinguishedName result = DistinguishedName.immutableDistinguishedName("cn=john doe");
+ LdapRdnComponent component = result.getLdapRdn(0).getComponent();
- component.setValue("somevalue");
+ component.setValue("somevalue");
+ });
}
@Test
diff --git a/core/src/test/java/org/springframework/ldap/core/LdapRdnComponentTests.java b/core/src/test/java/org/springframework/ldap/core/LdapRdnComponentTests.java
index b1b2fc2533..69bc72cc02 100644
--- a/core/src/test/java/org/springframework/ldap/core/LdapRdnComponentTests.java
+++ b/core/src/test/java/org/springframework/ldap/core/LdapRdnComponentTests.java
@@ -16,7 +16,7 @@
package org.springframework.ldap.core;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.assertj.core.api.Assertions.assertThat;
diff --git a/core/src/test/java/org/springframework/ldap/core/LdapRdnTests.java b/core/src/test/java/org/springframework/ldap/core/LdapRdnTests.java
index 30beaf0d80..da2a138623 100644
--- a/core/src/test/java/org/springframework/ldap/core/LdapRdnTests.java
+++ b/core/src/test/java/org/springframework/ldap/core/LdapRdnTests.java
@@ -17,11 +17,12 @@
package org.springframework.ldap.core;
import com.gargoylesoftware.base.testing.EqualsTester;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.springframework.ldap.BadLdapGrammarException;
import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
/**
* Unit test for the LdapRdn class.
@@ -72,9 +73,9 @@ public void testLdapRdn_parse_hexEscape() {
assertThat(rdn.getComponent().getLdapEncoded()).isEqualTo("foo=bar\\0Dfum");
}
- @Test(expected = BadLdapGrammarException.class)
+ @Test
public void testLdapRdn_parse_trailingBackslash() {
- new LdapRdn("foo=bar\\");
+ assertThatExceptionOfType(BadLdapGrammarException.class).isThrownBy(() -> new LdapRdn("foo=bar\\"));
}
@Test
@@ -86,9 +87,9 @@ public void testLdapRdn_parse_spaces_escape() {
assertThat(rdn.getComponent().getLdapEncoded()).isEqualTo("foo=\\ bar \\ ");
}
- @Test(expected = BadLdapGrammarException.class)
+ @Test
public void testLdapRdn_parse_tooMuchTrim() {
- new LdapRdn("foo=bar\\");
+ assertThatExceptionOfType(BadLdapGrammarException.class).isThrownBy(() -> new LdapRdn("foo=bar\\"));
}
@Test
@@ -100,9 +101,9 @@ public void testLdapRdn_parse_slash() {
assertThat(rdn.getComponent().getLdapEncoded()).isEqualTo("ou=Clerical / Secretarial Staff");
}
- @Test(expected = BadLdapGrammarException.class)
+ @Test
public void testLdapRdn_parse_quoteInKey() {
- new LdapRdn("\"umanroleid=2583");
+ assertThatExceptionOfType(BadLdapGrammarException.class).isThrownBy(() -> new LdapRdn("\"umanroleid=2583"));
}
@Test
@@ -147,16 +148,20 @@ public void testLdapRdn_Parse_MultipleComponents() {
assertThat(rdn.getValue("sn")).isEqualTo("Doe");
}
- @Test(expected = IllegalArgumentException.class)
+ @Test
public void testGetValueNoKeyWithCorrectValue() {
- LdapRdn tested = new LdapRdn("cn=john doe");
- tested.getValue("sn");
+ assertThatExceptionOfType(IllegalArgumentException.class).isThrownBy(() -> {
+ LdapRdn tested = new LdapRdn("cn=john doe");
+ tested.getValue("sn");
+ });
}
- @Test(expected = IllegalArgumentException.class)
+ @Test
public void testGetValueNoComponents() {
- LdapRdn tested = new LdapRdn();
- tested.getValue("sn");
+ assertThatExceptionOfType(IllegalArgumentException.class).isThrownBy(() -> {
+ LdapRdn tested = new LdapRdn();
+ tested.getValue("sn");
+ });
}
@Test
diff --git a/core/src/test/java/org/springframework/ldap/core/LdapTemplateListTests.java b/core/src/test/java/org/springframework/ldap/core/LdapTemplateListTests.java
index 374954796b..123507c275 100644
--- a/core/src/test/java/org/springframework/ldap/core/LdapTemplateListTests.java
+++ b/core/src/test/java/org/springframework/ldap/core/LdapTemplateListTests.java
@@ -26,8 +26,8 @@
import javax.naming.directory.DirContext;
import javax.naming.ldap.LdapContext;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import org.springframework.ldap.LimitExceededException;
import org.springframework.ldap.PartialResultException;
@@ -63,7 +63,7 @@ public class LdapTemplateListTests {
private LdapTemplate tested;
- @Before
+ @BeforeEach
public void setUp() throws Exception {
// Setup ContextSource mock
this.contextSourceMock = mock(ContextSource.class);
diff --git a/core/src/test/java/org/springframework/ldap/core/LdapTemplateLookupTests.java b/core/src/test/java/org/springframework/ldap/core/LdapTemplateLookupTests.java
index 63528d6453..1d3ea4879d 100644
--- a/core/src/test/java/org/springframework/ldap/core/LdapTemplateLookupTests.java
+++ b/core/src/test/java/org/springframework/ldap/core/LdapTemplateLookupTests.java
@@ -25,8 +25,8 @@
import javax.naming.ldap.LdapContext;
import javax.naming.ldap.LdapName;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import org.springframework.ldap.NameNotFoundException;
import org.springframework.ldap.odm.core.ObjectDirectoryMapper;
@@ -56,7 +56,7 @@ public class LdapTemplateLookupTests {
private ObjectDirectoryMapper odmMock;
- @Before
+ @BeforeEach
public void setUp() throws Exception {
// Setup ContextSource mock
this.contextSourceMock = mock(ContextSource.class);
diff --git a/core/src/test/java/org/springframework/ldap/core/LdapTemplateOdmTests.java b/core/src/test/java/org/springframework/ldap/core/LdapTemplateOdmTests.java
index 2e3a7071ff..d7c6804d5e 100644
--- a/core/src/test/java/org/springframework/ldap/core/LdapTemplateOdmTests.java
+++ b/core/src/test/java/org/springframework/ldap/core/LdapTemplateOdmTests.java
@@ -16,8 +16,8 @@
package org.springframework.ldap.core;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import org.springframework.ldap.odm.core.ObjectDirectoryMapper;
@@ -34,7 +34,7 @@ public class LdapTemplateOdmTests {
private ObjectDirectoryMapper odmMock;
- @Before
+ @BeforeEach
public void prepareTestedClass() {
this.tested = mock(LdapTemplate.class);
diff --git a/core/src/test/java/org/springframework/ldap/core/LdapTemplateRenameTests.java b/core/src/test/java/org/springframework/ldap/core/LdapTemplateRenameTests.java
index bff64add03..1aa9a218a4 100644
--- a/core/src/test/java/org/springframework/ldap/core/LdapTemplateRenameTests.java
+++ b/core/src/test/java/org/springframework/ldap/core/LdapTemplateRenameTests.java
@@ -20,8 +20,8 @@
import javax.naming.directory.DirContext;
import javax.naming.ldap.LdapContext;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import org.springframework.ldap.NameAlreadyBoundException;
import org.springframework.ldap.UncategorizedLdapException;
@@ -50,7 +50,7 @@ public class LdapTemplateRenameTests {
private LdapTemplate tested;
- @Before
+ @BeforeEach
public void setUp() throws Exception {
// Setup ContextSource mock
this.contextSourceMock = mock(ContextSource.class);
diff --git a/core/src/test/java/org/springframework/ldap/core/LdapTemplateTests.java b/core/src/test/java/org/springframework/ldap/core/LdapTemplateTests.java
index 213b497fcd..f22fc8cd6e 100644
--- a/core/src/test/java/org/springframework/ldap/core/LdapTemplateTests.java
+++ b/core/src/test/java/org/springframework/ldap/core/LdapTemplateTests.java
@@ -32,8 +32,8 @@
import javax.naming.ldap.LdapContext;
import javax.naming.ldap.LdapName;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import org.mockito.ArgumentCaptor;
import org.mockito.ArgumentMatcher;
@@ -109,7 +109,7 @@ public class LdapTemplateTests {
private AuthenticatedLdapEntryContextMapper authContextMapperMock;
- @Before
+ @BeforeEach
public void setUp() throws Exception {
// Setup ContextSource mock
diff --git a/core/src/test/java/org/springframework/ldap/core/NameAwareAttributeTests.java b/core/src/test/java/org/springframework/ldap/core/NameAwareAttributeTests.java
index 192b01a4cc..2b45af34d6 100644
--- a/core/src/test/java/org/springframework/ldap/core/NameAwareAttributeTests.java
+++ b/core/src/test/java/org/springframework/ldap/core/NameAwareAttributeTests.java
@@ -21,7 +21,7 @@
import javax.naming.NamingException;
import javax.naming.ldap.LdapName;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.springframework.ldap.support.LdapUtils;
diff --git a/core/src/test/java/org/springframework/ldap/core/NameAwareAttributesTests.java b/core/src/test/java/org/springframework/ldap/core/NameAwareAttributesTests.java
index a682cc1d6c..e9094ad00f 100644
--- a/core/src/test/java/org/springframework/ldap/core/NameAwareAttributesTests.java
+++ b/core/src/test/java/org/springframework/ldap/core/NameAwareAttributesTests.java
@@ -19,7 +19,7 @@
import java.util.List;
import java.util.stream.StreamSupport;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.assertj.core.api.Assertions.assertThat;
diff --git a/core/src/test/java/org/springframework/ldap/core/support/AbstractContextSourceTests.java b/core/src/test/java/org/springframework/ldap/core/support/AbstractContextSourceTests.java
index d1988a4705..597ba8e4e0 100644
--- a/core/src/test/java/org/springframework/ldap/core/support/AbstractContextSourceTests.java
+++ b/core/src/test/java/org/springframework/ldap/core/support/AbstractContextSourceTests.java
@@ -19,7 +19,7 @@
import javax.naming.InvalidNameException;
import javax.naming.ldap.LdapName;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.assertj.core.api.Assertions.assertThat;
diff --git a/core/src/test/java/org/springframework/ldap/core/support/AggregateDirContextProcessorTests.java b/core/src/test/java/org/springframework/ldap/core/support/AggregateDirContextProcessorTests.java
index bc5d86decc..33933a2988 100644
--- a/core/src/test/java/org/springframework/ldap/core/support/AggregateDirContextProcessorTests.java
+++ b/core/src/test/java/org/springframework/ldap/core/support/AggregateDirContextProcessorTests.java
@@ -18,8 +18,8 @@
import javax.naming.NamingException;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import org.springframework.ldap.core.DirContextProcessor;
@@ -34,7 +34,7 @@ public class AggregateDirContextProcessorTests {
private AggregateDirContextProcessor tested;
- @Before
+ @BeforeEach
public void setUp() throws Exception {
// Create processor1 mock
this.processor1Mock = mock(DirContextProcessor.class);
diff --git a/core/src/test/java/org/springframework/ldap/core/support/BaseLdapPathBeanPostProcessorTests.java b/core/src/test/java/org/springframework/ldap/core/support/BaseLdapPathBeanPostProcessorTests.java
index 3009ae4471..550c2813c1 100644
--- a/core/src/test/java/org/springframework/ldap/core/support/BaseLdapPathBeanPostProcessorTests.java
+++ b/core/src/test/java/org/springframework/ldap/core/support/BaseLdapPathBeanPostProcessorTests.java
@@ -18,8 +18,8 @@
import java.util.HashMap;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import org.springframework.beans.factory.NoSuchBeanDefinitionException;
import org.springframework.context.ApplicationContext;
@@ -27,6 +27,7 @@
import org.springframework.ldap.support.LdapUtils;
import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
import static org.mockito.BDDMockito.given;
import static org.mockito.BDDMockito.mock;
import static org.mockito.BDDMockito.verify;
@@ -46,7 +47,7 @@ public class BaseLdapPathBeanPostProcessorTests {
private BaseLdapNameAware ldapNameAwareMock;
- @Before
+ @BeforeEach
public void setUp() throws Exception {
this.tested = new BaseLdapPathBeanPostProcessor();
@@ -138,18 +139,22 @@ public void testGetAbstractContextSourceFromApplicationContext() throws Exceptio
assertThat(result).isSameAs(expectedContextSource);
}
- @Test(expected = NoSuchBeanDefinitionException.class)
- public void testGetAbstractContextSourceFromApplicationContextNoContextSource() throws Exception {
- given(this.applicationContextMock.getBeanNamesForType(BaseLdapPathSource.class)).willReturn(new String[0]);
+ @Test
+ public void testGetAbstractContextSourceFromApplicationContextNoContextSource() {
+ assertThatExceptionOfType(NoSuchBeanDefinitionException.class).isThrownBy(() -> {
+ given(this.applicationContextMock.getBeanNamesForType(BaseLdapPathSource.class)).willReturn(new String[0]);
- this.tested.getBaseLdapPathSourceFromApplicationContext();
+ this.tested.getBaseLdapPathSourceFromApplicationContext();
+ });
}
- @Test(expected = NoSuchBeanDefinitionException.class)
- public void testGetAbstractContextSourceFromApplicationContextTwoContextSources() throws Exception {
- given(this.applicationContextMock.getBeanNamesForType(BaseLdapPathSource.class)).willReturn(new String[2]);
+ @Test
+ public void testGetAbstractContextSourceFromApplicationContextTwoContextSources() {
+ assertThatExceptionOfType(NoSuchBeanDefinitionException.class).isThrownBy(() -> {
+ given(this.applicationContextMock.getBeanNamesForType(BaseLdapPathSource.class)).willReturn(new String[2]);
- this.tested.getBaseLdapPathSourceFromApplicationContext();
+ this.tested.getBaseLdapPathSourceFromApplicationContext();
+ });
}
@Test
diff --git a/core/src/test/java/org/springframework/ldap/core/support/ContextMapperCallbackHandlerWithControlsTests.java b/core/src/test/java/org/springframework/ldap/core/support/ContextMapperCallbackHandlerWithControlsTests.java
index 606755dec8..b8f87ba096 100644
--- a/core/src/test/java/org/springframework/ldap/core/support/ContextMapperCallbackHandlerWithControlsTests.java
+++ b/core/src/test/java/org/springframework/ldap/core/support/ContextMapperCallbackHandlerWithControlsTests.java
@@ -21,12 +21,13 @@
import javax.naming.ldap.Control;
import javax.naming.ldap.HasControls;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import org.springframework.ldap.core.ObjectRetrievalException;
import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
import static org.mockito.BDDMockito.given;
import static org.mockito.BDDMockito.mock;
@@ -41,15 +42,16 @@ public class ContextMapperCallbackHandlerWithControlsTests {
private ContextMapperCallbackHandlerWithControls tested;
@SuppressWarnings("unchecked")
- @Before
+ @BeforeEach
public void setUp() throws Exception {
this.mapperMock = mock(ContextMapperWithControls.class);
this.tested = new ContextMapperCallbackHandlerWithControls(this.mapperMock);
}
- @Test(expected = IllegalArgumentException.class)
+ @Test
public void testConstructorWithEmptyArgument() {
- new ContextMapperCallbackHandlerWithControls<>(null);
+ assertThatExceptionOfType(IllegalArgumentException.class)
+ .isThrownBy(() -> new ContextMapperCallbackHandlerWithControls<>(null));
}
@Test
@@ -78,11 +80,13 @@ public void testGetObjectFromNameClassPairImplementingHasControls() throws Namin
assertThat(actualResult).isEqualTo(expectedResult);
}
- @Test(expected = ObjectRetrievalException.class)
- public void testGetObjectFromNameClassPairObjectRetrievalException() throws NamingException {
- Binding expectedBinding = new Binding("some name", null);
+ @Test
+ public void testGetObjectFromNameClassPairObjectRetrievalException() {
+ assertThatExceptionOfType(ObjectRetrievalException.class).isThrownBy(() -> {
+ Binding expectedBinding = new Binding("some name", null);
- this.tested.getObjectFromNameClassPair(expectedBinding);
+ this.tested.getObjectFromNameClassPair(expectedBinding);
+ });
}
private static class MyBindingThatHasControls extends Binding implements HasControls {
diff --git a/core/src/test/java/org/springframework/ldap/core/support/CountNameClassPairResultCallbackHandlerTests.java b/core/src/test/java/org/springframework/ldap/core/support/CountNameClassPairResultCallbackHandlerTests.java
index aef8fbcf77..af7ca0cd2b 100644
--- a/core/src/test/java/org/springframework/ldap/core/support/CountNameClassPairResultCallbackHandlerTests.java
+++ b/core/src/test/java/org/springframework/ldap/core/support/CountNameClassPairResultCallbackHandlerTests.java
@@ -18,8 +18,8 @@
import javax.naming.directory.SearchResult;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import static org.assertj.core.api.Assertions.assertThat;
@@ -27,7 +27,7 @@ public class CountNameClassPairResultCallbackHandlerTests {
private CountNameClassPairCallbackHandler tested;
- @Before
+ @BeforeEach
public void setUp() throws Exception {
this.tested = new CountNameClassPairCallbackHandler();
}
diff --git a/core/src/test/java/org/springframework/ldap/core/support/DefaultDirObjectFactoryTests.java b/core/src/test/java/org/springframework/ldap/core/support/DefaultDirObjectFactoryTests.java
index a0ea20bfbc..1b7c661f93 100644
--- a/core/src/test/java/org/springframework/ldap/core/support/DefaultDirObjectFactoryTests.java
+++ b/core/src/test/java/org/springframework/ldap/core/support/DefaultDirObjectFactoryTests.java
@@ -25,8 +25,8 @@
import javax.naming.directory.Attributes;
import javax.naming.directory.BasicAttributes;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import org.springframework.ldap.core.DirContextAdapter;
import org.springframework.ldap.core.NameAwareAttributes;
@@ -49,7 +49,7 @@ public class DefaultDirObjectFactoryTests {
private Context contextMock2;
- @Before
+ @BeforeEach
public void setUp() throws Exception {
this.contextMock = mock(Context.class);
this.contextMock2 = mock(Context.class);
diff --git a/core/src/test/java/org/springframework/ldap/core/support/DefaultIncrementalAttributesMapperTests.java b/core/src/test/java/org/springframework/ldap/core/support/DefaultIncrementalAttributesMapperTests.java
index 56b27cb8b0..d1de42fc48 100644
--- a/core/src/test/java/org/springframework/ldap/core/support/DefaultIncrementalAttributesMapperTests.java
+++ b/core/src/test/java/org/springframework/ldap/core/support/DefaultIncrementalAttributesMapperTests.java
@@ -21,8 +21,8 @@
import javax.naming.directory.BasicAttribute;
import javax.naming.directory.BasicAttributes;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import static org.assertj.core.api.Assertions.assertThat;
@@ -36,7 +36,7 @@ public class DefaultIncrementalAttributesMapperTests {
private DefaultIncrementalAttributesMapper tested;
- @Before
+ @BeforeEach
public void setUp() throws Exception {
this.tested = new DefaultIncrementalAttributesMapper("member");
}
diff --git a/core/src/test/java/org/springframework/ldap/core/support/DefaultTlsDirContextAuthenticationStrategyTests.java b/core/src/test/java/org/springframework/ldap/core/support/DefaultTlsDirContextAuthenticationStrategyTests.java
index a8928f0ac2..534b7acf39 100644
--- a/core/src/test/java/org/springframework/ldap/core/support/DefaultTlsDirContextAuthenticationStrategyTests.java
+++ b/core/src/test/java/org/springframework/ldap/core/support/DefaultTlsDirContextAuthenticationStrategyTests.java
@@ -18,10 +18,12 @@
import javax.naming.ldap.LdapContext;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
import org.mockito.Mock;
-import org.mockito.junit.MockitoJUnitRunner;
+import org.mockito.junit.jupiter.MockitoExtension;
+import org.mockito.junit.jupiter.MockitoSettings;
+import org.mockito.quality.Strictness;
import static org.mockito.Mockito.verify;
@@ -29,7 +31,8 @@
* @author Rob Winch
* @since 5.0
*/
-@RunWith(MockitoJUnitRunner.class)
+@MockitoSettings(strictness = Strictness.WARN)
+@ExtendWith(MockitoExtension.class)
public class DefaultTlsDirContextAuthenticationStrategyTests {
@Mock
diff --git a/core/src/test/java/org/springframework/ldap/core/support/LdapContextSourceTests.java b/core/src/test/java/org/springframework/ldap/core/support/LdapContextSourceTests.java
index 51382623a2..c4cccf6adb 100644
--- a/core/src/test/java/org/springframework/ldap/core/support/LdapContextSourceTests.java
+++ b/core/src/test/java/org/springframework/ldap/core/support/LdapContextSourceTests.java
@@ -21,12 +21,13 @@
import javax.naming.Context;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import org.springframework.ldap.support.LdapUtils;
import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
/**
* Unit tests for the LdapContextSource class.
@@ -38,23 +39,25 @@ public class LdapContextSourceTests {
private LdapContextSource tested;
- @Before
+ @BeforeEach
public void setUp() throws Exception {
this.tested = new LdapContextSource();
}
- @Test(expected = IllegalArgumentException.class)
- public void testAfterPropertiesSet_NoUrl() throws Exception {
- this.tested.afterPropertiesSet();
+ @Test
+ public void testAfterPropertiesSet_NoUrl() {
+ assertThatExceptionOfType(IllegalArgumentException.class).isThrownBy(() -> this.tested.afterPropertiesSet());
}
// gh-538
- @Test(expected = IllegalArgumentException.class)
+ @Test
public void testAfterPropertiesSet_NullPassword() {
- this.tested.setUrl("ldap://ldap.example.com:389");
- this.tested.setUserDn("value");
- this.tested.setPassword(null);
- this.tested.afterPropertiesSet();
+ assertThatExceptionOfType(IllegalArgumentException.class).isThrownBy(() -> {
+ this.tested.setUrl("ldap://ldap.example.com:389");
+ this.tested.setUserDn("value");
+ this.tested.setPassword(null);
+ this.tested.afterPropertiesSet();
+ });
}
@Test
diff --git a/core/src/test/java/org/springframework/ldap/core/support/RangeOptionTests.java b/core/src/test/java/org/springframework/ldap/core/support/RangeOptionTests.java
index 35295f3f48..aa2c36bd7e 100644
--- a/core/src/test/java/org/springframework/ldap/core/support/RangeOptionTests.java
+++ b/core/src/test/java/org/springframework/ldap/core/support/RangeOptionTests.java
@@ -16,7 +16,7 @@
package org.springframework.ldap.core.support;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.fail;
diff --git a/core/src/test/java/org/springframework/ldap/core/support/SimpleDirContextAuthenticationStrategyTests.java b/core/src/test/java/org/springframework/ldap/core/support/SimpleDirContextAuthenticationStrategyTests.java
index db3ac0eee0..670df7c8e7 100644
--- a/core/src/test/java/org/springframework/ldap/core/support/SimpleDirContextAuthenticationStrategyTests.java
+++ b/core/src/test/java/org/springframework/ldap/core/support/SimpleDirContextAuthenticationStrategyTests.java
@@ -20,8 +20,8 @@
import javax.naming.Context;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import static org.assertj.core.api.Assertions.assertThat;
@@ -29,7 +29,7 @@ public class SimpleDirContextAuthenticationStrategyTests {
private SimpleDirContextAuthenticationStrategy tested;
- @Before
+ @BeforeEach
public void setUp() throws Exception {
this.tested = new SimpleDirContextAuthenticationStrategy();
}
diff --git a/core/src/test/java/org/springframework/ldap/core/support/SingleContextSourceTests.java b/core/src/test/java/org/springframework/ldap/core/support/SingleContextSourceTests.java
index 71c4082430..8e2c2280f7 100644
--- a/core/src/test/java/org/springframework/ldap/core/support/SingleContextSourceTests.java
+++ b/core/src/test/java/org/springframework/ldap/core/support/SingleContextSourceTests.java
@@ -22,8 +22,8 @@
import javax.naming.NamingException;
import javax.naming.directory.DirContext;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import org.springframework.ldap.core.ContextExecutor;
import org.springframework.ldap.core.ContextSource;
@@ -44,7 +44,7 @@ public class SingleContextSourceTests {
private DirContext dirContextMock;
- @Before
+ @BeforeEach
public void prepareMocks() {
this.contextSourceMock = mock(ContextSource.class);
this.dirContextMock = mock(DirContext.class);
diff --git a/core/src/test/java/org/springframework/ldap/core/support/ldap294/Ldap294Tests.java b/core/src/test/java/org/springframework/ldap/core/support/ldap294/Ldap294Tests.java
index 6c14ccf835..878b59cc2c 100644
--- a/core/src/test/java/org/springframework/ldap/core/support/ldap294/Ldap294Tests.java
+++ b/core/src/test/java/org/springframework/ldap/core/support/ldap294/Ldap294Tests.java
@@ -21,7 +21,7 @@
import javax.naming.NamingException;
import javax.naming.directory.DirContext;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.springframework.ldap.core.support.AbstractContextSource;
diff --git a/core/src/test/java/org/springframework/ldap/filter/AbstractFilterTests.java b/core/src/test/java/org/springframework/ldap/filter/AbstractFilterTests.java
index 2c074d21c7..30e4d020af 100644
--- a/core/src/test/java/org/springframework/ldap/filter/AbstractFilterTests.java
+++ b/core/src/test/java/org/springframework/ldap/filter/AbstractFilterTests.java
@@ -16,7 +16,7 @@
package org.springframework.ldap.filter;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.assertj.core.api.Assertions.assertThat;
diff --git a/core/src/test/java/org/springframework/ldap/filter/AndFilterTests.java b/core/src/test/java/org/springframework/ldap/filter/AndFilterTests.java
index 357a485b44..66ee9938d9 100644
--- a/core/src/test/java/org/springframework/ldap/filter/AndFilterTests.java
+++ b/core/src/test/java/org/springframework/ldap/filter/AndFilterTests.java
@@ -17,7 +17,7 @@
package org.springframework.ldap.filter;
import com.gargoylesoftware.base.testing.EqualsTester;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.assertj.core.api.Assertions.assertThat;
diff --git a/core/src/test/java/org/springframework/ldap/filter/EqualsFilterTests.java b/core/src/test/java/org/springframework/ldap/filter/EqualsFilterTests.java
index 41283a11fc..a16970c3be 100644
--- a/core/src/test/java/org/springframework/ldap/filter/EqualsFilterTests.java
+++ b/core/src/test/java/org/springframework/ldap/filter/EqualsFilterTests.java
@@ -17,7 +17,7 @@
package org.springframework.ldap.filter;
import com.gargoylesoftware.base.testing.EqualsTester;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.assertj.core.api.Assertions.assertThat;
diff --git a/core/src/test/java/org/springframework/ldap/filter/GreaterThanOrEqualsFilterTests.java b/core/src/test/java/org/springframework/ldap/filter/GreaterThanOrEqualsFilterTests.java
index d84d7f145e..9960faba14 100644
--- a/core/src/test/java/org/springframework/ldap/filter/GreaterThanOrEqualsFilterTests.java
+++ b/core/src/test/java/org/springframework/ldap/filter/GreaterThanOrEqualsFilterTests.java
@@ -17,7 +17,7 @@
package org.springframework.ldap.filter;
import com.gargoylesoftware.base.testing.EqualsTester;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.assertj.core.api.Assertions.assertThat;
diff --git a/core/src/test/java/org/springframework/ldap/filter/HardcodedFilterTests.java b/core/src/test/java/org/springframework/ldap/filter/HardcodedFilterTests.java
index 4aa178df31..8051c93042 100644
--- a/core/src/test/java/org/springframework/ldap/filter/HardcodedFilterTests.java
+++ b/core/src/test/java/org/springframework/ldap/filter/HardcodedFilterTests.java
@@ -17,7 +17,7 @@
package org.springframework.ldap.filter;
import com.gargoylesoftware.base.testing.EqualsTester;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.assertj.core.api.Assertions.assertThat;
diff --git a/core/src/test/java/org/springframework/ldap/filter/LessThanOrEqualsFilterTests.java b/core/src/test/java/org/springframework/ldap/filter/LessThanOrEqualsFilterTests.java
index 2273f304fd..8762ae3ccd 100644
--- a/core/src/test/java/org/springframework/ldap/filter/LessThanOrEqualsFilterTests.java
+++ b/core/src/test/java/org/springframework/ldap/filter/LessThanOrEqualsFilterTests.java
@@ -17,7 +17,7 @@
package org.springframework.ldap.filter;
import com.gargoylesoftware.base.testing.EqualsTester;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.assertj.core.api.Assertions.assertThat;
diff --git a/core/src/test/java/org/springframework/ldap/filter/LikeFilterTests.java b/core/src/test/java/org/springframework/ldap/filter/LikeFilterTests.java
index caf82f6327..a1f88d1563 100644
--- a/core/src/test/java/org/springframework/ldap/filter/LikeFilterTests.java
+++ b/core/src/test/java/org/springframework/ldap/filter/LikeFilterTests.java
@@ -17,7 +17,7 @@
package org.springframework.ldap.filter;
import com.gargoylesoftware.base.testing.EqualsTester;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.assertj.core.api.Assertions.assertThat;
diff --git a/core/src/test/java/org/springframework/ldap/filter/NotFilterTests.java b/core/src/test/java/org/springframework/ldap/filter/NotFilterTests.java
index e1af3b176b..7feacce9af 100644
--- a/core/src/test/java/org/springframework/ldap/filter/NotFilterTests.java
+++ b/core/src/test/java/org/springframework/ldap/filter/NotFilterTests.java
@@ -17,7 +17,7 @@
package org.springframework.ldap.filter;
import com.gargoylesoftware.base.testing.EqualsTester;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.assertj.core.api.Assertions.assertThat;
diff --git a/core/src/test/java/org/springframework/ldap/filter/NotPresentFilterTests.java b/core/src/test/java/org/springframework/ldap/filter/NotPresentFilterTests.java
index d7929ceed6..05d1fdf9ac 100644
--- a/core/src/test/java/org/springframework/ldap/filter/NotPresentFilterTests.java
+++ b/core/src/test/java/org/springframework/ldap/filter/NotPresentFilterTests.java
@@ -17,7 +17,7 @@
package org.springframework.ldap.filter;
import com.gargoylesoftware.base.testing.EqualsTester;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.assertj.core.api.Assertions.assertThat;
diff --git a/core/src/test/java/org/springframework/ldap/filter/OrFilterTests.java b/core/src/test/java/org/springframework/ldap/filter/OrFilterTests.java
index c5b8442194..7897498fed 100644
--- a/core/src/test/java/org/springframework/ldap/filter/OrFilterTests.java
+++ b/core/src/test/java/org/springframework/ldap/filter/OrFilterTests.java
@@ -16,7 +16,7 @@
package org.springframework.ldap.filter;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.assertj.core.api.Assertions.assertThat;
diff --git a/core/src/test/java/org/springframework/ldap/filter/PresentFilterTests.java b/core/src/test/java/org/springframework/ldap/filter/PresentFilterTests.java
index e7e22cc934..4dea47fa70 100644
--- a/core/src/test/java/org/springframework/ldap/filter/PresentFilterTests.java
+++ b/core/src/test/java/org/springframework/ldap/filter/PresentFilterTests.java
@@ -17,7 +17,7 @@
package org.springframework.ldap.filter;
import com.gargoylesoftware.base.testing.EqualsTester;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.assertj.core.api.Assertions.assertThat;
diff --git a/core/src/test/java/org/springframework/ldap/filter/ProximityFilterTests.java b/core/src/test/java/org/springframework/ldap/filter/ProximityFilterTests.java
index b1842f76e1..ceadbc23b9 100644
--- a/core/src/test/java/org/springframework/ldap/filter/ProximityFilterTests.java
+++ b/core/src/test/java/org/springframework/ldap/filter/ProximityFilterTests.java
@@ -16,7 +16,7 @@
package org.springframework.ldap.filter;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.assertj.core.api.Assertions.assertThat;
diff --git a/core/src/test/java/org/springframework/ldap/filter/WhitespaceWildcardsFilterTests.java b/core/src/test/java/org/springframework/ldap/filter/WhitespaceWildcardsFilterTests.java
index 8f7ec813c1..636f12f972 100644
--- a/core/src/test/java/org/springframework/ldap/filter/WhitespaceWildcardsFilterTests.java
+++ b/core/src/test/java/org/springframework/ldap/filter/WhitespaceWildcardsFilterTests.java
@@ -16,7 +16,7 @@
package org.springframework.ldap.filter;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.assertj.core.api.Assertions.assertThat;
diff --git a/core/src/test/java/org/springframework/ldap/odm/core/impl/DefaultObjectDirectoryMapperTests.java b/core/src/test/java/org/springframework/ldap/odm/core/impl/DefaultObjectDirectoryMapperTests.java
index 595b48c2b0..a0a632d0b6 100644
--- a/core/src/test/java/org/springframework/ldap/odm/core/impl/DefaultObjectDirectoryMapperTests.java
+++ b/core/src/test/java/org/springframework/ldap/odm/core/impl/DefaultObjectDirectoryMapperTests.java
@@ -21,12 +21,14 @@
import javax.naming.Name;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
import org.mockito.MockedStatic;
import org.mockito.Mockito;
-import org.mockito.junit.MockitoJUnitRunner;
+import org.mockito.junit.jupiter.MockitoExtension;
+import org.mockito.junit.jupiter.MockitoSettings;
+import org.mockito.quality.Strictness;
import org.springframework.core.SpringVersion;
import org.springframework.core.convert.ConversionService;
@@ -38,6 +40,7 @@
import org.springframework.util.StringUtils;
import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.verify;
@@ -45,12 +48,13 @@
/**
* @author Mattias Hellborg Arthursson
*/
-@RunWith(MockitoJUnitRunner.class)
+@MockitoSettings(strictness = Strictness.WARN)
+@ExtendWith(MockitoExtension.class)
public class DefaultObjectDirectoryMapperTests {
private DefaultObjectDirectoryMapper tested;
- @Before
+ @BeforeEach
public void prepareTestedInstance() {
this.tested = new DefaultObjectDirectoryMapper();
}
@@ -127,9 +131,10 @@ public void testIndexedDnAttributes() {
assertThat(calculatedId).isEqualTo(LdapUtils.newLdapName("cn=Some Person, ou=Some Company, c=Sweden"));
}
- @Test(expected = MetaDataException.class)
+ @Test
public void testIndexedDnAttributesRequiresThatAllAreIndexed() {
- this.tested.manageClass(UnitTestPersonWithIndexedAndUnindexedDnAttributes.class);
+ assertThatExceptionOfType(MetaDataException.class)
+ .isThrownBy(() -> this.tested.manageClass(UnitTestPersonWithIndexedAndUnindexedDnAttributes.class));
}
@Test
diff --git a/core/src/test/java/org/springframework/ldap/pool/AbstractPoolTestCase.java b/core/src/test/java/org/springframework/ldap/pool/AbstractPoolTestCase.java
index 1239adbe86..9e3a42205d 100644
--- a/core/src/test/java/org/springframework/ldap/pool/AbstractPoolTestCase.java
+++ b/core/src/test/java/org/springframework/ldap/pool/AbstractPoolTestCase.java
@@ -21,7 +21,7 @@
import javax.naming.ldap.LdapContext;
import org.apache.commons.pool.KeyedObjectPool;
-import org.junit.Before;
+import org.junit.jupiter.api.BeforeEach;
import org.springframework.ldap.core.ContextSource;
import org.springframework.ldap.pool.validation.DirContextValidator;
@@ -47,7 +47,7 @@ public abstract class AbstractPoolTestCase {
protected DirContextValidator dirContextValidatorMock;
- @Before
+ @BeforeEach
public void setUp() throws Exception {
this.contextMock = mock(Context.class);
this.dirContextMock = mock(DirContext.class);
diff --git a/core/src/test/java/org/springframework/ldap/pool/DelegatingContextTests.java b/core/src/test/java/org/springframework/ldap/pool/DelegatingContextTests.java
index ff22a6f075..ed33b6e9a7 100644
--- a/core/src/test/java/org/springframework/ldap/pool/DelegatingContextTests.java
+++ b/core/src/test/java/org/springframework/ldap/pool/DelegatingContextTests.java
@@ -21,7 +21,7 @@
import javax.naming.NamingException;
import org.apache.commons.pool.KeyedObjectPool;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.fail;
diff --git a/core/src/test/java/org/springframework/ldap/pool/DelegatingDirContextTests.java b/core/src/test/java/org/springframework/ldap/pool/DelegatingDirContextTests.java
index f174f78e22..8569dcb743 100644
--- a/core/src/test/java/org/springframework/ldap/pool/DelegatingDirContextTests.java
+++ b/core/src/test/java/org/springframework/ldap/pool/DelegatingDirContextTests.java
@@ -23,7 +23,7 @@
import javax.naming.directory.DirContext;
import org.apache.commons.pool.KeyedObjectPool;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.fail;
diff --git a/core/src/test/java/org/springframework/ldap/pool/DelegatingLdapContextTests.java b/core/src/test/java/org/springframework/ldap/pool/DelegatingLdapContextTests.java
index 028de096cf..1a518b4e4a 100644
--- a/core/src/test/java/org/springframework/ldap/pool/DelegatingLdapContextTests.java
+++ b/core/src/test/java/org/springframework/ldap/pool/DelegatingLdapContextTests.java
@@ -21,7 +21,7 @@
import javax.naming.ldap.LdapContext;
import org.apache.commons.pool.KeyedObjectPool;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.fail;
diff --git a/core/src/test/java/org/springframework/ldap/pool/MutableDelegatingLdapContextTests.java b/core/src/test/java/org/springframework/ldap/pool/MutableDelegatingLdapContextTests.java
index 30da15d5de..99f7784cd1 100644
--- a/core/src/test/java/org/springframework/ldap/pool/MutableDelegatingLdapContextTests.java
+++ b/core/src/test/java/org/springframework/ldap/pool/MutableDelegatingLdapContextTests.java
@@ -16,7 +16,7 @@
package org.springframework.ldap.pool;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.mockito.Mockito.verify;
diff --git a/core/src/test/java/org/springframework/ldap/pool/factory/DirContextPoolableObjectFactoryTests.java b/core/src/test/java/org/springframework/ldap/pool/factory/DirContextPoolableObjectFactoryTests.java
index 6ebc9474f5..3d17236264 100644
--- a/core/src/test/java/org/springframework/ldap/pool/factory/DirContextPoolableObjectFactoryTests.java
+++ b/core/src/test/java/org/springframework/ldap/pool/factory/DirContextPoolableObjectFactoryTests.java
@@ -22,7 +22,7 @@
import javax.naming.directory.DirContext;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.mockito.Mockito;
import org.springframework.ldap.core.ContextSource;
diff --git a/core/src/test/java/org/springframework/ldap/pool/factory/MutablePoolingContextSourceTests.java b/core/src/test/java/org/springframework/ldap/pool/factory/MutablePoolingContextSourceTests.java
index 7f82c0a700..251224a01b 100644
--- a/core/src/test/java/org/springframework/ldap/pool/factory/MutablePoolingContextSourceTests.java
+++ b/core/src/test/java/org/springframework/ldap/pool/factory/MutablePoolingContextSourceTests.java
@@ -18,7 +18,7 @@
import javax.naming.directory.DirContext;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.springframework.ldap.pool.AbstractPoolTestCase;
import org.springframework.ldap.pool.MutableDelegatingLdapContext;
diff --git a/core/src/test/java/org/springframework/ldap/pool/factory/PoolingContextSourceTests.java b/core/src/test/java/org/springframework/ldap/pool/factory/PoolingContextSourceTests.java
index 4babbe585f..efc448f4a8 100644
--- a/core/src/test/java/org/springframework/ldap/pool/factory/PoolingContextSourceTests.java
+++ b/core/src/test/java/org/springframework/ldap/pool/factory/PoolingContextSourceTests.java
@@ -20,7 +20,7 @@
import javax.naming.ldap.LdapContext;
import org.apache.commons.pool.impl.GenericKeyedObjectPool;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.springframework.dao.DataAccessResourceFailureException;
import org.springframework.ldap.core.ContextSource;
diff --git a/core/src/test/java/org/springframework/ldap/pool/validation/DefaultDirContextValidatorTests.java b/core/src/test/java/org/springframework/ldap/pool/validation/DefaultDirContextValidatorTests.java
index 02979b085f..a6dbaaaa09 100644
--- a/core/src/test/java/org/springframework/ldap/pool/validation/DefaultDirContextValidatorTests.java
+++ b/core/src/test/java/org/springframework/ldap/pool/validation/DefaultDirContextValidatorTests.java
@@ -21,8 +21,8 @@
import javax.naming.directory.DirContext;
import javax.naming.directory.SearchControls;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import org.springframework.ldap.pool.DirContextType;
@@ -41,7 +41,7 @@ public class DefaultDirContextValidatorTests {
private DirContext dirContextMock;
- @Before
+ @BeforeEach
public void setUp() throws Exception {
this.namingEnumerationMock = mock(NamingEnumeration.class);
this.dirContextMock = mock(DirContext.class);
diff --git a/core/src/test/java/org/springframework/ldap/pool2/AbstractPoolTestCase.java b/core/src/test/java/org/springframework/ldap/pool2/AbstractPoolTestCase.java
index 1d71aa5457..23c8329aa2 100644
--- a/core/src/test/java/org/springframework/ldap/pool2/AbstractPoolTestCase.java
+++ b/core/src/test/java/org/springframework/ldap/pool2/AbstractPoolTestCase.java
@@ -21,7 +21,7 @@
import javax.naming.ldap.LdapContext;
import org.apache.commons.pool2.KeyedObjectPool;
-import org.junit.Before;
+import org.junit.jupiter.api.BeforeEach;
import org.springframework.ldap.core.ContextSource;
import org.springframework.ldap.pool2.validation.DirContextValidator;
@@ -47,7 +47,7 @@ public abstract class AbstractPoolTestCase {
protected DirContextValidator dirContextValidatorMock;
- @Before
+ @BeforeEach
public void setUp() throws Exception {
this.contextMock = mock(Context.class);
this.dirContextMock = mock(DirContext.class);
diff --git a/core/src/test/java/org/springframework/ldap/pool2/DelegatingContextTests.java b/core/src/test/java/org/springframework/ldap/pool2/DelegatingContextTests.java
index 3833422c96..2d1860db3e 100644
--- a/core/src/test/java/org/springframework/ldap/pool2/DelegatingContextTests.java
+++ b/core/src/test/java/org/springframework/ldap/pool2/DelegatingContextTests.java
@@ -21,7 +21,7 @@
import javax.naming.NamingException;
import org.apache.commons.pool2.KeyedObjectPool;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.fail;
diff --git a/core/src/test/java/org/springframework/ldap/pool2/DelegatingDirContextTests.java b/core/src/test/java/org/springframework/ldap/pool2/DelegatingDirContextTests.java
index b6a9b442fa..b82e0a80ce 100644
--- a/core/src/test/java/org/springframework/ldap/pool2/DelegatingDirContextTests.java
+++ b/core/src/test/java/org/springframework/ldap/pool2/DelegatingDirContextTests.java
@@ -23,7 +23,7 @@
import javax.naming.directory.DirContext;
import org.apache.commons.pool2.KeyedObjectPool;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.fail;
diff --git a/core/src/test/java/org/springframework/ldap/pool2/DelegatingLdapContextTests.java b/core/src/test/java/org/springframework/ldap/pool2/DelegatingLdapContextTests.java
index 247795384c..c8e80f906b 100644
--- a/core/src/test/java/org/springframework/ldap/pool2/DelegatingLdapContextTests.java
+++ b/core/src/test/java/org/springframework/ldap/pool2/DelegatingLdapContextTests.java
@@ -21,7 +21,7 @@
import javax.naming.ldap.LdapContext;
import org.apache.commons.pool2.KeyedObjectPool;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.fail;
diff --git a/core/src/test/java/org/springframework/ldap/pool2/MutableDelegatingLdapContextTests.java b/core/src/test/java/org/springframework/ldap/pool2/MutableDelegatingLdapContextTests.java
index 4db7475e0c..03a5e55d27 100644
--- a/core/src/test/java/org/springframework/ldap/pool2/MutableDelegatingLdapContextTests.java
+++ b/core/src/test/java/org/springframework/ldap/pool2/MutableDelegatingLdapContextTests.java
@@ -16,7 +16,7 @@
package org.springframework.ldap.pool2;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.mockito.Mockito.verify;
diff --git a/core/src/test/java/org/springframework/ldap/pool2/factory/DirContextPooledObjectFactoryTests.java b/core/src/test/java/org/springframework/ldap/pool2/factory/DirContextPooledObjectFactoryTests.java
index 072a7a1423..317b2ebd56 100644
--- a/core/src/test/java/org/springframework/ldap/pool2/factory/DirContextPooledObjectFactoryTests.java
+++ b/core/src/test/java/org/springframework/ldap/pool2/factory/DirContextPooledObjectFactoryTests.java
@@ -24,7 +24,7 @@
import org.apache.commons.pool2.PooledObject;
import org.apache.commons.pool2.impl.DefaultPooledObject;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.springframework.ldap.core.ContextSource;
import org.springframework.ldap.pool2.AbstractPoolTestCase;
diff --git a/core/src/test/java/org/springframework/ldap/pool2/factory/MutablePooledContextSourceTests.java b/core/src/test/java/org/springframework/ldap/pool2/factory/MutablePooledContextSourceTests.java
index 2db1153983..08f9b6e126 100644
--- a/core/src/test/java/org/springframework/ldap/pool2/factory/MutablePooledContextSourceTests.java
+++ b/core/src/test/java/org/springframework/ldap/pool2/factory/MutablePooledContextSourceTests.java
@@ -18,7 +18,7 @@
import javax.naming.directory.DirContext;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.springframework.ldap.pool2.AbstractPoolTestCase;
import org.springframework.ldap.pool2.MutableDelegatingLdapContext;
diff --git a/core/src/test/java/org/springframework/ldap/pool2/factory/PoolConfigTests.java b/core/src/test/java/org/springframework/ldap/pool2/factory/PoolConfigTests.java
index 579d980225..e7e33e3d46 100644
--- a/core/src/test/java/org/springframework/ldap/pool2/factory/PoolConfigTests.java
+++ b/core/src/test/java/org/springframework/ldap/pool2/factory/PoolConfigTests.java
@@ -17,7 +17,7 @@
package org.springframework.ldap.pool2.factory;
import org.apache.commons.pool2.impl.GenericKeyedObjectPoolConfig;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.springframework.ldap.pool2.AbstractPoolTestCase;
diff --git a/core/src/test/java/org/springframework/ldap/pool2/factory/PooledContextSourceTests.java b/core/src/test/java/org/springframework/ldap/pool2/factory/PooledContextSourceTests.java
index 185ddc7d68..a8a23ff92b 100644
--- a/core/src/test/java/org/springframework/ldap/pool2/factory/PooledContextSourceTests.java
+++ b/core/src/test/java/org/springframework/ldap/pool2/factory/PooledContextSourceTests.java
@@ -19,7 +19,7 @@
import javax.naming.directory.DirContext;
import javax.naming.ldap.LdapContext;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.springframework.dao.DataAccessResourceFailureException;
import org.springframework.ldap.core.ContextSource;
diff --git a/core/src/test/java/org/springframework/ldap/query/LdapQueryBuilderTests.java b/core/src/test/java/org/springframework/ldap/query/LdapQueryBuilderTests.java
index ce4f076e39..b43e2963cb 100644
--- a/core/src/test/java/org/springframework/ldap/query/LdapQueryBuilderTests.java
+++ b/core/src/test/java/org/springframework/ldap/query/LdapQueryBuilderTests.java
@@ -16,12 +16,13 @@
package org.springframework.ldap.query;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.springframework.ldap.filter.ProximityFilter;
import org.springframework.ldap.support.LdapUtils;
import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
/**
* @author Mattias Hellborg Arthursson
@@ -88,18 +89,22 @@ public void buildHardcodedFilter() {
assertThat(result.filter().encode()).isEqualTo("(cn=Person*)");
}
- @Test(expected = IllegalStateException.class)
+ @Test
public void verifyThatHardcodedFilterFailsIfFilterAlreadySpecified() {
- LdapQueryBuilder query = LdapQueryBuilder.query();
- query.where("sn").is("Doe");
- query.filter("(cn=Person*)");
+ assertThatExceptionOfType(IllegalStateException.class).isThrownBy(() -> {
+ LdapQueryBuilder query = LdapQueryBuilder.query();
+ query.where("sn").is("Doe");
+ query.filter("(cn=Person*)");
+ });
}
- @Test(expected = IllegalStateException.class)
+ @Test
public void verifyThatFilterFormatFailsIfFilterAlreadySpecified() {
- LdapQueryBuilder query = LdapQueryBuilder.query();
- query.where("sn").is("Doe");
- query.filter("(|(cn={0})(cn={1}))", "Person*", "Parson*");
+ assertThatExceptionOfType(IllegalStateException.class).isThrownBy(() -> {
+ LdapQueryBuilder query = LdapQueryBuilder.query();
+ query.where("sn").is("Doe");
+ query.filter("(|(cn={0})(cn={1}))", "Person*", "Parson*");
+ });
}
@Test
@@ -162,28 +167,38 @@ public void buildNestedAnd() {
assertThat(result.filter().encode()).isEqualTo("(&(objectclass=person)(|(sn=Doe)(sn=Die)))");
}
- @Test(expected = IllegalStateException.class)
+ @Test
public void verifyEmptyFilterThrowsIllegalState() {
- LdapQueryBuilder.query().filter();
+ assertThatExceptionOfType(IllegalStateException.class).isThrownBy(() -> LdapQueryBuilder.query().filter());
}
- @Test(expected = IllegalStateException.class)
+ @Test
public void verifyThatNewAttemptToStartSpecifyingFilterThrowsIllegalState() {
- LdapQueryBuilder query = LdapQueryBuilder.query();
- query.where("sn").is("Doe");
- query.where("cn").is("John Doe");
+ assertThatExceptionOfType(IllegalStateException.class).isThrownBy(() -> {
+ LdapQueryBuilder query = LdapQueryBuilder.query();
+ query.where("sn").is("Doe");
+ query.where("cn").is("John Doe");
+ });
}
- @Test(expected = IllegalStateException.class)
+ @Test
public void verifyThatAttemptToStartSpecifyingBasePropertiesThrowsIllegalStateWhenFilterStarted() {
- LdapQueryBuilder query = LdapQueryBuilder.query();
- query.where("sn").is("Doe");
- query.base("dc=261consulting,dc=com");
+ assertThatExceptionOfType(IllegalStateException.class).isThrownBy(() -> {
+ LdapQueryBuilder query = LdapQueryBuilder.query();
+ query.where("sn").is("Doe");
+ query.base("dc=261consulting,dc=com");
+ });
}
- @Test(expected = IllegalStateException.class)
+ @Test
public void verifyThatOperatorChangeIsIllegal() {
- LdapQueryBuilder.query().where("cn").is("John Doe").and("sn").is("Doe").or("objectclass").is("person");
+ assertThatExceptionOfType(IllegalStateException.class).isThrownBy(() -> LdapQueryBuilder.query()
+ .where("cn")
+ .is("John Doe")
+ .and("sn")
+ .is("Doe")
+ .or("objectclass")
+ .is("person"));
}
}
diff --git a/core/src/test/java/org/springframework/ldap/support/LdapEncoderTests.java b/core/src/test/java/org/springframework/ldap/support/LdapEncoderTests.java
index abcd2e6f38..1217e921bb 100644
--- a/core/src/test/java/org/springframework/ldap/support/LdapEncoderTests.java
+++ b/core/src/test/java/org/springframework/ldap/support/LdapEncoderTests.java
@@ -16,11 +16,12 @@
package org.springframework.ldap.support;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.springframework.ldap.BadLdapGrammarException;
import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
/**
* Unit test for the LdapEncode class.
@@ -52,9 +53,9 @@ public void testNameDecode() {
assertThat(res).isEqualTo("# foo ,+\"\\<>; ");
}
- @Test(expected = BadLdapGrammarException.class)
+ @Test
public void testNameDecode_slashlast() {
- LdapEncoder.nameDecode("\\");
+ assertThatExceptionOfType(BadLdapGrammarException.class).isThrownBy(() -> LdapEncoder.nameDecode("\\"));
}
// gh-413
diff --git a/core/src/test/java/org/springframework/ldap/support/LdapNameBuilderTests.java b/core/src/test/java/org/springframework/ldap/support/LdapNameBuilderTests.java
index dde503da9c..cb938ec96a 100644
--- a/core/src/test/java/org/springframework/ldap/support/LdapNameBuilderTests.java
+++ b/core/src/test/java/org/springframework/ldap/support/LdapNameBuilderTests.java
@@ -16,7 +16,7 @@
package org.springframework.ldap.support;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.assertj.core.api.Assertions.assertThat;
diff --git a/core/src/test/java/org/springframework/ldap/support/LdapUtilsTests.java b/core/src/test/java/org/springframework/ldap/support/LdapUtilsTests.java
index 0037d70a34..a05a55e65f 100644
--- a/core/src/test/java/org/springframework/ldap/support/LdapUtilsTests.java
+++ b/core/src/test/java/org/springframework/ldap/support/LdapUtilsTests.java
@@ -25,8 +25,8 @@
import javax.naming.ldap.LdapName;
import org.apache.commons.lang.ArrayUtils;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import org.springframework.ldap.NoSuchAttributeException;
@@ -43,7 +43,7 @@ public class LdapUtilsTests {
private AttributeValueCallbackHandler handlerMock;
- @Before
+ @BeforeEach
public void setUp() throws Exception {
this.handlerMock = mock(AttributeValueCallbackHandler.class);
}
diff --git a/core/src/test/java/org/springframework/ldap/transaction/compensating/BindOperationExecutorTests.java b/core/src/test/java/org/springframework/ldap/transaction/compensating/BindOperationExecutorTests.java
index b183b08afd..8edeb45857 100644
--- a/core/src/test/java/org/springframework/ldap/transaction/compensating/BindOperationExecutorTests.java
+++ b/core/src/test/java/org/springframework/ldap/transaction/compensating/BindOperationExecutorTests.java
@@ -19,8 +19,8 @@
import javax.naming.directory.BasicAttributes;
import javax.naming.ldap.LdapName;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import org.springframework.ldap.core.LdapOperations;
import org.springframework.ldap.support.LdapUtils;
@@ -33,7 +33,7 @@ public class BindOperationExecutorTests {
private LdapOperations ldapOperationsMock;
- @Before
+ @BeforeEach
public void setUp() throws Exception {
this.ldapOperationsMock = mock(LdapOperations.class);
}
diff --git a/core/src/test/java/org/springframework/ldap/transaction/compensating/BindOperationRecorderTests.java b/core/src/test/java/org/springframework/ldap/transaction/compensating/BindOperationRecorderTests.java
index b42e9c6be6..a9f8538364 100644
--- a/core/src/test/java/org/springframework/ldap/transaction/compensating/BindOperationRecorderTests.java
+++ b/core/src/test/java/org/springframework/ldap/transaction/compensating/BindOperationRecorderTests.java
@@ -19,21 +19,22 @@
import javax.naming.directory.BasicAttributes;
import javax.naming.ldap.LdapName;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import org.springframework.ldap.core.LdapOperations;
import org.springframework.ldap.support.LdapUtils;
import org.springframework.transaction.compensating.CompensatingTransactionOperationExecutor;
import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
import static org.mockito.Mockito.mock;
public class BindOperationRecorderTests {
private LdapOperations ldapOperationsMock;
- @Before
+ @BeforeEach
public void setUp() throws Exception {
this.ldapOperationsMock = mock(LdapOperations.class);
@@ -75,13 +76,15 @@ public void testPerformOperation_String() {
assertThat(rollbackOperation.getLdapOperations()).isSameAs(this.ldapOperationsMock);
}
- @Test(expected = IllegalArgumentException.class)
+ @Test
public void testPerformOperation_Invalid() {
- BindOperationRecorder tested = new BindOperationRecorder(this.ldapOperationsMock);
- Object expectedDn = new Object();
+ assertThatExceptionOfType(IllegalArgumentException.class).isThrownBy(() -> {
+ BindOperationRecorder tested = new BindOperationRecorder(this.ldapOperationsMock);
+ Object expectedDn = new Object();
- // Perform test.
- tested.recordOperation(new Object[] { expectedDn });
+ // Perform test.
+ tested.recordOperation(new Object[] { expectedDn });
+ });
}
}
diff --git a/core/src/test/java/org/springframework/ldap/transaction/compensating/LdapCompensatingTransactionOperationFactoryTests.java b/core/src/test/java/org/springframework/ldap/transaction/compensating/LdapCompensatingTransactionOperationFactoryTests.java
index f82e1becd8..15eab75c3d 100644
--- a/core/src/test/java/org/springframework/ldap/transaction/compensating/LdapCompensatingTransactionOperationFactoryTests.java
+++ b/core/src/test/java/org/springframework/ldap/transaction/compensating/LdapCompensatingTransactionOperationFactoryTests.java
@@ -18,8 +18,8 @@
import javax.naming.directory.DirContext;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import org.springframework.ldap.core.LdapOperations;
import org.springframework.transaction.compensating.CompensatingTransactionOperationRecorder;
@@ -37,7 +37,7 @@ public class LdapCompensatingTransactionOperationFactoryTests {
private LdapCompensatingTransactionOperationFactory tested;
- @Before
+ @BeforeEach
public void setUp() throws Exception {
this.ldapOperationsMock = mock(LdapOperations.class);
this.renamingStrategyMock = mock(TempEntryRenamingStrategy.class);
diff --git a/core/src/test/java/org/springframework/ldap/transaction/compensating/LdapTransactionUtilsTests.java b/core/src/test/java/org/springframework/ldap/transaction/compensating/LdapTransactionUtilsTests.java
index dcb396cc25..fba3a56ea2 100644
--- a/core/src/test/java/org/springframework/ldap/transaction/compensating/LdapTransactionUtilsTests.java
+++ b/core/src/test/java/org/springframework/ldap/transaction/compensating/LdapTransactionUtilsTests.java
@@ -19,8 +19,8 @@
import javax.naming.NamingException;
import javax.naming.directory.DirContext;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import org.springframework.ldap.support.LdapUtils;
import org.springframework.transaction.support.TransactionSynchronizationManager;
@@ -33,7 +33,7 @@ public class LdapTransactionUtilsTests {
private DirContext dirContextMock;
- @Before
+ @BeforeEach
public void setUp() throws Exception {
this.dirContextMock = mock(DirContext.class);
diff --git a/core/src/test/java/org/springframework/ldap/transaction/compensating/ModifyAttributesOperationExecutorTests.java b/core/src/test/java/org/springframework/ldap/transaction/compensating/ModifyAttributesOperationExecutorTests.java
index 18c2254893..4d6b491b54 100644
--- a/core/src/test/java/org/springframework/ldap/transaction/compensating/ModifyAttributesOperationExecutorTests.java
+++ b/core/src/test/java/org/springframework/ldap/transaction/compensating/ModifyAttributesOperationExecutorTests.java
@@ -19,8 +19,8 @@
import javax.naming.Name;
import javax.naming.directory.ModificationItem;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import org.springframework.ldap.core.LdapOperations;
import org.springframework.ldap.support.LdapUtils;
@@ -33,7 +33,7 @@ public class ModifyAttributesOperationExecutorTests {
private LdapOperations ldapOperationsMock;
- @Before
+ @BeforeEach
public void setUp() throws Exception {
this.ldapOperationsMock = mock(LdapOperations.class);
}
diff --git a/core/src/test/java/org/springframework/ldap/transaction/compensating/ModifyAttributesOperationRecorderTests.java b/core/src/test/java/org/springframework/ldap/transaction/compensating/ModifyAttributesOperationRecorderTests.java
index 7e886309a4..4f0bf1dbc0 100644
--- a/core/src/test/java/org/springframework/ldap/transaction/compensating/ModifyAttributesOperationRecorderTests.java
+++ b/core/src/test/java/org/springframework/ldap/transaction/compensating/ModifyAttributesOperationRecorderTests.java
@@ -25,8 +25,8 @@
import javax.naming.directory.ModificationItem;
import javax.naming.ldap.LdapName;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import org.springframework.ldap.core.IncrementalAttributesMapper;
import org.springframework.ldap.core.LdapOperations;
@@ -45,7 +45,7 @@ public class ModifyAttributesOperationRecorderTests {
private ModifyAttributesOperationRecorder tested;
- @Before
+ @BeforeEach
public void setUp() throws Exception {
this.ldapOperationsMock = mock(LdapOperations.class);
this.attributesMapperMock = mock(IncrementalAttributesMapper.class);
diff --git a/core/src/test/java/org/springframework/ldap/transaction/compensating/RebindOperationExecutorTests.java b/core/src/test/java/org/springframework/ldap/transaction/compensating/RebindOperationExecutorTests.java
index bfab43c9b3..1eed6cd396 100644
--- a/core/src/test/java/org/springframework/ldap/transaction/compensating/RebindOperationExecutorTests.java
+++ b/core/src/test/java/org/springframework/ldap/transaction/compensating/RebindOperationExecutorTests.java
@@ -19,8 +19,8 @@
import javax.naming.directory.BasicAttributes;
import javax.naming.ldap.LdapName;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import org.springframework.ldap.core.LdapOperations;
import org.springframework.ldap.support.LdapUtils;
@@ -32,7 +32,7 @@ public class RebindOperationExecutorTests {
private LdapOperations ldapOperationsMock;
- @Before
+ @BeforeEach
public void setUp() throws Exception {
this.ldapOperationsMock = mock(LdapOperations.class);
}
diff --git a/core/src/test/java/org/springframework/ldap/transaction/compensating/RebindOperationRecorderTests.java b/core/src/test/java/org/springframework/ldap/transaction/compensating/RebindOperationRecorderTests.java
index 6424e5f141..ac7bcff4da 100644
--- a/core/src/test/java/org/springframework/ldap/transaction/compensating/RebindOperationRecorderTests.java
+++ b/core/src/test/java/org/springframework/ldap/transaction/compensating/RebindOperationRecorderTests.java
@@ -19,8 +19,8 @@
import javax.naming.directory.BasicAttributes;
import javax.naming.ldap.LdapName;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import org.springframework.ldap.core.LdapOperations;
import org.springframework.ldap.support.LdapUtils;
@@ -36,7 +36,7 @@ public class RebindOperationRecorderTests {
private TempEntryRenamingStrategy renamingStrategyMock;
- @Before
+ @BeforeEach
public void setUp() throws Exception {
this.ldapOperationsMock = mock(LdapOperations.class);
this.renamingStrategyMock = mock(TempEntryRenamingStrategy.class);
diff --git a/core/src/test/java/org/springframework/ldap/transaction/compensating/RenameOperationExecutorTests.java b/core/src/test/java/org/springframework/ldap/transaction/compensating/RenameOperationExecutorTests.java
index d2118053b3..e6441037f7 100644
--- a/core/src/test/java/org/springframework/ldap/transaction/compensating/RenameOperationExecutorTests.java
+++ b/core/src/test/java/org/springframework/ldap/transaction/compensating/RenameOperationExecutorTests.java
@@ -18,8 +18,8 @@
import javax.naming.ldap.LdapName;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import org.springframework.ldap.core.LdapOperations;
import org.springframework.ldap.support.LdapUtils;
@@ -32,7 +32,7 @@ public class RenameOperationExecutorTests {
private LdapOperations ldapOperationsMock;
- @Before
+ @BeforeEach
public void setUp() throws Exception {
this.ldapOperationsMock = mock(LdapOperations.class);
}
diff --git a/core/src/test/java/org/springframework/ldap/transaction/compensating/RenameOperationRecorderTests.java b/core/src/test/java/org/springframework/ldap/transaction/compensating/RenameOperationRecorderTests.java
index a89abf7bbc..2f6b2fffb8 100644
--- a/core/src/test/java/org/springframework/ldap/transaction/compensating/RenameOperationRecorderTests.java
+++ b/core/src/test/java/org/springframework/ldap/transaction/compensating/RenameOperationRecorderTests.java
@@ -16,8 +16,8 @@
package org.springframework.ldap.transaction.compensating;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import org.springframework.ldap.core.LdapOperations;
import org.springframework.transaction.compensating.CompensatingTransactionOperationExecutor;
@@ -29,7 +29,7 @@ public class RenameOperationRecorderTests {
private LdapOperations ldapOperationsMock;
- @Before
+ @BeforeEach
public void setUp() throws Exception {
this.ldapOperationsMock = mock(LdapOperations.class);
}
diff --git a/core/src/test/java/org/springframework/ldap/transaction/compensating/UnbindOperationExecutorTests.java b/core/src/test/java/org/springframework/ldap/transaction/compensating/UnbindOperationExecutorTests.java
index 2dc956ca1a..ff0a4e0aa5 100644
--- a/core/src/test/java/org/springframework/ldap/transaction/compensating/UnbindOperationExecutorTests.java
+++ b/core/src/test/java/org/springframework/ldap/transaction/compensating/UnbindOperationExecutorTests.java
@@ -18,8 +18,8 @@
import javax.naming.ldap.LdapName;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import org.springframework.ldap.core.LdapOperations;
import org.springframework.ldap.support.LdapUtils;
@@ -31,7 +31,7 @@ public class UnbindOperationExecutorTests {
private LdapOperations ldapOperationsMock;
- @Before
+ @BeforeEach
public void setUp() throws Exception {
this.ldapOperationsMock = mock(LdapOperations.class);
}
diff --git a/core/src/test/java/org/springframework/ldap/transaction/compensating/UnbindOperationRecorderTests.java b/core/src/test/java/org/springframework/ldap/transaction/compensating/UnbindOperationRecorderTests.java
index ef42f7a126..9b9b5cb000 100644
--- a/core/src/test/java/org/springframework/ldap/transaction/compensating/UnbindOperationRecorderTests.java
+++ b/core/src/test/java/org/springframework/ldap/transaction/compensating/UnbindOperationRecorderTests.java
@@ -18,8 +18,8 @@
import javax.naming.ldap.LdapName;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import org.springframework.ldap.core.LdapOperations;
import org.springframework.ldap.support.LdapUtils;
@@ -35,7 +35,7 @@ public class UnbindOperationRecorderTests {
private TempEntryRenamingStrategy renamingStrategyMock;
- @Before
+ @BeforeEach
public void setUp() throws Exception {
this.ldapOperationsMock = mock(LdapOperations.class);
diff --git a/core/src/test/java/org/springframework/ldap/transaction/compensating/manager/CompensatingTransactionUtilsTests.java b/core/src/test/java/org/springframework/ldap/transaction/compensating/manager/CompensatingTransactionUtilsTests.java
index e1443ae4ca..da991871c6 100644
--- a/core/src/test/java/org/springframework/ldap/transaction/compensating/manager/CompensatingTransactionUtilsTests.java
+++ b/core/src/test/java/org/springframework/ldap/transaction/compensating/manager/CompensatingTransactionUtilsTests.java
@@ -20,8 +20,8 @@
import javax.naming.directory.DirContext;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import org.springframework.ldap.core.ContextSource;
import org.springframework.transaction.compensating.CompensatingTransactionOperationManager;
@@ -40,7 +40,7 @@ public class CompensatingTransactionUtilsTests {
private CompensatingTransactionOperationManager operationManagerMock;
- @Before
+ @BeforeEach
public void setUp() throws Exception {
this.dirContextMock = mock(DirContext.class);
this.contextSourceMock = mock(ContextSource.class);
diff --git a/core/src/test/java/org/springframework/ldap/transaction/compensating/manager/ContextSourceTransactionManagerTests.java b/core/src/test/java/org/springframework/ldap/transaction/compensating/manager/ContextSourceTransactionManagerTests.java
index c6b9ae774d..fcf5d3d817 100644
--- a/core/src/test/java/org/springframework/ldap/transaction/compensating/manager/ContextSourceTransactionManagerTests.java
+++ b/core/src/test/java/org/springframework/ldap/transaction/compensating/manager/ContextSourceTransactionManagerTests.java
@@ -21,8 +21,8 @@
import javax.naming.directory.DirContext;
import javax.sql.DataSource;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import org.springframework.jdbc.datasource.DataSourceTransactionManager;
import org.springframework.ldap.UncategorizedLdapException;
@@ -59,7 +59,7 @@ public class ContextSourceTransactionManagerTests {
private TempEntryRenamingStrategy renamingStrategyMock;
- @Before
+ @BeforeEach
public void setUp() throws Exception {
if (TransactionSynchronizationManager.isSynchronizationActive()) {
TransactionSynchronizationManager.clearSynchronization();
diff --git a/core/src/test/java/org/springframework/ldap/transaction/compensating/manager/TransactionAwareContextSourceProxyTests.java b/core/src/test/java/org/springframework/ldap/transaction/compensating/manager/TransactionAwareContextSourceProxyTests.java
index d0033a7b54..031b9d4851 100644
--- a/core/src/test/java/org/springframework/ldap/transaction/compensating/manager/TransactionAwareContextSourceProxyTests.java
+++ b/core/src/test/java/org/springframework/ldap/transaction/compensating/manager/TransactionAwareContextSourceProxyTests.java
@@ -19,8 +19,8 @@
import javax.naming.directory.DirContext;
import javax.naming.ldap.LdapContext;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import org.springframework.ldap.core.ContextSource;
import org.springframework.ldap.core.DirContextProxy;
@@ -44,7 +44,7 @@ public class TransactionAwareContextSourceProxyTests {
private DirContext dirContextMock;
- @Before
+ @BeforeEach
public void setUp() throws Exception {
this.contextSourceMock = mock(ContextSource.class);
this.ldapContextMock = mock(LdapContext.class);
diff --git a/core/src/test/java/org/springframework/ldap/transaction/compensating/manager/TransactionAwareDirContextInvocationHandlerTests.java b/core/src/test/java/org/springframework/ldap/transaction/compensating/manager/TransactionAwareDirContextInvocationHandlerTests.java
index 4c3b472d69..dceb5a3df0 100644
--- a/core/src/test/java/org/springframework/ldap/transaction/compensating/manager/TransactionAwareDirContextInvocationHandlerTests.java
+++ b/core/src/test/java/org/springframework/ldap/transaction/compensating/manager/TransactionAwareDirContextInvocationHandlerTests.java
@@ -19,8 +19,8 @@
import javax.naming.NamingException;
import javax.naming.directory.DirContext;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import org.springframework.ldap.core.ContextSource;
import org.springframework.transaction.support.TransactionSynchronizationManager;
@@ -39,7 +39,7 @@ public class TransactionAwareDirContextInvocationHandlerTests {
private DirContextHolder holder;
- @Before
+ @BeforeEach
public void setUp() throws Exception {
this.dirContextMock = mock(DirContext.class);
this.contextSourceMock = mock(ContextSource.class);
diff --git a/core/src/test/java/org/springframework/ldap/transaction/compensating/support/DefaultTempEntryRenamingStrategyTests.java b/core/src/test/java/org/springframework/ldap/transaction/compensating/support/DefaultTempEntryRenamingStrategyTests.java
index 3f85065cce..6a1689f41d 100644
--- a/core/src/test/java/org/springframework/ldap/transaction/compensating/support/DefaultTempEntryRenamingStrategyTests.java
+++ b/core/src/test/java/org/springframework/ldap/transaction/compensating/support/DefaultTempEntryRenamingStrategyTests.java
@@ -19,7 +19,7 @@
import javax.naming.Name;
import javax.naming.ldap.LdapName;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.springframework.ldap.support.LdapUtils;
diff --git a/core/src/test/java/org/springframework/ldap/transaction/compensating/support/DifferentSubtreeTempEntryRenamingStrategyTests.java b/core/src/test/java/org/springframework/ldap/transaction/compensating/support/DifferentSubtreeTempEntryRenamingStrategyTests.java
index f71da758ba..026b4f3720 100644
--- a/core/src/test/java/org/springframework/ldap/transaction/compensating/support/DifferentSubtreeTempEntryRenamingStrategyTests.java
+++ b/core/src/test/java/org/springframework/ldap/transaction/compensating/support/DifferentSubtreeTempEntryRenamingStrategyTests.java
@@ -19,7 +19,7 @@
import javax.naming.Name;
import javax.naming.ldap.LdapName;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.springframework.ldap.support.LdapUtils;
diff --git a/core/src/test/java/org/springframework/ldap/util/ListComparatorTests.java b/core/src/test/java/org/springframework/ldap/util/ListComparatorTests.java
index c53d2fc24b..11fc002b80 100644
--- a/core/src/test/java/org/springframework/ldap/util/ListComparatorTests.java
+++ b/core/src/test/java/org/springframework/ldap/util/ListComparatorTests.java
@@ -19,8 +19,8 @@
import java.util.Arrays;
import java.util.List;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import org.springframework.ldap.support.ListComparator;
@@ -35,7 +35,7 @@ public class ListComparatorTests {
private ListComparator tested;
- @Before
+ @BeforeEach
public void setUp() throws Exception {
this.tested = new ListComparator();
}
diff --git a/core/src/test/java/org/springframework/transaction/compensating/support/DefaultCompensatingTransactionOperationManagerTests.java b/core/src/test/java/org/springframework/transaction/compensating/support/DefaultCompensatingTransactionOperationManagerTests.java
index c89f0f93df..ee2e1948b7 100644
--- a/core/src/test/java/org/springframework/transaction/compensating/support/DefaultCompensatingTransactionOperationManagerTests.java
+++ b/core/src/test/java/org/springframework/transaction/compensating/support/DefaultCompensatingTransactionOperationManagerTests.java
@@ -18,8 +18,8 @@
import java.util.Stack;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import org.springframework.transaction.TransactionSystemException;
import org.springframework.transaction.compensating.CompensatingTransactionOperationExecutor;
@@ -27,6 +27,7 @@
import org.springframework.transaction.compensating.CompensatingTransactionOperationRecorder;
import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
import static org.mockito.BDDMockito.given;
import static org.mockito.BDDMockito.mock;
import static org.mockito.BDDMockito.verify;
@@ -40,7 +41,7 @@ public class DefaultCompensatingTransactionOperationManagerTests {
private CompensatingTransactionOperationRecorder operationRecorderMock;
- @Before
+ @BeforeEach
public void setUp() throws Exception {
this.operationExecutorMock = mock(CompensatingTransactionOperationExecutor.class);
this.operationFactoryMock = mock(CompensatingTransactionOperationFactory.class);
@@ -77,15 +78,17 @@ public void testRollback() {
verify(this.operationExecutorMock).rollback();
}
- @Test(expected = TransactionSystemException.class)
+ @Test
public void testRollback_Exception() {
- DefaultCompensatingTransactionOperationManager tested = new DefaultCompensatingTransactionOperationManager(
- this.operationFactoryMock);
- tested.getOperationExecutors().push(this.operationExecutorMock);
+ assertThatExceptionOfType(TransactionSystemException.class).isThrownBy(() -> {
+ DefaultCompensatingTransactionOperationManager tested = new DefaultCompensatingTransactionOperationManager(
+ this.operationFactoryMock);
+ tested.getOperationExecutors().push(this.operationExecutorMock);
- willThrow(new RuntimeException()).given(this.operationExecutorMock).rollback();
+ willThrow(new RuntimeException()).given(this.operationExecutorMock).rollback();
- tested.rollback();
+ tested.rollback();
+ });
}
@Test
@@ -98,15 +101,17 @@ public void testCommit() {
verify(this.operationExecutorMock).commit();
}
- @Test(expected = TransactionSystemException.class)
+ @Test
public void testCommit_Exception() {
- DefaultCompensatingTransactionOperationManager tested = new DefaultCompensatingTransactionOperationManager(
- this.operationFactoryMock);
- tested.getOperationExecutors().push(this.operationExecutorMock);
+ assertThatExceptionOfType(TransactionSystemException.class).isThrownBy(() -> {
+ DefaultCompensatingTransactionOperationManager tested = new DefaultCompensatingTransactionOperationManager(
+ this.operationFactoryMock);
+ tested.getOperationExecutors().push(this.operationExecutorMock);
- willThrow(new RuntimeException()).given(this.operationExecutorMock).commit();
+ willThrow(new RuntimeException()).given(this.operationExecutorMock).commit();
- tested.commit();
+ tested.commit();
+ });
}
}
From 9cb2ba6f3b5fe769a67dc13088987b42f8cf65b2 Mon Sep 17 00:00:00 2001
From: Josh Cummings <3627351+jzheaux@users.noreply.github.com>
Date: Thu, 17 Jul 2025 11:54:59 -0600
Subject: [PATCH 19/67] Update Ldif Tests to JUnit 5
Issue gh-1058
---
ldif/ldif-core/build.gradle | 11 +++++++++--
.../DefaultAttributeValidationPolicyTests.java | 16 +++++++---------
.../ldap/ldif/Ldap233LdifParserTests.java | 2 +-
.../ldap/ldif/LdifParserTests.java | 10 +++++-----
4 files changed, 22 insertions(+), 17 deletions(-)
diff --git a/ldif/ldif-core/build.gradle b/ldif/ldif-core/build.gradle
index b0aed199c5..86ef8518a9 100644
--- a/ldif/ldif-core/build.gradle
+++ b/ldif/ldif-core/build.gradle
@@ -6,13 +6,20 @@ dependencies {
management platform(project(":spring-ldap-dependencies"))
api project(":spring-ldap-core")
+
testImplementation platform('org.junit:junit-bom')
- testImplementation "org.junit.vintage:junit-vintage-engine"
- testImplementation "junit:junit"
testImplementation "org.assertj:assertj-core"
+ testImplementation "org.junit.jupiter:junit-jupiter-api"
+ testImplementation "org.junit.jupiter:junit-jupiter-engine"
+ testImplementation "org.junit.jupiter:junit-jupiter-params"
+ testRuntimeOnly("org.junit.platform:junit-platform-launcher")
testImplementation ("log4j:log4j:1.2.17") {
exclude group: 'javax.jms'
exclude group: 'com.sun.jdmk'
exclude group: 'com.sun.jmx'
}
}
+
+tasks.withType(Test).configureEach {
+ useJUnitPlatform()
+}
diff --git a/ldif/ldif-core/src/test/java/org/springframework/ldap/ldif/DefaultAttributeValidationPolicyTests.java b/ldif/ldif-core/src/test/java/org/springframework/ldap/ldif/DefaultAttributeValidationPolicyTests.java
index ce42b737be..5aa797413d 100644
--- a/ldif/ldif-core/src/test/java/org/springframework/ldap/ldif/DefaultAttributeValidationPolicyTests.java
+++ b/ldif/ldif-core/src/test/java/org/springframework/ldap/ldif/DefaultAttributeValidationPolicyTests.java
@@ -21,10 +21,8 @@
import java.util.Collection;
import java.util.List;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-import org.junit.runners.Parameterized.Parameters;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -44,7 +42,6 @@
* @author Keith Barlow
*
*/
-@RunWith(Parameterized.class)
public class DefaultAttributeValidationPolicyTests {
private static Logger log = LoggerFactory.getLogger(DefaultAttributeValidationPolicyTests.class);
@@ -75,7 +72,6 @@ private enum AttributeType {
* The data set to parse.
* @return
*/
- @Parameters
public static Collection data() {
return Arrays.asList(new Object[][] {
// Format: line, id, options, value, type
@@ -146,7 +142,7 @@ public static Collection data() {
* @param value The value expected from successful parsing.
* @param type The attribute type: one of enum AttributeType.
*/
- public DefaultAttributeValidationPolicyTests(String line, String id, String options, String value,
+ public void initDefaultAttributeValidationPolicyTests(String line, String id, String options, String value,
AttributeType type) {
this.line = line;
this.id = id;
@@ -159,8 +155,10 @@ public DefaultAttributeValidationPolicyTests(String line, String id, String opti
* The test case: parses passed in parameters and validates the outcome against the
* expected results.
*/
- @Test
- public void parseAttribute() {
+ @MethodSource("data")
+ @ParameterizedTest
+ public void parseAttribute(String line, String id, String options, String value, AttributeType type) {
+ initDefaultAttributeValidationPolicyTests(line, id, options, value, type);
try {
LdapAttribute attribute = (LdapAttribute) policy.parse(this.line);
diff --git a/ldif/ldif-core/src/test/java/org/springframework/ldap/ldif/Ldap233LdifParserTests.java b/ldif/ldif-core/src/test/java/org/springframework/ldap/ldif/Ldap233LdifParserTests.java
index c8f8739f37..afa06eb9c7 100644
--- a/ldif/ldif-core/src/test/java/org/springframework/ldap/ldif/Ldap233LdifParserTests.java
+++ b/ldif/ldif-core/src/test/java/org/springframework/ldap/ldif/Ldap233LdifParserTests.java
@@ -20,7 +20,7 @@
import java.io.IOException;
import java.nio.file.Files;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.springframework.ldap.ldif.parser.LdifParser;
import org.springframework.ldap.schema.BasicSchemaSpecification;
diff --git a/ldif/ldif-core/src/test/java/org/springframework/ldap/ldif/LdifParserTests.java b/ldif/ldif-core/src/test/java/org/springframework/ldap/ldif/LdifParserTests.java
index 464ee1acd8..d52934e260 100644
--- a/ldif/ldif-core/src/test/java/org/springframework/ldap/ldif/LdifParserTests.java
+++ b/ldif/ldif-core/src/test/java/org/springframework/ldap/ldif/LdifParserTests.java
@@ -18,9 +18,9 @@
import java.io.IOException;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -66,7 +66,7 @@ public LdifParserTests() {
/**
* Setup: opens file.
*/
- @Before
+ @BeforeEach
public void openLdif() {
try {
this.parser.open();
@@ -122,7 +122,7 @@ public void parseLdif() {
/**
* Cleanup: closes file.
*/
- @After
+ @AfterEach
public void closeLdif() {
try {
this.parser.close();
From e69a0abf2b707fe01449572836db79801b859fa1 Mon Sep 17 00:00:00 2001
From: Josh Cummings <3627351+jzheaux@users.noreply.github.com>
Date: Thu, 17 Jul 2025 12:00:21 -0600
Subject: [PATCH 20/67] Update Odm Tests to JUnit 5
Issue gh-1058
---
odm/build.gradle | 8 +-
.../ldap/odm/test/ConverterFactoryTests.java | 2 +-
.../ldap/odm/test/ConverterManagerTests.java | 25 +++---
.../ldap/odm/test/JDependTests.java | 6 +-
.../ldap/odm/test/LdapTests.java | 78 +++++++++++--------
.../ldap/odm/test/SchemaToJavaTests.java | 18 ++---
.../ldap/odm/test/SchemaViewerTests.java | 18 ++---
7 files changed, 88 insertions(+), 67 deletions(-)
diff --git a/odm/build.gradle b/odm/build.gradle
index ad3be5be0d..111f7ffa7f 100644
--- a/odm/build.gradle
+++ b/odm/build.gradle
@@ -34,5 +34,11 @@ dependencies {
testImplementation "org.apache.directory.shared:shared-ldap"
testImplementation "org.assertj:assertj-core"
testImplementation platform('org.junit:junit-bom')
- testImplementation "org.junit.vintage:junit-vintage-engine"
+ testImplementation "org.junit.jupiter:junit-jupiter-api"
+ testImplementation "org.junit.jupiter:junit-jupiter-engine"
+ testRuntimeOnly("org.junit.platform:junit-platform-launcher")
+}
+
+tasks.withType(Test).configureEach {
+ useJUnitPlatform()
}
\ No newline at end of file
diff --git a/odm/src/test/java/org/springframework/ldap/odm/test/ConverterFactoryTests.java b/odm/src/test/java/org/springframework/ldap/odm/test/ConverterFactoryTests.java
index 20315c3075..c6adbbd187 100755
--- a/odm/src/test/java/org/springframework/ldap/odm/test/ConverterFactoryTests.java
+++ b/odm/src/test/java/org/springframework/ldap/odm/test/ConverterFactoryTests.java
@@ -20,7 +20,7 @@
import java.util.HashSet;
import java.util.Set;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.springframework.ldap.odm.test.utils.ExecuteRunnable;
import org.springframework.ldap.odm.test.utils.RunnableTests;
diff --git a/odm/src/test/java/org/springframework/ldap/odm/test/ConverterManagerTests.java b/odm/src/test/java/org/springframework/ldap/odm/test/ConverterManagerTests.java
index be25c68ad8..1051f5aa5f 100755
--- a/odm/src/test/java/org/springframework/ldap/odm/test/ConverterManagerTests.java
+++ b/odm/src/test/java/org/springframework/ldap/odm/test/ConverterManagerTests.java
@@ -19,9 +19,9 @@
import java.net.URI;
import java.util.BitSet;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import org.springframework.ldap.odm.test.utils.ExecuteRunnable;
import org.springframework.ldap.odm.test.utils.RunnableTests;
@@ -32,12 +32,13 @@
import org.springframework.ldap.odm.typeconversion.impl.converters.ToStringConverter;
import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
public final class ConverterManagerTests {
private ConverterManagerImpl converterManager;
- @Before
+ @BeforeEach
public void setUp() {
this.converterManager = new ConverterManagerImpl();
@@ -64,7 +65,7 @@ public void setUp() {
this.converterManager.addConverter(String.class, "", URI.class, uric);
}
- @After
+ @AfterEach
public void tearDown() {
this.converterManager = null;
}
@@ -141,15 +142,17 @@ public void runTest(ConverterTestData testData) {
}
// No converter for classes
- @Test(expected = ConverterException.class)
- public void noClassConverter() throws Exception {
- this.converterManager.convert(BitSet.class, "", Integer.class);
+ @Test
+ public void noClassConverter() {
+ assertThatExceptionOfType(ConverterException.class)
+ .isThrownBy(() -> this.converterManager.convert(BitSet.class, "", Integer.class));
}
// Invalid syntax so converter fails
- @Test(expected = ConverterException.class)
- public void invalidSyntax() throws Exception {
- this.converterManager.convert(String.class, "not a uri", URI.class);
+ @Test
+ public void invalidSyntax() {
+ assertThatExceptionOfType(ConverterException.class)
+ .isThrownBy(() -> this.converterManager.convert(String.class, "not a uri", URI.class));
}
private static final class ConverterTestData {
diff --git a/odm/src/test/java/org/springframework/ldap/odm/test/JDependTests.java b/odm/src/test/java/org/springframework/ldap/odm/test/JDependTests.java
index 713ccce752..e973aa3904 100755
--- a/odm/src/test/java/org/springframework/ldap/odm/test/JDependTests.java
+++ b/odm/src/test/java/org/springframework/ldap/odm/test/JDependTests.java
@@ -19,8 +19,8 @@
import java.io.IOException;
import jdepend.framework.JDepend;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import static org.assertj.core.api.Assertions.assertThat;
@@ -28,7 +28,7 @@ public class JDependTests {
private JDepend jdepend;
- @Before
+ @BeforeEach
public void setUp() throws IOException {
this.jdepend = new JDepend();
this.jdepend.addDirectory("build/classes/java/main");
diff --git a/odm/src/test/java/org/springframework/ldap/odm/test/LdapTests.java b/odm/src/test/java/org/springframework/ldap/odm/test/LdapTests.java
index 1285219fb5..f18c5a201c 100755
--- a/odm/src/test/java/org/springframework/ldap/odm/test/LdapTests.java
+++ b/odm/src/test/java/org/springframework/ldap/odm/test/LdapTests.java
@@ -35,11 +35,11 @@
import org.apache.commons.cli.Options;
import org.apache.commons.cli.ParseException;
import org.apache.commons.cli.PosixParser;
-import org.junit.After;
-import org.junit.AfterClass;
-import org.junit.Before;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -68,6 +68,7 @@
import org.springframework.util.CollectionUtils;
import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
// Tests all OdmManager functions
public final class LdapTests {
@@ -128,7 +129,7 @@ public final class LdapTests {
}
}
- @BeforeClass
+ @BeforeAll
public static void setUpClass() throws Exception {
// Added because the close down of Apache DS on Linux does
// not seem to free up its port.
@@ -138,7 +139,7 @@ public static void setUpClass() throws Exception {
LdapTestUtils.startEmbeddedServer(port, baseName.toString(), "odm-test");
}
- @AfterClass
+ @AfterAll
public static void tearDownClass() throws Exception {
LdapTestUtils.shutdownEmbeddedServer();
}
@@ -192,12 +193,12 @@ public void setUp(String url, String username, String password) throws Exception
this.odmManager = new OdmManagerImpl(this.converterManager, this.contextSource, managedClasses);
}
- @Before
+ @BeforeEach
public void setUp() throws Exception {
setUp("ldap://127.0.0.1:" + port, "", "");
}
- @After
+ @AfterEach
public void tearDown() throws Exception {
LdapTestUtils.clearSubContexts(this.contextSource, baseName);
@@ -437,70 +438,81 @@ public void delete() throws Exception {
}
// Trying to read a non-existant entry should be flagged as an error
- @Test(expected = NameNotFoundException.class)
- public void readNonExistant() throws Exception {
- this.odmManager.read(Person.class, LdapUtils.newLdapName("cn=Hili Harvey,ou=Doctors,o=Whoniverse"));
+ @Test
+ public void readNonExistant() {
+ assertThatExceptionOfType(NameNotFoundException.class).isThrownBy(() -> this.odmManager.read(Person.class,
+ LdapUtils.newLdapName("cn=Hili Harvey,ou=Doctors,o=Whoniverse")));
}
// Read an entry with classes in addition to those supported by the Entry
- @Test(expected = OdmException.class)
- public void readNonMatchingObjectclasses() throws Exception {
- this.odmManager.read(Person.class, LdapUtils.newLdapName("ou=Doctors,o=Whoniverse"));
+ @Test
+ public void readNonMatchingObjectclasses() {
+ assertThatExceptionOfType(OdmException.class)
+ .isThrownBy(() -> this.odmManager.read(Person.class, LdapUtils.newLdapName("ou=Doctors,o=Whoniverse")));
}
// Every class to be managed must be annotated @Entry
- @Test(expected = MetaDataException.class)
+ @Test
public void noEntryAnnotation() {
- ((OdmManagerImpl) this.odmManager).addManagedClass(NoEntry.class);
+ assertThatExceptionOfType(MetaDataException.class)
+ .isThrownBy(() -> ((OdmManagerImpl) this.odmManager).addManagedClass(NoEntry.class));
}
// There must be a field with the @Id annotation
- @Test(expected = MetaDataException.class)
+ @Test
public void noId() {
- ((OdmManagerImpl) this.odmManager).addManagedClass(NoId.class);
+ assertThatExceptionOfType(MetaDataException.class)
+ .isThrownBy(() -> ((OdmManagerImpl) this.odmManager).addManagedClass(NoId.class));
}
// Only one field may be annotated @Id
- @Test(expected = MetaDataException.class)
+ @Test
public void twoIds() {
- ((OdmManagerImpl) this.odmManager).addManagedClass(TwoIds.class);
+ assertThatExceptionOfType(MetaDataException.class)
+ .isThrownBy(() -> ((OdmManagerImpl) this.odmManager).addManagedClass(TwoIds.class));
}
// All Entry annotated classes must have a zero argument public constructor
- @Test(expected = InvalidEntryException.class)
+ @Test
public void noConstructor() {
- ((OdmManagerImpl) this.odmManager).addManagedClass(NoConstructor.class);
+ assertThatExceptionOfType(InvalidEntryException.class)
+ .isThrownBy(() -> ((OdmManagerImpl) this.odmManager).addManagedClass(NoConstructor.class));
}
// It is illegal put put both the Id and the Attribute annotation on the same field
- @Test(expected = MetaDataException.class)
+ @Test
public void attributeOnId() {
- ((OdmManagerImpl) this.odmManager).addManagedClass(AttributeOnId.class);
+ assertThatExceptionOfType(MetaDataException.class)
+ .isThrownBy(() -> ((OdmManagerImpl) this.odmManager).addManagedClass(AttributeOnId.class));
}
// The field annotation with @Id must be of type javax.naming.Name
- @Test(expected = MetaDataException.class)
+ @Test
public void idIsNotAName() {
- ((OdmManagerImpl) this.odmManager).addManagedClass(IdIsNotAName.class);
+ assertThatExceptionOfType(MetaDataException.class)
+ .isThrownBy(() -> ((OdmManagerImpl) this.odmManager).addManagedClass(IdIsNotAName.class));
}
// The OdmManager should flag any missing converters when it is instantiated
- @Test(expected = InvalidEntryException.class)
+ @Test
public void missingConverter() {
- ((OdmManagerImpl) this.odmManager).addManagedClass(MissingConverter.class);
+ assertThatExceptionOfType(InvalidEntryException.class)
+ .isThrownBy(() -> ((OdmManagerImpl) this.odmManager).addManagedClass(MissingConverter.class));
}
// The OdmManager should flag if the objectClass attribute is not of the appropriate
// type
- @Test(expected = MetaDataException.class)
+ @Test
public void wrongClassForOc() {
- ((OdmManagerImpl) this.odmManager).addManagedClass(WrongClassForOc.class);
+ assertThatExceptionOfType(MetaDataException.class)
+ .isThrownBy(() -> ((OdmManagerImpl) this.odmManager).addManagedClass(WrongClassForOc.class));
}
// The OdmManager should flag any attempt to use a "unmanaged" class
- @Test(expected = MetaDataException.class)
+ @Test
public void unManagedClass() {
- this.odmManager.read(Integer.class, baseName);
+ assertThatExceptionOfType(MetaDataException.class)
+ .isThrownBy(() -> this.odmManager.read(Integer.class, baseName));
}
@Test
diff --git a/odm/src/test/java/org/springframework/ldap/odm/test/SchemaToJavaTests.java b/odm/src/test/java/org/springframework/ldap/odm/test/SchemaToJavaTests.java
index 0cd8840015..aaf03d8d94 100755
--- a/odm/src/test/java/org/springframework/ldap/odm/test/SchemaToJavaTests.java
+++ b/odm/src/test/java/org/springframework/ldap/odm/test/SchemaToJavaTests.java
@@ -30,11 +30,11 @@
import javax.naming.ldap.LdapName;
-import org.junit.After;
-import org.junit.AfterClass;
-import org.junit.Before;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -69,7 +69,7 @@ public final class SchemaToJavaTests {
private LdapContextSource contextSource;
- @BeforeClass
+ @BeforeAll
public static void setUpClass() throws Exception {
// Added because the close down of Apache DS on Linux does
// not seem to free up its port.
@@ -79,13 +79,13 @@ public static void setUpClass() throws Exception {
LdapTestUtils.startEmbeddedServer(port, baseName.toString(), "odm-test");
}
- @AfterClass
+ @AfterAll
public static void tearDownClass() throws Exception {
// Stop the in process LDAP server
LdapTestUtils.shutdownEmbeddedServer();
}
- @Before
+ @BeforeEach
public void setUp() throws Exception {
// Create some basic converters and a converter manager
this.converterManager = new ConverterManagerImpl();
@@ -120,7 +120,7 @@ public void setUp() throws Exception {
LdapTestUtils.cleanAndSetup(this.contextSource, baseName, new ClassPathResource("testdata.ldif"));
}
- @After
+ @AfterEach
public void tearDown() throws Exception {
LdapTestUtils.shutdownEmbeddedServer();
diff --git a/odm/src/test/java/org/springframework/ldap/odm/test/SchemaViewerTests.java b/odm/src/test/java/org/springframework/ldap/odm/test/SchemaViewerTests.java
index d1b4bb1d36..d0916b4938 100755
--- a/odm/src/test/java/org/springframework/ldap/odm/test/SchemaViewerTests.java
+++ b/odm/src/test/java/org/springframework/ldap/odm/test/SchemaViewerTests.java
@@ -24,11 +24,11 @@
import javax.naming.ldap.LdapName;
-import org.junit.After;
-import org.junit.AfterClass;
-import org.junit.Before;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import org.springframework.ldap.odm.test.utils.ExecuteRunnable;
import org.springframework.ldap.odm.test.utils.GetFreePort;
@@ -50,7 +50,7 @@ public final class SchemaViewerTests {
private static String[] commonFlags;
- @BeforeClass
+ @BeforeAll
public static void setUpClass() throws Exception {
// Added because the close down of Apache DS on Linux does
// not seem to free up its port.
@@ -63,16 +63,16 @@ public static void setUpClass() throws Exception {
LdapTestUtils.startEmbeddedServer(port, baseName.toString(), "odm-test");
}
- @AfterClass
+ @AfterAll
public static void tearDownClass() throws Exception {
LdapTestUtils.shutdownEmbeddedServer();
}
- @Before
+ @BeforeEach
public void setUp() throws Exception {
}
- @After
+ @AfterEach
public void tearDown() throws Exception {
}
From 4e72a913a3a447f06bd2ff5876ea4d50d7d52528 Mon Sep 17 00:00:00 2001
From: Josh Cummings <3627351+jzheaux@users.noreply.github.com>
Date: Thu, 17 Jul 2025 12:01:59 -0600
Subject: [PATCH 21/67] Update Sandbox Tests to JUnit 5
Issue gh-1058
---
sandbox/build.gradle | 6 ++++--
.../VirtualListViewControlDirContextProcessorTests.java | 6 +++---
2 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/sandbox/build.gradle b/sandbox/build.gradle
index 1a2f9a7f13..5933ba8f23 100644
--- a/sandbox/build.gradle
+++ b/sandbox/build.gradle
@@ -9,8 +9,9 @@ dependencies {
provided "com.sun:ldapbp:1.0"
testImplementation platform('org.junit:junit-bom')
- testImplementation "org.junit.vintage:junit-vintage-engine"
- testImplementation "junit:junit"
+ testImplementation "org.junit.jupiter:junit-jupiter-api"
+ testImplementation "org.junit.jupiter:junit-jupiter-engine"
+ testRuntimeOnly("org.junit.platform:junit-platform-launcher")
testImplementation "org.mockito:mockito-core"
testImplementation "gsbase:gsbase"
testImplementation "org.assertj:assertj-core"
@@ -26,4 +27,5 @@ compileTestJava {
test {
jvmArgs '--add-exports', 'java.naming/com.sun.jndi.ldap=ALL-UNNAMED'
+ useJUnitPlatform()
}
diff --git a/sandbox/src/test/java/org/springframework/ldap/control/VirtualListViewControlDirContextProcessorTests.java b/sandbox/src/test/java/org/springframework/ldap/control/VirtualListViewControlDirContextProcessorTests.java
index d0b481f52e..236f394a34 100644
--- a/sandbox/src/test/java/org/springframework/ldap/control/VirtualListViewControlDirContextProcessorTests.java
+++ b/sandbox/src/test/java/org/springframework/ldap/control/VirtualListViewControlDirContextProcessorTests.java
@@ -27,8 +27,8 @@
import com.sun.jndi.ldap.ctl.VirtualListViewControl;
import com.sun.jndi.ldap.ctl.VirtualListViewResponseControl;
import junit.framework.AssertionFailedError;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import org.springframework.ldap.OperationNotSupportedException;
@@ -50,7 +50,7 @@ public class VirtualListViewControlDirContextProcessorTests {
private LdapContext ldapContextMock;
- @Before
+ @BeforeEach
public void setUp() throws Exception {
// Create ldapContext mock
this.ldapContextMock = mock(LdapContext.class);
From bd85ac33f32e075c47a041b85e52ed4cd422bb40 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 17 Jul 2025 18:14:23 +0000
Subject: [PATCH 22/67] Bump
io.spring.javaformat:spring-javaformat-gradle-plugin
Bumps [io.spring.javaformat:spring-javaformat-gradle-plugin](https://github.com/spring-io/spring-javaformat) from 0.0.46 to 0.0.47.
- [Release notes](https://github.com/spring-io/spring-javaformat/releases)
- [Commits](https://github.com/spring-io/spring-javaformat/compare/v0.0.46...v0.0.47)
---
updated-dependencies:
- dependency-name: io.spring.javaformat:spring-javaformat-gradle-plugin
dependency-version: 0.0.47
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot]
---
buildSrc/build.gradle | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/buildSrc/build.gradle b/buildSrc/build.gradle
index f90d10b39a..f9b180436d 100644
--- a/buildSrc/build.gradle
+++ b/buildSrc/build.gradle
@@ -89,7 +89,7 @@ dependencies {
implementation 'com.apollographql.apollo:apollo-runtime:2.5.14'
implementation 'com.github.ben-manes:gradle-versions-plugin:0.52.0'
implementation 'com.github.spullara.mustache.java:compiler:0.9.14'
- implementation 'io.spring.javaformat:spring-javaformat-gradle-plugin:0.0.46'
+ implementation 'io.spring.javaformat:spring-javaformat-gradle-plugin:0.0.47'
implementation 'io.spring.gradle:spring-security-release-plugin:1.0.6'
implementation 'io.spring.nohttp:nohttp-gradle:0.0.11'
implementation 'net.sourceforge.htmlunit:htmlunit:2.70.0'
From 177dba396c1df0feb8415f3f971fa4be7b65ffd3 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 17 Jul 2025 18:14:32 +0000
Subject: [PATCH 23/67] Bump com.squareup.okhttp3:mockwebserver from 3.14.9 to
5.1.0
Bumps [com.squareup.okhttp3:mockwebserver](https://github.com/square/okhttp) from 3.14.9 to 5.1.0.
- [Changelog](https://github.com/square/okhttp/blob/master/CHANGELOG.md)
- [Commits](https://github.com/square/okhttp/compare/parent-3.14.9...parent-5.1.0)
---
updated-dependencies:
- dependency-name: com.squareup.okhttp3:mockwebserver
dependency-version: 5.1.0
dependency-type: direct:production
update-type: version-update:semver-major
...
Signed-off-by: dependabot[bot]
---
buildSrc/build.gradle | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/buildSrc/build.gradle b/buildSrc/build.gradle
index f9b180436d..a783a24487 100644
--- a/buildSrc/build.gradle
+++ b/buildSrc/build.gradle
@@ -107,7 +107,7 @@ dependencies {
testImplementation 'org.assertj:assertj-core:3.27.3'
testImplementation 'org.mockito:mockito-core:3.12.4'
testImplementation 'org.mockito:mockito-junit-jupiter:3.12.4'
- testImplementation "com.squareup.okhttp3:mockwebserver:3.14.9"
+ testImplementation "com.squareup.okhttp3:mockwebserver:5.1.0"
}
From d8b4580c9e81db96ced0139400c7403b6cbcba04 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 17 Jul 2025 18:21:26 +0000
Subject: [PATCH 24/67] Bump org.mockito:mockito-core from 3.12.4 to 5.18.0
Bumps [org.mockito:mockito-core](https://github.com/mockito/mockito) from 3.12.4 to 5.18.0.
- [Release notes](https://github.com/mockito/mockito/releases)
- [Commits](https://github.com/mockito/mockito/compare/v3.12.4...v5.18.0)
---
updated-dependencies:
- dependency-name: org.mockito:mockito-core
dependency-version: 5.18.0
dependency-type: direct:production
update-type: version-update:semver-major
...
Signed-off-by: dependabot[bot]
---
buildSrc/build.gradle | 4 ++--
dependencies/build.gradle | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/buildSrc/build.gradle b/buildSrc/build.gradle
index a783a24487..2145576db4 100644
--- a/buildSrc/build.gradle
+++ b/buildSrc/build.gradle
@@ -105,8 +105,8 @@ dependencies {
testImplementation "org.junit.jupiter:junit-jupiter-engine"
testImplementation 'org.apache.commons:commons-io:1.3.2'
testImplementation 'org.assertj:assertj-core:3.27.3'
- testImplementation 'org.mockito:mockito-core:3.12.4'
- testImplementation 'org.mockito:mockito-junit-jupiter:3.12.4'
+ testImplementation 'org.mockito:mockito-core:5.18.0'
+ testImplementation 'org.mockito:mockito-junit-jupiter:5.18.0'
testImplementation "com.squareup.okhttp3:mockwebserver:5.1.0"
}
diff --git a/dependencies/build.gradle b/dependencies/build.gradle
index 402fd5aaa3..c8eaceb444 100644
--- a/dependencies/build.gradle
+++ b/dependencies/build.gradle
@@ -55,8 +55,8 @@ dependencies {
api "org.hibernate:hibernate-core-jakarta:5.6.15.Final"
api "org.hsqldb:hsqldb:2.7.4"
api "junit:junit:4.13.2"
- api "org.mockito:mockito-core:5.14.1"
- api "org.mockito:mockito-junit-jupiter:5.14.1"
+ api "org.mockito:mockito-core:5.18.0"
+ api "org.mockito:mockito-junit-jupiter:5.18.0"
api "org.slf4j:jcl-over-slf4j:2.0.17"
api "org.slf4j:log4j-over-slf4j:2.0.17"
api "org.slf4j:slf4j-api:2.0.17"
From 9e23748a4a6fd67170f2b65c7e6253c5075045a2 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 17 Jul 2025 18:24:06 +0000
Subject: [PATCH 25/67] Bump io.micrometer:micrometer-bom from 1.14.8 to 1.15.2
Bumps [io.micrometer:micrometer-bom](https://github.com/micrometer-metrics/micrometer) from 1.14.8 to 1.15.2.
- [Release notes](https://github.com/micrometer-metrics/micrometer/releases)
- [Commits](https://github.com/micrometer-metrics/micrometer/compare/v1.14.8...v1.15.2)
---
updated-dependencies:
- dependency-name: io.micrometer:micrometer-bom
dependency-version: 1.15.2
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot]
---
dependencies/build.gradle | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dependencies/build.gradle b/dependencies/build.gradle
index c8eaceb444..ddc20c82b1 100644
--- a/dependencies/build.gradle
+++ b/dependencies/build.gradle
@@ -25,7 +25,7 @@ dependencies {
}
api platform("org.springframework.security:spring-security-bom:6.4.6")
api platform('com.fasterxml.jackson:jackson-bom:2.19.1')
- api platform("io.micrometer:micrometer-bom:1.14.8")
+ api platform("io.micrometer:micrometer-bom:1.15.2")
api platform("io.micrometer:micrometer-tracing-bom:1.5.2")
api platform("org.junit:junit-bom:5.12.2")
constraints {
From 0d8060ac13251a1b96e65403bec1c581aea91b07 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 17 Jul 2025 18:24:15 +0000
Subject: [PATCH 26/67] Bump com.apollographql.apollo:apollo-runtime from
2.5.14 to 4.3.1
Bumps [com.apollographql.apollo:apollo-runtime](https://github.com/apollographql/apollo-kotlin) from 2.5.14 to 4.3.1.
- [Release notes](https://github.com/apollographql/apollo-kotlin/releases)
- [Changelog](https://github.com/apollographql/apollo-kotlin/blob/main/CHANGELOG.md)
- [Commits](https://github.com/apollographql/apollo-kotlin/compare/v2.5.14...v4.3.1)
---
updated-dependencies:
- dependency-name: com.apollographql.apollo:apollo-runtime
dependency-version: 4.3.1
dependency-type: direct:production
update-type: version-update:semver-major
...
Signed-off-by: dependabot[bot]
---
buildSrc/build.gradle | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/buildSrc/build.gradle b/buildSrc/build.gradle
index 2145576db4..981a5698a2 100644
--- a/buildSrc/build.gradle
+++ b/buildSrc/build.gradle
@@ -86,7 +86,7 @@ dependencies {
implementation ('org.gretty:gretty:4.1.6') {
exclude group: 'org.springframework.boot', module: 'spring-boot-loader-tools'
}
- implementation 'com.apollographql.apollo:apollo-runtime:2.5.14'
+ implementation 'com.apollographql.apollo:apollo-runtime:4.3.1'
implementation 'com.github.ben-manes:gradle-versions-plugin:0.52.0'
implementation 'com.github.spullara.mustache.java:compiler:0.9.14'
implementation 'io.spring.javaformat:spring-javaformat-gradle-plugin:0.0.47'
From a7334793a937f9bb6490207ab111dc7f316ea708 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 17 Jul 2025 18:27:24 +0000
Subject: [PATCH 27/67] Bump org.mockito:mockito-junit-jupiter from 3.12.4 to
5.18.0
Bumps [org.mockito:mockito-junit-jupiter](https://github.com/mockito/mockito) from 3.12.4 to 5.18.0.
- [Release notes](https://github.com/mockito/mockito/releases)
- [Commits](https://github.com/mockito/mockito/compare/v3.12.4...v5.18.0)
---
updated-dependencies:
- dependency-name: org.mockito:mockito-junit-jupiter
dependency-version: 5.18.0
dependency-type: direct:production
update-type: version-update:semver-major
...
Signed-off-by: dependabot[bot]
---
core/build.gradle | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/core/build.gradle b/core/build.gradle
index 17dcc002ce..40040d318b 100644
--- a/core/build.gradle
+++ b/core/build.gradle
@@ -44,7 +44,7 @@ dependencies {
testImplementation "commons-lang:commons-lang"
testImplementation "gsbase:gsbase"
testImplementation "org.mockito:mockito-core"
- testImplementation "org.mockito:mockito-junit-jupiter:4.11.0"
+ testImplementation "org.mockito:mockito-junit-jupiter:5.18.0"
testImplementation "org.springframework:spring-test"
testImplementation "org.assertj:assertj-core"
testImplementation "com.unboundid:unboundid-ldapsdk"
From aeccadbd3623062224be24a2ce458816492a5b1d Mon Sep 17 00:00:00 2001
From: Josh Cummings <3627351+jzheaux@users.noreply.github.com>
Date: Thu, 17 Jul 2025 12:40:01 -0600
Subject: [PATCH 28/67] Increase PR Limit to Ten Per Branch
---
.github/dependabot.yml | 3 +++
1 file changed, 3 insertions(+)
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
index a592f7610b..33bad9eb99 100644
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -8,6 +8,7 @@ updates:
interval: daily
time: '03:40'
timezone: Etc/UTC
+ open-pull-requests-limit: 10
labels:
- 'type: dependency-upgrade'
- 'in: build'
@@ -22,6 +23,7 @@ updates:
interval: daily
time: '03:40'
timezone: Etc/UTC
+ open-pull-requests-limit: 10
labels:
- 'type: dependency-upgrade'
- 'in: build'
@@ -46,6 +48,7 @@ updates:
interval: daily
time: '03:40'
timezone: Etc/UTC
+ open-pull-requests-limit: 10
labels:
- 'type: dependency-upgrade'
- 'in: build'
From d91fdea5e3676cbdacba66756cbbd04385193653 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 17 Jul 2025 18:35:59 +0000
Subject: [PATCH 29/67] Bump
org.sonarsource.scanner.gradle:sonarqube-gradle-plugin
Bumps [org.sonarsource.scanner.gradle:sonarqube-gradle-plugin](https://github.com/SonarSource/sonar-scanner-gradle) from 2.8.0.1969 to 6.2.0.5505.
- [Release notes](https://github.com/SonarSource/sonar-scanner-gradle/releases)
- [Commits](https://github.com/SonarSource/sonar-scanner-gradle/compare/2.8.0.1969...6.2.0.5505)
---
updated-dependencies:
- dependency-name: org.sonarsource.scanner.gradle:sonarqube-gradle-plugin
dependency-version: 6.2.0.5505
dependency-type: direct:production
update-type: version-update:semver-major
...
Signed-off-by: dependabot[bot]
---
buildSrc/build.gradle | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/buildSrc/build.gradle b/buildSrc/build.gradle
index 981a5698a2..b78aaa4e21 100644
--- a/buildSrc/build.gradle
+++ b/buildSrc/build.gradle
@@ -97,7 +97,7 @@ dependencies {
implementation 'org.hidetake:gradle-ssh-plugin:2.10.1'
implementation 'org.jfrog.buildinfo:build-info-extractor-gradle:4.34.1'
implementation 'org.springframework:spring-core:6.2.7'
- implementation 'org.sonarsource.scanner.gradle:sonarqube-gradle-plugin:2.8.0.1969'
+ implementation 'org.sonarsource.scanner.gradle:sonarqube-gradle-plugin:6.2.0.5505'
testImplementation platform('org.junit:junit-bom:5.12.2')
testImplementation "org.junit.jupiter:junit-jupiter-api"
From 0a297aa66f42e387fa9a74f4d958ed2ffc52628d Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 17 Jul 2025 18:36:23 +0000
Subject: [PATCH 30/67] Bump org.springframework.data:spring-data-bom from
2021.2.18 to 2025.0.1
Bumps [org.springframework.data:spring-data-bom](https://github.com/spring-projects/spring-data-bom) from 2021.2.18 to 2025.0.1.
- [Release notes](https://github.com/spring-projects/spring-data-bom/releases)
- [Commits](https://github.com/spring-projects/spring-data-bom/compare/2021.2.18...2025.0.1)
---
updated-dependencies:
- dependency-name: org.springframework.data:spring-data-bom
dependency-version: 2025.0.1
dependency-type: direct:production
update-type: version-update:semver-major
...
Signed-off-by: dependabot[bot]
---
dependencies/build.gradle | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dependencies/build.gradle b/dependencies/build.gradle
index ddc20c82b1..034e67c9b1 100644
--- a/dependencies/build.gradle
+++ b/dependencies/build.gradle
@@ -21,7 +21,7 @@ dependencies {
api platform("org.springframework.data:spring-data-bom:$springDataVersion")
} else {
api platform("org.springframework:spring-framework-bom:7.0.0-M6")
- api platform("org.springframework.data:spring-data-bom:2021.2.18")
+ api platform("org.springframework.data:spring-data-bom:2025.0.1")
}
api platform("org.springframework.security:spring-security-bom:6.4.6")
api platform('com.fasterxml.jackson:jackson-bom:2.19.1')
From 0400bee5de0b1b614d2144d390f77de70c3f55bd Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 17 Jul 2025 18:36:10 +0000
Subject: [PATCH 31/67] Bump io.projectreactor:reactor-core from 3.7.6 to 3.7.8
Bumps [io.projectreactor:reactor-core](https://github.com/reactor/reactor-core) from 3.7.6 to 3.7.8.
- [Release notes](https://github.com/reactor/reactor-core/releases)
- [Commits](https://github.com/reactor/reactor-core/compare/v3.7.6...v3.7.8)
---
updated-dependencies:
- dependency-name: io.projectreactor:reactor-core
dependency-version: 3.7.8
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot]
---
buildSrc/build.gradle | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/buildSrc/build.gradle b/buildSrc/build.gradle
index b78aaa4e21..9a710de867 100644
--- a/buildSrc/build.gradle
+++ b/buildSrc/build.gradle
@@ -82,7 +82,7 @@ dependencies {
implementation localGroovy()
implementation 'io.github.gradle-nexus:publish-plugin:1.3.0'
- implementation 'io.projectreactor:reactor-core:3.7.6'
+ implementation 'io.projectreactor:reactor-core:3.7.8'
implementation ('org.gretty:gretty:4.1.6') {
exclude group: 'org.springframework.boot', module: 'spring-boot-loader-tools'
}
From 483f9cec0d6ac3fd6f637b37ad2d2e951efd3387 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 17 Jul 2025 18:36:25 +0000
Subject: [PATCH 32/67] Bump org.jfrog.buildinfo:build-info-extractor-gradle
Bumps [org.jfrog.buildinfo:build-info-extractor-gradle](https://github.com/jfrog/artifactory-gradle-plugin) from 4.34.1 to 5.2.5.
- [Release notes](https://github.com/jfrog/artifactory-gradle-plugin/releases)
- [Commits](https://github.com/jfrog/artifactory-gradle-plugin/commits/5.2.5)
---
updated-dependencies:
- dependency-name: org.jfrog.buildinfo:build-info-extractor-gradle
dependency-version: 5.2.5
dependency-type: direct:production
update-type: version-update:semver-major
...
Signed-off-by: dependabot[bot]
---
build.gradle | 2 +-
buildSrc/build.gradle | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/build.gradle b/build.gradle
index a6c5f9faf8..9503a11a73 100644
--- a/build.gradle
+++ b/build.gradle
@@ -6,7 +6,7 @@ buildscript {
dependencies {
classpath "com.github.ben-manes:gradle-versions-plugin:0.52.0"
classpath "io.spring.gradle:dependency-management-plugin:1.1.7"
- classpath "org.jfrog.buildinfo:build-info-extractor-gradle:4.34.1"
+ classpath "org.jfrog.buildinfo:build-info-extractor-gradle:5.2.5"
classpath 'org.hidetake:gradle-ssh-plugin:2.10.1'
classpath 'io.codearte.gradle.nexus:gradle-nexus-staging-plugin:0.30.0'
classpath "io.spring.javaformat:spring-javaformat-gradle-plugin:$springJavaformatVersion"
diff --git a/buildSrc/build.gradle b/buildSrc/build.gradle
index 9a710de867..68213b75be 100644
--- a/buildSrc/build.gradle
+++ b/buildSrc/build.gradle
@@ -95,7 +95,7 @@ dependencies {
implementation 'net.sourceforge.htmlunit:htmlunit:2.70.0'
implementation 'org.asciidoctor:asciidoctor-gradle-jvm:3.3.2'
implementation 'org.hidetake:gradle-ssh-plugin:2.10.1'
- implementation 'org.jfrog.buildinfo:build-info-extractor-gradle:4.34.1'
+ implementation 'org.jfrog.buildinfo:build-info-extractor-gradle:5.2.5'
implementation 'org.springframework:spring-core:6.2.7'
implementation 'org.sonarsource.scanner.gradle:sonarqube-gradle-plugin:6.2.0.5505'
From 0d636c77d41c40253efe3d3fb9a682269d726dbb Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 17 Jul 2025 18:41:36 +0000
Subject: [PATCH 33/67] Bump org.asciidoctor:asciidoctor-gradle-jvm from 3.3.2
to 4.0.4
Bumps org.asciidoctor:asciidoctor-gradle-jvm from 3.3.2 to 4.0.4.
---
updated-dependencies:
- dependency-name: org.asciidoctor:asciidoctor-gradle-jvm
dependency-version: 4.0.4
dependency-type: direct:production
update-type: version-update:semver-major
...
Signed-off-by: dependabot[bot]
---
buildSrc/build.gradle | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/buildSrc/build.gradle b/buildSrc/build.gradle
index 68213b75be..aae15b2915 100644
--- a/buildSrc/build.gradle
+++ b/buildSrc/build.gradle
@@ -93,7 +93,7 @@ dependencies {
implementation 'io.spring.gradle:spring-security-release-plugin:1.0.6'
implementation 'io.spring.nohttp:nohttp-gradle:0.0.11'
implementation 'net.sourceforge.htmlunit:htmlunit:2.70.0'
- implementation 'org.asciidoctor:asciidoctor-gradle-jvm:3.3.2'
+ implementation 'org.asciidoctor:asciidoctor-gradle-jvm:4.0.4'
implementation 'org.hidetake:gradle-ssh-plugin:2.10.1'
implementation 'org.jfrog.buildinfo:build-info-extractor-gradle:5.2.5'
implementation 'org.springframework:spring-core:6.2.7'
From 965d9e7b1ecceea892a90d35b1d93c2788be136f Mon Sep 17 00:00:00 2001
From: Josh Cummings <3627351+jzheaux@users.noreply.github.com>
Date: Thu, 17 Jul 2025 12:46:31 -0600
Subject: [PATCH 34/67] Add 3.3.x to Release Scheduler
---
.github/workflows/release-scheduler.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.github/workflows/release-scheduler.yml b/.github/workflows/release-scheduler.yml
index 0a7343fb7b..f8ccc0bd4e 100644
--- a/.github/workflows/release-scheduler.yml
+++ b/.github/workflows/release-scheduler.yml
@@ -14,7 +14,7 @@ jobs:
strategy:
matrix:
# List of active maintenance branches.
- branch: [ main, 3.2.x, 2.4.x ]
+ branch: [ main, 3.3.x, 3.2.x, 2.4.x ]
runs-on: ubuntu-latest
steps:
- name: Checkout
From 7a297deb8744d1cce86f95bd431737e9b6c8adad Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 17 Jul 2025 18:40:58 +0000
Subject: [PATCH 35/67] Bump org.junit:junit-bom from 5.12.2 to 5.13.3
Bumps [org.junit:junit-bom](https://github.com/junit-team/junit-framework) from 5.12.2 to 5.13.3.
- [Release notes](https://github.com/junit-team/junit-framework/releases)
- [Commits](https://github.com/junit-team/junit-framework/compare/r5.12.2...r5.13.3)
---
updated-dependencies:
- dependency-name: org.junit:junit-bom
dependency-version: 5.13.3
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot]
---
buildSrc/build.gradle | 2 +-
dependencies/build.gradle | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/buildSrc/build.gradle b/buildSrc/build.gradle
index aae15b2915..49ae4ef669 100644
--- a/buildSrc/build.gradle
+++ b/buildSrc/build.gradle
@@ -99,7 +99,7 @@ dependencies {
implementation 'org.springframework:spring-core:6.2.7'
implementation 'org.sonarsource.scanner.gradle:sonarqube-gradle-plugin:6.2.0.5505'
- testImplementation platform('org.junit:junit-bom:5.12.2')
+ testImplementation platform('org.junit:junit-bom:5.13.3')
testImplementation "org.junit.jupiter:junit-jupiter-api"
testImplementation "org.junit.jupiter:junit-jupiter-params"
testImplementation "org.junit.jupiter:junit-jupiter-engine"
diff --git a/dependencies/build.gradle b/dependencies/build.gradle
index 034e67c9b1..669995a814 100644
--- a/dependencies/build.gradle
+++ b/dependencies/build.gradle
@@ -27,7 +27,7 @@ dependencies {
api platform('com.fasterxml.jackson:jackson-bom:2.19.1')
api platform("io.micrometer:micrometer-bom:1.15.2")
api platform("io.micrometer:micrometer-tracing-bom:1.5.2")
- api platform("org.junit:junit-bom:5.12.2")
+ api platform("org.junit:junit-bom:5.13.3")
constraints {
api "com.querydsl:querydsl-core:$queryDslVersion"
api "com.querydsl:querydsl-apt:$queryDslVersion"
From a9b975f236bc2ad3bef9a7a2f79c530a4cf70478 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 17 Jul 2025 18:41:12 +0000
Subject: [PATCH 36/67] Bump com.unboundid:unboundid-ldapsdk from 6.0.11 to
7.0.3
Bumps [com.unboundid:unboundid-ldapsdk](https://github.com/pingidentity/ldapsdk) from 6.0.11 to 7.0.3.
- [Release notes](https://github.com/pingidentity/ldapsdk/releases)
- [Changelog](https://github.com/pingidentity/ldapsdk/blob/master/docs/release-notes.html)
- [Commits](https://github.com/pingidentity/ldapsdk/compare/6.0.11...7.0.3)
---
updated-dependencies:
- dependency-name: com.unboundid:unboundid-ldapsdk
dependency-version: 7.0.3
dependency-type: direct:production
update-type: version-update:semver-major
...
Signed-off-by: dependabot[bot]
---
dependencies/build.gradle | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dependencies/build.gradle b/dependencies/build.gradle
index 669995a814..a79adad20a 100644
--- a/dependencies/build.gradle
+++ b/dependencies/build.gradle
@@ -34,7 +34,7 @@ dependencies {
api "commons-pool:commons-pool:1.6"
api "org.apache.commons:commons-pool2:2.12.1"
api "com.google.code.typica:typica:1.7.2"
- api "com.unboundid:unboundid-ldapsdk:6.0.11"
+ api "com.unboundid:unboundid-ldapsdk:7.0.3"
api "commons-codec:commons-codec:1.18.0"
api "commons-cli:commons-cli:1.9.0"
api "commons-lang:commons-lang:2.6"
From e4832fc40dce4e62caf8c1beca544caaefa37d55 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 17 Jul 2025 18:41:39 +0000
Subject: [PATCH 37/67] Bump com.intershop.gradle.javacc from 4.1.3 to 5.0.1
Bumps com.intershop.gradle.javacc from 4.1.3 to 5.0.1.
---
updated-dependencies:
- dependency-name: com.intershop.gradle.javacc
dependency-version: 5.0.1
dependency-type: direct:production
update-type: version-update:semver-major
...
Signed-off-by: dependabot[bot]
---
settings.gradle | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/settings.gradle b/settings.gradle
index 61d487f8ee..b61fef738c 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1,6 +1,6 @@
pluginManagement {
plugins {
- id 'com.intershop.gradle.javacc' version '4.1.3'
+ id 'com.intershop.gradle.javacc' version '5.0.1'
}
repositories {
gradlePluginPortal()
From 5cc68047da6481ededb3f304db385ee11556838f Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 17 Jul 2025 18:42:09 +0000
Subject: [PATCH 38/67] Bump io.github.gradle-nexus:publish-plugin from 1.3.0
to 2.0.0
Bumps [io.github.gradle-nexus:publish-plugin](https://github.com/gradle-nexus/publish-plugin) from 1.3.0 to 2.0.0.
- [Release notes](https://github.com/gradle-nexus/publish-plugin/releases)
- [Commits](https://github.com/gradle-nexus/publish-plugin/compare/v1.3.0...v2.0.0)
---
updated-dependencies:
- dependency-name: io.github.gradle-nexus:publish-plugin
dependency-version: 2.0.0
dependency-type: direct:production
update-type: version-update:semver-major
...
Signed-off-by: dependabot[bot]
---
buildSrc/build.gradle | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/buildSrc/build.gradle b/buildSrc/build.gradle
index 49ae4ef669..a8d70d579f 100644
--- a/buildSrc/build.gradle
+++ b/buildSrc/build.gradle
@@ -81,7 +81,7 @@ dependencies {
implementation 'org.yaml:snakeyaml:1.33'
implementation localGroovy()
- implementation 'io.github.gradle-nexus:publish-plugin:1.3.0'
+ implementation 'io.github.gradle-nexus:publish-plugin:2.0.0'
implementation 'io.projectreactor:reactor-core:3.7.8'
implementation ('org.gretty:gretty:4.1.6') {
exclude group: 'org.springframework.boot', module: 'spring-boot-loader-tools'
From 3e136a83c5fe0e59f48570bce5f881b2b4c5fe37 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 17 Jul 2025 18:41:18 +0000
Subject: [PATCH 39/67] Bump org.springframework.security:spring-security-bom
Bumps [org.springframework.security:spring-security-bom](https://github.com/spring-projects/spring-security) from 6.4.6 to 6.5.1.
- [Release notes](https://github.com/spring-projects/spring-security/releases)
- [Changelog](https://github.com/spring-projects/spring-security/blob/main/RELEASE.adoc)
- [Commits](https://github.com/spring-projects/spring-security/compare/6.4.6...6.5.1)
---
updated-dependencies:
- dependency-name: org.springframework.security:spring-security-bom
dependency-version: 6.5.1
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot]
---
dependencies/build.gradle | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dependencies/build.gradle b/dependencies/build.gradle
index a79adad20a..6007484c9b 100644
--- a/dependencies/build.gradle
+++ b/dependencies/build.gradle
@@ -23,7 +23,7 @@ dependencies {
api platform("org.springframework:spring-framework-bom:7.0.0-M6")
api platform("org.springframework.data:spring-data-bom:2025.0.1")
}
- api platform("org.springframework.security:spring-security-bom:6.4.6")
+ api platform("org.springframework.security:spring-security-bom:6.5.1")
api platform('com.fasterxml.jackson:jackson-bom:2.19.1')
api platform("io.micrometer:micrometer-bom:1.15.2")
api platform("io.micrometer:micrometer-tracing-bom:1.5.2")
From 1d228dd62873225d1417fc51833e4a6ef9f98a6c Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 17 Jul 2025 18:48:56 +0000
Subject: [PATCH 40/67] Bump org.springframework:spring-core from 6.2.7 to
6.2.9
Bumps [org.springframework:spring-core](https://github.com/spring-projects/spring-framework) from 6.2.7 to 6.2.9.
- [Release notes](https://github.com/spring-projects/spring-framework/releases)
- [Commits](https://github.com/spring-projects/spring-framework/compare/v6.2.7...v6.2.9)
---
updated-dependencies:
- dependency-name: org.springframework:spring-core
dependency-version: 6.2.9
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot]
---
buildSrc/build.gradle | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/buildSrc/build.gradle b/buildSrc/build.gradle
index a8d70d579f..bde1e04943 100644
--- a/buildSrc/build.gradle
+++ b/buildSrc/build.gradle
@@ -96,7 +96,7 @@ dependencies {
implementation 'org.asciidoctor:asciidoctor-gradle-jvm:4.0.4'
implementation 'org.hidetake:gradle-ssh-plugin:2.10.1'
implementation 'org.jfrog.buildinfo:build-info-extractor-gradle:5.2.5'
- implementation 'org.springframework:spring-core:6.2.7'
+ implementation 'org.springframework:spring-core:6.2.9'
implementation 'org.sonarsource.scanner.gradle:sonarqube-gradle-plugin:6.2.0.5505'
testImplementation platform('org.junit:junit-bom:5.13.3')
From 813f4f33fdc83733ce80b794514d1950322da7e2 Mon Sep 17 00:00:00 2001
From: Josh Cummings <3627351+jzheaux@users.noreply.github.com>
Date: Thu, 17 Jul 2025 12:57:33 -0600
Subject: [PATCH 41/67] Update to Framework 7.0.0-M7
Closes gh-1152
---
dependencies/build.gradle | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dependencies/build.gradle b/dependencies/build.gradle
index 6007484c9b..a3353ed964 100644
--- a/dependencies/build.gradle
+++ b/dependencies/build.gradle
@@ -20,7 +20,7 @@ dependencies {
api platform("org.springframework:spring-framework-bom:$springFrameworkVersion")
api platform("org.springframework.data:spring-data-bom:$springDataVersion")
} else {
- api platform("org.springframework:spring-framework-bom:7.0.0-M6")
+ api platform("org.springframework:spring-framework-bom:7.0.0-M7")
api platform("org.springframework.data:spring-data-bom:2025.0.1")
}
api platform("org.springframework.security:spring-security-bom:6.5.1")
From 29d72e84a6533ff51fc0bc977bcfc6c8c401752e Mon Sep 17 00:00:00 2001
From: Josh Cummings <3627351+jzheaux@users.noreply.github.com>
Date: Thu, 17 Jul 2025 13:01:34 -0600
Subject: [PATCH 42/67] Use JSpecify
Closes gh-1153
---
.../org/springframework/ldap/core/NameAwareAttributes.java | 3 ++-
.../ldap/core/support/ObservationContextSource.java | 4 ++--
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/core/src/main/java/org/springframework/ldap/core/NameAwareAttributes.java b/core/src/main/java/org/springframework/ldap/core/NameAwareAttributes.java
index bad22553fe..47516284f6 100644
--- a/core/src/main/java/org/springframework/ldap/core/NameAwareAttributes.java
+++ b/core/src/main/java/org/springframework/ldap/core/NameAwareAttributes.java
@@ -25,7 +25,8 @@
import javax.naming.directory.Attribute;
import javax.naming.directory.Attributes;
-import org.springframework.lang.NonNull;
+import org.jspecify.annotations.NonNull;
+
import org.springframework.util.Assert;
/**
diff --git a/core/src/main/java/org/springframework/ldap/core/support/ObservationContextSource.java b/core/src/main/java/org/springframework/ldap/core/support/ObservationContextSource.java
index 46b76814da..12ce778974 100644
--- a/core/src/main/java/org/springframework/ldap/core/support/ObservationContextSource.java
+++ b/core/src/main/java/org/springframework/ldap/core/support/ObservationContextSource.java
@@ -45,8 +45,8 @@
import io.micrometer.observation.Observation;
import io.micrometer.observation.ObservationConvention;
import io.micrometer.observation.ObservationRegistry;
+import org.jspecify.annotations.NonNull;
-import org.springframework.lang.NonNull;
import org.springframework.ldap.NamingException;
import org.springframework.ldap.core.ContextSource;
import org.springframework.ldap.core.DirContextOperations;
@@ -190,7 +190,7 @@ public KeyValues getLowCardinalityKeyValues(DirContextOperationObservationContex
}
@Override
- public boolean supportsContext(@NonNull Observation.Context context) {
+ public boolean supportsContext(Observation.Context context) {
return context instanceof DirContextOperationObservationContext;
}
From fc986f3917a6121bd7659f697ec8d7995bc87bec Mon Sep 17 00:00:00 2001
From: Josh Cummings <3627351+jzheaux@users.noreply.github.com>
Date: Thu, 17 Jul 2025 13:28:23 -0600
Subject: [PATCH 43/67] Require That Tests Pass to Deploy Artifacts
---
.github/workflows/continuous-integration-workflow.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.github/workflows/continuous-integration-workflow.yml b/.github/workflows/continuous-integration-workflow.yml
index eb07c4fb81..dc9d03e694 100644
--- a/.github/workflows/continuous-integration-workflow.yml
+++ b/.github/workflows/continuous-integration-workflow.yml
@@ -34,7 +34,7 @@ jobs:
test-args: --refresh-dependencies -PforceMavenRepositories=snapshot -PisOverrideVersionCatalog -PtestToolchain=17 -PspringFrameworkVersion=6.2.+ -PspringDataVersion=2024.0.+ --stacktrace
deploy-artifacts:
name: Deploy Artifacts
- needs: [ build ]
+ needs: [ build, test ]
uses: spring-io/spring-security-release-tools/.github/workflows/deploy-artifacts.yml@v1
with:
should-deploy-artifacts: ${{ needs.build.outputs.should-deploy-artifacts }}
From ad03809fb62eaa05d055fdedff8b447e2f22f849 Mon Sep 17 00:00:00 2001
From: Josh Cummings <3627351+jzheaux@users.noreply.github.com>
Date: Thu, 17 Jul 2025 13:33:48 -0600
Subject: [PATCH 44/67] Update Test Build to Latests Snapshots
---
.github/workflows/continuous-integration-workflow.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.github/workflows/continuous-integration-workflow.yml b/.github/workflows/continuous-integration-workflow.yml
index dc9d03e694..84a76dbe2e 100644
--- a/.github/workflows/continuous-integration-workflow.yml
+++ b/.github/workflows/continuous-integration-workflow.yml
@@ -31,7 +31,7 @@ jobs:
- java-version: 17
with:
java-version: ${{ matrix.java-version }}
- test-args: --refresh-dependencies -PforceMavenRepositories=snapshot -PisOverrideVersionCatalog -PtestToolchain=17 -PspringFrameworkVersion=6.2.+ -PspringDataVersion=2024.0.+ --stacktrace
+ test-args: --refresh-dependencies -PforceMavenRepositories=snapshot -PisOverrideVersionCatalog -PtestToolchain=17 -PspringFrameworkVersion=7.+ -PspringDataVersion=2025.0.+ --stacktrace
deploy-artifacts:
name: Deploy Artifacts
needs: [ build, test ]
From 416d97c008e5dc2a022c3aeafea5f48533aa57f0 Mon Sep 17 00:00:00 2001
From: Josh Cummings <3627351+jzheaux@users.noreply.github.com>
Date: Thu, 17 Jul 2025 13:36:56 -0600
Subject: [PATCH 45/67] Revert "Bump
org.jfrog.buildinfo:build-info-extractor-gradle"
This reverts commit 483f9cec0d6ac3fd6f637b37ad2d2e951efd3387.
---
build.gradle | 2 +-
buildSrc/build.gradle | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/build.gradle b/build.gradle
index 9503a11a73..a6c5f9faf8 100644
--- a/build.gradle
+++ b/build.gradle
@@ -6,7 +6,7 @@ buildscript {
dependencies {
classpath "com.github.ben-manes:gradle-versions-plugin:0.52.0"
classpath "io.spring.gradle:dependency-management-plugin:1.1.7"
- classpath "org.jfrog.buildinfo:build-info-extractor-gradle:5.2.5"
+ classpath "org.jfrog.buildinfo:build-info-extractor-gradle:4.34.1"
classpath 'org.hidetake:gradle-ssh-plugin:2.10.1'
classpath 'io.codearte.gradle.nexus:gradle-nexus-staging-plugin:0.30.0'
classpath "io.spring.javaformat:spring-javaformat-gradle-plugin:$springJavaformatVersion"
diff --git a/buildSrc/build.gradle b/buildSrc/build.gradle
index bde1e04943..a58876fc35 100644
--- a/buildSrc/build.gradle
+++ b/buildSrc/build.gradle
@@ -95,7 +95,7 @@ dependencies {
implementation 'net.sourceforge.htmlunit:htmlunit:2.70.0'
implementation 'org.asciidoctor:asciidoctor-gradle-jvm:4.0.4'
implementation 'org.hidetake:gradle-ssh-plugin:2.10.1'
- implementation 'org.jfrog.buildinfo:build-info-extractor-gradle:5.2.5'
+ implementation 'org.jfrog.buildinfo:build-info-extractor-gradle:4.34.1'
implementation 'org.springframework:spring-core:6.2.9'
implementation 'org.sonarsource.scanner.gradle:sonarqube-gradle-plugin:6.2.0.5505'
From 7c84f103528f1f5d6a9c202411dc291cde939abc Mon Sep 17 00:00:00 2001
From: Josh Cummings <3627351+jzheaux@users.noreply.github.com>
Date: Thu, 17 Jul 2025 14:34:07 -0600
Subject: [PATCH 46/67] Publish Milestones to Central
---
.github/workflows/continuous-integration-workflow.yml | 1 +
1 file changed, 1 insertion(+)
diff --git a/.github/workflows/continuous-integration-workflow.yml b/.github/workflows/continuous-integration-workflow.yml
index 84a76dbe2e..2f9856441f 100644
--- a/.github/workflows/continuous-integration-workflow.yml
+++ b/.github/workflows/continuous-integration-workflow.yml
@@ -38,6 +38,7 @@ jobs:
uses: spring-io/spring-security-release-tools/.github/workflows/deploy-artifacts.yml@v1
with:
should-deploy-artifacts: ${{ needs.build.outputs.should-deploy-artifacts }}
+ default-publish-milestones-central: true
secrets: inherit
deploy-docs:
name: Deploy Docs
From 923912400f992566bfe6cf700e822680a47c7aa0 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
Date: Thu, 17 Jul 2025 20:55:01 +0000
Subject: [PATCH 47/67] Release 4.0.0-M1
---
gradle.properties | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/gradle.properties b/gradle.properties
index 5dc9e988d9..193d9562f0 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,3 +1,3 @@
-version=4.0.0-SNAPSHOT
+version=4.0.0-M1
springJavaformatVersion=0.0.38
org.gradle.caching=true
From ae34a6511f54eb0c891d1c186dd042b2f955d0ec Mon Sep 17 00:00:00 2001
From: Josh Cummings <3627351+jzheaux@users.noreply.github.com>
Date: Thu, 17 Jul 2025 15:22:58 -0600
Subject: [PATCH 48/67] Update Milestone URL to Point to Central
---
.github/workflows/continuous-integration-workflow.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.github/workflows/continuous-integration-workflow.yml b/.github/workflows/continuous-integration-workflow.yml
index 2f9856441f..381e3311e8 100644
--- a/.github/workflows/continuous-integration-workflow.yml
+++ b/.github/workflows/continuous-integration-workflow.yml
@@ -61,7 +61,7 @@ jobs:
with:
should-perform-release: ${{ needs.deploy-artifacts.outputs.artifacts-deployed }}
project-version: ${{ needs.deploy-artifacts.outputs.project-version }}
- milestone-repo-url: https://repo.spring.io/artifactory/milestone
+ milestone-repo-url: https://repo1.maven.org/maven2
release-repo-url: https://repo1.maven.org/maven2
artifact-path: org/springframework/ldap/spring-ldap-core
slack-announcing-id: spring-ldap-announcing
From a78e8a0a709933d32c807e93b37bca71a3721744 Mon Sep 17 00:00:00 2001
From: Josh Cummings <3627351+jzheaux@users.noreply.github.com>
Date: Wed, 30 Jul 2025 09:19:57 -0600
Subject: [PATCH 49/67] Next Development Version
---
gradle.properties | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/gradle.properties b/gradle.properties
index 193d9562f0..5dc9e988d9 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,3 +1,3 @@
-version=4.0.0-M1
+version=4.0.0-SNAPSHOT
springJavaformatVersion=0.0.38
org.gradle.caching=true
From 3053f270885749f2fc329ccbbe58cb3794af931a Mon Sep 17 00:00:00 2001
From: Josh Cummings <3627351+jzheaux@users.noreply.github.com>
Date: Wed, 30 Jul 2025 09:22:35 -0600
Subject: [PATCH 50/67] Remove 3.2.x from CI
Closes gh-1174
---
.github/dependabot.yml | 25 -------------------------
.github/workflows/release-scheduler.yml | 2 +-
2 files changed, 1 insertion(+), 26 deletions(-)
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
index 33bad9eb99..477ec4de35 100644
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -40,31 +40,6 @@ updates:
update-types:
- version-update:semver-major
- version-update:semver-minor
- - package-ecosystem: gradle
- target-branch: 3.2.x
- milestone: 77 # 3.2.x
- directory: /
- schedule:
- interval: daily
- time: '03:40'
- timezone: Etc/UTC
- open-pull-requests-limit: 10
- labels:
- - 'type: dependency-upgrade'
- - 'in: build'
- ignore:
- - dependency-name: org.apache.directory.server:*
- - dependency-name: org.apache.directory.shared:*
- - dependency-name: org.junit:junit-bom
- update-types:
- - version-update:semver-major
- - dependency-name: org.mockito:mockito-bom
- update-types:
- - version-update:semver-major
- - dependency-name: '*'
- update-types:
- - version-update:semver-major
- - version-update:semver-minor
- package-ecosystem: github-actions
target-branch: main
diff --git a/.github/workflows/release-scheduler.yml b/.github/workflows/release-scheduler.yml
index f8ccc0bd4e..210c9a8825 100644
--- a/.github/workflows/release-scheduler.yml
+++ b/.github/workflows/release-scheduler.yml
@@ -14,7 +14,7 @@ jobs:
strategy:
matrix:
# List of active maintenance branches.
- branch: [ main, 3.3.x, 3.2.x, 2.4.x ]
+ branch: [ main, 3.3.x, 2.4.x ]
runs-on: ubuntu-latest
steps:
- name: Checkout
From 0358363431bda458b2f6df742a7b05744a468127 Mon Sep 17 00:00:00 2001
From: Josh Cummings <3627351+jzheaux@users.noreply.github.com>
Date: Thu, 7 Aug 2025 12:16:11 -0600
Subject: [PATCH 51/67] Update Copyright Headers to Use 2006-present
Closes gh-1173
---
.../spring/gradle/convention/ManagementConfigurationPlugin.java | 2 +-
.../gradle/github/changelog/GitHubChangelogPlugin.java | 2 +-
.../gradle/github/milestones/GitHubMilestoneApi.java | 2 +-
.../github/milestones/GitHubMilestoneHasNoOpenIssuesTask.java | 2 +-
.../gradle/github/milestones/GitHubMilestonePlugin.java | 2 +-
.../gradle/github/release/CreateGitHubReleaseTask.java | 2 +-
.../springframework/gradle/github/release/GitHubReleaseApi.java | 2 +-
.../gradle/github/release/GitHubReleasePlugin.java | 2 +-
.../java/org/springframework/gradle/github/release/Release.java | 2 +-
.../org/springframework/gradle/maven/SpringSigningPlugin.java | 2 +-
.../src/main/java/org/springframework/gradle/sagan/Release.java | 2 +-
.../main/java/org/springframework/gradle/sagan/SaganApi.java | 2 +-
.../springframework/gradle/sagan/SaganCreateReleaseTask.java | 2 +-
.../springframework/gradle/sagan/SaganDeleteReleaseTask.java | 2 +-
.../main/java/org/springframework/gradle/sagan/SaganPlugin.java | 2 +-
buildSrc/src/main/java/s101/S101Configure.java | 2 +-
buildSrc/src/main/java/s101/S101Configurer.java | 2 +-
buildSrc/src/main/java/s101/S101Install.java | 2 +-
buildSrc/src/main/java/s101/S101Plugin.java | 2 +-
buildSrc/src/main/java/s101/S101PluginExtension.java | 2 +-
buildSrc/src/test/java/io/spring/gradle/TestKit.java | 2 +-
.../spring/gradle/convention/IncludeCheckRemotePluginTests.java | 2 +-
.../io/spring/gradle/convention/IntegrationPluginTests.java | 2 +-
.../java/io/spring/gradle/convention/JavadocApiPluginTests.java | 2 +-
.../gradle/convention/RepositoryConventionPluginTests.java | 2 +-
.../java/io/spring/gradle/convention/sagan/SaganApiTests.java | 2 +-
.../gradle/github/release/GitHubReleaseApiTests.java | 2 +-
.../security/convention/versions/DependencyExcludesTests.java | 2 +-
.../versions/TransitiveDependencyLookupUtilsTests.java | 2 +-
.../springframework/ldap/LdapTemplateLookupOpenLdapITests.java | 2 +-
.../ldap/control/LdapTemplatePagedSearchITests.java | 2 +-
.../ldap/control/LdapTemplateSortedSearchITests.java | 2 +-
core/src/main/java/org/springframework/LdapDataEntry.java | 2 +-
.../java/org/springframework/ldap/AttributeInUseException.java | 2 +-
.../springframework/ldap/AttributeModificationException.java | 2 +-
.../java/org/springframework/ldap/AuthenticationException.java | 2 +-
.../ldap/AuthenticationNotSupportedException.java | 2 +-
.../java/org/springframework/ldap/BadLdapGrammarException.java | 2 +-
.../java/org/springframework/ldap/CannotProceedException.java | 2 +-
.../java/org/springframework/ldap/CommunicationException.java | 2 +-
.../java/org/springframework/ldap/ConfigurationException.java | 2 +-
.../java/org/springframework/ldap/ContextNotEmptyException.java | 2 +-
.../springframework/ldap/InsufficientResourcesException.java | 2 +-
.../org/springframework/ldap/InterruptedNamingException.java | 2 +-
.../ldap/InvalidAttributeIdentifierException.java | 2 +-
.../springframework/ldap/InvalidAttributeValueException.java | 2 +-
.../org/springframework/ldap/InvalidAttributesException.java | 2 +-
.../java/org/springframework/ldap/InvalidNameException.java | 2 +-
.../springframework/ldap/InvalidSearchControlsException.java | 2 +-
.../org/springframework/ldap/InvalidSearchFilterException.java | 2 +-
.../java/org/springframework/ldap/LdapReferralException.java | 2 +-
.../java/org/springframework/ldap/LimitExceededException.java | 2 +-
core/src/main/java/org/springframework/ldap/LinkException.java | 2 +-
.../main/java/org/springframework/ldap/LinkLoopException.java | 2 +-
.../java/org/springframework/ldap/MalformedLinkException.java | 2 +-
.../org/springframework/ldap/NameAlreadyBoundException.java | 2 +-
.../java/org/springframework/ldap/NameNotFoundException.java | 2 +-
.../src/main/java/org/springframework/ldap/NamingException.java | 2 +-
.../java/org/springframework/ldap/NamingSecurityException.java | 2 +-
.../org/springframework/ldap/NoInitialContextException.java | 2 +-
.../java/org/springframework/ldap/NoPermissionException.java | 2 +-
.../java/org/springframework/ldap/NoSuchAttributeException.java | 2 +-
.../main/java/org/springframework/ldap/NotContextException.java | 2 +-
.../springframework/ldap/OperationNotSupportedException.java | 2 +-
.../java/org/springframework/ldap/PartialResultException.java | 2 +-
.../main/java/org/springframework/ldap/ReferralException.java | 2 +-
.../java/org/springframework/ldap/SchemaViolationException.java | 2 +-
.../org/springframework/ldap/ServiceUnavailableException.java | 2 +-
.../org/springframework/ldap/SizeLimitExceededException.java | 2 +-
.../org/springframework/ldap/TimeLimitExceededException.java | 2 +-
.../org/springframework/ldap/UncategorizedLdapException.java | 2 +-
.../org/springframework/ldap/aot/hint/LdapCoreRuntimeHints.java | 2 +-
.../DefaultValuesAuthenticationSourceDecorator.java | 2 +-
.../org/springframework/ldap/config/ContextSourceParser.java | 2 +-
.../ldap/config/DefaultRenamingStrategyParser.java | 2 +-
.../src/main/java/org/springframework/ldap/config/Elements.java | 2 +-
.../org/springframework/ldap/config/LdapNamespaceHandler.java | 2 +-
.../org/springframework/ldap/config/LdapTemplateParser.java | 2 +-
.../main/java/org/springframework/ldap/config/ParserUtils.java | 2 +-
.../springframework/ldap/config/TransactionManagerParser.java | 2 +-
...actFallbackRequestAndResponseControlDirContextProcessor.java | 2 +-
.../ldap/control/AbstractRequestControlDirContextProcessor.java | 2 +-
.../ldap/control/CreateControlFailedException.java | 2 +-
.../main/java/org/springframework/ldap/control/PagedResult.java | 2 +-
.../org/springframework/ldap/control/PagedResultsCookie.java | 2 +-
.../ldap/control/PagedResultsDirContextProcessor.java | 2 +-
.../ldap/control/PagedResultsRequestControl.java | 2 +-
.../ldap/control/SortControlDirContextProcessor.java | 2 +-
.../ldap/convert/ConversionServiceBeanFactoryPostProcessor.java | 2 +-
.../java/org/springframework/ldap/convert/ConverterUtils.java | 2 +-
.../org/springframework/ldap/convert/NameToStringConverter.java | 2 +-
.../org/springframework/ldap/convert/StringToNameConverter.java | 2 +-
.../springframework/ldap/core/AttributeModificationsAware.java | 2 +-
.../java/org/springframework/ldap/core/AttributesMapper.java | 2 +-
.../ldap/core/AttributesMapperCallbackHandler.java | 2 +-
.../ldap/core/AuthenticatedLdapEntryContextCallback.java | 2 +-
.../ldap/core/AuthenticatedLdapEntryContextMapper.java | 2 +-
.../springframework/ldap/core/AuthenticationErrorCallback.java | 2 +-
.../org/springframework/ldap/core/AuthenticationSource.java | 2 +-
.../ldap/core/CollectingAuthenticationErrorCallback.java | 2 +-
.../ldap/core/CollectingNameClassPairCallbackHandler.java | 2 +-
.../java/org/springframework/ldap/core/ContextAssembler.java | 2 +-
.../java/org/springframework/ldap/core/ContextExecutor.java | 2 +-
.../main/java/org/springframework/ldap/core/ContextMapper.java | 2 +-
.../springframework/ldap/core/ContextMapperCallbackHandler.java | 2 +-
.../main/java/org/springframework/ldap/core/ContextSource.java | 2 +-
.../org/springframework/ldap/core/DefaultDnParserFactory.java | 2 +-
.../java/org/springframework/ldap/core/DefaultLdapClient.java | 2 +-
.../org/springframework/ldap/core/DefaultLdapClientBuilder.java | 2 +-
.../springframework/ldap/core/DefaultNameClassPairMapper.java | 2 +-
.../java/org/springframework/ldap/core/DirContextAdapter.java | 2 +-
.../org/springframework/ldap/core/DirContextOperations.java | 2 +-
.../java/org/springframework/ldap/core/DirContextProcessor.java | 2 +-
.../java/org/springframework/ldap/core/DirContextProxy.java | 2 +-
.../java/org/springframework/ldap/core/DistinguishedName.java | 2 +-
.../org/springframework/ldap/core/DistinguishedNameEditor.java | 2 +-
core/src/main/java/org/springframework/ldap/core/DnParser.java | 2 +-
.../springframework/ldap/core/IncrementalAttributesMapper.java | 2 +-
.../springframework/ldap/core/IterableNamingEnumeration.java | 2 +-
.../main/java/org/springframework/ldap/core/LdapAttribute.java | 2 +-
.../main/java/org/springframework/ldap/core/LdapAttributes.java | 2 +-
.../src/main/java/org/springframework/ldap/core/LdapClient.java | 2 +-
.../org/springframework/ldap/core/LdapEntryIdentification.java | 2 +-
.../ldap/core/LdapEntryIdentificationContextMapper.java | 2 +-
.../main/java/org/springframework/ldap/core/LdapOperations.java | 2 +-
core/src/main/java/org/springframework/ldap/core/LdapRdn.java | 2 +-
.../java/org/springframework/ldap/core/LdapRdnComponent.java | 2 +-
.../main/java/org/springframework/ldap/core/LdapTemplate.java | 2 +-
.../java/org/springframework/ldap/core/NameAwareAttribute.java | 2 +-
.../java/org/springframework/ldap/core/NameAwareAttributes.java | 2 +-
.../springframework/ldap/core/NameClassPairCallbackHandler.java | 2 +-
.../java/org/springframework/ldap/core/NameClassPairMapper.java | 2 +-
.../org/springframework/ldap/core/ObjectRetrievalException.java | 2 +-
.../main/java/org/springframework/ldap/core/SearchExecutor.java | 2 +-
.../ldap/core/support/AbstractContextMapper.java | 2 +-
.../ldap/core/support/AbstractContextSource.java | 2 +-
.../support/AbstractTlsDirContextAuthenticationStrategy.java | 2 +-
.../ldap/core/support/AggregateDirContextProcessor.java | 2 +-
.../springframework/ldap/core/support/BaseLdapNameAware.java | 2 +-
.../springframework/ldap/core/support/BaseLdapPathAware.java | 2 +-
.../ldap/core/support/BaseLdapPathBeanPostProcessor.java | 2 +-
.../ldap/core/support/BaseLdapPathContextSource.java | 2 +-
.../springframework/ldap/core/support/BaseLdapPathSource.java | 2 +-
.../core/support/ContextMapperCallbackHandlerWithControls.java | 2 +-
.../ldap/core/support/ContextMapperWithControls.java | 2 +-
.../core/support/ContextSourceObservationPostProcessor.java | 2 +-
.../ldap/core/support/CountNameClassPairCallbackHandler.java | 2 +-
.../ldap/core/support/DefaultDirObjectFactory.java | 2 +-
.../ldap/core/support/DefaultIncrementalAttributesMapper.java | 2 +-
.../support/DefaultTlsDirContextAuthenticationStrategy.java | 2 +-
.../support/DelegatingBaseLdapPathContextSourceSupport.java | 2 +-
.../core/support/DigestMd5DirContextAuthenticationStrategy.java | 2 +-
.../ldap/core/support/DirContextAuthenticationStrategy.java | 2 +-
.../org/springframework/ldap/core/support/DirContextSource.java | 2 +-
.../support/ExternalTlsDirContextAuthenticationStrategy.java | 2 +-
.../springframework/ldap/core/support/LdapContextSource.java | 2 +-
.../ldap/core/support/LdapOperationsCallback.java | 2 +-
.../ldap/core/support/LookupAttemptingCallback.java | 2 +-
.../ldap/core/support/ObservationContextSource.java | 2 +-
.../java/org/springframework/ldap/core/support/RangeOption.java | 2 +-
.../core/support/SimpleDirContextAuthenticationStrategy.java | 2 +-
.../springframework/ldap/core/support/SingleContextSource.java | 2 +-
.../org/springframework/ldap/filter/AbsoluteFalseFilter.java | 2 +-
.../org/springframework/ldap/filter/AbsoluteTrueFilter.java | 2 +-
.../java/org/springframework/ldap/filter/AbstractFilter.java | 2 +-
.../main/java/org/springframework/ldap/filter/AndFilter.java | 2 +-
.../org/springframework/ldap/filter/BinaryLogicalFilter.java | 2 +-
.../java/org/springframework/ldap/filter/CompareFilter.java | 2 +-
.../main/java/org/springframework/ldap/filter/EqualsFilter.java | 2 +-
core/src/main/java/org/springframework/ldap/filter/Filter.java | 2 +-
.../main/java/org/springframework/ldap/filter/FilterEditor.java | 2 +-
.../springframework/ldap/filter/GreaterThanOrEqualsFilter.java | 2 +-
.../java/org/springframework/ldap/filter/HardcodedFilter.java | 2 +-
.../org/springframework/ldap/filter/LessThanOrEqualsFilter.java | 2 +-
.../main/java/org/springframework/ldap/filter/LikeFilter.java | 2 +-
.../main/java/org/springframework/ldap/filter/NotFilter.java | 2 +-
.../java/org/springframework/ldap/filter/NotPresentFilter.java | 2 +-
.../src/main/java/org/springframework/ldap/filter/OrFilter.java | 2 +-
.../java/org/springframework/ldap/filter/PresentFilter.java | 2 +-
.../java/org/springframework/ldap/filter/ProximityFilter.java | 2 +-
.../springframework/ldap/filter/WhitespaceWildcardsFilter.java | 2 +-
.../org/springframework/ldap/odm/annotations/Attribute.java | 2 +-
.../org/springframework/ldap/odm/annotations/DnAttribute.java | 2 +-
.../java/org/springframework/ldap/odm/annotations/Entry.java | 2 +-
.../main/java/org/springframework/ldap/odm/annotations/Id.java | 2 +-
.../org/springframework/ldap/odm/annotations/Transient.java | 2 +-
.../org/springframework/ldap/odm/annotations/package-info.java | 2 +-
.../ldap/odm/config/ObjectDirectoryMapperConfiguration.java | 2 +-
.../springframework/ldap/odm/core/ObjectDirectoryMapper.java | 2 +-
.../java/org/springframework/ldap/odm/core/OdmException.java | 2 +-
.../springframework/ldap/odm/core/impl/AttributeMetaData.java | 2 +-
.../springframework/ldap/odm/core/impl/CaseIgnoreString.java | 2 +-
.../ldap/odm/core/impl/DefaultObjectDirectoryMapper.java | 2 +-
.../ldap/odm/core/impl/InvalidEntryException.java | 2 +-
.../springframework/ldap/odm/core/impl/MetaDataException.java | 2 +-
.../org/springframework/ldap/odm/core/impl/ObjectMetaData.java | 2 +-
.../ldap/odm/core/impl/UnmanagedClassException.java | 2 +-
.../org/springframework/ldap/odm/core/impl/package-info.java | 2 +-
.../java/org/springframework/ldap/odm/core/package-info.java | 2 +-
.../ldap/odm/typeconversion/ConverterException.java | 2 +-
.../ldap/odm/typeconversion/ConverterManager.java | 2 +-
.../typeconversion/impl/ConversionServiceConverterManager.java | 2 +-
.../springframework/ldap/odm/typeconversion/impl/Converter.java | 2 +-
.../odm/typeconversion/impl/ConverterManagerFactoryBean.java | 2 +-
.../ldap/odm/typeconversion/impl/ConverterManagerImpl.java | 2 +-
.../ldap/odm/typeconversion/impl/StringConverter.java | 2 +-
.../odm/typeconversion/impl/converters/FromStringConverter.java | 2 +-
.../odm/typeconversion/impl/converters/ToStringConverter.java | 2 +-
.../ldap/odm/typeconversion/impl/converters/package-info.java | 2 +-
.../ldap/odm/typeconversion/impl/package-info.java | 2 +-
.../springframework/ldap/odm/typeconversion/package-info.java | 2 +-
.../java/org/springframework/ldap/pool/DelegatingContext.java | 2 +-
.../org/springframework/ldap/pool/DelegatingDirContext.java | 2 +-
.../org/springframework/ldap/pool/DelegatingLdapContext.java | 2 +-
.../main/java/org/springframework/ldap/pool/DirContextType.java | 2 +-
.../java/org/springframework/ldap/pool/FailureAwareContext.java | 2 +-
.../springframework/ldap/pool/MutableDelegatingLdapContext.java | 2 +-
.../java/org/springframework/ldap/pool/PoolExhaustedAction.java | 2 +-
.../ldap/pool/factory/DirContextPoolableObjectFactory.java | 2 +-
.../ldap/pool/factory/MutablePoolingContextSource.java | 2 +-
.../springframework/ldap/pool/factory/PoolingContextSource.java | 2 +-
.../ldap/pool/validation/DefaultDirContextValidator.java | 2 +-
.../ldap/pool/validation/DirContextValidator.java | 2 +-
.../java/org/springframework/ldap/pool2/DelegatingContext.java | 2 +-
.../org/springframework/ldap/pool2/DelegatingDirContext.java | 2 +-
.../org/springframework/ldap/pool2/DelegatingLdapContext.java | 2 +-
.../java/org/springframework/ldap/pool2/DirContextType.java | 2 +-
.../org/springframework/ldap/pool2/FailureAwareContext.java | 2 +-
.../ldap/pool2/MutableDelegatingLdapContext.java | 2 +-
.../ldap/pool2/factory/DirContextPooledObjectFactory.java | 2 +-
.../ldap/pool2/factory/MutablePooledContextSource.java | 2 +-
.../java/org/springframework/ldap/pool2/factory/PoolConfig.java | 2 +-
.../springframework/ldap/pool2/factory/PooledContextSource.java | 2 +-
.../ldap/pool2/validation/DefaultDirContextValidator.java | 2 +-
.../ldap/pool2/validation/DirContextValidator.java | 2 +-
.../springframework/ldap/query/AppendableContainerCriteria.java | 2 +-
.../java/org/springframework/ldap/query/ConditionCriteria.java | 2 +-
.../java/org/springframework/ldap/query/ContainerCriteria.java | 2 +-
.../org/springframework/ldap/query/CriteriaContainerType.java | 2 +-
.../springframework/ldap/query/DefaultConditionCriteria.java | 2 +-
.../springframework/ldap/query/DefaultContainerCriteria.java | 2 +-
.../src/main/java/org/springframework/ldap/query/LdapQuery.java | 2 +-
.../java/org/springframework/ldap/query/LdapQueryBuilder.java | 2 +-
.../main/java/org/springframework/ldap/query/SearchScope.java | 2 +-
.../ldap/support/AttributeValueCallbackHandler.java | 2 +-
.../main/java/org/springframework/ldap/support/LdapEncoder.java | 2 +-
.../java/org/springframework/ldap/support/LdapNameBuilder.java | 2 +-
.../main/java/org/springframework/ldap/support/LdapUtils.java | 2 +-
.../java/org/springframework/ldap/support/ListComparator.java | 2 +-
.../ldap/transaction/compensating/BindOperationExecutor.java | 2 +-
.../ldap/transaction/compensating/BindOperationRecorder.java | 2 +-
.../LdapCompensatingTransactionOperationFactory.java | 2 +-
.../ldap/transaction/compensating/LdapTransactionUtils.java | 2 +-
.../compensating/ModifyAttributesOperationExecutor.java | 2 +-
.../compensating/ModifyAttributesOperationRecorder.java | 2 +-
.../ldap/transaction/compensating/NullOperationExecutor.java | 2 +-
.../ldap/transaction/compensating/NullOperationRecorder.java | 2 +-
.../ldap/transaction/compensating/RebindOperationExecutor.java | 2 +-
.../ldap/transaction/compensating/RebindOperationRecorder.java | 2 +-
.../ldap/transaction/compensating/RenameOperationExecutor.java | 2 +-
.../ldap/transaction/compensating/RenameOperationRecorder.java | 2 +-
.../transaction/compensating/TempEntryRenamingStrategy.java | 2 +-
.../ldap/transaction/compensating/UnbindOperationExecutor.java | 2 +-
.../ldap/transaction/compensating/UnbindOperationRecorder.java | 2 +-
.../compensating/manager/ContextSourceTransactionManager.java | 2 +-
.../manager/ContextSourceTransactionManagerDelegate.java | 2 +-
.../ldap/transaction/compensating/manager/DirContextHolder.java | 2 +-
.../manager/TransactionAwareContextSourceProxy.java | 2 +-
.../manager/TransactionAwareDirContextInvocationHandler.java | 2 +-
.../compensating/support/DefaultTempEntryRenamingStrategy.java | 2 +-
.../support/DifferentSubtreeTempEntryRenamingStrategy.java | 2 +-
.../compensating/CompensatingTransactionOperationExecutor.java | 2 +-
.../compensating/CompensatingTransactionOperationFactory.java | 2 +-
.../compensating/CompensatingTransactionOperationManager.java | 2 +-
.../compensating/CompensatingTransactionOperationRecorder.java | 2 +-
.../support/AbstractCompensatingTransactionManagerDelegate.java | 2 +-
.../support/CompensatingTransactionHolderSupport.java | 2 +-
.../compensating/support/CompensatingTransactionObject.java | 2 +-
.../compensating/support/CompensatingTransactionUtils.java | 2 +-
.../support/DefaultCompensatingTransactionOperationManager.java | 2 +-
.../java/org/springframework/ldap/NamingExceptionTests.java | 2 +-
.../ldap/aot/hint/LdapCoreRuntimeHintsTests.java | 2 +-
.../DefaultValuesAuthenticationSourceDecoratorTests.java | 2 +-
.../springframework/ldap/config/DummyAuthenticationSource.java | 2 +-
.../ldap/config/DummyAuthenticationStrategy.java | 2 +-
.../ldap/config/LdapTemplateNamespaceHandlerTests.java | 2 +-
.../java/org/springframework/ldap/config/MockFactoryBean.java | 2 +-
.../java/org/springframework/ldap/control/PagedResultTests.java | 2 +-
.../springframework/ldap/control/PagedResultsCookieTests.java | 2 +-
.../ldap/control/PagedResultsDirContextProcessorTests.java | 2 +-
.../ldap/control/RequestControlDirContextProcessorTests.java | 2 +-
.../ldap/control/SortControlDirContextProcessorTests.java | 2 +-
.../ldap/core/CollectingNameClassPairCallbackHandlerTests.java | 2 +-
.../ldap/core/ContextMapperCallbackHandlerTests.java | 2 +-
.../springframework/ldap/core/DefaultLdapClientListTests.java | 2 +-
.../springframework/ldap/core/DefaultLdapClientLookupTests.java | 2 +-
.../springframework/ldap/core/DefaultLdapClientRenameTests.java | 2 +-
.../org/springframework/ldap/core/DefaultLdapClientTests.java | 2 +-
.../springframework/ldap/core/DirContextAdapterBugTests.java | 2 +-
.../org/springframework/ldap/core/DirContextAdapterTests.java | 2 +-
.../springframework/ldap/core/DistinguishedNameEditorTests.java | 2 +-
.../org/springframework/ldap/core/DistinguishedNameTests.java | 2 +-
.../org/springframework/ldap/core/LdapRdnComponentTests.java | 2 +-
.../test/java/org/springframework/ldap/core/LdapRdnTests.java | 2 +-
.../org/springframework/ldap/core/LdapTemplateListTests.java | 2 +-
.../org/springframework/ldap/core/LdapTemplateLookupTests.java | 2 +-
.../org/springframework/ldap/core/LdapTemplateOdmTests.java | 2 +-
.../org/springframework/ldap/core/LdapTemplateRenameTests.java | 2 +-
.../java/org/springframework/ldap/core/LdapTemplateTests.java | 2 +-
.../test/java/org/springframework/ldap/core/MockDirContext.java | 2 +-
.../org/springframework/ldap/core/NameAwareAttributeTests.java | 2 +-
.../org/springframework/ldap/core/NameAwareAttributesTests.java | 2 +-
.../org/springframework/ldap/core/TestDirContextAdapters.java | 2 +-
.../org/springframework/ldap/core/TestModificationItems.java | 2 +-
.../org/springframework/ldap/core/TestNameAwareAttributes.java | 2 +-
.../ldap/core/support/AbstractContextSourceTests.java | 2 +-
.../ldap/core/support/AggregateDirContextProcessorTests.java | 2 +-
.../ldap/core/support/BaseLdapPathBeanPostProcessorTests.java | 2 +-
.../support/ContextMapperCallbackHandlerWithControlsTests.java | 2 +-
.../support/CountNameClassPairResultCallbackHandlerTests.java | 2 +-
.../ldap/core/support/DefaultDirObjectFactoryTests.java | 2 +-
.../core/support/DefaultIncrementalAttributesMapperTests.java | 2 +-
.../DefaultTlsDirContextAuthenticationStrategyTests.java | 2 +-
.../ldap/core/support/LdapContextSourceTests.java | 2 +-
.../ldap/core/support/ObservationContextSourceTests.java | 2 +-
.../org/springframework/ldap/core/support/RangeOptionTests.java | 2 +-
.../support/SimpleDirContextAuthenticationStrategyTests.java | 2 +-
.../ldap/core/support/SingleContextSourceTests.java | 2 +-
.../springframework/ldap/core/support/ldap294/Ldap294Tests.java | 2 +-
.../org/springframework/ldap/filter/AbstractFilterTests.java | 2 +-
.../java/org/springframework/ldap/filter/AndFilterTests.java | 2 +-
.../java/org/springframework/ldap/filter/EqualsFilterTests.java | 2 +-
.../ldap/filter/GreaterThanOrEqualsFilterTests.java | 2 +-
.../org/springframework/ldap/filter/HardcodedFilterTests.java | 2 +-
.../ldap/filter/LessThanOrEqualsFilterTests.java | 2 +-
.../java/org/springframework/ldap/filter/LikeFilterTests.java | 2 +-
.../java/org/springframework/ldap/filter/NotFilterTests.java | 2 +-
.../org/springframework/ldap/filter/NotPresentFilterTests.java | 2 +-
.../java/org/springframework/ldap/filter/OrFilterTests.java | 2 +-
.../org/springframework/ldap/filter/PresentFilterTests.java | 2 +-
.../org/springframework/ldap/filter/ProximityFilterTests.java | 2 +-
.../ldap/filter/WhitespaceWildcardsFilterTests.java | 2 +-
.../springframework/ldap/odm/core/impl/BaseUnitTestPerson.java | 2 +-
.../ldap/odm/core/impl/DefaultObjectDirectoryMapperTests.java | 2 +-
.../org/springframework/ldap/odm/core/impl/UnitTestPerson.java | 2 +-
.../impl/UnitTestPersonWithIndexedAndUnindexedDnAttributes.java | 2 +-
.../odm/core/impl/UnitTestPersonWithIndexedDnAttributes.java | 2 +-
.../ldap/odm/core/impl/UnitTestPersonWithInvalidFieldType.java | 2 +-
.../org/springframework/ldap/pool/AbstractPoolTestCase.java | 2 +-
.../org/springframework/ldap/pool/DelegatingContextTests.java | 2 +-
.../springframework/ldap/pool/DelegatingDirContextTests.java | 2 +-
.../springframework/ldap/pool/DelegatingLdapContextTests.java | 2 +-
.../ldap/pool/MutableDelegatingLdapContextTests.java | 2 +-
.../ldap/pool/factory/DirContextPoolableObjectFactoryTests.java | 2 +-
.../ldap/pool/factory/MutablePoolingContextSourceTests.java | 2 +-
.../ldap/pool/factory/PoolingContextSourceTests.java | 2 +-
.../ldap/pool/validation/DefaultDirContextValidatorTests.java | 2 +-
.../org/springframework/ldap/pool2/AbstractPoolTestCase.java | 2 +-
.../org/springframework/ldap/pool2/DelegatingContextTests.java | 2 +-
.../springframework/ldap/pool2/DelegatingDirContextTests.java | 2 +-
.../springframework/ldap/pool2/DelegatingLdapContextTests.java | 2 +-
.../org/springframework/ldap/pool2/DummyEvictionPolicy.java | 2 +-
.../ldap/pool2/MutableDelegatingLdapContextTests.java | 2 +-
.../ldap/pool2/factory/DirContextPooledObjectFactoryTests.java | 2 +-
.../ldap/pool2/factory/MutablePooledContextSourceTests.java | 2 +-
.../org/springframework/ldap/pool2/factory/PoolConfigTests.java | 2 +-
.../ldap/pool2/factory/PooledContextSourceTests.java | 2 +-
.../org/springframework/ldap/query/LdapQueryBuilderTests.java | 2 +-
.../java/org/springframework/ldap/support/LdapEncoderTests.java | 2 +-
.../org/springframework/ldap/support/LdapNameBuilderTests.java | 2 +-
.../java/org/springframework/ldap/support/LdapUtilsTests.java | 2 +-
.../transaction/compensating/BindOperationExecutorTests.java | 2 +-
.../transaction/compensating/BindOperationRecorderTests.java | 2 +-
.../LdapCompensatingTransactionOperationFactoryTests.java | 2 +-
.../transaction/compensating/LdapTransactionUtilsTests.java | 2 +-
.../compensating/ModifyAttributesOperationExecutorTests.java | 2 +-
.../compensating/ModifyAttributesOperationRecorderTests.java | 2 +-
.../transaction/compensating/RebindOperationExecutorTests.java | 2 +-
.../transaction/compensating/RebindOperationRecorderTests.java | 2 +-
.../transaction/compensating/RenameOperationExecutorTests.java | 2 +-
.../transaction/compensating/RenameOperationRecorderTests.java | 2 +-
.../transaction/compensating/UnbindOperationExecutorTests.java | 2 +-
.../transaction/compensating/UnbindOperationRecorderTests.java | 2 +-
.../compensating/manager/CompensatingTransactionUtilsTests.java | 2 +-
.../manager/ContextSourceTransactionManagerTests.java | 2 +-
.../manager/TransactionAwareContextSourceProxyTests.java | 2 +-
.../TransactionAwareDirContextInvocationHandlerTests.java | 2 +-
.../support/DefaultTempEntryRenamingStrategyTests.java | 2 +-
.../support/DifferentSubtreeTempEntryRenamingStrategyTests.java | 2 +-
.../java/org/springframework/ldap/util/ListComparatorTests.java | 2 +-
.../DefaultCompensatingTransactionOperationManagerTests.java | 2 +-
etc/checkstyle/header.txt | 2 +-
.../ldap/ldif/InvalidAttributeFormatException.java | 2 +-
.../springframework/ldap/ldif/InvalidRecordFormatException.java | 2 +-
.../java/org/springframework/ldap/ldif/parser/LdifParser.java | 2 +-
.../main/java/org/springframework/ldap/ldif/parser/Parser.java | 2 +-
.../ldap/ldif/support/AttributeValidationPolicy.java | 2 +-
.../ldap/ldif/support/DefaultAttributeValidationPolicy.java | 2 +-
.../org/springframework/ldap/ldif/support/LineIdentifier.java | 2 +-
.../org/springframework/ldap/ldif/support/SeparatorPolicy.java | 2 +-
.../springframework/ldap/schema/BasicSchemaSpecification.java | 2 +-
.../springframework/ldap/schema/DefaultSchemaSpecification.java | 2 +-
.../java/org/springframework/ldap/schema/Specification.java | 2 +-
.../ldap/ldif/DefaultAttributeValidationPolicyTests.java | 2 +-
.../org/springframework/ldap/ldif/Ldap233LdifParserTests.java | 2 +-
.../java/org/springframework/ldap/ldif/LdifParserTests.java | 2 +-
.../main/java/org/springframework/ldap/odm/core/OdmManager.java | 2 +-
.../org/springframework/ldap/odm/core/impl/OdmManagerImpl.java | 2 +-
.../ldap/odm/core/impl/OdmManagerImplFactoryBean.java | 2 +-
.../org/springframework/ldap/odm/tools/AttributeSchema.java | 2 +-
.../java/org/springframework/ldap/odm/tools/ObjectSchema.java | 2 +-
.../java/org/springframework/ldap/odm/tools/SchemaReader.java | 2 +-
.../java/org/springframework/ldap/odm/tools/SchemaToJava.java | 2 +-
.../java/org/springframework/ldap/odm/tools/SchemaViewer.java | 2 +-
.../org/springframework/ldap/odm/tools/SyntaxToJavaClass.java | 2 +-
.../java/org/springframework/ldap/odm/tools/package-info.java | 2 +-
.../apache/directory/server/core/avltree/ArrayMarshaller.java | 2 +-
.../springframework/ldap/odm/test/ConverterFactoryTests.java | 2 +-
.../springframework/ldap/odm/test/ConverterManagerTests.java | 2 +-
.../java/org/springframework/ldap/odm/test/JDependTests.java | 2 +-
.../test/java/org/springframework/ldap/odm/test/LdapTests.java | 2 +-
.../org/springframework/ldap/odm/test/OrganizationalUnit.java | 2 +-
odm/src/test/java/org/springframework/ldap/odm/test/Person.java | 2 +-
.../java/org/springframework/ldap/odm/test/PlainPerson.java | 2 +-
.../org/springframework/ldap/odm/test/SchemaToJavaTests.java | 2 +-
.../org/springframework/ldap/odm/test/SchemaViewerTests.java | 2 +-
.../java/org/springframework/ldap/odm/test/UriConverter.java | 2 +-
.../springframework/ldap/odm/test/utils/CompilerInterface.java | 2 +-
.../springframework/ldap/odm/test/utils/ExecuteRunnable.java | 2 +-
.../org/springframework/ldap/odm/test/utils/GetFreePort.java | 2 +-
.../org/springframework/ldap/odm/test/utils/RunnableTests.java | 2 +-
.../VirtualListViewControlAggregateDirContextProcessor.java | 2 +-
.../ldap/control/VirtualListViewControlDirContextProcessor.java | 2 +-
.../ldap/control/VirtualListViewResultsCookie.java | 2 +-
.../control/VirtualListViewControlDirContextProcessorTests.java | 2 +-
.../ldap/test/AbstractEc2InstanceLaunchingFactoryBean.java | 2 +-
.../ldap/test/AttributeCheckAttributesMapper.java | 2 +-
.../springframework/ldap/test/AttributeCheckContextMapper.java | 2 +-
.../ldap/test/ContextSourceEc2InstanceLaunchingFactoryBean.java | 2 +-
.../java/org/springframework/ldap/test/DummyDirContext.java | 2 +-
.../java/org/springframework/ldap/test/EmbeddedLdapServer.java | 2 +-
.../ldap/test/EmbeddedLdapServerFactoryBean.java | 2 +-
.../main/java/org/springframework/ldap/test/LdapTestUtils.java | 2 +-
.../main/java/org/springframework/ldap/test/LdifPopulator.java | 2 +-
.../springframework/ldap/test/TestContextSourceFactoryBean.java | 2 +-
.../springframework/ldap/test/unboundid/EmbeddedLdapServer.java | 2 +-
.../ldap/test/unboundid/EmbeddedLdapServerFactoryBean.java | 2 +-
.../org/springframework/ldap/test/unboundid/LdapTestUtils.java | 2 +-
.../org/springframework/ldap/test/unboundid/LdifPopulator.java | 2 +-
.../ldap/test/unboundid/TestContextSourceFactoryBean.java | 2 +-
.../apache/directory/server/core/avltree/ArrayMarshaller.java | 2 +-
.../ldap/test/EmbeddedLdapServerFactoryBeanTests.java | 2 +-
.../ldap/test/unboundid/EmbeddedLdapServerFactoryBeanTests.java | 2 +-
.../ldap/test/unboundid/EmbeddedLdapServerTests.java | 2 +-
.../ldap/test/unboundid/TestContextSourceFactoryBeanTests.java | 2 +-
.../org/springframework/ldap/itest/ad/CompilerInterface.java | 2 +-
.../ldap/itest/ad/IncrementalAttributeMapperITests.java | 2 +-
.../org/springframework/ldap/itest/ad/SchemaToJavaAdITests.java | 2 +-
.../java/org/springframework/ldap/AllMatchHostnameVerifier.java | 2 +-
.../DigestMd5ContextSourceEc2InstanceLaunchingFactoryBean.java | 2 +-
.../ldap/TlsContextSourceEc2InstanceLaunchingFactoryBean.java | 2 +-
.../src/main/java/org/springframework/ldap/control/Person.java | 2 +-
.../springframework/ldap/itest/control/PagedSearchITests.java | 2 +-
.../ldap/itest/core/LdapTemplateSearchResultITests.java | 2 +-
.../ldap/itest/core/support/DigestMd5AuthenticationITests.java | 2 +-
.../itest/core/LdapTemplateVirtualListViewSearchITests.java | 2 +-
.../main/java/org/springframework/ldap/itest/LdapGroupDao.java | 2 +-
.../src/main/java/org/springframework/ldap/itest/NoAdTests.java | 2 +-
.../src/main/java/org/springframework/ldap/itest/Person.java | 2 +-
.../org/springframework/ldap/itest/PersonAttributesMapper.java | 2 +-
.../org/springframework/ldap/itest/PersonContextMapper.java | 2 +-
.../ldap/itest/core/DummyDistinguishedNameConsumer.java | 2 +-
.../ldap/itest/core/support/DummyBaseLdapNameAware.java | 2 +-
.../ldap/itest/core/support/DummyBaseLdapPathAware.java | 2 +-
.../springframework/ldap/itest/filter/DummyFilterConsumer.java | 2 +-
.../src/main/java/org/springframework/ldap/itest/odm/Group.java | 2 +-
.../main/java/org/springframework/ldap/itest/odm/Person.java | 2 +-
.../springframework/ldap/itest/odm/PersonWithDnAnnotations.java | 2 +-
.../support/springsecurity/MethodSecurityExpressionHandler.java | 2 +-
.../ldap/itest/transaction/compensating/manager/DummyDao.java | 2 +-
.../itest/transaction/compensating/manager/DummyException.java | 2 +-
.../transaction/compensating/manager/DummyServiceImpl.java | 2 +-
.../transaction/compensating/manager/LdapDummyDaoImpl.java | 2 +-
.../apache/directory/server/core/avltree/ArrayMarshaller.java | 2 +-
.../ldap/LdapConditionallyFilteredTestRunner.java | 2 +-
.../ldap/itest/AbstractLdapTemplateIntegrationTests.java | 2 +-
.../ldap/itest/DefaultLdapClientAuthenticationITests.java | 2 +-
.../ldap/itest/DefaultLdapClientBindUnbindITests.java | 2 +-
.../springframework/ldap/itest/DefaultLdapClientListITests.java | 2 +-
.../ldap/itest/DefaultLdapClientLookupITests.java | 2 +-
.../ldap/itest/DefaultLdapClientLookupMultiRdnITests.java | 2 +-
.../ldap/itest/DefaultLdapClientModifyITests.java | 2 +-
.../ldap/itest/DefaultLdapClientRecursiveDeleteITests.java | 2 +-
.../ldap/itest/DefaultLdapClientRenameITests.java | 2 +-
.../ldap/itest/DefaultLdapClientSearchResultITests.java | 2 +-
.../org/springframework/ldap/itest/InvalidBackslashITests.java | 2 +-
.../ldap/itest/LdapTemplateAttributesMapperITests.java | 2 +-
.../ldap/itest/LdapTemplateAuthenticationITests.java | 2 +-
.../ldap/itest/LdapTemplateBindUnbindITests.java | 2 +-
.../ldap/itest/LdapTemplateContextExecutorTests.java | 2 +-
.../ldap/itest/LdapTemplateContextMapperITests.java | 2 +-
.../org/springframework/ldap/itest/LdapTemplateListITests.java | 2 +-
.../springframework/ldap/itest/LdapTemplateLookupITests.java | 2 +-
.../ldap/itest/LdapTemplateLookupMultiRdnITests.java | 2 +-
.../springframework/ldap/itest/LdapTemplateModifyITests.java | 2 +-
.../ldap/itest/LdapTemplateNoBaseSuffixITests.java | 2 +-
.../springframework/ldap/itest/LdapTemplatePooledITests.java | 2 +-
.../ldap/itest/LdapTemplateRecursiveDeleteITests.java | 2 +-
.../springframework/ldap/itest/LdapTemplateRenameITests.java | 2 +-
.../ldap/itest/LdapTemplateSearchResultITests.java | 2 +-
.../itest/LdapTemplateSearchResultNamespaceConfigITests.java | 2 +-
.../ldap/itest/control/SupportedControlsITests.java | 2 +-
.../ldap/itest/core/DistinguishedNameEditorITests.java | 2 +-
.../ldap/itest/core/DnParsePerformanceITests.java | 2 +-
.../ldap/itest/core/simple/SimpleLdapTemplateITests.java | 2 +-
.../itest/core/support/BaseLdapPathBeanPostprocessorITests.java | 2 +-
.../BaseLdapPathBeanPostprocessorNamespaceConfigITests.java | 2 +-
.../itest/core/support/LdapContextSourceIntegrationTests.java | 2 +-
.../support/LdapContextSourceMultiServerIntegrationTests.java | 2 +-
.../ldap/itest/filter/HardcodedFilterIntegrationTests.java | 2 +-
.../ldap/itest/integration/JiraLdap247ITests.java | 2 +-
.../org/springframework/ldap/itest/ldap321/Ldap321Tests.java | 2 +-
.../java/org/springframework/ldap/itest/ldap321/RoleRepo.java | 2 +-
.../org/springframework/ldap/itest/ldap473/Ldap473Tests.java | 2 +-
.../ContextSourceTransactionManagerIntegrationTests.java | 2 +-
...ontextSourceTransactionManagerNamespaceIntegrationTests.java | 2 +-
.../ContextSourceTransactionManagerSubtreeIntegrationTests.java | 2 +-
.../ldap/itest/odm/LdapTemplateOdmGroupManipulationITests.java | 2 +-
.../ldap/itest/odm/LdapTemplateOdmWithDnAnnotationsITests.java | 2 +-
.../itest/odm/LdapTemplateOdmWithNoDnAnnotationsITests.java | 2 +-
530 files changed, 530 insertions(+), 530 deletions(-)
diff --git a/buildSrc/src/main/groovy/io/spring/gradle/convention/ManagementConfigurationPlugin.java b/buildSrc/src/main/groovy/io/spring/gradle/convention/ManagementConfigurationPlugin.java
index 8db6fd970b..39a891c32e 100644
--- a/buildSrc/src/main/groovy/io/spring/gradle/convention/ManagementConfigurationPlugin.java
+++ b/buildSrc/src/main/groovy/io/spring/gradle/convention/ManagementConfigurationPlugin.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2002-2021 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/buildSrc/src/main/java/org/springframework/gradle/github/changelog/GitHubChangelogPlugin.java b/buildSrc/src/main/java/org/springframework/gradle/github/changelog/GitHubChangelogPlugin.java
index 7c09fa6ceb..fe240dd6b4 100644
--- a/buildSrc/src/main/java/org/springframework/gradle/github/changelog/GitHubChangelogPlugin.java
+++ b/buildSrc/src/main/java/org/springframework/gradle/github/changelog/GitHubChangelogPlugin.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2019-2020 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/buildSrc/src/main/java/org/springframework/gradle/github/milestones/GitHubMilestoneApi.java b/buildSrc/src/main/java/org/springframework/gradle/github/milestones/GitHubMilestoneApi.java
index fd3c0d817b..8f24f6a6e0 100644
--- a/buildSrc/src/main/java/org/springframework/gradle/github/milestones/GitHubMilestoneApi.java
+++ b/buildSrc/src/main/java/org/springframework/gradle/github/milestones/GitHubMilestoneApi.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2019-2020 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/buildSrc/src/main/java/org/springframework/gradle/github/milestones/GitHubMilestoneHasNoOpenIssuesTask.java b/buildSrc/src/main/java/org/springframework/gradle/github/milestones/GitHubMilestoneHasNoOpenIssuesTask.java
index 40b026c804..bfee59755e 100644
--- a/buildSrc/src/main/java/org/springframework/gradle/github/milestones/GitHubMilestoneHasNoOpenIssuesTask.java
+++ b/buildSrc/src/main/java/org/springframework/gradle/github/milestones/GitHubMilestoneHasNoOpenIssuesTask.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2019-2020 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/buildSrc/src/main/java/org/springframework/gradle/github/milestones/GitHubMilestonePlugin.java b/buildSrc/src/main/java/org/springframework/gradle/github/milestones/GitHubMilestonePlugin.java
index 57f749d97c..45cc06fb36 100644
--- a/buildSrc/src/main/java/org/springframework/gradle/github/milestones/GitHubMilestonePlugin.java
+++ b/buildSrc/src/main/java/org/springframework/gradle/github/milestones/GitHubMilestonePlugin.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2019-2020 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/buildSrc/src/main/java/org/springframework/gradle/github/release/CreateGitHubReleaseTask.java b/buildSrc/src/main/java/org/springframework/gradle/github/release/CreateGitHubReleaseTask.java
index 65c8b687be..6598e29852 100644
--- a/buildSrc/src/main/java/org/springframework/gradle/github/release/CreateGitHubReleaseTask.java
+++ b/buildSrc/src/main/java/org/springframework/gradle/github/release/CreateGitHubReleaseTask.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2002-2021 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/buildSrc/src/main/java/org/springframework/gradle/github/release/GitHubReleaseApi.java b/buildSrc/src/main/java/org/springframework/gradle/github/release/GitHubReleaseApi.java
index 65238d0b82..6cc8e78ebe 100644
--- a/buildSrc/src/main/java/org/springframework/gradle/github/release/GitHubReleaseApi.java
+++ b/buildSrc/src/main/java/org/springframework/gradle/github/release/GitHubReleaseApi.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2002-2021 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/buildSrc/src/main/java/org/springframework/gradle/github/release/GitHubReleasePlugin.java b/buildSrc/src/main/java/org/springframework/gradle/github/release/GitHubReleasePlugin.java
index 1a33162e33..6182ff9b03 100644
--- a/buildSrc/src/main/java/org/springframework/gradle/github/release/GitHubReleasePlugin.java
+++ b/buildSrc/src/main/java/org/springframework/gradle/github/release/GitHubReleasePlugin.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2002-2021 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/buildSrc/src/main/java/org/springframework/gradle/github/release/Release.java b/buildSrc/src/main/java/org/springframework/gradle/github/release/Release.java
index 6dec2ceb79..74d7a45e86 100644
--- a/buildSrc/src/main/java/org/springframework/gradle/github/release/Release.java
+++ b/buildSrc/src/main/java/org/springframework/gradle/github/release/Release.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2002-2021 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/buildSrc/src/main/java/org/springframework/gradle/maven/SpringSigningPlugin.java b/buildSrc/src/main/java/org/springframework/gradle/maven/SpringSigningPlugin.java
index ed3f46e2ca..76ea1ad846 100644
--- a/buildSrc/src/main/java/org/springframework/gradle/maven/SpringSigningPlugin.java
+++ b/buildSrc/src/main/java/org/springframework/gradle/maven/SpringSigningPlugin.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2016-2019 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* 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
diff --git a/buildSrc/src/main/java/org/springframework/gradle/sagan/Release.java b/buildSrc/src/main/java/org/springframework/gradle/sagan/Release.java
index 5e62c658e0..ff8596239f 100644
--- a/buildSrc/src/main/java/org/springframework/gradle/sagan/Release.java
+++ b/buildSrc/src/main/java/org/springframework/gradle/sagan/Release.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2019-2020 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/buildSrc/src/main/java/org/springframework/gradle/sagan/SaganApi.java b/buildSrc/src/main/java/org/springframework/gradle/sagan/SaganApi.java
index b2a413f8e6..9ff8003491 100644
--- a/buildSrc/src/main/java/org/springframework/gradle/sagan/SaganApi.java
+++ b/buildSrc/src/main/java/org/springframework/gradle/sagan/SaganApi.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2019-2020 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/buildSrc/src/main/java/org/springframework/gradle/sagan/SaganCreateReleaseTask.java b/buildSrc/src/main/java/org/springframework/gradle/sagan/SaganCreateReleaseTask.java
index 6592544b1f..38c6de296a 100644
--- a/buildSrc/src/main/java/org/springframework/gradle/sagan/SaganCreateReleaseTask.java
+++ b/buildSrc/src/main/java/org/springframework/gradle/sagan/SaganCreateReleaseTask.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2019-2020 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/buildSrc/src/main/java/org/springframework/gradle/sagan/SaganDeleteReleaseTask.java b/buildSrc/src/main/java/org/springframework/gradle/sagan/SaganDeleteReleaseTask.java
index 49a3885226..55d9a3538a 100644
--- a/buildSrc/src/main/java/org/springframework/gradle/sagan/SaganDeleteReleaseTask.java
+++ b/buildSrc/src/main/java/org/springframework/gradle/sagan/SaganDeleteReleaseTask.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2019-2020 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/buildSrc/src/main/java/org/springframework/gradle/sagan/SaganPlugin.java b/buildSrc/src/main/java/org/springframework/gradle/sagan/SaganPlugin.java
index 987a8a3b4d..2a893b9d63 100644
--- a/buildSrc/src/main/java/org/springframework/gradle/sagan/SaganPlugin.java
+++ b/buildSrc/src/main/java/org/springframework/gradle/sagan/SaganPlugin.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2019-2020 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/buildSrc/src/main/java/s101/S101Configure.java b/buildSrc/src/main/java/s101/S101Configure.java
index a8e2154dfd..913de4518d 100644
--- a/buildSrc/src/main/java/s101/S101Configure.java
+++ b/buildSrc/src/main/java/s101/S101Configure.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2002-2021 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/buildSrc/src/main/java/s101/S101Configurer.java b/buildSrc/src/main/java/s101/S101Configurer.java
index 6ce3caf7f5..86696aa97b 100644
--- a/buildSrc/src/main/java/s101/S101Configurer.java
+++ b/buildSrc/src/main/java/s101/S101Configurer.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2002-2021 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/buildSrc/src/main/java/s101/S101Install.java b/buildSrc/src/main/java/s101/S101Install.java
index 8d95db0d1f..3e8ca5ef8f 100644
--- a/buildSrc/src/main/java/s101/S101Install.java
+++ b/buildSrc/src/main/java/s101/S101Install.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2002-2021 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/buildSrc/src/main/java/s101/S101Plugin.java b/buildSrc/src/main/java/s101/S101Plugin.java
index 00894fb335..c7cf0d8bd2 100644
--- a/buildSrc/src/main/java/s101/S101Plugin.java
+++ b/buildSrc/src/main/java/s101/S101Plugin.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2002-2021 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/buildSrc/src/main/java/s101/S101PluginExtension.java b/buildSrc/src/main/java/s101/S101PluginExtension.java
index f3abe0f156..5a09ba5a48 100644
--- a/buildSrc/src/main/java/s101/S101PluginExtension.java
+++ b/buildSrc/src/main/java/s101/S101PluginExtension.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2002-2021 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/buildSrc/src/test/java/io/spring/gradle/TestKit.java b/buildSrc/src/test/java/io/spring/gradle/TestKit.java
index e7e0f0afeb..cc529da6b7 100644
--- a/buildSrc/src/test/java/io/spring/gradle/TestKit.java
+++ b/buildSrc/src/test/java/io/spring/gradle/TestKit.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2002-2017 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* 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
diff --git a/buildSrc/src/test/java/io/spring/gradle/convention/IncludeCheckRemotePluginTests.java b/buildSrc/src/test/java/io/spring/gradle/convention/IncludeCheckRemotePluginTests.java
index 6bcc5fe8a3..2086785546 100644
--- a/buildSrc/src/test/java/io/spring/gradle/convention/IncludeCheckRemotePluginTests.java
+++ b/buildSrc/src/test/java/io/spring/gradle/convention/IncludeCheckRemotePluginTests.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2002-2021 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* 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
diff --git a/buildSrc/src/test/java/io/spring/gradle/convention/IntegrationPluginTests.java b/buildSrc/src/test/java/io/spring/gradle/convention/IntegrationPluginTests.java
index b1e8ed9d29..084b83fa8a 100644
--- a/buildSrc/src/test/java/io/spring/gradle/convention/IntegrationPluginTests.java
+++ b/buildSrc/src/test/java/io/spring/gradle/convention/IntegrationPluginTests.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2002-2016 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* 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
diff --git a/buildSrc/src/test/java/io/spring/gradle/convention/JavadocApiPluginTests.java b/buildSrc/src/test/java/io/spring/gradle/convention/JavadocApiPluginTests.java
index 532b0f5bd2..b45b3f8820 100644
--- a/buildSrc/src/test/java/io/spring/gradle/convention/JavadocApiPluginTests.java
+++ b/buildSrc/src/test/java/io/spring/gradle/convention/JavadocApiPluginTests.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2002-2016 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* 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
diff --git a/buildSrc/src/test/java/io/spring/gradle/convention/RepositoryConventionPluginTests.java b/buildSrc/src/test/java/io/spring/gradle/convention/RepositoryConventionPluginTests.java
index f1048dbbab..79d0a195ef 100644
--- a/buildSrc/src/test/java/io/spring/gradle/convention/RepositoryConventionPluginTests.java
+++ b/buildSrc/src/test/java/io/spring/gradle/convention/RepositoryConventionPluginTests.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2016-2018 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* 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
diff --git a/buildSrc/src/test/java/io/spring/gradle/convention/sagan/SaganApiTests.java b/buildSrc/src/test/java/io/spring/gradle/convention/sagan/SaganApiTests.java
index 61168e9013..3f699621b6 100644
--- a/buildSrc/src/test/java/io/spring/gradle/convention/sagan/SaganApiTests.java
+++ b/buildSrc/src/test/java/io/spring/gradle/convention/sagan/SaganApiTests.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2019-2020 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/buildSrc/src/test/java/org/springframework/gradle/github/release/GitHubReleaseApiTests.java b/buildSrc/src/test/java/org/springframework/gradle/github/release/GitHubReleaseApiTests.java
index c24e5990f0..439bf48780 100644
--- a/buildSrc/src/test/java/org/springframework/gradle/github/release/GitHubReleaseApiTests.java
+++ b/buildSrc/src/test/java/org/springframework/gradle/github/release/GitHubReleaseApiTests.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2002-2021 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/buildSrc/src/test/java/org/springframework/security/convention/versions/DependencyExcludesTests.java b/buildSrc/src/test/java/org/springframework/security/convention/versions/DependencyExcludesTests.java
index da515af733..b3bf937a8a 100644
--- a/buildSrc/src/test/java/org/springframework/security/convention/versions/DependencyExcludesTests.java
+++ b/buildSrc/src/test/java/org/springframework/security/convention/versions/DependencyExcludesTests.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2019-2020 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/buildSrc/src/test/java/org/springframework/security/convention/versions/TransitiveDependencyLookupUtilsTests.java b/buildSrc/src/test/java/org/springframework/security/convention/versions/TransitiveDependencyLookupUtilsTests.java
index 8b0637d6f3..47bbafd129 100644
--- a/buildSrc/src/test/java/org/springframework/security/convention/versions/TransitiveDependencyLookupUtilsTests.java
+++ b/buildSrc/src/test/java/org/springframework/security/convention/versions/TransitiveDependencyLookupUtilsTests.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2019-2020 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/core/src/itest-openldap/java/org/springframework/ldap/LdapTemplateLookupOpenLdapITests.java b/core/src/itest-openldap/java/org/springframework/ldap/LdapTemplateLookupOpenLdapITests.java
index 0cf73f9535..ea789dcdf3 100644
--- a/core/src/itest-openldap/java/org/springframework/ldap/LdapTemplateLookupOpenLdapITests.java
+++ b/core/src/itest-openldap/java/org/springframework/ldap/LdapTemplateLookupOpenLdapITests.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2016 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/core/src/itest-openldap/java/org/springframework/ldap/control/LdapTemplatePagedSearchITests.java b/core/src/itest-openldap/java/org/springframework/ldap/control/LdapTemplatePagedSearchITests.java
index 38c106bcf0..7f2152bf5e 100644
--- a/core/src/itest-openldap/java/org/springframework/ldap/control/LdapTemplatePagedSearchITests.java
+++ b/core/src/itest-openldap/java/org/springframework/ldap/control/LdapTemplatePagedSearchITests.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2016 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/core/src/itest-openldap/java/org/springframework/ldap/control/LdapTemplateSortedSearchITests.java b/core/src/itest-openldap/java/org/springframework/ldap/control/LdapTemplateSortedSearchITests.java
index ec072f8142..98e9c1c76d 100644
--- a/core/src/itest-openldap/java/org/springframework/ldap/control/LdapTemplateSortedSearchITests.java
+++ b/core/src/itest-openldap/java/org/springframework/ldap/control/LdapTemplateSortedSearchITests.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2016 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/core/src/main/java/org/springframework/LdapDataEntry.java b/core/src/main/java/org/springframework/LdapDataEntry.java
index 0ab9ffafda..f4e9bb94cc 100644
--- a/core/src/main/java/org/springframework/LdapDataEntry.java
+++ b/core/src/main/java/org/springframework/LdapDataEntry.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2023 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/core/src/main/java/org/springframework/ldap/AttributeInUseException.java b/core/src/main/java/org/springframework/ldap/AttributeInUseException.java
index 5e1353645e..25368d6a79 100644
--- a/core/src/main/java/org/springframework/ldap/AttributeInUseException.java
+++ b/core/src/main/java/org/springframework/ldap/AttributeInUseException.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2010 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/core/src/main/java/org/springframework/ldap/AttributeModificationException.java b/core/src/main/java/org/springframework/ldap/AttributeModificationException.java
index b5660cdeba..08ef55eeaf 100644
--- a/core/src/main/java/org/springframework/ldap/AttributeModificationException.java
+++ b/core/src/main/java/org/springframework/ldap/AttributeModificationException.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2010 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/core/src/main/java/org/springframework/ldap/AuthenticationException.java b/core/src/main/java/org/springframework/ldap/AuthenticationException.java
index 91a375aa6b..086481257b 100644
--- a/core/src/main/java/org/springframework/ldap/AuthenticationException.java
+++ b/core/src/main/java/org/springframework/ldap/AuthenticationException.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2010 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/core/src/main/java/org/springframework/ldap/AuthenticationNotSupportedException.java b/core/src/main/java/org/springframework/ldap/AuthenticationNotSupportedException.java
index f688117634..557d445103 100644
--- a/core/src/main/java/org/springframework/ldap/AuthenticationNotSupportedException.java
+++ b/core/src/main/java/org/springframework/ldap/AuthenticationNotSupportedException.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2010 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/core/src/main/java/org/springframework/ldap/BadLdapGrammarException.java b/core/src/main/java/org/springframework/ldap/BadLdapGrammarException.java
index f95b2daa39..683899d561 100644
--- a/core/src/main/java/org/springframework/ldap/BadLdapGrammarException.java
+++ b/core/src/main/java/org/springframework/ldap/BadLdapGrammarException.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2010 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/core/src/main/java/org/springframework/ldap/CannotProceedException.java b/core/src/main/java/org/springframework/ldap/CannotProceedException.java
index df7febdc28..7895998193 100644
--- a/core/src/main/java/org/springframework/ldap/CannotProceedException.java
+++ b/core/src/main/java/org/springframework/ldap/CannotProceedException.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2010 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/core/src/main/java/org/springframework/ldap/CommunicationException.java b/core/src/main/java/org/springframework/ldap/CommunicationException.java
index 60913c01b1..51f297aa92 100644
--- a/core/src/main/java/org/springframework/ldap/CommunicationException.java
+++ b/core/src/main/java/org/springframework/ldap/CommunicationException.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2010 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/core/src/main/java/org/springframework/ldap/ConfigurationException.java b/core/src/main/java/org/springframework/ldap/ConfigurationException.java
index 48cf393cfb..b074279454 100644
--- a/core/src/main/java/org/springframework/ldap/ConfigurationException.java
+++ b/core/src/main/java/org/springframework/ldap/ConfigurationException.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2010 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/core/src/main/java/org/springframework/ldap/ContextNotEmptyException.java b/core/src/main/java/org/springframework/ldap/ContextNotEmptyException.java
index 8418a44499..b966c3f6c2 100644
--- a/core/src/main/java/org/springframework/ldap/ContextNotEmptyException.java
+++ b/core/src/main/java/org/springframework/ldap/ContextNotEmptyException.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2010 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/core/src/main/java/org/springframework/ldap/InsufficientResourcesException.java b/core/src/main/java/org/springframework/ldap/InsufficientResourcesException.java
index a853c5dc69..5942ac450e 100644
--- a/core/src/main/java/org/springframework/ldap/InsufficientResourcesException.java
+++ b/core/src/main/java/org/springframework/ldap/InsufficientResourcesException.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2010 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/core/src/main/java/org/springframework/ldap/InterruptedNamingException.java b/core/src/main/java/org/springframework/ldap/InterruptedNamingException.java
index 6208805f00..a57aa540c7 100644
--- a/core/src/main/java/org/springframework/ldap/InterruptedNamingException.java
+++ b/core/src/main/java/org/springframework/ldap/InterruptedNamingException.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2010 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/core/src/main/java/org/springframework/ldap/InvalidAttributeIdentifierException.java b/core/src/main/java/org/springframework/ldap/InvalidAttributeIdentifierException.java
index cdbcc39272..a2a8e734b4 100644
--- a/core/src/main/java/org/springframework/ldap/InvalidAttributeIdentifierException.java
+++ b/core/src/main/java/org/springframework/ldap/InvalidAttributeIdentifierException.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2010 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/core/src/main/java/org/springframework/ldap/InvalidAttributeValueException.java b/core/src/main/java/org/springframework/ldap/InvalidAttributeValueException.java
index 77570b8762..f9b364e0b7 100644
--- a/core/src/main/java/org/springframework/ldap/InvalidAttributeValueException.java
+++ b/core/src/main/java/org/springframework/ldap/InvalidAttributeValueException.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2010 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/core/src/main/java/org/springframework/ldap/InvalidAttributesException.java b/core/src/main/java/org/springframework/ldap/InvalidAttributesException.java
index 27dbe24eac..39a383f0d9 100644
--- a/core/src/main/java/org/springframework/ldap/InvalidAttributesException.java
+++ b/core/src/main/java/org/springframework/ldap/InvalidAttributesException.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2010 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/core/src/main/java/org/springframework/ldap/InvalidNameException.java b/core/src/main/java/org/springframework/ldap/InvalidNameException.java
index 7197b86022..2391116a5d 100644
--- a/core/src/main/java/org/springframework/ldap/InvalidNameException.java
+++ b/core/src/main/java/org/springframework/ldap/InvalidNameException.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2010 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/core/src/main/java/org/springframework/ldap/InvalidSearchControlsException.java b/core/src/main/java/org/springframework/ldap/InvalidSearchControlsException.java
index 49423b43e7..2594740df6 100644
--- a/core/src/main/java/org/springframework/ldap/InvalidSearchControlsException.java
+++ b/core/src/main/java/org/springframework/ldap/InvalidSearchControlsException.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2010 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/core/src/main/java/org/springframework/ldap/InvalidSearchFilterException.java b/core/src/main/java/org/springframework/ldap/InvalidSearchFilterException.java
index 4d1e311e07..39e87fb531 100644
--- a/core/src/main/java/org/springframework/ldap/InvalidSearchFilterException.java
+++ b/core/src/main/java/org/springframework/ldap/InvalidSearchFilterException.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2010 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/core/src/main/java/org/springframework/ldap/LdapReferralException.java b/core/src/main/java/org/springframework/ldap/LdapReferralException.java
index 04b48e2408..ba2e1dd54b 100644
--- a/core/src/main/java/org/springframework/ldap/LdapReferralException.java
+++ b/core/src/main/java/org/springframework/ldap/LdapReferralException.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2010 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/core/src/main/java/org/springframework/ldap/LimitExceededException.java b/core/src/main/java/org/springframework/ldap/LimitExceededException.java
index 8c37157fa8..2a19db6e5e 100644
--- a/core/src/main/java/org/springframework/ldap/LimitExceededException.java
+++ b/core/src/main/java/org/springframework/ldap/LimitExceededException.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2010 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/core/src/main/java/org/springframework/ldap/LinkException.java b/core/src/main/java/org/springframework/ldap/LinkException.java
index a938545866..67e2922851 100644
--- a/core/src/main/java/org/springframework/ldap/LinkException.java
+++ b/core/src/main/java/org/springframework/ldap/LinkException.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2010 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/core/src/main/java/org/springframework/ldap/LinkLoopException.java b/core/src/main/java/org/springframework/ldap/LinkLoopException.java
index 6fcfac52d2..f222c1be5e 100644
--- a/core/src/main/java/org/springframework/ldap/LinkLoopException.java
+++ b/core/src/main/java/org/springframework/ldap/LinkLoopException.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2010 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/core/src/main/java/org/springframework/ldap/MalformedLinkException.java b/core/src/main/java/org/springframework/ldap/MalformedLinkException.java
index b63e059041..9e87d9de8f 100644
--- a/core/src/main/java/org/springframework/ldap/MalformedLinkException.java
+++ b/core/src/main/java/org/springframework/ldap/MalformedLinkException.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2010 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/core/src/main/java/org/springframework/ldap/NameAlreadyBoundException.java b/core/src/main/java/org/springframework/ldap/NameAlreadyBoundException.java
index 33592059d2..fe797c7258 100644
--- a/core/src/main/java/org/springframework/ldap/NameAlreadyBoundException.java
+++ b/core/src/main/java/org/springframework/ldap/NameAlreadyBoundException.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2010 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/core/src/main/java/org/springframework/ldap/NameNotFoundException.java b/core/src/main/java/org/springframework/ldap/NameNotFoundException.java
index 283f1e6845..9a77be3be7 100644
--- a/core/src/main/java/org/springframework/ldap/NameNotFoundException.java
+++ b/core/src/main/java/org/springframework/ldap/NameNotFoundException.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2010 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/core/src/main/java/org/springframework/ldap/NamingException.java b/core/src/main/java/org/springframework/ldap/NamingException.java
index 0b4de5a1ed..aea44a498c 100644
--- a/core/src/main/java/org/springframework/ldap/NamingException.java
+++ b/core/src/main/java/org/springframework/ldap/NamingException.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2010 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/core/src/main/java/org/springframework/ldap/NamingSecurityException.java b/core/src/main/java/org/springframework/ldap/NamingSecurityException.java
index c96666e3a6..a98071026c 100644
--- a/core/src/main/java/org/springframework/ldap/NamingSecurityException.java
+++ b/core/src/main/java/org/springframework/ldap/NamingSecurityException.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2010 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/core/src/main/java/org/springframework/ldap/NoInitialContextException.java b/core/src/main/java/org/springframework/ldap/NoInitialContextException.java
index d7368f7e98..d51aa72fd8 100644
--- a/core/src/main/java/org/springframework/ldap/NoInitialContextException.java
+++ b/core/src/main/java/org/springframework/ldap/NoInitialContextException.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2010 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/core/src/main/java/org/springframework/ldap/NoPermissionException.java b/core/src/main/java/org/springframework/ldap/NoPermissionException.java
index 6cf8aafb5d..ffc3d2d2ee 100644
--- a/core/src/main/java/org/springframework/ldap/NoPermissionException.java
+++ b/core/src/main/java/org/springframework/ldap/NoPermissionException.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2010 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/core/src/main/java/org/springframework/ldap/NoSuchAttributeException.java b/core/src/main/java/org/springframework/ldap/NoSuchAttributeException.java
index df62bf6aa7..b5d3620fbb 100644
--- a/core/src/main/java/org/springframework/ldap/NoSuchAttributeException.java
+++ b/core/src/main/java/org/springframework/ldap/NoSuchAttributeException.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2010 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/core/src/main/java/org/springframework/ldap/NotContextException.java b/core/src/main/java/org/springframework/ldap/NotContextException.java
index a0a1196ac2..d190d04c96 100644
--- a/core/src/main/java/org/springframework/ldap/NotContextException.java
+++ b/core/src/main/java/org/springframework/ldap/NotContextException.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2010 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/core/src/main/java/org/springframework/ldap/OperationNotSupportedException.java b/core/src/main/java/org/springframework/ldap/OperationNotSupportedException.java
index 274895c602..768d2bf886 100644
--- a/core/src/main/java/org/springframework/ldap/OperationNotSupportedException.java
+++ b/core/src/main/java/org/springframework/ldap/OperationNotSupportedException.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2010 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/core/src/main/java/org/springframework/ldap/PartialResultException.java b/core/src/main/java/org/springframework/ldap/PartialResultException.java
index f7ece08256..4d435d85f0 100644
--- a/core/src/main/java/org/springframework/ldap/PartialResultException.java
+++ b/core/src/main/java/org/springframework/ldap/PartialResultException.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2010 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/core/src/main/java/org/springframework/ldap/ReferralException.java b/core/src/main/java/org/springframework/ldap/ReferralException.java
index e6bf27f45d..3758efde4f 100644
--- a/core/src/main/java/org/springframework/ldap/ReferralException.java
+++ b/core/src/main/java/org/springframework/ldap/ReferralException.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2010 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/core/src/main/java/org/springframework/ldap/SchemaViolationException.java b/core/src/main/java/org/springframework/ldap/SchemaViolationException.java
index b2021a1aac..f147749eee 100644
--- a/core/src/main/java/org/springframework/ldap/SchemaViolationException.java
+++ b/core/src/main/java/org/springframework/ldap/SchemaViolationException.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2010 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/core/src/main/java/org/springframework/ldap/ServiceUnavailableException.java b/core/src/main/java/org/springframework/ldap/ServiceUnavailableException.java
index 900880a89a..a58fdc395a 100644
--- a/core/src/main/java/org/springframework/ldap/ServiceUnavailableException.java
+++ b/core/src/main/java/org/springframework/ldap/ServiceUnavailableException.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2010 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/core/src/main/java/org/springframework/ldap/SizeLimitExceededException.java b/core/src/main/java/org/springframework/ldap/SizeLimitExceededException.java
index 9d0df109ce..3ded7ffbb9 100644
--- a/core/src/main/java/org/springframework/ldap/SizeLimitExceededException.java
+++ b/core/src/main/java/org/springframework/ldap/SizeLimitExceededException.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2010 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/core/src/main/java/org/springframework/ldap/TimeLimitExceededException.java b/core/src/main/java/org/springframework/ldap/TimeLimitExceededException.java
index 1b4dfdc4c4..09f9e2b723 100644
--- a/core/src/main/java/org/springframework/ldap/TimeLimitExceededException.java
+++ b/core/src/main/java/org/springframework/ldap/TimeLimitExceededException.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2010 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/core/src/main/java/org/springframework/ldap/UncategorizedLdapException.java b/core/src/main/java/org/springframework/ldap/UncategorizedLdapException.java
index 039cad5b9e..278c83c93d 100644
--- a/core/src/main/java/org/springframework/ldap/UncategorizedLdapException.java
+++ b/core/src/main/java/org/springframework/ldap/UncategorizedLdapException.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2010 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/core/src/main/java/org/springframework/ldap/aot/hint/LdapCoreRuntimeHints.java b/core/src/main/java/org/springframework/ldap/aot/hint/LdapCoreRuntimeHints.java
index 130bf2caa0..ec373e7f2f 100644
--- a/core/src/main/java/org/springframework/ldap/aot/hint/LdapCoreRuntimeHints.java
+++ b/core/src/main/java/org/springframework/ldap/aot/hint/LdapCoreRuntimeHints.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2023 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/core/src/main/java/org/springframework/ldap/authentication/DefaultValuesAuthenticationSourceDecorator.java b/core/src/main/java/org/springframework/ldap/authentication/DefaultValuesAuthenticationSourceDecorator.java
index e7954875c3..680eff27bc 100644
--- a/core/src/main/java/org/springframework/ldap/authentication/DefaultValuesAuthenticationSourceDecorator.java
+++ b/core/src/main/java/org/springframework/ldap/authentication/DefaultValuesAuthenticationSourceDecorator.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2013 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/core/src/main/java/org/springframework/ldap/config/ContextSourceParser.java b/core/src/main/java/org/springframework/ldap/config/ContextSourceParser.java
index 55f29890fe..1f676958ca 100644
--- a/core/src/main/java/org/springframework/ldap/config/ContextSourceParser.java
+++ b/core/src/main/java/org/springframework/ldap/config/ContextSourceParser.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2025 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/core/src/main/java/org/springframework/ldap/config/DefaultRenamingStrategyParser.java b/core/src/main/java/org/springframework/ldap/config/DefaultRenamingStrategyParser.java
index 7af4dffe5e..041b25a881 100644
--- a/core/src/main/java/org/springframework/ldap/config/DefaultRenamingStrategyParser.java
+++ b/core/src/main/java/org/springframework/ldap/config/DefaultRenamingStrategyParser.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2013 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/core/src/main/java/org/springframework/ldap/config/Elements.java b/core/src/main/java/org/springframework/ldap/config/Elements.java
index 652169f321..b88833354a 100644
--- a/core/src/main/java/org/springframework/ldap/config/Elements.java
+++ b/core/src/main/java/org/springframework/ldap/config/Elements.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2015 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/core/src/main/java/org/springframework/ldap/config/LdapNamespaceHandler.java b/core/src/main/java/org/springframework/ldap/config/LdapNamespaceHandler.java
index d95792cbef..176d9eba49 100644
--- a/core/src/main/java/org/springframework/ldap/config/LdapNamespaceHandler.java
+++ b/core/src/main/java/org/springframework/ldap/config/LdapNamespaceHandler.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2013 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/core/src/main/java/org/springframework/ldap/config/LdapTemplateParser.java b/core/src/main/java/org/springframework/ldap/config/LdapTemplateParser.java
index 0bf676dec0..1df40d5905 100644
--- a/core/src/main/java/org/springframework/ldap/config/LdapTemplateParser.java
+++ b/core/src/main/java/org/springframework/ldap/config/LdapTemplateParser.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2013 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/core/src/main/java/org/springframework/ldap/config/ParserUtils.java b/core/src/main/java/org/springframework/ldap/config/ParserUtils.java
index d7f22d207b..d62535536c 100644
--- a/core/src/main/java/org/springframework/ldap/config/ParserUtils.java
+++ b/core/src/main/java/org/springframework/ldap/config/ParserUtils.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2013 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/core/src/main/java/org/springframework/ldap/config/TransactionManagerParser.java b/core/src/main/java/org/springframework/ldap/config/TransactionManagerParser.java
index 37078544da..2c52de655e 100644
--- a/core/src/main/java/org/springframework/ldap/config/TransactionManagerParser.java
+++ b/core/src/main/java/org/springframework/ldap/config/TransactionManagerParser.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2013 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/core/src/main/java/org/springframework/ldap/control/AbstractFallbackRequestAndResponseControlDirContextProcessor.java b/core/src/main/java/org/springframework/ldap/control/AbstractFallbackRequestAndResponseControlDirContextProcessor.java
index a3ff9e73a9..a0d9364c81 100644
--- a/core/src/main/java/org/springframework/ldap/control/AbstractFallbackRequestAndResponseControlDirContextProcessor.java
+++ b/core/src/main/java/org/springframework/ldap/control/AbstractFallbackRequestAndResponseControlDirContextProcessor.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2013 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/core/src/main/java/org/springframework/ldap/control/AbstractRequestControlDirContextProcessor.java b/core/src/main/java/org/springframework/ldap/control/AbstractRequestControlDirContextProcessor.java
index 6c1ddafc66..5c83f3b1fa 100644
--- a/core/src/main/java/org/springframework/ldap/control/AbstractRequestControlDirContextProcessor.java
+++ b/core/src/main/java/org/springframework/ldap/control/AbstractRequestControlDirContextProcessor.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2013 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/core/src/main/java/org/springframework/ldap/control/CreateControlFailedException.java b/core/src/main/java/org/springframework/ldap/control/CreateControlFailedException.java
index 26f921eb2c..5ae80bd39c 100644
--- a/core/src/main/java/org/springframework/ldap/control/CreateControlFailedException.java
+++ b/core/src/main/java/org/springframework/ldap/control/CreateControlFailedException.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2010 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/core/src/main/java/org/springframework/ldap/control/PagedResult.java b/core/src/main/java/org/springframework/ldap/control/PagedResult.java
index 97ba2b08a5..6070e944bd 100644
--- a/core/src/main/java/org/springframework/ldap/control/PagedResult.java
+++ b/core/src/main/java/org/springframework/ldap/control/PagedResult.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2013 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/core/src/main/java/org/springframework/ldap/control/PagedResultsCookie.java b/core/src/main/java/org/springframework/ldap/control/PagedResultsCookie.java
index e90b69fb99..92c678513d 100644
--- a/core/src/main/java/org/springframework/ldap/control/PagedResultsCookie.java
+++ b/core/src/main/java/org/springframework/ldap/control/PagedResultsCookie.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2013 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/core/src/main/java/org/springframework/ldap/control/PagedResultsDirContextProcessor.java b/core/src/main/java/org/springframework/ldap/control/PagedResultsDirContextProcessor.java
index 7e5fe5ac2f..ae010b9aab 100644
--- a/core/src/main/java/org/springframework/ldap/control/PagedResultsDirContextProcessor.java
+++ b/core/src/main/java/org/springframework/ldap/control/PagedResultsDirContextProcessor.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2013 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/core/src/main/java/org/springframework/ldap/control/PagedResultsRequestControl.java b/core/src/main/java/org/springframework/ldap/control/PagedResultsRequestControl.java
index f5a5a8be0e..7a60598381 100644
--- a/core/src/main/java/org/springframework/ldap/control/PagedResultsRequestControl.java
+++ b/core/src/main/java/org/springframework/ldap/control/PagedResultsRequestControl.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2013 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/core/src/main/java/org/springframework/ldap/control/SortControlDirContextProcessor.java b/core/src/main/java/org/springframework/ldap/control/SortControlDirContextProcessor.java
index bdf81a6114..3893592c8c 100644
--- a/core/src/main/java/org/springframework/ldap/control/SortControlDirContextProcessor.java
+++ b/core/src/main/java/org/springframework/ldap/control/SortControlDirContextProcessor.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2013 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/core/src/main/java/org/springframework/ldap/convert/ConversionServiceBeanFactoryPostProcessor.java b/core/src/main/java/org/springframework/ldap/convert/ConversionServiceBeanFactoryPostProcessor.java
index 96a196df87..577bd19db7 100644
--- a/core/src/main/java/org/springframework/ldap/convert/ConversionServiceBeanFactoryPostProcessor.java
+++ b/core/src/main/java/org/springframework/ldap/convert/ConversionServiceBeanFactoryPostProcessor.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2002-2025 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/core/src/main/java/org/springframework/ldap/convert/ConverterUtils.java b/core/src/main/java/org/springframework/ldap/convert/ConverterUtils.java
index ca768e6dc5..5763f391df 100644
--- a/core/src/main/java/org/springframework/ldap/convert/ConverterUtils.java
+++ b/core/src/main/java/org/springframework/ldap/convert/ConverterUtils.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2002-2025 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/core/src/main/java/org/springframework/ldap/convert/NameToStringConverter.java b/core/src/main/java/org/springframework/ldap/convert/NameToStringConverter.java
index 6bc0d55911..ed07fe6358 100644
--- a/core/src/main/java/org/springframework/ldap/convert/NameToStringConverter.java
+++ b/core/src/main/java/org/springframework/ldap/convert/NameToStringConverter.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2002-2025 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/core/src/main/java/org/springframework/ldap/convert/StringToNameConverter.java b/core/src/main/java/org/springframework/ldap/convert/StringToNameConverter.java
index 2eb4041b6e..c942be3b50 100644
--- a/core/src/main/java/org/springframework/ldap/convert/StringToNameConverter.java
+++ b/core/src/main/java/org/springframework/ldap/convert/StringToNameConverter.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2002-2025 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/core/src/main/java/org/springframework/ldap/core/AttributeModificationsAware.java b/core/src/main/java/org/springframework/ldap/core/AttributeModificationsAware.java
index c167556dfa..22b1d0c51f 100644
--- a/core/src/main/java/org/springframework/ldap/core/AttributeModificationsAware.java
+++ b/core/src/main/java/org/springframework/ldap/core/AttributeModificationsAware.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2010 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/core/src/main/java/org/springframework/ldap/core/AttributesMapper.java b/core/src/main/java/org/springframework/ldap/core/AttributesMapper.java
index 429d974588..d988201a10 100644
--- a/core/src/main/java/org/springframework/ldap/core/AttributesMapper.java
+++ b/core/src/main/java/org/springframework/ldap/core/AttributesMapper.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2013 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/core/src/main/java/org/springframework/ldap/core/AttributesMapperCallbackHandler.java b/core/src/main/java/org/springframework/ldap/core/AttributesMapperCallbackHandler.java
index d403882dc4..b1339a3f7c 100644
--- a/core/src/main/java/org/springframework/ldap/core/AttributesMapperCallbackHandler.java
+++ b/core/src/main/java/org/springframework/ldap/core/AttributesMapperCallbackHandler.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2013 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/core/src/main/java/org/springframework/ldap/core/AuthenticatedLdapEntryContextCallback.java b/core/src/main/java/org/springframework/ldap/core/AuthenticatedLdapEntryContextCallback.java
index ab21100a00..8f5ced9001 100644
--- a/core/src/main/java/org/springframework/ldap/core/AuthenticatedLdapEntryContextCallback.java
+++ b/core/src/main/java/org/springframework/ldap/core/AuthenticatedLdapEntryContextCallback.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2010 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/core/src/main/java/org/springframework/ldap/core/AuthenticatedLdapEntryContextMapper.java b/core/src/main/java/org/springframework/ldap/core/AuthenticatedLdapEntryContextMapper.java
index 9951c0c21e..bdddac0f05 100644
--- a/core/src/main/java/org/springframework/ldap/core/AuthenticatedLdapEntryContextMapper.java
+++ b/core/src/main/java/org/springframework/ldap/core/AuthenticatedLdapEntryContextMapper.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2013 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/core/src/main/java/org/springframework/ldap/core/AuthenticationErrorCallback.java b/core/src/main/java/org/springframework/ldap/core/AuthenticationErrorCallback.java
index 41da20c620..2c38e1a038 100644
--- a/core/src/main/java/org/springframework/ldap/core/AuthenticationErrorCallback.java
+++ b/core/src/main/java/org/springframework/ldap/core/AuthenticationErrorCallback.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2023 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/core/src/main/java/org/springframework/ldap/core/AuthenticationSource.java b/core/src/main/java/org/springframework/ldap/core/AuthenticationSource.java
index f5e7946bd6..c9dccfcd73 100644
--- a/core/src/main/java/org/springframework/ldap/core/AuthenticationSource.java
+++ b/core/src/main/java/org/springframework/ldap/core/AuthenticationSource.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2010 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/core/src/main/java/org/springframework/ldap/core/CollectingAuthenticationErrorCallback.java b/core/src/main/java/org/springframework/ldap/core/CollectingAuthenticationErrorCallback.java
index e0a8308fba..aa3f9cda7f 100644
--- a/core/src/main/java/org/springframework/ldap/core/CollectingAuthenticationErrorCallback.java
+++ b/core/src/main/java/org/springframework/ldap/core/CollectingAuthenticationErrorCallback.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2010 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/core/src/main/java/org/springframework/ldap/core/CollectingNameClassPairCallbackHandler.java b/core/src/main/java/org/springframework/ldap/core/CollectingNameClassPairCallbackHandler.java
index 304a6e6274..d81c2d623c 100644
--- a/core/src/main/java/org/springframework/ldap/core/CollectingNameClassPairCallbackHandler.java
+++ b/core/src/main/java/org/springframework/ldap/core/CollectingNameClassPairCallbackHandler.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2025 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/core/src/main/java/org/springframework/ldap/core/ContextAssembler.java b/core/src/main/java/org/springframework/ldap/core/ContextAssembler.java
index f9edf32056..2c4e5fc2a7 100644
--- a/core/src/main/java/org/springframework/ldap/core/ContextAssembler.java
+++ b/core/src/main/java/org/springframework/ldap/core/ContextAssembler.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2010 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/core/src/main/java/org/springframework/ldap/core/ContextExecutor.java b/core/src/main/java/org/springframework/ldap/core/ContextExecutor.java
index 50eff38f82..de8a3fad94 100644
--- a/core/src/main/java/org/springframework/ldap/core/ContextExecutor.java
+++ b/core/src/main/java/org/springframework/ldap/core/ContextExecutor.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2013 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/core/src/main/java/org/springframework/ldap/core/ContextMapper.java b/core/src/main/java/org/springframework/ldap/core/ContextMapper.java
index 2f8bfe9d67..aa25188ea2 100644
--- a/core/src/main/java/org/springframework/ldap/core/ContextMapper.java
+++ b/core/src/main/java/org/springframework/ldap/core/ContextMapper.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2013 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/core/src/main/java/org/springframework/ldap/core/ContextMapperCallbackHandler.java b/core/src/main/java/org/springframework/ldap/core/ContextMapperCallbackHandler.java
index dfee6f9cf0..4e0f6e885a 100644
--- a/core/src/main/java/org/springframework/ldap/core/ContextMapperCallbackHandler.java
+++ b/core/src/main/java/org/springframework/ldap/core/ContextMapperCallbackHandler.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2013 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/core/src/main/java/org/springframework/ldap/core/ContextSource.java b/core/src/main/java/org/springframework/ldap/core/ContextSource.java
index 9c5e954a90..e7d84f01c3 100644
--- a/core/src/main/java/org/springframework/ldap/core/ContextSource.java
+++ b/core/src/main/java/org/springframework/ldap/core/ContextSource.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2013 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/core/src/main/java/org/springframework/ldap/core/DefaultDnParserFactory.java b/core/src/main/java/org/springframework/ldap/core/DefaultDnParserFactory.java
index ccfe1acdee..adc14038ab 100644
--- a/core/src/main/java/org/springframework/ldap/core/DefaultDnParserFactory.java
+++ b/core/src/main/java/org/springframework/ldap/core/DefaultDnParserFactory.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2013 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/core/src/main/java/org/springframework/ldap/core/DefaultLdapClient.java b/core/src/main/java/org/springframework/ldap/core/DefaultLdapClient.java
index ee5fea492a..19f54d8e43 100644
--- a/core/src/main/java/org/springframework/ldap/core/DefaultLdapClient.java
+++ b/core/src/main/java/org/springframework/ldap/core/DefaultLdapClient.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2002-2025 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/core/src/main/java/org/springframework/ldap/core/DefaultLdapClientBuilder.java b/core/src/main/java/org/springframework/ldap/core/DefaultLdapClientBuilder.java
index 6146cd4889..6ee9788d68 100644
--- a/core/src/main/java/org/springframework/ldap/core/DefaultLdapClientBuilder.java
+++ b/core/src/main/java/org/springframework/ldap/core/DefaultLdapClientBuilder.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2023 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/core/src/main/java/org/springframework/ldap/core/DefaultNameClassPairMapper.java b/core/src/main/java/org/springframework/ldap/core/DefaultNameClassPairMapper.java
index fb25f6fd8a..2a82f67647 100644
--- a/core/src/main/java/org/springframework/ldap/core/DefaultNameClassPairMapper.java
+++ b/core/src/main/java/org/springframework/ldap/core/DefaultNameClassPairMapper.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2013 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/core/src/main/java/org/springframework/ldap/core/DirContextAdapter.java b/core/src/main/java/org/springframework/ldap/core/DirContextAdapter.java
index 1749f6d9d5..2c3c347f77 100644
--- a/core/src/main/java/org/springframework/ldap/core/DirContextAdapter.java
+++ b/core/src/main/java/org/springframework/ldap/core/DirContextAdapter.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2025 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/core/src/main/java/org/springframework/ldap/core/DirContextOperations.java b/core/src/main/java/org/springframework/ldap/core/DirContextOperations.java
index e10293b0df..e3d0a54b5c 100644
--- a/core/src/main/java/org/springframework/ldap/core/DirContextOperations.java
+++ b/core/src/main/java/org/springframework/ldap/core/DirContextOperations.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2010 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/core/src/main/java/org/springframework/ldap/core/DirContextProcessor.java b/core/src/main/java/org/springframework/ldap/core/DirContextProcessor.java
index f81371085a..f35a2efa0e 100644
--- a/core/src/main/java/org/springframework/ldap/core/DirContextProcessor.java
+++ b/core/src/main/java/org/springframework/ldap/core/DirContextProcessor.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2010 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/core/src/main/java/org/springframework/ldap/core/DirContextProxy.java b/core/src/main/java/org/springframework/ldap/core/DirContextProxy.java
index a6490cd6e2..bed5734074 100644
--- a/core/src/main/java/org/springframework/ldap/core/DirContextProxy.java
+++ b/core/src/main/java/org/springframework/ldap/core/DirContextProxy.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2010 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/core/src/main/java/org/springframework/ldap/core/DistinguishedName.java b/core/src/main/java/org/springframework/ldap/core/DistinguishedName.java
index 0d46887eaf..a76d5002b3 100644
--- a/core/src/main/java/org/springframework/ldap/core/DistinguishedName.java
+++ b/core/src/main/java/org/springframework/ldap/core/DistinguishedName.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2013 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/core/src/main/java/org/springframework/ldap/core/DistinguishedNameEditor.java b/core/src/main/java/org/springframework/ldap/core/DistinguishedNameEditor.java
index 45b2bfca5d..bb2da1b1f0 100644
--- a/core/src/main/java/org/springframework/ldap/core/DistinguishedNameEditor.java
+++ b/core/src/main/java/org/springframework/ldap/core/DistinguishedNameEditor.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2010 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/core/src/main/java/org/springframework/ldap/core/DnParser.java b/core/src/main/java/org/springframework/ldap/core/DnParser.java
index 235cd48f90..2a7e3b7253 100644
--- a/core/src/main/java/org/springframework/ldap/core/DnParser.java
+++ b/core/src/main/java/org/springframework/ldap/core/DnParser.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2010 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/core/src/main/java/org/springframework/ldap/core/IncrementalAttributesMapper.java b/core/src/main/java/org/springframework/ldap/core/IncrementalAttributesMapper.java
index 1ef7b7d4e3..c0279fd666 100644
--- a/core/src/main/java/org/springframework/ldap/core/IncrementalAttributesMapper.java
+++ b/core/src/main/java/org/springframework/ldap/core/IncrementalAttributesMapper.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2013 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/core/src/main/java/org/springframework/ldap/core/IterableNamingEnumeration.java b/core/src/main/java/org/springframework/ldap/core/IterableNamingEnumeration.java
index 4082e7bb06..973f907a36 100644
--- a/core/src/main/java/org/springframework/ldap/core/IterableNamingEnumeration.java
+++ b/core/src/main/java/org/springframework/ldap/core/IterableNamingEnumeration.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2023 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/core/src/main/java/org/springframework/ldap/core/LdapAttribute.java b/core/src/main/java/org/springframework/ldap/core/LdapAttribute.java
index de8cf7b560..4eda3ae510 100644
--- a/core/src/main/java/org/springframework/ldap/core/LdapAttribute.java
+++ b/core/src/main/java/org/springframework/ldap/core/LdapAttribute.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2025 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/core/src/main/java/org/springframework/ldap/core/LdapAttributes.java b/core/src/main/java/org/springframework/ldap/core/LdapAttributes.java
index ff3a416551..e792984b38 100644
--- a/core/src/main/java/org/springframework/ldap/core/LdapAttributes.java
+++ b/core/src/main/java/org/springframework/ldap/core/LdapAttributes.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2010 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/core/src/main/java/org/springframework/ldap/core/LdapClient.java b/core/src/main/java/org/springframework/ldap/core/LdapClient.java
index 3092dceacd..3095ca5168 100644
--- a/core/src/main/java/org/springframework/ldap/core/LdapClient.java
+++ b/core/src/main/java/org/springframework/ldap/core/LdapClient.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2025 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/core/src/main/java/org/springframework/ldap/core/LdapEntryIdentification.java b/core/src/main/java/org/springframework/ldap/core/LdapEntryIdentification.java
index 74af11f047..3e8ef1fbf4 100644
--- a/core/src/main/java/org/springframework/ldap/core/LdapEntryIdentification.java
+++ b/core/src/main/java/org/springframework/ldap/core/LdapEntryIdentification.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2010 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/core/src/main/java/org/springframework/ldap/core/LdapEntryIdentificationContextMapper.java b/core/src/main/java/org/springframework/ldap/core/LdapEntryIdentificationContextMapper.java
index f27ee25f02..7266208110 100644
--- a/core/src/main/java/org/springframework/ldap/core/LdapEntryIdentificationContextMapper.java
+++ b/core/src/main/java/org/springframework/ldap/core/LdapEntryIdentificationContextMapper.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2013 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/core/src/main/java/org/springframework/ldap/core/LdapOperations.java b/core/src/main/java/org/springframework/ldap/core/LdapOperations.java
index b03fb7475c..64711b39c8 100644
--- a/core/src/main/java/org/springframework/ldap/core/LdapOperations.java
+++ b/core/src/main/java/org/springframework/ldap/core/LdapOperations.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2022 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/core/src/main/java/org/springframework/ldap/core/LdapRdn.java b/core/src/main/java/org/springframework/ldap/core/LdapRdn.java
index 8375e0d7d5..a576cb825c 100644
--- a/core/src/main/java/org/springframework/ldap/core/LdapRdn.java
+++ b/core/src/main/java/org/springframework/ldap/core/LdapRdn.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2025 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/core/src/main/java/org/springframework/ldap/core/LdapRdnComponent.java b/core/src/main/java/org/springframework/ldap/core/LdapRdnComponent.java
index 071e4b98e3..7406460309 100644
--- a/core/src/main/java/org/springframework/ldap/core/LdapRdnComponent.java
+++ b/core/src/main/java/org/springframework/ldap/core/LdapRdnComponent.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2013 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/core/src/main/java/org/springframework/ldap/core/LdapTemplate.java b/core/src/main/java/org/springframework/ldap/core/LdapTemplate.java
index 5328ec0f53..315089ed92 100644
--- a/core/src/main/java/org/springframework/ldap/core/LdapTemplate.java
+++ b/core/src/main/java/org/springframework/ldap/core/LdapTemplate.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2025 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/core/src/main/java/org/springframework/ldap/core/NameAwareAttribute.java b/core/src/main/java/org/springframework/ldap/core/NameAwareAttribute.java
index c46ce89cfe..80791539c4 100644
--- a/core/src/main/java/org/springframework/ldap/core/NameAwareAttribute.java
+++ b/core/src/main/java/org/springframework/ldap/core/NameAwareAttribute.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2025 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/core/src/main/java/org/springframework/ldap/core/NameAwareAttributes.java b/core/src/main/java/org/springframework/ldap/core/NameAwareAttributes.java
index 47516284f6..4484c99602 100644
--- a/core/src/main/java/org/springframework/ldap/core/NameAwareAttributes.java
+++ b/core/src/main/java/org/springframework/ldap/core/NameAwareAttributes.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2025 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/core/src/main/java/org/springframework/ldap/core/NameClassPairCallbackHandler.java b/core/src/main/java/org/springframework/ldap/core/NameClassPairCallbackHandler.java
index 43bcb2526c..f66a8cea51 100644
--- a/core/src/main/java/org/springframework/ldap/core/NameClassPairCallbackHandler.java
+++ b/core/src/main/java/org/springframework/ldap/core/NameClassPairCallbackHandler.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2010 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/core/src/main/java/org/springframework/ldap/core/NameClassPairMapper.java b/core/src/main/java/org/springframework/ldap/core/NameClassPairMapper.java
index 77a199289b..09e518121f 100644
--- a/core/src/main/java/org/springframework/ldap/core/NameClassPairMapper.java
+++ b/core/src/main/java/org/springframework/ldap/core/NameClassPairMapper.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2013 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/core/src/main/java/org/springframework/ldap/core/ObjectRetrievalException.java b/core/src/main/java/org/springframework/ldap/core/ObjectRetrievalException.java
index 63cfc45ba6..e430f12173 100644
--- a/core/src/main/java/org/springframework/ldap/core/ObjectRetrievalException.java
+++ b/core/src/main/java/org/springframework/ldap/core/ObjectRetrievalException.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2010 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/core/src/main/java/org/springframework/ldap/core/SearchExecutor.java b/core/src/main/java/org/springframework/ldap/core/SearchExecutor.java
index 64a2824e4d..3d23f2e5a9 100644
--- a/core/src/main/java/org/springframework/ldap/core/SearchExecutor.java
+++ b/core/src/main/java/org/springframework/ldap/core/SearchExecutor.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2010 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/core/src/main/java/org/springframework/ldap/core/support/AbstractContextMapper.java b/core/src/main/java/org/springframework/ldap/core/support/AbstractContextMapper.java
index 6d828f3b0e..baf98d0ade 100644
--- a/core/src/main/java/org/springframework/ldap/core/support/AbstractContextMapper.java
+++ b/core/src/main/java/org/springframework/ldap/core/support/AbstractContextMapper.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2013 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/core/src/main/java/org/springframework/ldap/core/support/AbstractContextSource.java b/core/src/main/java/org/springframework/ldap/core/support/AbstractContextSource.java
index 4524f51684..a61e4c9578 100644
--- a/core/src/main/java/org/springframework/ldap/core/support/AbstractContextSource.java
+++ b/core/src/main/java/org/springframework/ldap/core/support/AbstractContextSource.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2025 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/core/src/main/java/org/springframework/ldap/core/support/AbstractTlsDirContextAuthenticationStrategy.java b/core/src/main/java/org/springframework/ldap/core/support/AbstractTlsDirContextAuthenticationStrategy.java
index 375214cbbe..5f67607ebc 100755
--- a/core/src/main/java/org/springframework/ldap/core/support/AbstractTlsDirContextAuthenticationStrategy.java
+++ b/core/src/main/java/org/springframework/ldap/core/support/AbstractTlsDirContextAuthenticationStrategy.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2024 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/core/src/main/java/org/springframework/ldap/core/support/AggregateDirContextProcessor.java b/core/src/main/java/org/springframework/ldap/core/support/AggregateDirContextProcessor.java
index bbb2f184d3..44e8d90264 100644
--- a/core/src/main/java/org/springframework/ldap/core/support/AggregateDirContextProcessor.java
+++ b/core/src/main/java/org/springframework/ldap/core/support/AggregateDirContextProcessor.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2025 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/core/src/main/java/org/springframework/ldap/core/support/BaseLdapNameAware.java b/core/src/main/java/org/springframework/ldap/core/support/BaseLdapNameAware.java
index 275d7ea85b..895f4e7da4 100644
--- a/core/src/main/java/org/springframework/ldap/core/support/BaseLdapNameAware.java
+++ b/core/src/main/java/org/springframework/ldap/core/support/BaseLdapNameAware.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2013 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/core/src/main/java/org/springframework/ldap/core/support/BaseLdapPathAware.java b/core/src/main/java/org/springframework/ldap/core/support/BaseLdapPathAware.java
index 5892c62da6..a7df9c7451 100644
--- a/core/src/main/java/org/springframework/ldap/core/support/BaseLdapPathAware.java
+++ b/core/src/main/java/org/springframework/ldap/core/support/BaseLdapPathAware.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2010 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/core/src/main/java/org/springframework/ldap/core/support/BaseLdapPathBeanPostProcessor.java b/core/src/main/java/org/springframework/ldap/core/support/BaseLdapPathBeanPostProcessor.java
index e99e034e04..243d83bc28 100644
--- a/core/src/main/java/org/springframework/ldap/core/support/BaseLdapPathBeanPostProcessor.java
+++ b/core/src/main/java/org/springframework/ldap/core/support/BaseLdapPathBeanPostProcessor.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2013 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/core/src/main/java/org/springframework/ldap/core/support/BaseLdapPathContextSource.java b/core/src/main/java/org/springframework/ldap/core/support/BaseLdapPathContextSource.java
index 035254dec8..cc71cf8673 100644
--- a/core/src/main/java/org/springframework/ldap/core/support/BaseLdapPathContextSource.java
+++ b/core/src/main/java/org/springframework/ldap/core/support/BaseLdapPathContextSource.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2010 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/core/src/main/java/org/springframework/ldap/core/support/BaseLdapPathSource.java b/core/src/main/java/org/springframework/ldap/core/support/BaseLdapPathSource.java
index 9742eedd7a..68e63aeb15 100644
--- a/core/src/main/java/org/springframework/ldap/core/support/BaseLdapPathSource.java
+++ b/core/src/main/java/org/springframework/ldap/core/support/BaseLdapPathSource.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2010 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/core/src/main/java/org/springframework/ldap/core/support/ContextMapperCallbackHandlerWithControls.java b/core/src/main/java/org/springframework/ldap/core/support/ContextMapperCallbackHandlerWithControls.java
index c883c9910e..71a9e6b58c 100644
--- a/core/src/main/java/org/springframework/ldap/core/support/ContextMapperCallbackHandlerWithControls.java
+++ b/core/src/main/java/org/springframework/ldap/core/support/ContextMapperCallbackHandlerWithControls.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2013 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/core/src/main/java/org/springframework/ldap/core/support/ContextMapperWithControls.java b/core/src/main/java/org/springframework/ldap/core/support/ContextMapperWithControls.java
index 84b474fe0c..e682baebda 100644
--- a/core/src/main/java/org/springframework/ldap/core/support/ContextMapperWithControls.java
+++ b/core/src/main/java/org/springframework/ldap/core/support/ContextMapperWithControls.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2013 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/core/src/main/java/org/springframework/ldap/core/support/ContextSourceObservationPostProcessor.java b/core/src/main/java/org/springframework/ldap/core/support/ContextSourceObservationPostProcessor.java
index 2dfdf52563..64275159d6 100644
--- a/core/src/main/java/org/springframework/ldap/core/support/ContextSourceObservationPostProcessor.java
+++ b/core/src/main/java/org/springframework/ldap/core/support/ContextSourceObservationPostProcessor.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2002-2025 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/core/src/main/java/org/springframework/ldap/core/support/CountNameClassPairCallbackHandler.java b/core/src/main/java/org/springframework/ldap/core/support/CountNameClassPairCallbackHandler.java
index edf3be9361..591a419596 100644
--- a/core/src/main/java/org/springframework/ldap/core/support/CountNameClassPairCallbackHandler.java
+++ b/core/src/main/java/org/springframework/ldap/core/support/CountNameClassPairCallbackHandler.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2010 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/core/src/main/java/org/springframework/ldap/core/support/DefaultDirObjectFactory.java b/core/src/main/java/org/springframework/ldap/core/support/DefaultDirObjectFactory.java
index 8bf24cc5d0..b7be4b43a1 100644
--- a/core/src/main/java/org/springframework/ldap/core/support/DefaultDirObjectFactory.java
+++ b/core/src/main/java/org/springframework/ldap/core/support/DefaultDirObjectFactory.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2013 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/core/src/main/java/org/springframework/ldap/core/support/DefaultIncrementalAttributesMapper.java b/core/src/main/java/org/springframework/ldap/core/support/DefaultIncrementalAttributesMapper.java
index 5588dd1f5d..1c3d2696c5 100644
--- a/core/src/main/java/org/springframework/ldap/core/support/DefaultIncrementalAttributesMapper.java
+++ b/core/src/main/java/org/springframework/ldap/core/support/DefaultIncrementalAttributesMapper.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2025 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/core/src/main/java/org/springframework/ldap/core/support/DefaultTlsDirContextAuthenticationStrategy.java b/core/src/main/java/org/springframework/ldap/core/support/DefaultTlsDirContextAuthenticationStrategy.java
index 643af87970..76a92f9c6e 100755
--- a/core/src/main/java/org/springframework/ldap/core/support/DefaultTlsDirContextAuthenticationStrategy.java
+++ b/core/src/main/java/org/springframework/ldap/core/support/DefaultTlsDirContextAuthenticationStrategy.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2010 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/core/src/main/java/org/springframework/ldap/core/support/DelegatingBaseLdapPathContextSourceSupport.java b/core/src/main/java/org/springframework/ldap/core/support/DelegatingBaseLdapPathContextSourceSupport.java
index 2c58e4faa9..f0589fa00c 100644
--- a/core/src/main/java/org/springframework/ldap/core/support/DelegatingBaseLdapPathContextSourceSupport.java
+++ b/core/src/main/java/org/springframework/ldap/core/support/DelegatingBaseLdapPathContextSourceSupport.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2013 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/core/src/main/java/org/springframework/ldap/core/support/DigestMd5DirContextAuthenticationStrategy.java b/core/src/main/java/org/springframework/ldap/core/support/DigestMd5DirContextAuthenticationStrategy.java
index ea2b01daa1..f96715412a 100644
--- a/core/src/main/java/org/springframework/ldap/core/support/DigestMd5DirContextAuthenticationStrategy.java
+++ b/core/src/main/java/org/springframework/ldap/core/support/DigestMd5DirContextAuthenticationStrategy.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2013 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/core/src/main/java/org/springframework/ldap/core/support/DirContextAuthenticationStrategy.java b/core/src/main/java/org/springframework/ldap/core/support/DirContextAuthenticationStrategy.java
index 07d16179d9..556b725fef 100755
--- a/core/src/main/java/org/springframework/ldap/core/support/DirContextAuthenticationStrategy.java
+++ b/core/src/main/java/org/springframework/ldap/core/support/DirContextAuthenticationStrategy.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2013 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/core/src/main/java/org/springframework/ldap/core/support/DirContextSource.java b/core/src/main/java/org/springframework/ldap/core/support/DirContextSource.java
index 7cefe68ebf..43d3aa9cee 100644
--- a/core/src/main/java/org/springframework/ldap/core/support/DirContextSource.java
+++ b/core/src/main/java/org/springframework/ldap/core/support/DirContextSource.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2010 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/core/src/main/java/org/springframework/ldap/core/support/ExternalTlsDirContextAuthenticationStrategy.java b/core/src/main/java/org/springframework/ldap/core/support/ExternalTlsDirContextAuthenticationStrategy.java
index 63ea449d36..ddc9c3c557 100755
--- a/core/src/main/java/org/springframework/ldap/core/support/ExternalTlsDirContextAuthenticationStrategy.java
+++ b/core/src/main/java/org/springframework/ldap/core/support/ExternalTlsDirContextAuthenticationStrategy.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2013 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/core/src/main/java/org/springframework/ldap/core/support/LdapContextSource.java b/core/src/main/java/org/springframework/ldap/core/support/LdapContextSource.java
index 0d013c0129..a29fc4faf8 100644
--- a/core/src/main/java/org/springframework/ldap/core/support/LdapContextSource.java
+++ b/core/src/main/java/org/springframework/ldap/core/support/LdapContextSource.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2013 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/core/src/main/java/org/springframework/ldap/core/support/LdapOperationsCallback.java b/core/src/main/java/org/springframework/ldap/core/support/LdapOperationsCallback.java
index 50721939b4..ac709c5eef 100644
--- a/core/src/main/java/org/springframework/ldap/core/support/LdapOperationsCallback.java
+++ b/core/src/main/java/org/springframework/ldap/core/support/LdapOperationsCallback.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2013 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/core/src/main/java/org/springframework/ldap/core/support/LookupAttemptingCallback.java b/core/src/main/java/org/springframework/ldap/core/support/LookupAttemptingCallback.java
index e6094eaac9..21d0c062d6 100644
--- a/core/src/main/java/org/springframework/ldap/core/support/LookupAttemptingCallback.java
+++ b/core/src/main/java/org/springframework/ldap/core/support/LookupAttemptingCallback.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2013 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/core/src/main/java/org/springframework/ldap/core/support/ObservationContextSource.java b/core/src/main/java/org/springframework/ldap/core/support/ObservationContextSource.java
index 12ce778974..dd20d7546b 100644
--- a/core/src/main/java/org/springframework/ldap/core/support/ObservationContextSource.java
+++ b/core/src/main/java/org/springframework/ldap/core/support/ObservationContextSource.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2025 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/core/src/main/java/org/springframework/ldap/core/support/RangeOption.java b/core/src/main/java/org/springframework/ldap/core/support/RangeOption.java
index ba09970049..794b7becc2 100644
--- a/core/src/main/java/org/springframework/ldap/core/support/RangeOption.java
+++ b/core/src/main/java/org/springframework/ldap/core/support/RangeOption.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2013 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/core/src/main/java/org/springframework/ldap/core/support/SimpleDirContextAuthenticationStrategy.java b/core/src/main/java/org/springframework/ldap/core/support/SimpleDirContextAuthenticationStrategy.java
index 2fc1a71c83..3e47105a3a 100755
--- a/core/src/main/java/org/springframework/ldap/core/support/SimpleDirContextAuthenticationStrategy.java
+++ b/core/src/main/java/org/springframework/ldap/core/support/SimpleDirContextAuthenticationStrategy.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2013 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/core/src/main/java/org/springframework/ldap/core/support/SingleContextSource.java b/core/src/main/java/org/springframework/ldap/core/support/SingleContextSource.java
index 29e7ea9056..634867bf5a 100644
--- a/core/src/main/java/org/springframework/ldap/core/support/SingleContextSource.java
+++ b/core/src/main/java/org/springframework/ldap/core/support/SingleContextSource.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2013 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/core/src/main/java/org/springframework/ldap/filter/AbsoluteFalseFilter.java b/core/src/main/java/org/springframework/ldap/filter/AbsoluteFalseFilter.java
index 3243c5aa61..0ec18a8202 100644
--- a/core/src/main/java/org/springframework/ldap/filter/AbsoluteFalseFilter.java
+++ b/core/src/main/java/org/springframework/ldap/filter/AbsoluteFalseFilter.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2013 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/core/src/main/java/org/springframework/ldap/filter/AbsoluteTrueFilter.java b/core/src/main/java/org/springframework/ldap/filter/AbsoluteTrueFilter.java
index a293887726..e68549ccff 100644
--- a/core/src/main/java/org/springframework/ldap/filter/AbsoluteTrueFilter.java
+++ b/core/src/main/java/org/springframework/ldap/filter/AbsoluteTrueFilter.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2013 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/core/src/main/java/org/springframework/ldap/filter/AbstractFilter.java b/core/src/main/java/org/springframework/ldap/filter/AbstractFilter.java
index ef006fbf1a..543f39ecf6 100644
--- a/core/src/main/java/org/springframework/ldap/filter/AbstractFilter.java
+++ b/core/src/main/java/org/springframework/ldap/filter/AbstractFilter.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2013 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/core/src/main/java/org/springframework/ldap/filter/AndFilter.java b/core/src/main/java/org/springframework/ldap/filter/AndFilter.java
index 0cdaf9ad53..65587417d2 100644
--- a/core/src/main/java/org/springframework/ldap/filter/AndFilter.java
+++ b/core/src/main/java/org/springframework/ldap/filter/AndFilter.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2010 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/core/src/main/java/org/springframework/ldap/filter/BinaryLogicalFilter.java b/core/src/main/java/org/springframework/ldap/filter/BinaryLogicalFilter.java
index 63776cfd41..85e578ff41 100644
--- a/core/src/main/java/org/springframework/ldap/filter/BinaryLogicalFilter.java
+++ b/core/src/main/java/org/springframework/ldap/filter/BinaryLogicalFilter.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2025 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/core/src/main/java/org/springframework/ldap/filter/CompareFilter.java b/core/src/main/java/org/springframework/ldap/filter/CompareFilter.java
index 684cb8334a..f22bdfa966 100644
--- a/core/src/main/java/org/springframework/ldap/filter/CompareFilter.java
+++ b/core/src/main/java/org/springframework/ldap/filter/CompareFilter.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2025 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/core/src/main/java/org/springframework/ldap/filter/EqualsFilter.java b/core/src/main/java/org/springframework/ldap/filter/EqualsFilter.java
index 6904bb7151..589a456116 100644
--- a/core/src/main/java/org/springframework/ldap/filter/EqualsFilter.java
+++ b/core/src/main/java/org/springframework/ldap/filter/EqualsFilter.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2025 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/core/src/main/java/org/springframework/ldap/filter/Filter.java b/core/src/main/java/org/springframework/ldap/filter/Filter.java
index 3c70bf527a..4260ca6ace 100644
--- a/core/src/main/java/org/springframework/ldap/filter/Filter.java
+++ b/core/src/main/java/org/springframework/ldap/filter/Filter.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2010 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/core/src/main/java/org/springframework/ldap/filter/FilterEditor.java b/core/src/main/java/org/springframework/ldap/filter/FilterEditor.java
index f4919060cb..d2ef9e332e 100644
--- a/core/src/main/java/org/springframework/ldap/filter/FilterEditor.java
+++ b/core/src/main/java/org/springframework/ldap/filter/FilterEditor.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2010 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/core/src/main/java/org/springframework/ldap/filter/GreaterThanOrEqualsFilter.java b/core/src/main/java/org/springframework/ldap/filter/GreaterThanOrEqualsFilter.java
index e8b66a6deb..3e9c18082b 100644
--- a/core/src/main/java/org/springframework/ldap/filter/GreaterThanOrEqualsFilter.java
+++ b/core/src/main/java/org/springframework/ldap/filter/GreaterThanOrEqualsFilter.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2025 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/core/src/main/java/org/springframework/ldap/filter/HardcodedFilter.java b/core/src/main/java/org/springframework/ldap/filter/HardcodedFilter.java
index d7c0f0205d..52dfa5611c 100644
--- a/core/src/main/java/org/springframework/ldap/filter/HardcodedFilter.java
+++ b/core/src/main/java/org/springframework/ldap/filter/HardcodedFilter.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2013 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/core/src/main/java/org/springframework/ldap/filter/LessThanOrEqualsFilter.java b/core/src/main/java/org/springframework/ldap/filter/LessThanOrEqualsFilter.java
index b203ac5d63..c60b2d2b2b 100644
--- a/core/src/main/java/org/springframework/ldap/filter/LessThanOrEqualsFilter.java
+++ b/core/src/main/java/org/springframework/ldap/filter/LessThanOrEqualsFilter.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2025 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/core/src/main/java/org/springframework/ldap/filter/LikeFilter.java b/core/src/main/java/org/springframework/ldap/filter/LikeFilter.java
index a0692a459e..01be8c859d 100644
--- a/core/src/main/java/org/springframework/ldap/filter/LikeFilter.java
+++ b/core/src/main/java/org/springframework/ldap/filter/LikeFilter.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2025 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/core/src/main/java/org/springframework/ldap/filter/NotFilter.java b/core/src/main/java/org/springframework/ldap/filter/NotFilter.java
index 2e48c12fb4..7b4f089e78 100644
--- a/core/src/main/java/org/springframework/ldap/filter/NotFilter.java
+++ b/core/src/main/java/org/springframework/ldap/filter/NotFilter.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2013 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/core/src/main/java/org/springframework/ldap/filter/NotPresentFilter.java b/core/src/main/java/org/springframework/ldap/filter/NotPresentFilter.java
index 63f1294741..c8dfca962e 100644
--- a/core/src/main/java/org/springframework/ldap/filter/NotPresentFilter.java
+++ b/core/src/main/java/org/springframework/ldap/filter/NotPresentFilter.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2013 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/core/src/main/java/org/springframework/ldap/filter/OrFilter.java b/core/src/main/java/org/springframework/ldap/filter/OrFilter.java
index 5a68c229af..f0160fa675 100644
--- a/core/src/main/java/org/springframework/ldap/filter/OrFilter.java
+++ b/core/src/main/java/org/springframework/ldap/filter/OrFilter.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2013 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/core/src/main/java/org/springframework/ldap/filter/PresentFilter.java b/core/src/main/java/org/springframework/ldap/filter/PresentFilter.java
index b3ca179a11..88230894b9 100644
--- a/core/src/main/java/org/springframework/ldap/filter/PresentFilter.java
+++ b/core/src/main/java/org/springframework/ldap/filter/PresentFilter.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2013 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/core/src/main/java/org/springframework/ldap/filter/ProximityFilter.java b/core/src/main/java/org/springframework/ldap/filter/ProximityFilter.java
index dc34924d50..7ee56a56bf 100644
--- a/core/src/main/java/org/springframework/ldap/filter/ProximityFilter.java
+++ b/core/src/main/java/org/springframework/ldap/filter/ProximityFilter.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2025 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/core/src/main/java/org/springframework/ldap/filter/WhitespaceWildcardsFilter.java b/core/src/main/java/org/springframework/ldap/filter/WhitespaceWildcardsFilter.java
index 31e836aa8b..d2f62ad4cf 100644
--- a/core/src/main/java/org/springframework/ldap/filter/WhitespaceWildcardsFilter.java
+++ b/core/src/main/java/org/springframework/ldap/filter/WhitespaceWildcardsFilter.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2013 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/core/src/main/java/org/springframework/ldap/odm/annotations/Attribute.java b/core/src/main/java/org/springframework/ldap/odm/annotations/Attribute.java
index af73ef3c87..303eb56f68 100755
--- a/core/src/main/java/org/springframework/ldap/odm/annotations/Attribute.java
+++ b/core/src/main/java/org/springframework/ldap/odm/annotations/Attribute.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2023 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/core/src/main/java/org/springframework/ldap/odm/annotations/DnAttribute.java b/core/src/main/java/org/springframework/ldap/odm/annotations/DnAttribute.java
index ae9612e1b1..11c1cead67 100644
--- a/core/src/main/java/org/springframework/ldap/odm/annotations/DnAttribute.java
+++ b/core/src/main/java/org/springframework/ldap/odm/annotations/DnAttribute.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2023 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/core/src/main/java/org/springframework/ldap/odm/annotations/Entry.java b/core/src/main/java/org/springframework/ldap/odm/annotations/Entry.java
index 8c51ad824e..50272d04ba 100755
--- a/core/src/main/java/org/springframework/ldap/odm/annotations/Entry.java
+++ b/core/src/main/java/org/springframework/ldap/odm/annotations/Entry.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2023 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/core/src/main/java/org/springframework/ldap/odm/annotations/Id.java b/core/src/main/java/org/springframework/ldap/odm/annotations/Id.java
index 0fcdfff08e..a4360128d3 100755
--- a/core/src/main/java/org/springframework/ldap/odm/annotations/Id.java
+++ b/core/src/main/java/org/springframework/ldap/odm/annotations/Id.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2023 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/core/src/main/java/org/springframework/ldap/odm/annotations/Transient.java b/core/src/main/java/org/springframework/ldap/odm/annotations/Transient.java
index 43aba6b972..dc8ab366be 100755
--- a/core/src/main/java/org/springframework/ldap/odm/annotations/Transient.java
+++ b/core/src/main/java/org/springframework/ldap/odm/annotations/Transient.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2023 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/core/src/main/java/org/springframework/ldap/odm/annotations/package-info.java b/core/src/main/java/org/springframework/ldap/odm/annotations/package-info.java
index ce9d11dd65..833783b991 100755
--- a/core/src/main/java/org/springframework/ldap/odm/annotations/package-info.java
+++ b/core/src/main/java/org/springframework/ldap/odm/annotations/package-info.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2023 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/core/src/main/java/org/springframework/ldap/odm/config/ObjectDirectoryMapperConfiguration.java b/core/src/main/java/org/springframework/ldap/odm/config/ObjectDirectoryMapperConfiguration.java
index 6a4c5c7bb4..9153e4e8e4 100644
--- a/core/src/main/java/org/springframework/ldap/odm/config/ObjectDirectoryMapperConfiguration.java
+++ b/core/src/main/java/org/springframework/ldap/odm/config/ObjectDirectoryMapperConfiguration.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2002-2025 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/core/src/main/java/org/springframework/ldap/odm/core/ObjectDirectoryMapper.java b/core/src/main/java/org/springframework/ldap/odm/core/ObjectDirectoryMapper.java
index cea272e667..5af27cd10b 100644
--- a/core/src/main/java/org/springframework/ldap/odm/core/ObjectDirectoryMapper.java
+++ b/core/src/main/java/org/springframework/ldap/odm/core/ObjectDirectoryMapper.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2013 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/core/src/main/java/org/springframework/ldap/odm/core/OdmException.java b/core/src/main/java/org/springframework/ldap/odm/core/OdmException.java
index 3560397610..86874ede04 100755
--- a/core/src/main/java/org/springframework/ldap/odm/core/OdmException.java
+++ b/core/src/main/java/org/springframework/ldap/odm/core/OdmException.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2013 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/core/src/main/java/org/springframework/ldap/odm/core/impl/AttributeMetaData.java b/core/src/main/java/org/springframework/ldap/odm/core/impl/AttributeMetaData.java
index 29e5d340bc..aa7ad6d7f1 100755
--- a/core/src/main/java/org/springframework/ldap/odm/core/impl/AttributeMetaData.java
+++ b/core/src/main/java/org/springframework/ldap/odm/core/impl/AttributeMetaData.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2025 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/core/src/main/java/org/springframework/ldap/odm/core/impl/CaseIgnoreString.java b/core/src/main/java/org/springframework/ldap/odm/core/impl/CaseIgnoreString.java
index 2f92fcebe6..9112c9745a 100755
--- a/core/src/main/java/org/springframework/ldap/odm/core/impl/CaseIgnoreString.java
+++ b/core/src/main/java/org/springframework/ldap/odm/core/impl/CaseIgnoreString.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2013 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/core/src/main/java/org/springframework/ldap/odm/core/impl/DefaultObjectDirectoryMapper.java b/core/src/main/java/org/springframework/ldap/odm/core/impl/DefaultObjectDirectoryMapper.java
index b65bbd8efb..ca096e7c5d 100644
--- a/core/src/main/java/org/springframework/ldap/odm/core/impl/DefaultObjectDirectoryMapper.java
+++ b/core/src/main/java/org/springframework/ldap/odm/core/impl/DefaultObjectDirectoryMapper.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2025 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/core/src/main/java/org/springframework/ldap/odm/core/impl/InvalidEntryException.java b/core/src/main/java/org/springframework/ldap/odm/core/impl/InvalidEntryException.java
index 901add113e..f60d409287 100755
--- a/core/src/main/java/org/springframework/ldap/odm/core/impl/InvalidEntryException.java
+++ b/core/src/main/java/org/springframework/ldap/odm/core/impl/InvalidEntryException.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2013 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/core/src/main/java/org/springframework/ldap/odm/core/impl/MetaDataException.java b/core/src/main/java/org/springframework/ldap/odm/core/impl/MetaDataException.java
index 7322b42ee8..6c3a53c22a 100755
--- a/core/src/main/java/org/springframework/ldap/odm/core/impl/MetaDataException.java
+++ b/core/src/main/java/org/springframework/ldap/odm/core/impl/MetaDataException.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2013 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/core/src/main/java/org/springframework/ldap/odm/core/impl/ObjectMetaData.java b/core/src/main/java/org/springframework/ldap/odm/core/impl/ObjectMetaData.java
index 4c2e71cc39..9ddeab1858 100755
--- a/core/src/main/java/org/springframework/ldap/odm/core/impl/ObjectMetaData.java
+++ b/core/src/main/java/org/springframework/ldap/odm/core/impl/ObjectMetaData.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2025 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/core/src/main/java/org/springframework/ldap/odm/core/impl/UnmanagedClassException.java b/core/src/main/java/org/springframework/ldap/odm/core/impl/UnmanagedClassException.java
index 9c22595f70..2bad5bdb0e 100755
--- a/core/src/main/java/org/springframework/ldap/odm/core/impl/UnmanagedClassException.java
+++ b/core/src/main/java/org/springframework/ldap/odm/core/impl/UnmanagedClassException.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2013 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/core/src/main/java/org/springframework/ldap/odm/core/impl/package-info.java b/core/src/main/java/org/springframework/ldap/odm/core/impl/package-info.java
index c1762c5208..259dd51bd6 100755
--- a/core/src/main/java/org/springframework/ldap/odm/core/impl/package-info.java
+++ b/core/src/main/java/org/springframework/ldap/odm/core/impl/package-info.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2023 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/core/src/main/java/org/springframework/ldap/odm/core/package-info.java b/core/src/main/java/org/springframework/ldap/odm/core/package-info.java
index 403034b2ed..06db21f07a 100755
--- a/core/src/main/java/org/springframework/ldap/odm/core/package-info.java
+++ b/core/src/main/java/org/springframework/ldap/odm/core/package-info.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2023 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/core/src/main/java/org/springframework/ldap/odm/typeconversion/ConverterException.java b/core/src/main/java/org/springframework/ldap/odm/typeconversion/ConverterException.java
index 8621dbd0dc..6db56bde0a 100755
--- a/core/src/main/java/org/springframework/ldap/odm/typeconversion/ConverterException.java
+++ b/core/src/main/java/org/springframework/ldap/odm/typeconversion/ConverterException.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2025 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/core/src/main/java/org/springframework/ldap/odm/typeconversion/ConverterManager.java b/core/src/main/java/org/springframework/ldap/odm/typeconversion/ConverterManager.java
index 3c221166aa..9d72e9ac41 100755
--- a/core/src/main/java/org/springframework/ldap/odm/typeconversion/ConverterManager.java
+++ b/core/src/main/java/org/springframework/ldap/odm/typeconversion/ConverterManager.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2025 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/core/src/main/java/org/springframework/ldap/odm/typeconversion/impl/ConversionServiceConverterManager.java b/core/src/main/java/org/springframework/ldap/odm/typeconversion/impl/ConversionServiceConverterManager.java
index ee0609b4a3..1c5dc1ec9f 100644
--- a/core/src/main/java/org/springframework/ldap/odm/typeconversion/impl/ConversionServiceConverterManager.java
+++ b/core/src/main/java/org/springframework/ldap/odm/typeconversion/impl/ConversionServiceConverterManager.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2025 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/core/src/main/java/org/springframework/ldap/odm/typeconversion/impl/Converter.java b/core/src/main/java/org/springframework/ldap/odm/typeconversion/impl/Converter.java
index c998f90f19..4279b8b0e0 100755
--- a/core/src/main/java/org/springframework/ldap/odm/typeconversion/impl/Converter.java
+++ b/core/src/main/java/org/springframework/ldap/odm/typeconversion/impl/Converter.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2025 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/core/src/main/java/org/springframework/ldap/odm/typeconversion/impl/ConverterManagerFactoryBean.java b/core/src/main/java/org/springframework/ldap/odm/typeconversion/impl/ConverterManagerFactoryBean.java
index 140f81181f..bffc186f33 100755
--- a/core/src/main/java/org/springframework/ldap/odm/typeconversion/impl/ConverterManagerFactoryBean.java
+++ b/core/src/main/java/org/springframework/ldap/odm/typeconversion/impl/ConverterManagerFactoryBean.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2025 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/core/src/main/java/org/springframework/ldap/odm/typeconversion/impl/ConverterManagerImpl.java b/core/src/main/java/org/springframework/ldap/odm/typeconversion/impl/ConverterManagerImpl.java
index c6a8dace79..a69764455d 100644
--- a/core/src/main/java/org/springframework/ldap/odm/typeconversion/impl/ConverterManagerImpl.java
+++ b/core/src/main/java/org/springframework/ldap/odm/typeconversion/impl/ConverterManagerImpl.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2025 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/core/src/main/java/org/springframework/ldap/odm/typeconversion/impl/StringConverter.java b/core/src/main/java/org/springframework/ldap/odm/typeconversion/impl/StringConverter.java
index 1391881a7a..5c0aa72c1d 100644
--- a/core/src/main/java/org/springframework/ldap/odm/typeconversion/impl/StringConverter.java
+++ b/core/src/main/java/org/springframework/ldap/odm/typeconversion/impl/StringConverter.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2025 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/core/src/main/java/org/springframework/ldap/odm/typeconversion/impl/converters/FromStringConverter.java b/core/src/main/java/org/springframework/ldap/odm/typeconversion/impl/converters/FromStringConverter.java
index 16a3ac8068..4ea1bdba71 100755
--- a/core/src/main/java/org/springframework/ldap/odm/typeconversion/impl/converters/FromStringConverter.java
+++ b/core/src/main/java/org/springframework/ldap/odm/typeconversion/impl/converters/FromStringConverter.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2025 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/core/src/main/java/org/springframework/ldap/odm/typeconversion/impl/converters/ToStringConverter.java b/core/src/main/java/org/springframework/ldap/odm/typeconversion/impl/converters/ToStringConverter.java
index 935553d370..f713c2d44d 100755
--- a/core/src/main/java/org/springframework/ldap/odm/typeconversion/impl/converters/ToStringConverter.java
+++ b/core/src/main/java/org/springframework/ldap/odm/typeconversion/impl/converters/ToStringConverter.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2025 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/core/src/main/java/org/springframework/ldap/odm/typeconversion/impl/converters/package-info.java b/core/src/main/java/org/springframework/ldap/odm/typeconversion/impl/converters/package-info.java
index b0f30d09d7..13adad0789 100755
--- a/core/src/main/java/org/springframework/ldap/odm/typeconversion/impl/converters/package-info.java
+++ b/core/src/main/java/org/springframework/ldap/odm/typeconversion/impl/converters/package-info.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2023 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/core/src/main/java/org/springframework/ldap/odm/typeconversion/impl/package-info.java b/core/src/main/java/org/springframework/ldap/odm/typeconversion/impl/package-info.java
index da5288899b..6a89c11ce0 100755
--- a/core/src/main/java/org/springframework/ldap/odm/typeconversion/impl/package-info.java
+++ b/core/src/main/java/org/springframework/ldap/odm/typeconversion/impl/package-info.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2023 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/core/src/main/java/org/springframework/ldap/odm/typeconversion/package-info.java b/core/src/main/java/org/springframework/ldap/odm/typeconversion/package-info.java
index 24f4521af3..2ff19d0d93 100755
--- a/core/src/main/java/org/springframework/ldap/odm/typeconversion/package-info.java
+++ b/core/src/main/java/org/springframework/ldap/odm/typeconversion/package-info.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2023 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/core/src/main/java/org/springframework/ldap/pool/DelegatingContext.java b/core/src/main/java/org/springframework/ldap/pool/DelegatingContext.java
index f497ccfffb..6bb7d91739 100644
--- a/core/src/main/java/org/springframework/ldap/pool/DelegatingContext.java
+++ b/core/src/main/java/org/springframework/ldap/pool/DelegatingContext.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2013 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/core/src/main/java/org/springframework/ldap/pool/DelegatingDirContext.java b/core/src/main/java/org/springframework/ldap/pool/DelegatingDirContext.java
index 824682c75d..a8651049ec 100644
--- a/core/src/main/java/org/springframework/ldap/pool/DelegatingDirContext.java
+++ b/core/src/main/java/org/springframework/ldap/pool/DelegatingDirContext.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2013 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/core/src/main/java/org/springframework/ldap/pool/DelegatingLdapContext.java b/core/src/main/java/org/springframework/ldap/pool/DelegatingLdapContext.java
index b145ecf2a5..b0ad1ae6f2 100644
--- a/core/src/main/java/org/springframework/ldap/pool/DelegatingLdapContext.java
+++ b/core/src/main/java/org/springframework/ldap/pool/DelegatingLdapContext.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2013 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/core/src/main/java/org/springframework/ldap/pool/DirContextType.java b/core/src/main/java/org/springframework/ldap/pool/DirContextType.java
index da665e65cc..9227ed2d9a 100644
--- a/core/src/main/java/org/springframework/ldap/pool/DirContextType.java
+++ b/core/src/main/java/org/springframework/ldap/pool/DirContextType.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2013 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/core/src/main/java/org/springframework/ldap/pool/FailureAwareContext.java b/core/src/main/java/org/springframework/ldap/pool/FailureAwareContext.java
index d5d9f6f877..e967578f32 100644
--- a/core/src/main/java/org/springframework/ldap/pool/FailureAwareContext.java
+++ b/core/src/main/java/org/springframework/ldap/pool/FailureAwareContext.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2013 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/core/src/main/java/org/springframework/ldap/pool/MutableDelegatingLdapContext.java b/core/src/main/java/org/springframework/ldap/pool/MutableDelegatingLdapContext.java
index a9bf43fd92..f906e8dd9c 100644
--- a/core/src/main/java/org/springframework/ldap/pool/MutableDelegatingLdapContext.java
+++ b/core/src/main/java/org/springframework/ldap/pool/MutableDelegatingLdapContext.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2013 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/core/src/main/java/org/springframework/ldap/pool/PoolExhaustedAction.java b/core/src/main/java/org/springframework/ldap/pool/PoolExhaustedAction.java
index 18a72c7bec..838854d0f1 100644
--- a/core/src/main/java/org/springframework/ldap/pool/PoolExhaustedAction.java
+++ b/core/src/main/java/org/springframework/ldap/pool/PoolExhaustedAction.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2023 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/core/src/main/java/org/springframework/ldap/pool/factory/DirContextPoolableObjectFactory.java b/core/src/main/java/org/springframework/ldap/pool/factory/DirContextPoolableObjectFactory.java
index 6c7d05a79a..6d698adf4b 100644
--- a/core/src/main/java/org/springframework/ldap/pool/factory/DirContextPoolableObjectFactory.java
+++ b/core/src/main/java/org/springframework/ldap/pool/factory/DirContextPoolableObjectFactory.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2025 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/core/src/main/java/org/springframework/ldap/pool/factory/MutablePoolingContextSource.java b/core/src/main/java/org/springframework/ldap/pool/factory/MutablePoolingContextSource.java
index 61ac66803e..5013372b91 100644
--- a/core/src/main/java/org/springframework/ldap/pool/factory/MutablePoolingContextSource.java
+++ b/core/src/main/java/org/springframework/ldap/pool/factory/MutablePoolingContextSource.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2010 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/core/src/main/java/org/springframework/ldap/pool/factory/PoolingContextSource.java b/core/src/main/java/org/springframework/ldap/pool/factory/PoolingContextSource.java
index ee59d3bdcc..7ce3833dff 100644
--- a/core/src/main/java/org/springframework/ldap/pool/factory/PoolingContextSource.java
+++ b/core/src/main/java/org/springframework/ldap/pool/factory/PoolingContextSource.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2013 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/core/src/main/java/org/springframework/ldap/pool/validation/DefaultDirContextValidator.java b/core/src/main/java/org/springframework/ldap/pool/validation/DefaultDirContextValidator.java
index e9cd7d6586..54d3b97a9a 100644
--- a/core/src/main/java/org/springframework/ldap/pool/validation/DefaultDirContextValidator.java
+++ b/core/src/main/java/org/springframework/ldap/pool/validation/DefaultDirContextValidator.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2022 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/core/src/main/java/org/springframework/ldap/pool/validation/DirContextValidator.java b/core/src/main/java/org/springframework/ldap/pool/validation/DirContextValidator.java
index a4e37ecf1c..ed5810da40 100644
--- a/core/src/main/java/org/springframework/ldap/pool/validation/DirContextValidator.java
+++ b/core/src/main/java/org/springframework/ldap/pool/validation/DirContextValidator.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2010 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/core/src/main/java/org/springframework/ldap/pool2/DelegatingContext.java b/core/src/main/java/org/springframework/ldap/pool2/DelegatingContext.java
index 0890af1251..e4a1bdbb4f 100644
--- a/core/src/main/java/org/springframework/ldap/pool2/DelegatingContext.java
+++ b/core/src/main/java/org/springframework/ldap/pool2/DelegatingContext.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2015 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/core/src/main/java/org/springframework/ldap/pool2/DelegatingDirContext.java b/core/src/main/java/org/springframework/ldap/pool2/DelegatingDirContext.java
index 7dd8f792aa..59346ff7f8 100644
--- a/core/src/main/java/org/springframework/ldap/pool2/DelegatingDirContext.java
+++ b/core/src/main/java/org/springframework/ldap/pool2/DelegatingDirContext.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2015 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/core/src/main/java/org/springframework/ldap/pool2/DelegatingLdapContext.java b/core/src/main/java/org/springframework/ldap/pool2/DelegatingLdapContext.java
index 39d1401ad5..6c2f29b040 100644
--- a/core/src/main/java/org/springframework/ldap/pool2/DelegatingLdapContext.java
+++ b/core/src/main/java/org/springframework/ldap/pool2/DelegatingLdapContext.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2015 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/core/src/main/java/org/springframework/ldap/pool2/DirContextType.java b/core/src/main/java/org/springframework/ldap/pool2/DirContextType.java
index 4f7d04cb98..cf0bc68b32 100644
--- a/core/src/main/java/org/springframework/ldap/pool2/DirContextType.java
+++ b/core/src/main/java/org/springframework/ldap/pool2/DirContextType.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2013 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/core/src/main/java/org/springframework/ldap/pool2/FailureAwareContext.java b/core/src/main/java/org/springframework/ldap/pool2/FailureAwareContext.java
index 1c45ff75f6..31c69dafa7 100644
--- a/core/src/main/java/org/springframework/ldap/pool2/FailureAwareContext.java
+++ b/core/src/main/java/org/springframework/ldap/pool2/FailureAwareContext.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2013 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/core/src/main/java/org/springframework/ldap/pool2/MutableDelegatingLdapContext.java b/core/src/main/java/org/springframework/ldap/pool2/MutableDelegatingLdapContext.java
index e53f0fc18a..0a46e0a19f 100644
--- a/core/src/main/java/org/springframework/ldap/pool2/MutableDelegatingLdapContext.java
+++ b/core/src/main/java/org/springframework/ldap/pool2/MutableDelegatingLdapContext.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2015 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/core/src/main/java/org/springframework/ldap/pool2/factory/DirContextPooledObjectFactory.java b/core/src/main/java/org/springframework/ldap/pool2/factory/DirContextPooledObjectFactory.java
index 7b1631cd21..00c9a930ef 100644
--- a/core/src/main/java/org/springframework/ldap/pool2/factory/DirContextPooledObjectFactory.java
+++ b/core/src/main/java/org/springframework/ldap/pool2/factory/DirContextPooledObjectFactory.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2025 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/core/src/main/java/org/springframework/ldap/pool2/factory/MutablePooledContextSource.java b/core/src/main/java/org/springframework/ldap/pool2/factory/MutablePooledContextSource.java
index b5ce6f1c7d..83a067dcbf 100644
--- a/core/src/main/java/org/springframework/ldap/pool2/factory/MutablePooledContextSource.java
+++ b/core/src/main/java/org/springframework/ldap/pool2/factory/MutablePooledContextSource.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2015 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/core/src/main/java/org/springframework/ldap/pool2/factory/PoolConfig.java b/core/src/main/java/org/springframework/ldap/pool2/factory/PoolConfig.java
index a69cd8032c..f194774943 100644
--- a/core/src/main/java/org/springframework/ldap/pool2/factory/PoolConfig.java
+++ b/core/src/main/java/org/springframework/ldap/pool2/factory/PoolConfig.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2015 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/core/src/main/java/org/springframework/ldap/pool2/factory/PooledContextSource.java b/core/src/main/java/org/springframework/ldap/pool2/factory/PooledContextSource.java
index 4e0cb5f630..6852670c1a 100644
--- a/core/src/main/java/org/springframework/ldap/pool2/factory/PooledContextSource.java
+++ b/core/src/main/java/org/springframework/ldap/pool2/factory/PooledContextSource.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2025 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/core/src/main/java/org/springframework/ldap/pool2/validation/DefaultDirContextValidator.java b/core/src/main/java/org/springframework/ldap/pool2/validation/DefaultDirContextValidator.java
index feb7bf57a2..ac3cdb15fb 100644
--- a/core/src/main/java/org/springframework/ldap/pool2/validation/DefaultDirContextValidator.java
+++ b/core/src/main/java/org/springframework/ldap/pool2/validation/DefaultDirContextValidator.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2022 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/core/src/main/java/org/springframework/ldap/pool2/validation/DirContextValidator.java b/core/src/main/java/org/springframework/ldap/pool2/validation/DirContextValidator.java
index 21c2403e0a..7afe1874f2 100644
--- a/core/src/main/java/org/springframework/ldap/pool2/validation/DirContextValidator.java
+++ b/core/src/main/java/org/springframework/ldap/pool2/validation/DirContextValidator.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2010 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/core/src/main/java/org/springframework/ldap/query/AppendableContainerCriteria.java b/core/src/main/java/org/springframework/ldap/query/AppendableContainerCriteria.java
index 313e625d4e..dfaee2c69c 100644
--- a/core/src/main/java/org/springframework/ldap/query/AppendableContainerCriteria.java
+++ b/core/src/main/java/org/springframework/ldap/query/AppendableContainerCriteria.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2013 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/core/src/main/java/org/springframework/ldap/query/ConditionCriteria.java b/core/src/main/java/org/springframework/ldap/query/ConditionCriteria.java
index bd5c026e72..ff6ecdc42a 100644
--- a/core/src/main/java/org/springframework/ldap/query/ConditionCriteria.java
+++ b/core/src/main/java/org/springframework/ldap/query/ConditionCriteria.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2013 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/core/src/main/java/org/springframework/ldap/query/ContainerCriteria.java b/core/src/main/java/org/springframework/ldap/query/ContainerCriteria.java
index a2ddff54c8..caafb7cfae 100644
--- a/core/src/main/java/org/springframework/ldap/query/ContainerCriteria.java
+++ b/core/src/main/java/org/springframework/ldap/query/ContainerCriteria.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2013 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/core/src/main/java/org/springframework/ldap/query/CriteriaContainerType.java b/core/src/main/java/org/springframework/ldap/query/CriteriaContainerType.java
index 4230ccf6c4..d2cc78c478 100644
--- a/core/src/main/java/org/springframework/ldap/query/CriteriaContainerType.java
+++ b/core/src/main/java/org/springframework/ldap/query/CriteriaContainerType.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2013 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/core/src/main/java/org/springframework/ldap/query/DefaultConditionCriteria.java b/core/src/main/java/org/springframework/ldap/query/DefaultConditionCriteria.java
index 7228789017..6d69fbcfbd 100644
--- a/core/src/main/java/org/springframework/ldap/query/DefaultConditionCriteria.java
+++ b/core/src/main/java/org/springframework/ldap/query/DefaultConditionCriteria.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2013 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/core/src/main/java/org/springframework/ldap/query/DefaultContainerCriteria.java b/core/src/main/java/org/springframework/ldap/query/DefaultContainerCriteria.java
index 55e47a0763..42dc9bbe7e 100644
--- a/core/src/main/java/org/springframework/ldap/query/DefaultContainerCriteria.java
+++ b/core/src/main/java/org/springframework/ldap/query/DefaultContainerCriteria.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2025 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/core/src/main/java/org/springframework/ldap/query/LdapQuery.java b/core/src/main/java/org/springframework/ldap/query/LdapQuery.java
index d6e079bfbf..cd7ed83dd3 100644
--- a/core/src/main/java/org/springframework/ldap/query/LdapQuery.java
+++ b/core/src/main/java/org/springframework/ldap/query/LdapQuery.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2013 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/core/src/main/java/org/springframework/ldap/query/LdapQueryBuilder.java b/core/src/main/java/org/springframework/ldap/query/LdapQueryBuilder.java
index 461a509257..17bfb88c1d 100644
--- a/core/src/main/java/org/springframework/ldap/query/LdapQueryBuilder.java
+++ b/core/src/main/java/org/springframework/ldap/query/LdapQueryBuilder.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2021 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/core/src/main/java/org/springframework/ldap/query/SearchScope.java b/core/src/main/java/org/springframework/ldap/query/SearchScope.java
index 0532e5f9b8..cdaa593796 100644
--- a/core/src/main/java/org/springframework/ldap/query/SearchScope.java
+++ b/core/src/main/java/org/springframework/ldap/query/SearchScope.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2013 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/core/src/main/java/org/springframework/ldap/support/AttributeValueCallbackHandler.java b/core/src/main/java/org/springframework/ldap/support/AttributeValueCallbackHandler.java
index 07da5778fa..eb122d1300 100644
--- a/core/src/main/java/org/springframework/ldap/support/AttributeValueCallbackHandler.java
+++ b/core/src/main/java/org/springframework/ldap/support/AttributeValueCallbackHandler.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2010 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/core/src/main/java/org/springframework/ldap/support/LdapEncoder.java b/core/src/main/java/org/springframework/ldap/support/LdapEncoder.java
index e7ae6339de..8901a06a1f 100644
--- a/core/src/main/java/org/springframework/ldap/support/LdapEncoder.java
+++ b/core/src/main/java/org/springframework/ldap/support/LdapEncoder.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2021 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/core/src/main/java/org/springframework/ldap/support/LdapNameBuilder.java b/core/src/main/java/org/springframework/ldap/support/LdapNameBuilder.java
index 992872f3ea..4d22b72909 100644
--- a/core/src/main/java/org/springframework/ldap/support/LdapNameBuilder.java
+++ b/core/src/main/java/org/springframework/ldap/support/LdapNameBuilder.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2021 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/core/src/main/java/org/springframework/ldap/support/LdapUtils.java b/core/src/main/java/org/springframework/ldap/support/LdapUtils.java
index a556ff36af..afcfc95a80 100644
--- a/core/src/main/java/org/springframework/ldap/support/LdapUtils.java
+++ b/core/src/main/java/org/springframework/ldap/support/LdapUtils.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2025 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/core/src/main/java/org/springframework/ldap/support/ListComparator.java b/core/src/main/java/org/springframework/ldap/support/ListComparator.java
index d470cd220f..58c98c50c4 100644
--- a/core/src/main/java/org/springframework/ldap/support/ListComparator.java
+++ b/core/src/main/java/org/springframework/ldap/support/ListComparator.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2010 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/core/src/main/java/org/springframework/ldap/transaction/compensating/BindOperationExecutor.java b/core/src/main/java/org/springframework/ldap/transaction/compensating/BindOperationExecutor.java
index 0071ee422b..67fcc034a2 100644
--- a/core/src/main/java/org/springframework/ldap/transaction/compensating/BindOperationExecutor.java
+++ b/core/src/main/java/org/springframework/ldap/transaction/compensating/BindOperationExecutor.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2013 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/core/src/main/java/org/springframework/ldap/transaction/compensating/BindOperationRecorder.java b/core/src/main/java/org/springframework/ldap/transaction/compensating/BindOperationRecorder.java
index 849238762b..336ed3dc22 100644
--- a/core/src/main/java/org/springframework/ldap/transaction/compensating/BindOperationRecorder.java
+++ b/core/src/main/java/org/springframework/ldap/transaction/compensating/BindOperationRecorder.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2010 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/core/src/main/java/org/springframework/ldap/transaction/compensating/LdapCompensatingTransactionOperationFactory.java b/core/src/main/java/org/springframework/ldap/transaction/compensating/LdapCompensatingTransactionOperationFactory.java
index cdc1bcfa83..d6376d85aa 100644
--- a/core/src/main/java/org/springframework/ldap/transaction/compensating/LdapCompensatingTransactionOperationFactory.java
+++ b/core/src/main/java/org/springframework/ldap/transaction/compensating/LdapCompensatingTransactionOperationFactory.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2013 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/core/src/main/java/org/springframework/ldap/transaction/compensating/LdapTransactionUtils.java b/core/src/main/java/org/springframework/ldap/transaction/compensating/LdapTransactionUtils.java
index 38d402f124..924fa5f6a6 100644
--- a/core/src/main/java/org/springframework/ldap/transaction/compensating/LdapTransactionUtils.java
+++ b/core/src/main/java/org/springframework/ldap/transaction/compensating/LdapTransactionUtils.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2013 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/core/src/main/java/org/springframework/ldap/transaction/compensating/ModifyAttributesOperationExecutor.java b/core/src/main/java/org/springframework/ldap/transaction/compensating/ModifyAttributesOperationExecutor.java
index 93c621a518..88f1f58489 100644
--- a/core/src/main/java/org/springframework/ldap/transaction/compensating/ModifyAttributesOperationExecutor.java
+++ b/core/src/main/java/org/springframework/ldap/transaction/compensating/ModifyAttributesOperationExecutor.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2013 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/core/src/main/java/org/springframework/ldap/transaction/compensating/ModifyAttributesOperationRecorder.java b/core/src/main/java/org/springframework/ldap/transaction/compensating/ModifyAttributesOperationRecorder.java
index 46e8c64ad1..f8c04c07af 100644
--- a/core/src/main/java/org/springframework/ldap/transaction/compensating/ModifyAttributesOperationRecorder.java
+++ b/core/src/main/java/org/springframework/ldap/transaction/compensating/ModifyAttributesOperationRecorder.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2025 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/core/src/main/java/org/springframework/ldap/transaction/compensating/NullOperationExecutor.java b/core/src/main/java/org/springframework/ldap/transaction/compensating/NullOperationExecutor.java
index 21e86264a3..4035e3d4b8 100644
--- a/core/src/main/java/org/springframework/ldap/transaction/compensating/NullOperationExecutor.java
+++ b/core/src/main/java/org/springframework/ldap/transaction/compensating/NullOperationExecutor.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2013 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/core/src/main/java/org/springframework/ldap/transaction/compensating/NullOperationRecorder.java b/core/src/main/java/org/springframework/ldap/transaction/compensating/NullOperationRecorder.java
index 0f2d70ecd8..bd0e00ce6b 100644
--- a/core/src/main/java/org/springframework/ldap/transaction/compensating/NullOperationRecorder.java
+++ b/core/src/main/java/org/springframework/ldap/transaction/compensating/NullOperationRecorder.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2010 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/core/src/main/java/org/springframework/ldap/transaction/compensating/RebindOperationExecutor.java b/core/src/main/java/org/springframework/ldap/transaction/compensating/RebindOperationExecutor.java
index 6b07948730..5a14df7945 100644
--- a/core/src/main/java/org/springframework/ldap/transaction/compensating/RebindOperationExecutor.java
+++ b/core/src/main/java/org/springframework/ldap/transaction/compensating/RebindOperationExecutor.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2013 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/core/src/main/java/org/springframework/ldap/transaction/compensating/RebindOperationRecorder.java b/core/src/main/java/org/springframework/ldap/transaction/compensating/RebindOperationRecorder.java
index 9db5de5736..a48456ebb1 100644
--- a/core/src/main/java/org/springframework/ldap/transaction/compensating/RebindOperationRecorder.java
+++ b/core/src/main/java/org/springframework/ldap/transaction/compensating/RebindOperationRecorder.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2010 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/core/src/main/java/org/springframework/ldap/transaction/compensating/RenameOperationExecutor.java b/core/src/main/java/org/springframework/ldap/transaction/compensating/RenameOperationExecutor.java
index 3f5af01e66..8f6a43d220 100644
--- a/core/src/main/java/org/springframework/ldap/transaction/compensating/RenameOperationExecutor.java
+++ b/core/src/main/java/org/springframework/ldap/transaction/compensating/RenameOperationExecutor.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2013 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/core/src/main/java/org/springframework/ldap/transaction/compensating/RenameOperationRecorder.java b/core/src/main/java/org/springframework/ldap/transaction/compensating/RenameOperationRecorder.java
index cb3fe6c061..8690e1b667 100644
--- a/core/src/main/java/org/springframework/ldap/transaction/compensating/RenameOperationRecorder.java
+++ b/core/src/main/java/org/springframework/ldap/transaction/compensating/RenameOperationRecorder.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2013 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/core/src/main/java/org/springframework/ldap/transaction/compensating/TempEntryRenamingStrategy.java b/core/src/main/java/org/springframework/ldap/transaction/compensating/TempEntryRenamingStrategy.java
index c740824f46..99cf3feaa9 100644
--- a/core/src/main/java/org/springframework/ldap/transaction/compensating/TempEntryRenamingStrategy.java
+++ b/core/src/main/java/org/springframework/ldap/transaction/compensating/TempEntryRenamingStrategy.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2010 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/core/src/main/java/org/springframework/ldap/transaction/compensating/UnbindOperationExecutor.java b/core/src/main/java/org/springframework/ldap/transaction/compensating/UnbindOperationExecutor.java
index 011c43b04b..b3ed62a5e4 100644
--- a/core/src/main/java/org/springframework/ldap/transaction/compensating/UnbindOperationExecutor.java
+++ b/core/src/main/java/org/springframework/ldap/transaction/compensating/UnbindOperationExecutor.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2013 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/core/src/main/java/org/springframework/ldap/transaction/compensating/UnbindOperationRecorder.java b/core/src/main/java/org/springframework/ldap/transaction/compensating/UnbindOperationRecorder.java
index 0c7270938b..ffec1e832a 100644
--- a/core/src/main/java/org/springframework/ldap/transaction/compensating/UnbindOperationRecorder.java
+++ b/core/src/main/java/org/springframework/ldap/transaction/compensating/UnbindOperationRecorder.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2010 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/core/src/main/java/org/springframework/ldap/transaction/compensating/manager/ContextSourceTransactionManager.java b/core/src/main/java/org/springframework/ldap/transaction/compensating/manager/ContextSourceTransactionManager.java
index 30bca18db0..8c5a4e26ba 100644
--- a/core/src/main/java/org/springframework/ldap/transaction/compensating/manager/ContextSourceTransactionManager.java
+++ b/core/src/main/java/org/springframework/ldap/transaction/compensating/manager/ContextSourceTransactionManager.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2013 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/core/src/main/java/org/springframework/ldap/transaction/compensating/manager/ContextSourceTransactionManagerDelegate.java b/core/src/main/java/org/springframework/ldap/transaction/compensating/manager/ContextSourceTransactionManagerDelegate.java
index 2408dc7ebc..5baf9a8380 100644
--- a/core/src/main/java/org/springframework/ldap/transaction/compensating/manager/ContextSourceTransactionManagerDelegate.java
+++ b/core/src/main/java/org/springframework/ldap/transaction/compensating/manager/ContextSourceTransactionManagerDelegate.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2013 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/core/src/main/java/org/springframework/ldap/transaction/compensating/manager/DirContextHolder.java b/core/src/main/java/org/springframework/ldap/transaction/compensating/manager/DirContextHolder.java
index 399d96912e..c2908a3094 100644
--- a/core/src/main/java/org/springframework/ldap/transaction/compensating/manager/DirContextHolder.java
+++ b/core/src/main/java/org/springframework/ldap/transaction/compensating/manager/DirContextHolder.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2002-2007 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/core/src/main/java/org/springframework/ldap/transaction/compensating/manager/TransactionAwareContextSourceProxy.java b/core/src/main/java/org/springframework/ldap/transaction/compensating/manager/TransactionAwareContextSourceProxy.java
index 276bfb82ed..87b2f521a2 100644
--- a/core/src/main/java/org/springframework/ldap/transaction/compensating/manager/TransactionAwareContextSourceProxy.java
+++ b/core/src/main/java/org/springframework/ldap/transaction/compensating/manager/TransactionAwareContextSourceProxy.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2002-2007 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/core/src/main/java/org/springframework/ldap/transaction/compensating/manager/TransactionAwareDirContextInvocationHandler.java b/core/src/main/java/org/springframework/ldap/transaction/compensating/manager/TransactionAwareDirContextInvocationHandler.java
index 9ce5edb245..36218fe686 100644
--- a/core/src/main/java/org/springframework/ldap/transaction/compensating/manager/TransactionAwareDirContextInvocationHandler.java
+++ b/core/src/main/java/org/springframework/ldap/transaction/compensating/manager/TransactionAwareDirContextInvocationHandler.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2013 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/core/src/main/java/org/springframework/ldap/transaction/compensating/support/DefaultTempEntryRenamingStrategy.java b/core/src/main/java/org/springframework/ldap/transaction/compensating/support/DefaultTempEntryRenamingStrategy.java
index 23d449b2e4..b875f0e145 100644
--- a/core/src/main/java/org/springframework/ldap/transaction/compensating/support/DefaultTempEntryRenamingStrategy.java
+++ b/core/src/main/java/org/springframework/ldap/transaction/compensating/support/DefaultTempEntryRenamingStrategy.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2010 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/core/src/main/java/org/springframework/ldap/transaction/compensating/support/DifferentSubtreeTempEntryRenamingStrategy.java b/core/src/main/java/org/springframework/ldap/transaction/compensating/support/DifferentSubtreeTempEntryRenamingStrategy.java
index c89b2ef62d..4885551739 100644
--- a/core/src/main/java/org/springframework/ldap/transaction/compensating/support/DifferentSubtreeTempEntryRenamingStrategy.java
+++ b/core/src/main/java/org/springframework/ldap/transaction/compensating/support/DifferentSubtreeTempEntryRenamingStrategy.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2013 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/core/src/main/java/org/springframework/transaction/compensating/CompensatingTransactionOperationExecutor.java b/core/src/main/java/org/springframework/transaction/compensating/CompensatingTransactionOperationExecutor.java
index 5f010e68dd..c7055ed36f 100644
--- a/core/src/main/java/org/springframework/transaction/compensating/CompensatingTransactionOperationExecutor.java
+++ b/core/src/main/java/org/springframework/transaction/compensating/CompensatingTransactionOperationExecutor.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2010 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/core/src/main/java/org/springframework/transaction/compensating/CompensatingTransactionOperationFactory.java b/core/src/main/java/org/springframework/transaction/compensating/CompensatingTransactionOperationFactory.java
index ed227a265e..e60b7c9b56 100644
--- a/core/src/main/java/org/springframework/transaction/compensating/CompensatingTransactionOperationFactory.java
+++ b/core/src/main/java/org/springframework/transaction/compensating/CompensatingTransactionOperationFactory.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2010 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/core/src/main/java/org/springframework/transaction/compensating/CompensatingTransactionOperationManager.java b/core/src/main/java/org/springframework/transaction/compensating/CompensatingTransactionOperationManager.java
index 97f284897a..76af7ebe79 100644
--- a/core/src/main/java/org/springframework/transaction/compensating/CompensatingTransactionOperationManager.java
+++ b/core/src/main/java/org/springframework/transaction/compensating/CompensatingTransactionOperationManager.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2010 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/core/src/main/java/org/springframework/transaction/compensating/CompensatingTransactionOperationRecorder.java b/core/src/main/java/org/springframework/transaction/compensating/CompensatingTransactionOperationRecorder.java
index 9e32826534..9b38fc3a33 100644
--- a/core/src/main/java/org/springframework/transaction/compensating/CompensatingTransactionOperationRecorder.java
+++ b/core/src/main/java/org/springframework/transaction/compensating/CompensatingTransactionOperationRecorder.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2010 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/core/src/main/java/org/springframework/transaction/compensating/support/AbstractCompensatingTransactionManagerDelegate.java b/core/src/main/java/org/springframework/transaction/compensating/support/AbstractCompensatingTransactionManagerDelegate.java
index c550f7b74b..9ea2ee92be 100644
--- a/core/src/main/java/org/springframework/transaction/compensating/support/AbstractCompensatingTransactionManagerDelegate.java
+++ b/core/src/main/java/org/springframework/transaction/compensating/support/AbstractCompensatingTransactionManagerDelegate.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2013 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/core/src/main/java/org/springframework/transaction/compensating/support/CompensatingTransactionHolderSupport.java b/core/src/main/java/org/springframework/transaction/compensating/support/CompensatingTransactionHolderSupport.java
index 5456c3aee6..657bdef824 100644
--- a/core/src/main/java/org/springframework/transaction/compensating/support/CompensatingTransactionHolderSupport.java
+++ b/core/src/main/java/org/springframework/transaction/compensating/support/CompensatingTransactionHolderSupport.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2010 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/core/src/main/java/org/springframework/transaction/compensating/support/CompensatingTransactionObject.java b/core/src/main/java/org/springframework/transaction/compensating/support/CompensatingTransactionObject.java
index dc42871f99..439f934451 100644
--- a/core/src/main/java/org/springframework/transaction/compensating/support/CompensatingTransactionObject.java
+++ b/core/src/main/java/org/springframework/transaction/compensating/support/CompensatingTransactionObject.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2010 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/core/src/main/java/org/springframework/transaction/compensating/support/CompensatingTransactionUtils.java b/core/src/main/java/org/springframework/transaction/compensating/support/CompensatingTransactionUtils.java
index 65cffb3d08..8cf58b7767 100644
--- a/core/src/main/java/org/springframework/transaction/compensating/support/CompensatingTransactionUtils.java
+++ b/core/src/main/java/org/springframework/transaction/compensating/support/CompensatingTransactionUtils.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2010 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/core/src/main/java/org/springframework/transaction/compensating/support/DefaultCompensatingTransactionOperationManager.java b/core/src/main/java/org/springframework/transaction/compensating/support/DefaultCompensatingTransactionOperationManager.java
index d34b076b7d..faa10efc3f 100644
--- a/core/src/main/java/org/springframework/transaction/compensating/support/DefaultCompensatingTransactionOperationManager.java
+++ b/core/src/main/java/org/springframework/transaction/compensating/support/DefaultCompensatingTransactionOperationManager.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2025 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/core/src/test/java/org/springframework/ldap/NamingExceptionTests.java b/core/src/test/java/org/springframework/ldap/NamingExceptionTests.java
index fba3e0dd3a..f7735f76de 100644
--- a/core/src/test/java/org/springframework/ldap/NamingExceptionTests.java
+++ b/core/src/test/java/org/springframework/ldap/NamingExceptionTests.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2013 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/core/src/test/java/org/springframework/ldap/aot/hint/LdapCoreRuntimeHintsTests.java b/core/src/test/java/org/springframework/ldap/aot/hint/LdapCoreRuntimeHintsTests.java
index 05072cbc69..0880c6c299 100644
--- a/core/src/test/java/org/springframework/ldap/aot/hint/LdapCoreRuntimeHintsTests.java
+++ b/core/src/test/java/org/springframework/ldap/aot/hint/LdapCoreRuntimeHintsTests.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2023 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/core/src/test/java/org/springframework/ldap/authentication/DefaultValuesAuthenticationSourceDecoratorTests.java b/core/src/test/java/org/springframework/ldap/authentication/DefaultValuesAuthenticationSourceDecoratorTests.java
index 5e5f54b874..3409d8fbf2 100644
--- a/core/src/test/java/org/springframework/ldap/authentication/DefaultValuesAuthenticationSourceDecoratorTests.java
+++ b/core/src/test/java/org/springframework/ldap/authentication/DefaultValuesAuthenticationSourceDecoratorTests.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2016 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/core/src/test/java/org/springframework/ldap/config/DummyAuthenticationSource.java b/core/src/test/java/org/springframework/ldap/config/DummyAuthenticationSource.java
index 849f0b36f9..8be654422d 100644
--- a/core/src/test/java/org/springframework/ldap/config/DummyAuthenticationSource.java
+++ b/core/src/test/java/org/springframework/ldap/config/DummyAuthenticationSource.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2013 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/core/src/test/java/org/springframework/ldap/config/DummyAuthenticationStrategy.java b/core/src/test/java/org/springframework/ldap/config/DummyAuthenticationStrategy.java
index 1fc6117459..b1037359a6 100644
--- a/core/src/test/java/org/springframework/ldap/config/DummyAuthenticationStrategy.java
+++ b/core/src/test/java/org/springframework/ldap/config/DummyAuthenticationStrategy.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2013 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/core/src/test/java/org/springframework/ldap/config/LdapTemplateNamespaceHandlerTests.java b/core/src/test/java/org/springframework/ldap/config/LdapTemplateNamespaceHandlerTests.java
index 10dd308ef5..7632eeace4 100644
--- a/core/src/test/java/org/springframework/ldap/config/LdapTemplateNamespaceHandlerTests.java
+++ b/core/src/test/java/org/springframework/ldap/config/LdapTemplateNamespaceHandlerTests.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2016 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/core/src/test/java/org/springframework/ldap/config/MockFactoryBean.java b/core/src/test/java/org/springframework/ldap/config/MockFactoryBean.java
index 6e1dabca4e..c7340f56de 100644
--- a/core/src/test/java/org/springframework/ldap/config/MockFactoryBean.java
+++ b/core/src/test/java/org/springframework/ldap/config/MockFactoryBean.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2013 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/core/src/test/java/org/springframework/ldap/control/PagedResultTests.java b/core/src/test/java/org/springframework/ldap/control/PagedResultTests.java
index 811f68f878..e1cd3fb3ae 100644
--- a/core/src/test/java/org/springframework/ldap/control/PagedResultTests.java
+++ b/core/src/test/java/org/springframework/ldap/control/PagedResultTests.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2013 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/core/src/test/java/org/springframework/ldap/control/PagedResultsCookieTests.java b/core/src/test/java/org/springframework/ldap/control/PagedResultsCookieTests.java
index 03f4cc8228..3c3e402815 100644
--- a/core/src/test/java/org/springframework/ldap/control/PagedResultsCookieTests.java
+++ b/core/src/test/java/org/springframework/ldap/control/PagedResultsCookieTests.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2013 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/core/src/test/java/org/springframework/ldap/control/PagedResultsDirContextProcessorTests.java b/core/src/test/java/org/springframework/ldap/control/PagedResultsDirContextProcessorTests.java
index 74fe5857d3..45861dc597 100644
--- a/core/src/test/java/org/springframework/ldap/control/PagedResultsDirContextProcessorTests.java
+++ b/core/src/test/java/org/springframework/ldap/control/PagedResultsDirContextProcessorTests.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2016 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/core/src/test/java/org/springframework/ldap/control/RequestControlDirContextProcessorTests.java b/core/src/test/java/org/springframework/ldap/control/RequestControlDirContextProcessorTests.java
index de245284f5..2f8dcd746e 100644
--- a/core/src/test/java/org/springframework/ldap/control/RequestControlDirContextProcessorTests.java
+++ b/core/src/test/java/org/springframework/ldap/control/RequestControlDirContextProcessorTests.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2013 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/core/src/test/java/org/springframework/ldap/control/SortControlDirContextProcessorTests.java b/core/src/test/java/org/springframework/ldap/control/SortControlDirContextProcessorTests.java
index b83816b961..e1341fe997 100644
--- a/core/src/test/java/org/springframework/ldap/control/SortControlDirContextProcessorTests.java
+++ b/core/src/test/java/org/springframework/ldap/control/SortControlDirContextProcessorTests.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2016 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/core/src/test/java/org/springframework/ldap/core/CollectingNameClassPairCallbackHandlerTests.java b/core/src/test/java/org/springframework/ldap/core/CollectingNameClassPairCallbackHandlerTests.java
index 38f038b3e9..0f493a9185 100644
--- a/core/src/test/java/org/springframework/ldap/core/CollectingNameClassPairCallbackHandlerTests.java
+++ b/core/src/test/java/org/springframework/ldap/core/CollectingNameClassPairCallbackHandlerTests.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2016 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/core/src/test/java/org/springframework/ldap/core/ContextMapperCallbackHandlerTests.java b/core/src/test/java/org/springframework/ldap/core/ContextMapperCallbackHandlerTests.java
index f436fed404..c367ddeb13 100644
--- a/core/src/test/java/org/springframework/ldap/core/ContextMapperCallbackHandlerTests.java
+++ b/core/src/test/java/org/springframework/ldap/core/ContextMapperCallbackHandlerTests.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2016 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/core/src/test/java/org/springframework/ldap/core/DefaultLdapClientListTests.java b/core/src/test/java/org/springframework/ldap/core/DefaultLdapClientListTests.java
index da3e6ff92e..027106de40 100644
--- a/core/src/test/java/org/springframework/ldap/core/DefaultLdapClientListTests.java
+++ b/core/src/test/java/org/springframework/ldap/core/DefaultLdapClientListTests.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2022 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/core/src/test/java/org/springframework/ldap/core/DefaultLdapClientLookupTests.java b/core/src/test/java/org/springframework/ldap/core/DefaultLdapClientLookupTests.java
index 4bddd0e8de..32ff50ad03 100644
--- a/core/src/test/java/org/springframework/ldap/core/DefaultLdapClientLookupTests.java
+++ b/core/src/test/java/org/springframework/ldap/core/DefaultLdapClientLookupTests.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2022 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/core/src/test/java/org/springframework/ldap/core/DefaultLdapClientRenameTests.java b/core/src/test/java/org/springframework/ldap/core/DefaultLdapClientRenameTests.java
index 2de2d22ea9..5e2dec8c9a 100644
--- a/core/src/test/java/org/springframework/ldap/core/DefaultLdapClientRenameTests.java
+++ b/core/src/test/java/org/springframework/ldap/core/DefaultLdapClientRenameTests.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2016 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/core/src/test/java/org/springframework/ldap/core/DefaultLdapClientTests.java b/core/src/test/java/org/springframework/ldap/core/DefaultLdapClientTests.java
index 0638699849..02cb1acd0b 100644
--- a/core/src/test/java/org/springframework/ldap/core/DefaultLdapClientTests.java
+++ b/core/src/test/java/org/springframework/ldap/core/DefaultLdapClientTests.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2025 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/core/src/test/java/org/springframework/ldap/core/DirContextAdapterBugTests.java b/core/src/test/java/org/springframework/ldap/core/DirContextAdapterBugTests.java
index 71ab412bd3..3e39238be0 100644
--- a/core/src/test/java/org/springframework/ldap/core/DirContextAdapterBugTests.java
+++ b/core/src/test/java/org/springframework/ldap/core/DirContextAdapterBugTests.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2016 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/core/src/test/java/org/springframework/ldap/core/DirContextAdapterTests.java b/core/src/test/java/org/springframework/ldap/core/DirContextAdapterTests.java
index a73a2830a2..7c57db372a 100644
--- a/core/src/test/java/org/springframework/ldap/core/DirContextAdapterTests.java
+++ b/core/src/test/java/org/springframework/ldap/core/DirContextAdapterTests.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2016 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/core/src/test/java/org/springframework/ldap/core/DistinguishedNameEditorTests.java b/core/src/test/java/org/springframework/ldap/core/DistinguishedNameEditorTests.java
index 5816ad564e..938e1e4ea2 100644
--- a/core/src/test/java/org/springframework/ldap/core/DistinguishedNameEditorTests.java
+++ b/core/src/test/java/org/springframework/ldap/core/DistinguishedNameEditorTests.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2016 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/core/src/test/java/org/springframework/ldap/core/DistinguishedNameTests.java b/core/src/test/java/org/springframework/ldap/core/DistinguishedNameTests.java
index d62b8a213c..3c61e6f31f 100644
--- a/core/src/test/java/org/springframework/ldap/core/DistinguishedNameTests.java
+++ b/core/src/test/java/org/springframework/ldap/core/DistinguishedNameTests.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2016 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/core/src/test/java/org/springframework/ldap/core/LdapRdnComponentTests.java b/core/src/test/java/org/springframework/ldap/core/LdapRdnComponentTests.java
index 69bc72cc02..83296f42d5 100644
--- a/core/src/test/java/org/springframework/ldap/core/LdapRdnComponentTests.java
+++ b/core/src/test/java/org/springframework/ldap/core/LdapRdnComponentTests.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2016 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/core/src/test/java/org/springframework/ldap/core/LdapRdnTests.java b/core/src/test/java/org/springframework/ldap/core/LdapRdnTests.java
index da2a138623..a44f69d958 100644
--- a/core/src/test/java/org/springframework/ldap/core/LdapRdnTests.java
+++ b/core/src/test/java/org/springframework/ldap/core/LdapRdnTests.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2016 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/core/src/test/java/org/springframework/ldap/core/LdapTemplateListTests.java b/core/src/test/java/org/springframework/ldap/core/LdapTemplateListTests.java
index 123507c275..7f4118afec 100644
--- a/core/src/test/java/org/springframework/ldap/core/LdapTemplateListTests.java
+++ b/core/src/test/java/org/springframework/ldap/core/LdapTemplateListTests.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2016 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/core/src/test/java/org/springframework/ldap/core/LdapTemplateLookupTests.java b/core/src/test/java/org/springframework/ldap/core/LdapTemplateLookupTests.java
index 1d3ea4879d..fa9b21e293 100644
--- a/core/src/test/java/org/springframework/ldap/core/LdapTemplateLookupTests.java
+++ b/core/src/test/java/org/springframework/ldap/core/LdapTemplateLookupTests.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2016 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/core/src/test/java/org/springframework/ldap/core/LdapTemplateOdmTests.java b/core/src/test/java/org/springframework/ldap/core/LdapTemplateOdmTests.java
index d7c6804d5e..d3c6822483 100644
--- a/core/src/test/java/org/springframework/ldap/core/LdapTemplateOdmTests.java
+++ b/core/src/test/java/org/springframework/ldap/core/LdapTemplateOdmTests.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2023 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/core/src/test/java/org/springframework/ldap/core/LdapTemplateRenameTests.java b/core/src/test/java/org/springframework/ldap/core/LdapTemplateRenameTests.java
index 1aa9a218a4..ae88464d10 100644
--- a/core/src/test/java/org/springframework/ldap/core/LdapTemplateRenameTests.java
+++ b/core/src/test/java/org/springframework/ldap/core/LdapTemplateRenameTests.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2016 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/core/src/test/java/org/springframework/ldap/core/LdapTemplateTests.java b/core/src/test/java/org/springframework/ldap/core/LdapTemplateTests.java
index f22fc8cd6e..296bfb1c5b 100644
--- a/core/src/test/java/org/springframework/ldap/core/LdapTemplateTests.java
+++ b/core/src/test/java/org/springframework/ldap/core/LdapTemplateTests.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2016 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/core/src/test/java/org/springframework/ldap/core/MockDirContext.java b/core/src/test/java/org/springframework/ldap/core/MockDirContext.java
index b888534d43..3d4928e1a2 100644
--- a/core/src/test/java/org/springframework/ldap/core/MockDirContext.java
+++ b/core/src/test/java/org/springframework/ldap/core/MockDirContext.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2002-2024 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/core/src/test/java/org/springframework/ldap/core/NameAwareAttributeTests.java b/core/src/test/java/org/springframework/ldap/core/NameAwareAttributeTests.java
index 2b45af34d6..c92113e162 100644
--- a/core/src/test/java/org/springframework/ldap/core/NameAwareAttributeTests.java
+++ b/core/src/test/java/org/springframework/ldap/core/NameAwareAttributeTests.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2016 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/core/src/test/java/org/springframework/ldap/core/NameAwareAttributesTests.java b/core/src/test/java/org/springframework/ldap/core/NameAwareAttributesTests.java
index e9094ad00f..3851846bb8 100644
--- a/core/src/test/java/org/springframework/ldap/core/NameAwareAttributesTests.java
+++ b/core/src/test/java/org/springframework/ldap/core/NameAwareAttributesTests.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2025 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/core/src/test/java/org/springframework/ldap/core/TestDirContextAdapters.java b/core/src/test/java/org/springframework/ldap/core/TestDirContextAdapters.java
index 1b0a841947..42cadcc944 100644
--- a/core/src/test/java/org/springframework/ldap/core/TestDirContextAdapters.java
+++ b/core/src/test/java/org/springframework/ldap/core/TestDirContextAdapters.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2002-2024 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/core/src/test/java/org/springframework/ldap/core/TestModificationItems.java b/core/src/test/java/org/springframework/ldap/core/TestModificationItems.java
index 66585abd83..87c6ac9820 100644
--- a/core/src/test/java/org/springframework/ldap/core/TestModificationItems.java
+++ b/core/src/test/java/org/springframework/ldap/core/TestModificationItems.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2002-2024 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/core/src/test/java/org/springframework/ldap/core/TestNameAwareAttributes.java b/core/src/test/java/org/springframework/ldap/core/TestNameAwareAttributes.java
index 2189512a4a..adb7bc6004 100644
--- a/core/src/test/java/org/springframework/ldap/core/TestNameAwareAttributes.java
+++ b/core/src/test/java/org/springframework/ldap/core/TestNameAwareAttributes.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2002-2024 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/core/src/test/java/org/springframework/ldap/core/support/AbstractContextSourceTests.java b/core/src/test/java/org/springframework/ldap/core/support/AbstractContextSourceTests.java
index 597ba8e4e0..9cd3788826 100644
--- a/core/src/test/java/org/springframework/ldap/core/support/AbstractContextSourceTests.java
+++ b/core/src/test/java/org/springframework/ldap/core/support/AbstractContextSourceTests.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2016 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/core/src/test/java/org/springframework/ldap/core/support/AggregateDirContextProcessorTests.java b/core/src/test/java/org/springframework/ldap/core/support/AggregateDirContextProcessorTests.java
index 33933a2988..fd6c8a3805 100644
--- a/core/src/test/java/org/springframework/ldap/core/support/AggregateDirContextProcessorTests.java
+++ b/core/src/test/java/org/springframework/ldap/core/support/AggregateDirContextProcessorTests.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2013 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/core/src/test/java/org/springframework/ldap/core/support/BaseLdapPathBeanPostProcessorTests.java b/core/src/test/java/org/springframework/ldap/core/support/BaseLdapPathBeanPostProcessorTests.java
index 550c2813c1..8add4a6d16 100644
--- a/core/src/test/java/org/springframework/ldap/core/support/BaseLdapPathBeanPostProcessorTests.java
+++ b/core/src/test/java/org/springframework/ldap/core/support/BaseLdapPathBeanPostProcessorTests.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2025 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/core/src/test/java/org/springframework/ldap/core/support/ContextMapperCallbackHandlerWithControlsTests.java b/core/src/test/java/org/springframework/ldap/core/support/ContextMapperCallbackHandlerWithControlsTests.java
index b8f87ba096..691ff8ca2f 100644
--- a/core/src/test/java/org/springframework/ldap/core/support/ContextMapperCallbackHandlerWithControlsTests.java
+++ b/core/src/test/java/org/springframework/ldap/core/support/ContextMapperCallbackHandlerWithControlsTests.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2025 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/core/src/test/java/org/springframework/ldap/core/support/CountNameClassPairResultCallbackHandlerTests.java b/core/src/test/java/org/springframework/ldap/core/support/CountNameClassPairResultCallbackHandlerTests.java
index af7ca0cd2b..fcf2476476 100644
--- a/core/src/test/java/org/springframework/ldap/core/support/CountNameClassPairResultCallbackHandlerTests.java
+++ b/core/src/test/java/org/springframework/ldap/core/support/CountNameClassPairResultCallbackHandlerTests.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2016 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/core/src/test/java/org/springframework/ldap/core/support/DefaultDirObjectFactoryTests.java b/core/src/test/java/org/springframework/ldap/core/support/DefaultDirObjectFactoryTests.java
index 1b7c661f93..b3d0cfd48e 100644
--- a/core/src/test/java/org/springframework/ldap/core/support/DefaultDirObjectFactoryTests.java
+++ b/core/src/test/java/org/springframework/ldap/core/support/DefaultDirObjectFactoryTests.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2016 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/core/src/test/java/org/springframework/ldap/core/support/DefaultIncrementalAttributesMapperTests.java b/core/src/test/java/org/springframework/ldap/core/support/DefaultIncrementalAttributesMapperTests.java
index d1de42fc48..f7842aa4f4 100644
--- a/core/src/test/java/org/springframework/ldap/core/support/DefaultIncrementalAttributesMapperTests.java
+++ b/core/src/test/java/org/springframework/ldap/core/support/DefaultIncrementalAttributesMapperTests.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2016 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/core/src/test/java/org/springframework/ldap/core/support/DefaultTlsDirContextAuthenticationStrategyTests.java b/core/src/test/java/org/springframework/ldap/core/support/DefaultTlsDirContextAuthenticationStrategyTests.java
index 534b7acf39..82a2763c79 100644
--- a/core/src/test/java/org/springframework/ldap/core/support/DefaultTlsDirContextAuthenticationStrategyTests.java
+++ b/core/src/test/java/org/springframework/ldap/core/support/DefaultTlsDirContextAuthenticationStrategyTests.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2023 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/core/src/test/java/org/springframework/ldap/core/support/LdapContextSourceTests.java b/core/src/test/java/org/springframework/ldap/core/support/LdapContextSourceTests.java
index c4cccf6adb..521773483e 100644
--- a/core/src/test/java/org/springframework/ldap/core/support/LdapContextSourceTests.java
+++ b/core/src/test/java/org/springframework/ldap/core/support/LdapContextSourceTests.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2016 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/core/src/test/java/org/springframework/ldap/core/support/ObservationContextSourceTests.java b/core/src/test/java/org/springframework/ldap/core/support/ObservationContextSourceTests.java
index 9bcefea33d..d57134be5a 100644
--- a/core/src/test/java/org/springframework/ldap/core/support/ObservationContextSourceTests.java
+++ b/core/src/test/java/org/springframework/ldap/core/support/ObservationContextSourceTests.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2025 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/core/src/test/java/org/springframework/ldap/core/support/RangeOptionTests.java b/core/src/test/java/org/springframework/ldap/core/support/RangeOptionTests.java
index aa2c36bd7e..684563b23e 100644
--- a/core/src/test/java/org/springframework/ldap/core/support/RangeOptionTests.java
+++ b/core/src/test/java/org/springframework/ldap/core/support/RangeOptionTests.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2016 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/core/src/test/java/org/springframework/ldap/core/support/SimpleDirContextAuthenticationStrategyTests.java b/core/src/test/java/org/springframework/ldap/core/support/SimpleDirContextAuthenticationStrategyTests.java
index 670df7c8e7..cd06e5f7be 100644
--- a/core/src/test/java/org/springframework/ldap/core/support/SimpleDirContextAuthenticationStrategyTests.java
+++ b/core/src/test/java/org/springframework/ldap/core/support/SimpleDirContextAuthenticationStrategyTests.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2016 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/core/src/test/java/org/springframework/ldap/core/support/SingleContextSourceTests.java b/core/src/test/java/org/springframework/ldap/core/support/SingleContextSourceTests.java
index 8e2c2280f7..e61d9a96a2 100644
--- a/core/src/test/java/org/springframework/ldap/core/support/SingleContextSourceTests.java
+++ b/core/src/test/java/org/springframework/ldap/core/support/SingleContextSourceTests.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2025 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/core/src/test/java/org/springframework/ldap/core/support/ldap294/Ldap294Tests.java b/core/src/test/java/org/springframework/ldap/core/support/ldap294/Ldap294Tests.java
index 878b59cc2c..0d9b4af325 100644
--- a/core/src/test/java/org/springframework/ldap/core/support/ldap294/Ldap294Tests.java
+++ b/core/src/test/java/org/springframework/ldap/core/support/ldap294/Ldap294Tests.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2002-2013 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/core/src/test/java/org/springframework/ldap/filter/AbstractFilterTests.java b/core/src/test/java/org/springframework/ldap/filter/AbstractFilterTests.java
index 30e4d020af..2cba11370f 100644
--- a/core/src/test/java/org/springframework/ldap/filter/AbstractFilterTests.java
+++ b/core/src/test/java/org/springframework/ldap/filter/AbstractFilterTests.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2016 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/core/src/test/java/org/springframework/ldap/filter/AndFilterTests.java b/core/src/test/java/org/springframework/ldap/filter/AndFilterTests.java
index 66ee9938d9..ab5c507c70 100644
--- a/core/src/test/java/org/springframework/ldap/filter/AndFilterTests.java
+++ b/core/src/test/java/org/springframework/ldap/filter/AndFilterTests.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2016 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/core/src/test/java/org/springframework/ldap/filter/EqualsFilterTests.java b/core/src/test/java/org/springframework/ldap/filter/EqualsFilterTests.java
index a16970c3be..350fc6512b 100644
--- a/core/src/test/java/org/springframework/ldap/filter/EqualsFilterTests.java
+++ b/core/src/test/java/org/springframework/ldap/filter/EqualsFilterTests.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2016 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/core/src/test/java/org/springframework/ldap/filter/GreaterThanOrEqualsFilterTests.java b/core/src/test/java/org/springframework/ldap/filter/GreaterThanOrEqualsFilterTests.java
index 9960faba14..b6bea3709e 100644
--- a/core/src/test/java/org/springframework/ldap/filter/GreaterThanOrEqualsFilterTests.java
+++ b/core/src/test/java/org/springframework/ldap/filter/GreaterThanOrEqualsFilterTests.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2016 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/core/src/test/java/org/springframework/ldap/filter/HardcodedFilterTests.java b/core/src/test/java/org/springframework/ldap/filter/HardcodedFilterTests.java
index 8051c93042..61810f7e3c 100644
--- a/core/src/test/java/org/springframework/ldap/filter/HardcodedFilterTests.java
+++ b/core/src/test/java/org/springframework/ldap/filter/HardcodedFilterTests.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2016 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/core/src/test/java/org/springframework/ldap/filter/LessThanOrEqualsFilterTests.java b/core/src/test/java/org/springframework/ldap/filter/LessThanOrEqualsFilterTests.java
index 8762ae3ccd..5f795561fc 100644
--- a/core/src/test/java/org/springframework/ldap/filter/LessThanOrEqualsFilterTests.java
+++ b/core/src/test/java/org/springframework/ldap/filter/LessThanOrEqualsFilterTests.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2016 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/core/src/test/java/org/springframework/ldap/filter/LikeFilterTests.java b/core/src/test/java/org/springframework/ldap/filter/LikeFilterTests.java
index a1f88d1563..fc1384657f 100644
--- a/core/src/test/java/org/springframework/ldap/filter/LikeFilterTests.java
+++ b/core/src/test/java/org/springframework/ldap/filter/LikeFilterTests.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2016 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/core/src/test/java/org/springframework/ldap/filter/NotFilterTests.java b/core/src/test/java/org/springframework/ldap/filter/NotFilterTests.java
index 7feacce9af..50b624c167 100644
--- a/core/src/test/java/org/springframework/ldap/filter/NotFilterTests.java
+++ b/core/src/test/java/org/springframework/ldap/filter/NotFilterTests.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2016 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/core/src/test/java/org/springframework/ldap/filter/NotPresentFilterTests.java b/core/src/test/java/org/springframework/ldap/filter/NotPresentFilterTests.java
index 05d1fdf9ac..daa2e4d8e8 100644
--- a/core/src/test/java/org/springframework/ldap/filter/NotPresentFilterTests.java
+++ b/core/src/test/java/org/springframework/ldap/filter/NotPresentFilterTests.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2016 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/core/src/test/java/org/springframework/ldap/filter/OrFilterTests.java b/core/src/test/java/org/springframework/ldap/filter/OrFilterTests.java
index 7897498fed..e9ee77e2a1 100644
--- a/core/src/test/java/org/springframework/ldap/filter/OrFilterTests.java
+++ b/core/src/test/java/org/springframework/ldap/filter/OrFilterTests.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2016 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/core/src/test/java/org/springframework/ldap/filter/PresentFilterTests.java b/core/src/test/java/org/springframework/ldap/filter/PresentFilterTests.java
index 4dea47fa70..e87cad3254 100644
--- a/core/src/test/java/org/springframework/ldap/filter/PresentFilterTests.java
+++ b/core/src/test/java/org/springframework/ldap/filter/PresentFilterTests.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2016 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/core/src/test/java/org/springframework/ldap/filter/ProximityFilterTests.java b/core/src/test/java/org/springframework/ldap/filter/ProximityFilterTests.java
index ceadbc23b9..3b31cca476 100644
--- a/core/src/test/java/org/springframework/ldap/filter/ProximityFilterTests.java
+++ b/core/src/test/java/org/springframework/ldap/filter/ProximityFilterTests.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2025 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/core/src/test/java/org/springframework/ldap/filter/WhitespaceWildcardsFilterTests.java b/core/src/test/java/org/springframework/ldap/filter/WhitespaceWildcardsFilterTests.java
index 636f12f972..9b377b37e7 100644
--- a/core/src/test/java/org/springframework/ldap/filter/WhitespaceWildcardsFilterTests.java
+++ b/core/src/test/java/org/springframework/ldap/filter/WhitespaceWildcardsFilterTests.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2016 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/core/src/test/java/org/springframework/ldap/odm/core/impl/BaseUnitTestPerson.java b/core/src/test/java/org/springframework/ldap/odm/core/impl/BaseUnitTestPerson.java
index ae460256f5..a355df65b3 100644
--- a/core/src/test/java/org/springframework/ldap/odm/core/impl/BaseUnitTestPerson.java
+++ b/core/src/test/java/org/springframework/ldap/odm/core/impl/BaseUnitTestPerson.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2015 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/core/src/test/java/org/springframework/ldap/odm/core/impl/DefaultObjectDirectoryMapperTests.java b/core/src/test/java/org/springframework/ldap/odm/core/impl/DefaultObjectDirectoryMapperTests.java
index a0a632d0b6..3a735b2894 100644
--- a/core/src/test/java/org/springframework/ldap/odm/core/impl/DefaultObjectDirectoryMapperTests.java
+++ b/core/src/test/java/org/springframework/ldap/odm/core/impl/DefaultObjectDirectoryMapperTests.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2025 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/core/src/test/java/org/springframework/ldap/odm/core/impl/UnitTestPerson.java b/core/src/test/java/org/springframework/ldap/odm/core/impl/UnitTestPerson.java
index 0ff1b081c6..0418bf102e 100644
--- a/core/src/test/java/org/springframework/ldap/odm/core/impl/UnitTestPerson.java
+++ b/core/src/test/java/org/springframework/ldap/odm/core/impl/UnitTestPerson.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2013 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/core/src/test/java/org/springframework/ldap/odm/core/impl/UnitTestPersonWithIndexedAndUnindexedDnAttributes.java b/core/src/test/java/org/springframework/ldap/odm/core/impl/UnitTestPersonWithIndexedAndUnindexedDnAttributes.java
index 754fa2f236..910206124f 100644
--- a/core/src/test/java/org/springframework/ldap/odm/core/impl/UnitTestPersonWithIndexedAndUnindexedDnAttributes.java
+++ b/core/src/test/java/org/springframework/ldap/odm/core/impl/UnitTestPersonWithIndexedAndUnindexedDnAttributes.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2013 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/core/src/test/java/org/springframework/ldap/odm/core/impl/UnitTestPersonWithIndexedDnAttributes.java b/core/src/test/java/org/springframework/ldap/odm/core/impl/UnitTestPersonWithIndexedDnAttributes.java
index 370bc0af16..143579b559 100644
--- a/core/src/test/java/org/springframework/ldap/odm/core/impl/UnitTestPersonWithIndexedDnAttributes.java
+++ b/core/src/test/java/org/springframework/ldap/odm/core/impl/UnitTestPersonWithIndexedDnAttributes.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2025 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/core/src/test/java/org/springframework/ldap/odm/core/impl/UnitTestPersonWithInvalidFieldType.java b/core/src/test/java/org/springframework/ldap/odm/core/impl/UnitTestPersonWithInvalidFieldType.java
index bf01615310..53e1c555d9 100644
--- a/core/src/test/java/org/springframework/ldap/odm/core/impl/UnitTestPersonWithInvalidFieldType.java
+++ b/core/src/test/java/org/springframework/ldap/odm/core/impl/UnitTestPersonWithInvalidFieldType.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2013 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/core/src/test/java/org/springframework/ldap/pool/AbstractPoolTestCase.java b/core/src/test/java/org/springframework/ldap/pool/AbstractPoolTestCase.java
index 9e3a42205d..fde3ce11ba 100644
--- a/core/src/test/java/org/springframework/ldap/pool/AbstractPoolTestCase.java
+++ b/core/src/test/java/org/springframework/ldap/pool/AbstractPoolTestCase.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2013 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/core/src/test/java/org/springframework/ldap/pool/DelegatingContextTests.java b/core/src/test/java/org/springframework/ldap/pool/DelegatingContextTests.java
index ed33b6e9a7..1fed9cab69 100644
--- a/core/src/test/java/org/springframework/ldap/pool/DelegatingContextTests.java
+++ b/core/src/test/java/org/springframework/ldap/pool/DelegatingContextTests.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2016 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/core/src/test/java/org/springframework/ldap/pool/DelegatingDirContextTests.java b/core/src/test/java/org/springframework/ldap/pool/DelegatingDirContextTests.java
index 8569dcb743..dd664b7625 100644
--- a/core/src/test/java/org/springframework/ldap/pool/DelegatingDirContextTests.java
+++ b/core/src/test/java/org/springframework/ldap/pool/DelegatingDirContextTests.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2016 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/core/src/test/java/org/springframework/ldap/pool/DelegatingLdapContextTests.java b/core/src/test/java/org/springframework/ldap/pool/DelegatingLdapContextTests.java
index 1a518b4e4a..a2367ad892 100644
--- a/core/src/test/java/org/springframework/ldap/pool/DelegatingLdapContextTests.java
+++ b/core/src/test/java/org/springframework/ldap/pool/DelegatingLdapContextTests.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2016 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/core/src/test/java/org/springframework/ldap/pool/MutableDelegatingLdapContextTests.java b/core/src/test/java/org/springframework/ldap/pool/MutableDelegatingLdapContextTests.java
index 99f7784cd1..57f440e3fc 100644
--- a/core/src/test/java/org/springframework/ldap/pool/MutableDelegatingLdapContextTests.java
+++ b/core/src/test/java/org/springframework/ldap/pool/MutableDelegatingLdapContextTests.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2013 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/core/src/test/java/org/springframework/ldap/pool/factory/DirContextPoolableObjectFactoryTests.java b/core/src/test/java/org/springframework/ldap/pool/factory/DirContextPoolableObjectFactoryTests.java
index 3d17236264..813b4fcb41 100644
--- a/core/src/test/java/org/springframework/ldap/pool/factory/DirContextPoolableObjectFactoryTests.java
+++ b/core/src/test/java/org/springframework/ldap/pool/factory/DirContextPoolableObjectFactoryTests.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2016 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/core/src/test/java/org/springframework/ldap/pool/factory/MutablePoolingContextSourceTests.java b/core/src/test/java/org/springframework/ldap/pool/factory/MutablePoolingContextSourceTests.java
index 251224a01b..2881961aef 100644
--- a/core/src/test/java/org/springframework/ldap/pool/factory/MutablePoolingContextSourceTests.java
+++ b/core/src/test/java/org/springframework/ldap/pool/factory/MutablePoolingContextSourceTests.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2016 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/core/src/test/java/org/springframework/ldap/pool/factory/PoolingContextSourceTests.java b/core/src/test/java/org/springframework/ldap/pool/factory/PoolingContextSourceTests.java
index efc448f4a8..f1fdf847ff 100644
--- a/core/src/test/java/org/springframework/ldap/pool/factory/PoolingContextSourceTests.java
+++ b/core/src/test/java/org/springframework/ldap/pool/factory/PoolingContextSourceTests.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2016 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/core/src/test/java/org/springframework/ldap/pool/validation/DefaultDirContextValidatorTests.java b/core/src/test/java/org/springframework/ldap/pool/validation/DefaultDirContextValidatorTests.java
index a6dbaaaa09..630312c58f 100644
--- a/core/src/test/java/org/springframework/ldap/pool/validation/DefaultDirContextValidatorTests.java
+++ b/core/src/test/java/org/springframework/ldap/pool/validation/DefaultDirContextValidatorTests.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2016 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/core/src/test/java/org/springframework/ldap/pool2/AbstractPoolTestCase.java b/core/src/test/java/org/springframework/ldap/pool2/AbstractPoolTestCase.java
index 23c8329aa2..4760a7a598 100644
--- a/core/src/test/java/org/springframework/ldap/pool2/AbstractPoolTestCase.java
+++ b/core/src/test/java/org/springframework/ldap/pool2/AbstractPoolTestCase.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2015 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/core/src/test/java/org/springframework/ldap/pool2/DelegatingContextTests.java b/core/src/test/java/org/springframework/ldap/pool2/DelegatingContextTests.java
index 2d1860db3e..ffa95a2554 100644
--- a/core/src/test/java/org/springframework/ldap/pool2/DelegatingContextTests.java
+++ b/core/src/test/java/org/springframework/ldap/pool2/DelegatingContextTests.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2016 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/core/src/test/java/org/springframework/ldap/pool2/DelegatingDirContextTests.java b/core/src/test/java/org/springframework/ldap/pool2/DelegatingDirContextTests.java
index b82e0a80ce..519317656d 100644
--- a/core/src/test/java/org/springframework/ldap/pool2/DelegatingDirContextTests.java
+++ b/core/src/test/java/org/springframework/ldap/pool2/DelegatingDirContextTests.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2016 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/core/src/test/java/org/springframework/ldap/pool2/DelegatingLdapContextTests.java b/core/src/test/java/org/springframework/ldap/pool2/DelegatingLdapContextTests.java
index c8e80f906b..d7fa796275 100644
--- a/core/src/test/java/org/springframework/ldap/pool2/DelegatingLdapContextTests.java
+++ b/core/src/test/java/org/springframework/ldap/pool2/DelegatingLdapContextTests.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2016 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/core/src/test/java/org/springframework/ldap/pool2/DummyEvictionPolicy.java b/core/src/test/java/org/springframework/ldap/pool2/DummyEvictionPolicy.java
index 63a018528c..525e55074c 100644
--- a/core/src/test/java/org/springframework/ldap/pool2/DummyEvictionPolicy.java
+++ b/core/src/test/java/org/springframework/ldap/pool2/DummyEvictionPolicy.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2015 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/core/src/test/java/org/springframework/ldap/pool2/MutableDelegatingLdapContextTests.java b/core/src/test/java/org/springframework/ldap/pool2/MutableDelegatingLdapContextTests.java
index 03a5e55d27..6cd2ee0b03 100644
--- a/core/src/test/java/org/springframework/ldap/pool2/MutableDelegatingLdapContextTests.java
+++ b/core/src/test/java/org/springframework/ldap/pool2/MutableDelegatingLdapContextTests.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2015 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/core/src/test/java/org/springframework/ldap/pool2/factory/DirContextPooledObjectFactoryTests.java b/core/src/test/java/org/springframework/ldap/pool2/factory/DirContextPooledObjectFactoryTests.java
index 317b2ebd56..c173983ba8 100644
--- a/core/src/test/java/org/springframework/ldap/pool2/factory/DirContextPooledObjectFactoryTests.java
+++ b/core/src/test/java/org/springframework/ldap/pool2/factory/DirContextPooledObjectFactoryTests.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2016 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/core/src/test/java/org/springframework/ldap/pool2/factory/MutablePooledContextSourceTests.java b/core/src/test/java/org/springframework/ldap/pool2/factory/MutablePooledContextSourceTests.java
index 08f9b6e126..ada6dc19ed 100644
--- a/core/src/test/java/org/springframework/ldap/pool2/factory/MutablePooledContextSourceTests.java
+++ b/core/src/test/java/org/springframework/ldap/pool2/factory/MutablePooledContextSourceTests.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2016 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/core/src/test/java/org/springframework/ldap/pool2/factory/PoolConfigTests.java b/core/src/test/java/org/springframework/ldap/pool2/factory/PoolConfigTests.java
index e7e33e3d46..df050b3503 100644
--- a/core/src/test/java/org/springframework/ldap/pool2/factory/PoolConfigTests.java
+++ b/core/src/test/java/org/springframework/ldap/pool2/factory/PoolConfigTests.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2016 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/core/src/test/java/org/springframework/ldap/pool2/factory/PooledContextSourceTests.java b/core/src/test/java/org/springframework/ldap/pool2/factory/PooledContextSourceTests.java
index a8a23ff92b..a67ebc7a09 100644
--- a/core/src/test/java/org/springframework/ldap/pool2/factory/PooledContextSourceTests.java
+++ b/core/src/test/java/org/springframework/ldap/pool2/factory/PooledContextSourceTests.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2016 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/core/src/test/java/org/springframework/ldap/query/LdapQueryBuilderTests.java b/core/src/test/java/org/springframework/ldap/query/LdapQueryBuilderTests.java
index b43e2963cb..0710e193ad 100644
--- a/core/src/test/java/org/springframework/ldap/query/LdapQueryBuilderTests.java
+++ b/core/src/test/java/org/springframework/ldap/query/LdapQueryBuilderTests.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2025 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/core/src/test/java/org/springframework/ldap/support/LdapEncoderTests.java b/core/src/test/java/org/springframework/ldap/support/LdapEncoderTests.java
index 1217e921bb..5cae8e5588 100644
--- a/core/src/test/java/org/springframework/ldap/support/LdapEncoderTests.java
+++ b/core/src/test/java/org/springframework/ldap/support/LdapEncoderTests.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2016 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/core/src/test/java/org/springframework/ldap/support/LdapNameBuilderTests.java b/core/src/test/java/org/springframework/ldap/support/LdapNameBuilderTests.java
index cb938ec96a..04e282b55c 100644
--- a/core/src/test/java/org/springframework/ldap/support/LdapNameBuilderTests.java
+++ b/core/src/test/java/org/springframework/ldap/support/LdapNameBuilderTests.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2023 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/core/src/test/java/org/springframework/ldap/support/LdapUtilsTests.java b/core/src/test/java/org/springframework/ldap/support/LdapUtilsTests.java
index a05a55e65f..8bb673815e 100644
--- a/core/src/test/java/org/springframework/ldap/support/LdapUtilsTests.java
+++ b/core/src/test/java/org/springframework/ldap/support/LdapUtilsTests.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2016 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/core/src/test/java/org/springframework/ldap/transaction/compensating/BindOperationExecutorTests.java b/core/src/test/java/org/springframework/ldap/transaction/compensating/BindOperationExecutorTests.java
index 8edeb45857..e068836a17 100644
--- a/core/src/test/java/org/springframework/ldap/transaction/compensating/BindOperationExecutorTests.java
+++ b/core/src/test/java/org/springframework/ldap/transaction/compensating/BindOperationExecutorTests.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2013 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/core/src/test/java/org/springframework/ldap/transaction/compensating/BindOperationRecorderTests.java b/core/src/test/java/org/springframework/ldap/transaction/compensating/BindOperationRecorderTests.java
index a9f8538364..51fd20657f 100644
--- a/core/src/test/java/org/springframework/ldap/transaction/compensating/BindOperationRecorderTests.java
+++ b/core/src/test/java/org/springframework/ldap/transaction/compensating/BindOperationRecorderTests.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2016 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/core/src/test/java/org/springframework/ldap/transaction/compensating/LdapCompensatingTransactionOperationFactoryTests.java b/core/src/test/java/org/springframework/ldap/transaction/compensating/LdapCompensatingTransactionOperationFactoryTests.java
index 15eab75c3d..77d547b1d8 100644
--- a/core/src/test/java/org/springframework/ldap/transaction/compensating/LdapCompensatingTransactionOperationFactoryTests.java
+++ b/core/src/test/java/org/springframework/ldap/transaction/compensating/LdapCompensatingTransactionOperationFactoryTests.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2016 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/core/src/test/java/org/springframework/ldap/transaction/compensating/LdapTransactionUtilsTests.java b/core/src/test/java/org/springframework/ldap/transaction/compensating/LdapTransactionUtilsTests.java
index fba3a56ea2..1092d45b4b 100644
--- a/core/src/test/java/org/springframework/ldap/transaction/compensating/LdapTransactionUtilsTests.java
+++ b/core/src/test/java/org/springframework/ldap/transaction/compensating/LdapTransactionUtilsTests.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2013 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/core/src/test/java/org/springframework/ldap/transaction/compensating/ModifyAttributesOperationExecutorTests.java b/core/src/test/java/org/springframework/ldap/transaction/compensating/ModifyAttributesOperationExecutorTests.java
index 4d6b491b54..b362299247 100644
--- a/core/src/test/java/org/springframework/ldap/transaction/compensating/ModifyAttributesOperationExecutorTests.java
+++ b/core/src/test/java/org/springframework/ldap/transaction/compensating/ModifyAttributesOperationExecutorTests.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2013 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/core/src/test/java/org/springframework/ldap/transaction/compensating/ModifyAttributesOperationRecorderTests.java b/core/src/test/java/org/springframework/ldap/transaction/compensating/ModifyAttributesOperationRecorderTests.java
index 4f0bf1dbc0..52173dccda 100644
--- a/core/src/test/java/org/springframework/ldap/transaction/compensating/ModifyAttributesOperationRecorderTests.java
+++ b/core/src/test/java/org/springframework/ldap/transaction/compensating/ModifyAttributesOperationRecorderTests.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2016 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/core/src/test/java/org/springframework/ldap/transaction/compensating/RebindOperationExecutorTests.java b/core/src/test/java/org/springframework/ldap/transaction/compensating/RebindOperationExecutorTests.java
index 1eed6cd396..e8af089ecb 100644
--- a/core/src/test/java/org/springframework/ldap/transaction/compensating/RebindOperationExecutorTests.java
+++ b/core/src/test/java/org/springframework/ldap/transaction/compensating/RebindOperationExecutorTests.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2013 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/core/src/test/java/org/springframework/ldap/transaction/compensating/RebindOperationRecorderTests.java b/core/src/test/java/org/springframework/ldap/transaction/compensating/RebindOperationRecorderTests.java
index ac7bcff4da..612a51978b 100644
--- a/core/src/test/java/org/springframework/ldap/transaction/compensating/RebindOperationRecorderTests.java
+++ b/core/src/test/java/org/springframework/ldap/transaction/compensating/RebindOperationRecorderTests.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2016 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/core/src/test/java/org/springframework/ldap/transaction/compensating/RenameOperationExecutorTests.java b/core/src/test/java/org/springframework/ldap/transaction/compensating/RenameOperationExecutorTests.java
index e6441037f7..bad9e39b97 100644
--- a/core/src/test/java/org/springframework/ldap/transaction/compensating/RenameOperationExecutorTests.java
+++ b/core/src/test/java/org/springframework/ldap/transaction/compensating/RenameOperationExecutorTests.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2013 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/core/src/test/java/org/springframework/ldap/transaction/compensating/RenameOperationRecorderTests.java b/core/src/test/java/org/springframework/ldap/transaction/compensating/RenameOperationRecorderTests.java
index 2f6b2fffb8..f8e8133bfe 100644
--- a/core/src/test/java/org/springframework/ldap/transaction/compensating/RenameOperationRecorderTests.java
+++ b/core/src/test/java/org/springframework/ldap/transaction/compensating/RenameOperationRecorderTests.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2016 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/core/src/test/java/org/springframework/ldap/transaction/compensating/UnbindOperationExecutorTests.java b/core/src/test/java/org/springframework/ldap/transaction/compensating/UnbindOperationExecutorTests.java
index ff0a4e0aa5..d39995cc3b 100644
--- a/core/src/test/java/org/springframework/ldap/transaction/compensating/UnbindOperationExecutorTests.java
+++ b/core/src/test/java/org/springframework/ldap/transaction/compensating/UnbindOperationExecutorTests.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2013 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/core/src/test/java/org/springframework/ldap/transaction/compensating/UnbindOperationRecorderTests.java b/core/src/test/java/org/springframework/ldap/transaction/compensating/UnbindOperationRecorderTests.java
index 9b9b5cb000..afa5290078 100644
--- a/core/src/test/java/org/springframework/ldap/transaction/compensating/UnbindOperationRecorderTests.java
+++ b/core/src/test/java/org/springframework/ldap/transaction/compensating/UnbindOperationRecorderTests.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2016 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/core/src/test/java/org/springframework/ldap/transaction/compensating/manager/CompensatingTransactionUtilsTests.java b/core/src/test/java/org/springframework/ldap/transaction/compensating/manager/CompensatingTransactionUtilsTests.java
index da991871c6..036711ef5e 100644
--- a/core/src/test/java/org/springframework/ldap/transaction/compensating/manager/CompensatingTransactionUtilsTests.java
+++ b/core/src/test/java/org/springframework/ldap/transaction/compensating/manager/CompensatingTransactionUtilsTests.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2013 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/core/src/test/java/org/springframework/ldap/transaction/compensating/manager/ContextSourceTransactionManagerTests.java b/core/src/test/java/org/springframework/ldap/transaction/compensating/manager/ContextSourceTransactionManagerTests.java
index fcf5d3d817..72bb26b770 100644
--- a/core/src/test/java/org/springframework/ldap/transaction/compensating/manager/ContextSourceTransactionManagerTests.java
+++ b/core/src/test/java/org/springframework/ldap/transaction/compensating/manager/ContextSourceTransactionManagerTests.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2016 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/core/src/test/java/org/springframework/ldap/transaction/compensating/manager/TransactionAwareContextSourceProxyTests.java b/core/src/test/java/org/springframework/ldap/transaction/compensating/manager/TransactionAwareContextSourceProxyTests.java
index 031b9d4851..65da6d29db 100644
--- a/core/src/test/java/org/springframework/ldap/transaction/compensating/manager/TransactionAwareContextSourceProxyTests.java
+++ b/core/src/test/java/org/springframework/ldap/transaction/compensating/manager/TransactionAwareContextSourceProxyTests.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2016 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/core/src/test/java/org/springframework/ldap/transaction/compensating/manager/TransactionAwareDirContextInvocationHandlerTests.java b/core/src/test/java/org/springframework/ldap/transaction/compensating/manager/TransactionAwareDirContextInvocationHandlerTests.java
index dceb5a3df0..916a2d4eac 100644
--- a/core/src/test/java/org/springframework/ldap/transaction/compensating/manager/TransactionAwareDirContextInvocationHandlerTests.java
+++ b/core/src/test/java/org/springframework/ldap/transaction/compensating/manager/TransactionAwareDirContextInvocationHandlerTests.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2013 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/core/src/test/java/org/springframework/ldap/transaction/compensating/support/DefaultTempEntryRenamingStrategyTests.java b/core/src/test/java/org/springframework/ldap/transaction/compensating/support/DefaultTempEntryRenamingStrategyTests.java
index 6a1689f41d..8b198967f6 100644
--- a/core/src/test/java/org/springframework/ldap/transaction/compensating/support/DefaultTempEntryRenamingStrategyTests.java
+++ b/core/src/test/java/org/springframework/ldap/transaction/compensating/support/DefaultTempEntryRenamingStrategyTests.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2016 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/core/src/test/java/org/springframework/ldap/transaction/compensating/support/DifferentSubtreeTempEntryRenamingStrategyTests.java b/core/src/test/java/org/springframework/ldap/transaction/compensating/support/DifferentSubtreeTempEntryRenamingStrategyTests.java
index 026b4f3720..ec0fba3cf4 100644
--- a/core/src/test/java/org/springframework/ldap/transaction/compensating/support/DifferentSubtreeTempEntryRenamingStrategyTests.java
+++ b/core/src/test/java/org/springframework/ldap/transaction/compensating/support/DifferentSubtreeTempEntryRenamingStrategyTests.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2016 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/core/src/test/java/org/springframework/ldap/util/ListComparatorTests.java b/core/src/test/java/org/springframework/ldap/util/ListComparatorTests.java
index 11fc002b80..1d3ebd764d 100644
--- a/core/src/test/java/org/springframework/ldap/util/ListComparatorTests.java
+++ b/core/src/test/java/org/springframework/ldap/util/ListComparatorTests.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2016 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/core/src/test/java/org/springframework/transaction/compensating/support/DefaultCompensatingTransactionOperationManagerTests.java b/core/src/test/java/org/springframework/transaction/compensating/support/DefaultCompensatingTransactionOperationManagerTests.java
index ee2e1948b7..ee66808bfd 100644
--- a/core/src/test/java/org/springframework/transaction/compensating/support/DefaultCompensatingTransactionOperationManagerTests.java
+++ b/core/src/test/java/org/springframework/transaction/compensating/support/DefaultCompensatingTransactionOperationManagerTests.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2016 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/etc/checkstyle/header.txt b/etc/checkstyle/header.txt
index 1974e99b83..c8270a4f67 100644
--- a/etc/checkstyle/header.txt
+++ b/etc/checkstyle/header.txt
@@ -1,5 +1,5 @@
^\Q/*\E$
-^\Q * Copyright \E20\d\d-20\d\d the original author or authors.$
+^\Q * Copyright \E2006-present the original author or authors.$
^\Q *\E$
^\Q * Licensed under the Apache License, Version 2.0 (the "License");\E$
^\Q * you may not use this file except in compliance with the License.\E$
diff --git a/ldif/ldif-core/src/main/java/org/springframework/ldap/ldif/InvalidAttributeFormatException.java b/ldif/ldif-core/src/main/java/org/springframework/ldap/ldif/InvalidAttributeFormatException.java
index fcf0fbb6e2..63db609dd7 100644
--- a/ldif/ldif-core/src/main/java/org/springframework/ldap/ldif/InvalidAttributeFormatException.java
+++ b/ldif/ldif-core/src/main/java/org/springframework/ldap/ldif/InvalidAttributeFormatException.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2010 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/ldif/ldif-core/src/main/java/org/springframework/ldap/ldif/InvalidRecordFormatException.java b/ldif/ldif-core/src/main/java/org/springframework/ldap/ldif/InvalidRecordFormatException.java
index ef3e0fad1a..02960e368b 100644
--- a/ldif/ldif-core/src/main/java/org/springframework/ldap/ldif/InvalidRecordFormatException.java
+++ b/ldif/ldif-core/src/main/java/org/springframework/ldap/ldif/InvalidRecordFormatException.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2010 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/ldif/ldif-core/src/main/java/org/springframework/ldap/ldif/parser/LdifParser.java b/ldif/ldif-core/src/main/java/org/springframework/ldap/ldif/parser/LdifParser.java
index b3ecd7e4db..be1b59e275 100644
--- a/ldif/ldif-core/src/main/java/org/springframework/ldap/ldif/parser/LdifParser.java
+++ b/ldif/ldif-core/src/main/java/org/springframework/ldap/ldif/parser/LdifParser.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2013 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/ldif/ldif-core/src/main/java/org/springframework/ldap/ldif/parser/Parser.java b/ldif/ldif-core/src/main/java/org/springframework/ldap/ldif/parser/Parser.java
index ce294ef9cb..68b26174d4 100644
--- a/ldif/ldif-core/src/main/java/org/springframework/ldap/ldif/parser/Parser.java
+++ b/ldif/ldif-core/src/main/java/org/springframework/ldap/ldif/parser/Parser.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2010 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/ldif/ldif-core/src/main/java/org/springframework/ldap/ldif/support/AttributeValidationPolicy.java b/ldif/ldif-core/src/main/java/org/springframework/ldap/ldif/support/AttributeValidationPolicy.java
index b23600378f..98878d716f 100644
--- a/ldif/ldif-core/src/main/java/org/springframework/ldap/ldif/support/AttributeValidationPolicy.java
+++ b/ldif/ldif-core/src/main/java/org/springframework/ldap/ldif/support/AttributeValidationPolicy.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2010 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/ldif/ldif-core/src/main/java/org/springframework/ldap/ldif/support/DefaultAttributeValidationPolicy.java b/ldif/ldif-core/src/main/java/org/springframework/ldap/ldif/support/DefaultAttributeValidationPolicy.java
index d868c34222..ffdd7564da 100644
--- a/ldif/ldif-core/src/main/java/org/springframework/ldap/ldif/support/DefaultAttributeValidationPolicy.java
+++ b/ldif/ldif-core/src/main/java/org/springframework/ldap/ldif/support/DefaultAttributeValidationPolicy.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2021 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/ldif/ldif-core/src/main/java/org/springframework/ldap/ldif/support/LineIdentifier.java b/ldif/ldif-core/src/main/java/org/springframework/ldap/ldif/support/LineIdentifier.java
index adcfad710c..1258ae0f29 100644
--- a/ldif/ldif-core/src/main/java/org/springframework/ldap/ldif/support/LineIdentifier.java
+++ b/ldif/ldif-core/src/main/java/org/springframework/ldap/ldif/support/LineIdentifier.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2010 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/ldif/ldif-core/src/main/java/org/springframework/ldap/ldif/support/SeparatorPolicy.java b/ldif/ldif-core/src/main/java/org/springframework/ldap/ldif/support/SeparatorPolicy.java
index a12b818fb5..c8aed88787 100644
--- a/ldif/ldif-core/src/main/java/org/springframework/ldap/ldif/support/SeparatorPolicy.java
+++ b/ldif/ldif-core/src/main/java/org/springframework/ldap/ldif/support/SeparatorPolicy.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2013 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/ldif/ldif-core/src/main/java/org/springframework/ldap/schema/BasicSchemaSpecification.java b/ldif/ldif-core/src/main/java/org/springframework/ldap/schema/BasicSchemaSpecification.java
index eff21682ac..782cf9d66b 100644
--- a/ldif/ldif-core/src/main/java/org/springframework/ldap/schema/BasicSchemaSpecification.java
+++ b/ldif/ldif-core/src/main/java/org/springframework/ldap/schema/BasicSchemaSpecification.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2023 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/ldif/ldif-core/src/main/java/org/springframework/ldap/schema/DefaultSchemaSpecification.java b/ldif/ldif-core/src/main/java/org/springframework/ldap/schema/DefaultSchemaSpecification.java
index fe25a0e4be..d306f4da6d 100644
--- a/ldif/ldif-core/src/main/java/org/springframework/ldap/schema/DefaultSchemaSpecification.java
+++ b/ldif/ldif-core/src/main/java/org/springframework/ldap/schema/DefaultSchemaSpecification.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2010 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/ldif/ldif-core/src/main/java/org/springframework/ldap/schema/Specification.java b/ldif/ldif-core/src/main/java/org/springframework/ldap/schema/Specification.java
index 546031e11a..ca57770cac 100644
--- a/ldif/ldif-core/src/main/java/org/springframework/ldap/schema/Specification.java
+++ b/ldif/ldif-core/src/main/java/org/springframework/ldap/schema/Specification.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2010 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/ldif/ldif-core/src/test/java/org/springframework/ldap/ldif/DefaultAttributeValidationPolicyTests.java b/ldif/ldif-core/src/test/java/org/springframework/ldap/ldif/DefaultAttributeValidationPolicyTests.java
index 5aa797413d..c105b42d49 100644
--- a/ldif/ldif-core/src/test/java/org/springframework/ldap/ldif/DefaultAttributeValidationPolicyTests.java
+++ b/ldif/ldif-core/src/test/java/org/springframework/ldap/ldif/DefaultAttributeValidationPolicyTests.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2016 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/ldif/ldif-core/src/test/java/org/springframework/ldap/ldif/Ldap233LdifParserTests.java b/ldif/ldif-core/src/test/java/org/springframework/ldap/ldif/Ldap233LdifParserTests.java
index afa06eb9c7..bfb359b563 100644
--- a/ldif/ldif-core/src/test/java/org/springframework/ldap/ldif/Ldap233LdifParserTests.java
+++ b/ldif/ldif-core/src/test/java/org/springframework/ldap/ldif/Ldap233LdifParserTests.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2016 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/ldif/ldif-core/src/test/java/org/springframework/ldap/ldif/LdifParserTests.java b/ldif/ldif-core/src/test/java/org/springframework/ldap/ldif/LdifParserTests.java
index d52934e260..2164ae3e26 100644
--- a/ldif/ldif-core/src/test/java/org/springframework/ldap/ldif/LdifParserTests.java
+++ b/ldif/ldif-core/src/test/java/org/springframework/ldap/ldif/LdifParserTests.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2016 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/odm/src/main/java/org/springframework/ldap/odm/core/OdmManager.java b/odm/src/main/java/org/springframework/ldap/odm/core/OdmManager.java
index 5db3335a18..4bdbd44d51 100755
--- a/odm/src/main/java/org/springframework/ldap/odm/core/OdmManager.java
+++ b/odm/src/main/java/org/springframework/ldap/odm/core/OdmManager.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2013 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/odm/src/main/java/org/springframework/ldap/odm/core/impl/OdmManagerImpl.java b/odm/src/main/java/org/springframework/ldap/odm/core/impl/OdmManagerImpl.java
index c71c66d174..3d2ce65b10 100755
--- a/odm/src/main/java/org/springframework/ldap/odm/core/impl/OdmManagerImpl.java
+++ b/odm/src/main/java/org/springframework/ldap/odm/core/impl/OdmManagerImpl.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2013 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/odm/src/main/java/org/springframework/ldap/odm/core/impl/OdmManagerImplFactoryBean.java b/odm/src/main/java/org/springframework/ldap/odm/core/impl/OdmManagerImplFactoryBean.java
index 6c7d367f9d..4987596223 100755
--- a/odm/src/main/java/org/springframework/ldap/odm/core/impl/OdmManagerImplFactoryBean.java
+++ b/odm/src/main/java/org/springframework/ldap/odm/core/impl/OdmManagerImplFactoryBean.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2013 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/odm/src/main/java/org/springframework/ldap/odm/tools/AttributeSchema.java b/odm/src/main/java/org/springframework/ldap/odm/tools/AttributeSchema.java
index 8b0bead182..6b6d677ab2 100755
--- a/odm/src/main/java/org/springframework/ldap/odm/tools/AttributeSchema.java
+++ b/odm/src/main/java/org/springframework/ldap/odm/tools/AttributeSchema.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2013 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/odm/src/main/java/org/springframework/ldap/odm/tools/ObjectSchema.java b/odm/src/main/java/org/springframework/ldap/odm/tools/ObjectSchema.java
index 1aacee6507..afd5b57419 100755
--- a/odm/src/main/java/org/springframework/ldap/odm/tools/ObjectSchema.java
+++ b/odm/src/main/java/org/springframework/ldap/odm/tools/ObjectSchema.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2025 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/odm/src/main/java/org/springframework/ldap/odm/tools/SchemaReader.java b/odm/src/main/java/org/springframework/ldap/odm/tools/SchemaReader.java
index f8a9e600ba..b84489337d 100755
--- a/odm/src/main/java/org/springframework/ldap/odm/tools/SchemaReader.java
+++ b/odm/src/main/java/org/springframework/ldap/odm/tools/SchemaReader.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2025 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/odm/src/main/java/org/springframework/ldap/odm/tools/SchemaToJava.java b/odm/src/main/java/org/springframework/ldap/odm/tools/SchemaToJava.java
index cc9f2d2df4..5c8a265a1f 100755
--- a/odm/src/main/java/org/springframework/ldap/odm/tools/SchemaToJava.java
+++ b/odm/src/main/java/org/springframework/ldap/odm/tools/SchemaToJava.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2025 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/odm/src/main/java/org/springframework/ldap/odm/tools/SchemaViewer.java b/odm/src/main/java/org/springframework/ldap/odm/tools/SchemaViewer.java
index 2a85379ecb..7061165a79 100755
--- a/odm/src/main/java/org/springframework/ldap/odm/tools/SchemaViewer.java
+++ b/odm/src/main/java/org/springframework/ldap/odm/tools/SchemaViewer.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2025 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/odm/src/main/java/org/springframework/ldap/odm/tools/SyntaxToJavaClass.java b/odm/src/main/java/org/springframework/ldap/odm/tools/SyntaxToJavaClass.java
index baab9a1521..c62a0ba12f 100755
--- a/odm/src/main/java/org/springframework/ldap/odm/tools/SyntaxToJavaClass.java
+++ b/odm/src/main/java/org/springframework/ldap/odm/tools/SyntaxToJavaClass.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2025 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/odm/src/main/java/org/springframework/ldap/odm/tools/package-info.java b/odm/src/main/java/org/springframework/ldap/odm/tools/package-info.java
index f31bae286e..c900dbe3b9 100755
--- a/odm/src/main/java/org/springframework/ldap/odm/tools/package-info.java
+++ b/odm/src/main/java/org/springframework/ldap/odm/tools/package-info.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2023 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/odm/src/test/java/org/apache/directory/server/core/avltree/ArrayMarshaller.java b/odm/src/test/java/org/apache/directory/server/core/avltree/ArrayMarshaller.java
index cdaa9d5fcb..a7cdddb620 100644
--- a/odm/src/test/java/org/apache/directory/server/core/avltree/ArrayMarshaller.java
+++ b/odm/src/test/java/org/apache/directory/server/core/avltree/ArrayMarshaller.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2002-2021 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/odm/src/test/java/org/springframework/ldap/odm/test/ConverterFactoryTests.java b/odm/src/test/java/org/springframework/ldap/odm/test/ConverterFactoryTests.java
index c6adbbd187..4835edcd79 100755
--- a/odm/src/test/java/org/springframework/ldap/odm/test/ConverterFactoryTests.java
+++ b/odm/src/test/java/org/springframework/ldap/odm/test/ConverterFactoryTests.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2025 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/odm/src/test/java/org/springframework/ldap/odm/test/ConverterManagerTests.java b/odm/src/test/java/org/springframework/ldap/odm/test/ConverterManagerTests.java
index 1051f5aa5f..8bd12e8c4a 100755
--- a/odm/src/test/java/org/springframework/ldap/odm/test/ConverterManagerTests.java
+++ b/odm/src/test/java/org/springframework/ldap/odm/test/ConverterManagerTests.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2025 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/odm/src/test/java/org/springframework/ldap/odm/test/JDependTests.java b/odm/src/test/java/org/springframework/ldap/odm/test/JDependTests.java
index e973aa3904..dd7611c548 100755
--- a/odm/src/test/java/org/springframework/ldap/odm/test/JDependTests.java
+++ b/odm/src/test/java/org/springframework/ldap/odm/test/JDependTests.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2013 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/odm/src/test/java/org/springframework/ldap/odm/test/LdapTests.java b/odm/src/test/java/org/springframework/ldap/odm/test/LdapTests.java
index f18c5a201c..42f2112623 100755
--- a/odm/src/test/java/org/springframework/ldap/odm/test/LdapTests.java
+++ b/odm/src/test/java/org/springframework/ldap/odm/test/LdapTests.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2025 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/odm/src/test/java/org/springframework/ldap/odm/test/OrganizationalUnit.java b/odm/src/test/java/org/springframework/ldap/odm/test/OrganizationalUnit.java
index 6101ede4f8..ea90949104 100755
--- a/odm/src/test/java/org/springframework/ldap/odm/test/OrganizationalUnit.java
+++ b/odm/src/test/java/org/springframework/ldap/odm/test/OrganizationalUnit.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2025 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/odm/src/test/java/org/springframework/ldap/odm/test/Person.java b/odm/src/test/java/org/springframework/ldap/odm/test/Person.java
index aec1981aad..ad78f97746 100755
--- a/odm/src/test/java/org/springframework/ldap/odm/test/Person.java
+++ b/odm/src/test/java/org/springframework/ldap/odm/test/Person.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2025 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/odm/src/test/java/org/springframework/ldap/odm/test/PlainPerson.java b/odm/src/test/java/org/springframework/ldap/odm/test/PlainPerson.java
index fe6e51ecae..6c3827594e 100755
--- a/odm/src/test/java/org/springframework/ldap/odm/test/PlainPerson.java
+++ b/odm/src/test/java/org/springframework/ldap/odm/test/PlainPerson.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2025 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/odm/src/test/java/org/springframework/ldap/odm/test/SchemaToJavaTests.java b/odm/src/test/java/org/springframework/ldap/odm/test/SchemaToJavaTests.java
index aaf03d8d94..a91c714a49 100755
--- a/odm/src/test/java/org/springframework/ldap/odm/test/SchemaToJavaTests.java
+++ b/odm/src/test/java/org/springframework/ldap/odm/test/SchemaToJavaTests.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2013 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/odm/src/test/java/org/springframework/ldap/odm/test/SchemaViewerTests.java b/odm/src/test/java/org/springframework/ldap/odm/test/SchemaViewerTests.java
index d0916b4938..dfd341f560 100755
--- a/odm/src/test/java/org/springframework/ldap/odm/test/SchemaViewerTests.java
+++ b/odm/src/test/java/org/springframework/ldap/odm/test/SchemaViewerTests.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2025 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/odm/src/test/java/org/springframework/ldap/odm/test/UriConverter.java b/odm/src/test/java/org/springframework/ldap/odm/test/UriConverter.java
index e15a00b071..cc14279e46 100755
--- a/odm/src/test/java/org/springframework/ldap/odm/test/UriConverter.java
+++ b/odm/src/test/java/org/springframework/ldap/odm/test/UriConverter.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2023 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/odm/src/test/java/org/springframework/ldap/odm/test/utils/CompilerInterface.java b/odm/src/test/java/org/springframework/ldap/odm/test/utils/CompilerInterface.java
index e8455c9579..bdf72c13f3 100755
--- a/odm/src/test/java/org/springframework/ldap/odm/test/utils/CompilerInterface.java
+++ b/odm/src/test/java/org/springframework/ldap/odm/test/utils/CompilerInterface.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2023 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/odm/src/test/java/org/springframework/ldap/odm/test/utils/ExecuteRunnable.java b/odm/src/test/java/org/springframework/ldap/odm/test/utils/ExecuteRunnable.java
index 6b188c2d38..d40696ec61 100755
--- a/odm/src/test/java/org/springframework/ldap/odm/test/utils/ExecuteRunnable.java
+++ b/odm/src/test/java/org/springframework/ldap/odm/test/utils/ExecuteRunnable.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2023 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/odm/src/test/java/org/springframework/ldap/odm/test/utils/GetFreePort.java b/odm/src/test/java/org/springframework/ldap/odm/test/utils/GetFreePort.java
index 0eb7326918..db4fc67b27 100755
--- a/odm/src/test/java/org/springframework/ldap/odm/test/utils/GetFreePort.java
+++ b/odm/src/test/java/org/springframework/ldap/odm/test/utils/GetFreePort.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2023 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/odm/src/test/java/org/springframework/ldap/odm/test/utils/RunnableTests.java b/odm/src/test/java/org/springframework/ldap/odm/test/utils/RunnableTests.java
index 1420c03845..92f2baa067 100644
--- a/odm/src/test/java/org/springframework/ldap/odm/test/utils/RunnableTests.java
+++ b/odm/src/test/java/org/springframework/ldap/odm/test/utils/RunnableTests.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2023 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/sandbox/src/main/java/org/springframework/ldap/control/VirtualListViewControlAggregateDirContextProcessor.java b/sandbox/src/main/java/org/springframework/ldap/control/VirtualListViewControlAggregateDirContextProcessor.java
index 51a27305b9..c3f9cb2948 100644
--- a/sandbox/src/main/java/org/springframework/ldap/control/VirtualListViewControlAggregateDirContextProcessor.java
+++ b/sandbox/src/main/java/org/springframework/ldap/control/VirtualListViewControlAggregateDirContextProcessor.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2010 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/sandbox/src/main/java/org/springframework/ldap/control/VirtualListViewControlDirContextProcessor.java b/sandbox/src/main/java/org/springframework/ldap/control/VirtualListViewControlDirContextProcessor.java
index 780806f910..a621d4ee94 100644
--- a/sandbox/src/main/java/org/springframework/ldap/control/VirtualListViewControlDirContextProcessor.java
+++ b/sandbox/src/main/java/org/springframework/ldap/control/VirtualListViewControlDirContextProcessor.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2013 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/sandbox/src/main/java/org/springframework/ldap/control/VirtualListViewResultsCookie.java b/sandbox/src/main/java/org/springframework/ldap/control/VirtualListViewResultsCookie.java
index 4f2a7b8a1a..d8dee9400f 100644
--- a/sandbox/src/main/java/org/springframework/ldap/control/VirtualListViewResultsCookie.java
+++ b/sandbox/src/main/java/org/springframework/ldap/control/VirtualListViewResultsCookie.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2010 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/sandbox/src/test/java/org/springframework/ldap/control/VirtualListViewControlDirContextProcessorTests.java b/sandbox/src/test/java/org/springframework/ldap/control/VirtualListViewControlDirContextProcessorTests.java
index 236f394a34..61a8b75bca 100644
--- a/sandbox/src/test/java/org/springframework/ldap/control/VirtualListViewControlDirContextProcessorTests.java
+++ b/sandbox/src/test/java/org/springframework/ldap/control/VirtualListViewControlDirContextProcessorTests.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2016 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/test-support/src/main/java/org/springframework/ldap/test/AbstractEc2InstanceLaunchingFactoryBean.java b/test-support/src/main/java/org/springframework/ldap/test/AbstractEc2InstanceLaunchingFactoryBean.java
index ef7ff759fd..22d0a38265 100644
--- a/test-support/src/main/java/org/springframework/ldap/test/AbstractEc2InstanceLaunchingFactoryBean.java
+++ b/test-support/src/main/java/org/springframework/ldap/test/AbstractEc2InstanceLaunchingFactoryBean.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2013 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/test-support/src/main/java/org/springframework/ldap/test/AttributeCheckAttributesMapper.java b/test-support/src/main/java/org/springframework/ldap/test/AttributeCheckAttributesMapper.java
index 3ef90e3867..10748e4dcd 100644
--- a/test-support/src/main/java/org/springframework/ldap/test/AttributeCheckAttributesMapper.java
+++ b/test-support/src/main/java/org/springframework/ldap/test/AttributeCheckAttributesMapper.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2022 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/test-support/src/main/java/org/springframework/ldap/test/AttributeCheckContextMapper.java b/test-support/src/main/java/org/springframework/ldap/test/AttributeCheckContextMapper.java
index 25efbab5c2..49430e1769 100644
--- a/test-support/src/main/java/org/springframework/ldap/test/AttributeCheckContextMapper.java
+++ b/test-support/src/main/java/org/springframework/ldap/test/AttributeCheckContextMapper.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2010 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/test-support/src/main/java/org/springframework/ldap/test/ContextSourceEc2InstanceLaunchingFactoryBean.java b/test-support/src/main/java/org/springframework/ldap/test/ContextSourceEc2InstanceLaunchingFactoryBean.java
index 0fd0287bb5..a0e704005b 100644
--- a/test-support/src/main/java/org/springframework/ldap/test/ContextSourceEc2InstanceLaunchingFactoryBean.java
+++ b/test-support/src/main/java/org/springframework/ldap/test/ContextSourceEc2InstanceLaunchingFactoryBean.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2010 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/test-support/src/main/java/org/springframework/ldap/test/DummyDirContext.java b/test-support/src/main/java/org/springframework/ldap/test/DummyDirContext.java
index 4c52e601b8..bf3bc7bd75 100644
--- a/test-support/src/main/java/org/springframework/ldap/test/DummyDirContext.java
+++ b/test-support/src/main/java/org/springframework/ldap/test/DummyDirContext.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2013 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/test-support/src/main/java/org/springframework/ldap/test/EmbeddedLdapServer.java b/test-support/src/main/java/org/springframework/ldap/test/EmbeddedLdapServer.java
index c3b9196d80..a566b5013a 100644
--- a/test-support/src/main/java/org/springframework/ldap/test/EmbeddedLdapServer.java
+++ b/test-support/src/main/java/org/springframework/ldap/test/EmbeddedLdapServer.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2013 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/test-support/src/main/java/org/springframework/ldap/test/EmbeddedLdapServerFactoryBean.java b/test-support/src/main/java/org/springframework/ldap/test/EmbeddedLdapServerFactoryBean.java
index 542ac2f892..1df2088274 100644
--- a/test-support/src/main/java/org/springframework/ldap/test/EmbeddedLdapServerFactoryBean.java
+++ b/test-support/src/main/java/org/springframework/ldap/test/EmbeddedLdapServerFactoryBean.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2013 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/test-support/src/main/java/org/springframework/ldap/test/LdapTestUtils.java b/test-support/src/main/java/org/springframework/ldap/test/LdapTestUtils.java
index 37d58761f2..fe8dc9483b 100644
--- a/test-support/src/main/java/org/springframework/ldap/test/LdapTestUtils.java
+++ b/test-support/src/main/java/org/springframework/ldap/test/LdapTestUtils.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2013 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/test-support/src/main/java/org/springframework/ldap/test/LdifPopulator.java b/test-support/src/main/java/org/springframework/ldap/test/LdifPopulator.java
index 9d8a89d82c..c202d74ad3 100644
--- a/test-support/src/main/java/org/springframework/ldap/test/LdifPopulator.java
+++ b/test-support/src/main/java/org/springframework/ldap/test/LdifPopulator.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2013 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/test-support/src/main/java/org/springframework/ldap/test/TestContextSourceFactoryBean.java b/test-support/src/main/java/org/springframework/ldap/test/TestContextSourceFactoryBean.java
index 009de20477..83d4b0b2ae 100644
--- a/test-support/src/main/java/org/springframework/ldap/test/TestContextSourceFactoryBean.java
+++ b/test-support/src/main/java/org/springframework/ldap/test/TestContextSourceFactoryBean.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2013 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/test-support/src/main/java/org/springframework/ldap/test/unboundid/EmbeddedLdapServer.java b/test-support/src/main/java/org/springframework/ldap/test/unboundid/EmbeddedLdapServer.java
index 06d3baeb7a..50ab37b0d3 100644
--- a/test-support/src/main/java/org/springframework/ldap/test/unboundid/EmbeddedLdapServer.java
+++ b/test-support/src/main/java/org/springframework/ldap/test/unboundid/EmbeddedLdapServer.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2016 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/test-support/src/main/java/org/springframework/ldap/test/unboundid/EmbeddedLdapServerFactoryBean.java b/test-support/src/main/java/org/springframework/ldap/test/unboundid/EmbeddedLdapServerFactoryBean.java
index 1db350956e..972e92499c 100644
--- a/test-support/src/main/java/org/springframework/ldap/test/unboundid/EmbeddedLdapServerFactoryBean.java
+++ b/test-support/src/main/java/org/springframework/ldap/test/unboundid/EmbeddedLdapServerFactoryBean.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2016 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/test-support/src/main/java/org/springframework/ldap/test/unboundid/LdapTestUtils.java b/test-support/src/main/java/org/springframework/ldap/test/unboundid/LdapTestUtils.java
index 1da4aa7a06..977f4742b1 100644
--- a/test-support/src/main/java/org/springframework/ldap/test/unboundid/LdapTestUtils.java
+++ b/test-support/src/main/java/org/springframework/ldap/test/unboundid/LdapTestUtils.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2016 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/test-support/src/main/java/org/springframework/ldap/test/unboundid/LdifPopulator.java b/test-support/src/main/java/org/springframework/ldap/test/unboundid/LdifPopulator.java
index 6b825ef8a2..a819bff05f 100644
--- a/test-support/src/main/java/org/springframework/ldap/test/unboundid/LdifPopulator.java
+++ b/test-support/src/main/java/org/springframework/ldap/test/unboundid/LdifPopulator.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2016 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/test-support/src/main/java/org/springframework/ldap/test/unboundid/TestContextSourceFactoryBean.java b/test-support/src/main/java/org/springframework/ldap/test/unboundid/TestContextSourceFactoryBean.java
index 5bc3c0e9f5..e6b655c24a 100644
--- a/test-support/src/main/java/org/springframework/ldap/test/unboundid/TestContextSourceFactoryBean.java
+++ b/test-support/src/main/java/org/springframework/ldap/test/unboundid/TestContextSourceFactoryBean.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2016 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/test-support/src/test/java/org/apache/directory/server/core/avltree/ArrayMarshaller.java b/test-support/src/test/java/org/apache/directory/server/core/avltree/ArrayMarshaller.java
index cdaa9d5fcb..a7cdddb620 100644
--- a/test-support/src/test/java/org/apache/directory/server/core/avltree/ArrayMarshaller.java
+++ b/test-support/src/test/java/org/apache/directory/server/core/avltree/ArrayMarshaller.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2002-2021 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/test-support/src/test/java/org/springframework/ldap/test/EmbeddedLdapServerFactoryBeanTests.java b/test-support/src/test/java/org/springframework/ldap/test/EmbeddedLdapServerFactoryBeanTests.java
index d4ecd24b02..a601ea8a57 100644
--- a/test-support/src/test/java/org/springframework/ldap/test/EmbeddedLdapServerFactoryBeanTests.java
+++ b/test-support/src/test/java/org/springframework/ldap/test/EmbeddedLdapServerFactoryBeanTests.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2025 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/test-support/src/test/java/org/springframework/ldap/test/unboundid/EmbeddedLdapServerFactoryBeanTests.java b/test-support/src/test/java/org/springframework/ldap/test/unboundid/EmbeddedLdapServerFactoryBeanTests.java
index a05c8213b9..6f8f754637 100644
--- a/test-support/src/test/java/org/springframework/ldap/test/unboundid/EmbeddedLdapServerFactoryBeanTests.java
+++ b/test-support/src/test/java/org/springframework/ldap/test/unboundid/EmbeddedLdapServerFactoryBeanTests.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2025 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/test-support/src/test/java/org/springframework/ldap/test/unboundid/EmbeddedLdapServerTests.java b/test-support/src/test/java/org/springframework/ldap/test/unboundid/EmbeddedLdapServerTests.java
index 1e2e5dfda8..c5add91d7d 100644
--- a/test-support/src/test/java/org/springframework/ldap/test/unboundid/EmbeddedLdapServerTests.java
+++ b/test-support/src/test/java/org/springframework/ldap/test/unboundid/EmbeddedLdapServerTests.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2025 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/test-support/src/test/java/org/springframework/ldap/test/unboundid/TestContextSourceFactoryBeanTests.java b/test-support/src/test/java/org/springframework/ldap/test/unboundid/TestContextSourceFactoryBeanTests.java
index 5050945711..cdd41fa22f 100644
--- a/test-support/src/test/java/org/springframework/ldap/test/unboundid/TestContextSourceFactoryBeanTests.java
+++ b/test-support/src/test/java/org/springframework/ldap/test/unboundid/TestContextSourceFactoryBeanTests.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2025 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/test/integration-tests-ad/src/test/java/org/springframework/ldap/itest/ad/CompilerInterface.java b/test/integration-tests-ad/src/test/java/org/springframework/ldap/itest/ad/CompilerInterface.java
index 2520603d2a..77ecd92855 100755
--- a/test/integration-tests-ad/src/test/java/org/springframework/ldap/itest/ad/CompilerInterface.java
+++ b/test/integration-tests-ad/src/test/java/org/springframework/ldap/itest/ad/CompilerInterface.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2013 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/test/integration-tests-ad/src/test/java/org/springframework/ldap/itest/ad/IncrementalAttributeMapperITests.java b/test/integration-tests-ad/src/test/java/org/springframework/ldap/itest/ad/IncrementalAttributeMapperITests.java
index a95f4dd1b6..fb51263c97 100644
--- a/test/integration-tests-ad/src/test/java/org/springframework/ldap/itest/ad/IncrementalAttributeMapperITests.java
+++ b/test/integration-tests-ad/src/test/java/org/springframework/ldap/itest/ad/IncrementalAttributeMapperITests.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2025 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/test/integration-tests-ad/src/test/java/org/springframework/ldap/itest/ad/SchemaToJavaAdITests.java b/test/integration-tests-ad/src/test/java/org/springframework/ldap/itest/ad/SchemaToJavaAdITests.java
index 799d33eee4..187128314c 100644
--- a/test/integration-tests-ad/src/test/java/org/springframework/ldap/itest/ad/SchemaToJavaAdITests.java
+++ b/test/integration-tests-ad/src/test/java/org/springframework/ldap/itest/ad/SchemaToJavaAdITests.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2025 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/test/integration-tests-openldap/src/main/java/org/springframework/ldap/AllMatchHostnameVerifier.java b/test/integration-tests-openldap/src/main/java/org/springframework/ldap/AllMatchHostnameVerifier.java
index 064644ec09..047d78ce23 100644
--- a/test/integration-tests-openldap/src/main/java/org/springframework/ldap/AllMatchHostnameVerifier.java
+++ b/test/integration-tests-openldap/src/main/java/org/springframework/ldap/AllMatchHostnameVerifier.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2013 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/test/integration-tests-openldap/src/main/java/org/springframework/ldap/DigestMd5ContextSourceEc2InstanceLaunchingFactoryBean.java b/test/integration-tests-openldap/src/main/java/org/springframework/ldap/DigestMd5ContextSourceEc2InstanceLaunchingFactoryBean.java
index 737c5edd3c..fb35824a00 100644
--- a/test/integration-tests-openldap/src/main/java/org/springframework/ldap/DigestMd5ContextSourceEc2InstanceLaunchingFactoryBean.java
+++ b/test/integration-tests-openldap/src/main/java/org/springframework/ldap/DigestMd5ContextSourceEc2InstanceLaunchingFactoryBean.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2010 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/test/integration-tests-openldap/src/main/java/org/springframework/ldap/TlsContextSourceEc2InstanceLaunchingFactoryBean.java b/test/integration-tests-openldap/src/main/java/org/springframework/ldap/TlsContextSourceEc2InstanceLaunchingFactoryBean.java
index d16d111c60..d101f38d6c 100644
--- a/test/integration-tests-openldap/src/main/java/org/springframework/ldap/TlsContextSourceEc2InstanceLaunchingFactoryBean.java
+++ b/test/integration-tests-openldap/src/main/java/org/springframework/ldap/TlsContextSourceEc2InstanceLaunchingFactoryBean.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2010 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/test/integration-tests-openldap/src/main/java/org/springframework/ldap/control/Person.java b/test/integration-tests-openldap/src/main/java/org/springframework/ldap/control/Person.java
index 162c8824f3..3f0c976e4e 100644
--- a/test/integration-tests-openldap/src/main/java/org/springframework/ldap/control/Person.java
+++ b/test/integration-tests-openldap/src/main/java/org/springframework/ldap/control/Person.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2010 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/test/integration-tests-openldap/src/test/java/org/springframework/ldap/itest/control/PagedSearchITests.java b/test/integration-tests-openldap/src/test/java/org/springframework/ldap/itest/control/PagedSearchITests.java
index a43afded63..945473ecf6 100644
--- a/test/integration-tests-openldap/src/test/java/org/springframework/ldap/itest/control/PagedSearchITests.java
+++ b/test/integration-tests-openldap/src/test/java/org/springframework/ldap/itest/control/PagedSearchITests.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2025 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/test/integration-tests-openldap/src/test/java/org/springframework/ldap/itest/core/LdapTemplateSearchResultITests.java b/test/integration-tests-openldap/src/test/java/org/springframework/ldap/itest/core/LdapTemplateSearchResultITests.java
index b5e21a457e..87f1bdebd3 100644
--- a/test/integration-tests-openldap/src/test/java/org/springframework/ldap/itest/core/LdapTemplateSearchResultITests.java
+++ b/test/integration-tests-openldap/src/test/java/org/springframework/ldap/itest/core/LdapTemplateSearchResultITests.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2016 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/test/integration-tests-openldap/src/test/java/org/springframework/ldap/itest/core/support/DigestMd5AuthenticationITests.java b/test/integration-tests-openldap/src/test/java/org/springframework/ldap/itest/core/support/DigestMd5AuthenticationITests.java
index 3796e4e203..c901110179 100644
--- a/test/integration-tests-openldap/src/test/java/org/springframework/ldap/itest/core/support/DigestMd5AuthenticationITests.java
+++ b/test/integration-tests-openldap/src/test/java/org/springframework/ldap/itest/core/support/DigestMd5AuthenticationITests.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2016 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/test/integration-tests-sunone/src/test/java/org/springframework/ldap/itest/core/LdapTemplateVirtualListViewSearchITests.java b/test/integration-tests-sunone/src/test/java/org/springframework/ldap/itest/core/LdapTemplateVirtualListViewSearchITests.java
index c4ca4998c9..bbd641b621 100644
--- a/test/integration-tests-sunone/src/test/java/org/springframework/ldap/itest/core/LdapTemplateVirtualListViewSearchITests.java
+++ b/test/integration-tests-sunone/src/test/java/org/springframework/ldap/itest/core/LdapTemplateVirtualListViewSearchITests.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2016 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/test/integration-tests/src/main/java/org/springframework/ldap/itest/LdapGroupDao.java b/test/integration-tests/src/main/java/org/springframework/ldap/itest/LdapGroupDao.java
index d5d54133e1..4df9fac42f 100644
--- a/test/integration-tests/src/main/java/org/springframework/ldap/itest/LdapGroupDao.java
+++ b/test/integration-tests/src/main/java/org/springframework/ldap/itest/LdapGroupDao.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2013 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/test/integration-tests/src/main/java/org/springframework/ldap/itest/NoAdTests.java b/test/integration-tests/src/main/java/org/springframework/ldap/itest/NoAdTests.java
index 5cdb4b8f2d..7ae0be2191 100644
--- a/test/integration-tests/src/main/java/org/springframework/ldap/itest/NoAdTests.java
+++ b/test/integration-tests/src/main/java/org/springframework/ldap/itest/NoAdTests.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2013 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/test/integration-tests/src/main/java/org/springframework/ldap/itest/Person.java b/test/integration-tests/src/main/java/org/springframework/ldap/itest/Person.java
index 6855681573..62a4dc9aa3 100644
--- a/test/integration-tests/src/main/java/org/springframework/ldap/itest/Person.java
+++ b/test/integration-tests/src/main/java/org/springframework/ldap/itest/Person.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2010 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/test/integration-tests/src/main/java/org/springframework/ldap/itest/PersonAttributesMapper.java b/test/integration-tests/src/main/java/org/springframework/ldap/itest/PersonAttributesMapper.java
index 0cad3eb951..6f9554522a 100644
--- a/test/integration-tests/src/main/java/org/springframework/ldap/itest/PersonAttributesMapper.java
+++ b/test/integration-tests/src/main/java/org/springframework/ldap/itest/PersonAttributesMapper.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2010 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/test/integration-tests/src/main/java/org/springframework/ldap/itest/PersonContextMapper.java b/test/integration-tests/src/main/java/org/springframework/ldap/itest/PersonContextMapper.java
index df3de70059..9bdc746861 100644
--- a/test/integration-tests/src/main/java/org/springframework/ldap/itest/PersonContextMapper.java
+++ b/test/integration-tests/src/main/java/org/springframework/ldap/itest/PersonContextMapper.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2010 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/test/integration-tests/src/main/java/org/springframework/ldap/itest/core/DummyDistinguishedNameConsumer.java b/test/integration-tests/src/main/java/org/springframework/ldap/itest/core/DummyDistinguishedNameConsumer.java
index 3ccb5c9b9e..29132bc374 100644
--- a/test/integration-tests/src/main/java/org/springframework/ldap/itest/core/DummyDistinguishedNameConsumer.java
+++ b/test/integration-tests/src/main/java/org/springframework/ldap/itest/core/DummyDistinguishedNameConsumer.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2010 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/test/integration-tests/src/main/java/org/springframework/ldap/itest/core/support/DummyBaseLdapNameAware.java b/test/integration-tests/src/main/java/org/springframework/ldap/itest/core/support/DummyBaseLdapNameAware.java
index 337b4dd1de..f791af03b6 100644
--- a/test/integration-tests/src/main/java/org/springframework/ldap/itest/core/support/DummyBaseLdapNameAware.java
+++ b/test/integration-tests/src/main/java/org/springframework/ldap/itest/core/support/DummyBaseLdapNameAware.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2013 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/test/integration-tests/src/main/java/org/springframework/ldap/itest/core/support/DummyBaseLdapPathAware.java b/test/integration-tests/src/main/java/org/springframework/ldap/itest/core/support/DummyBaseLdapPathAware.java
index 0db97b8373..8fc1a367d8 100644
--- a/test/integration-tests/src/main/java/org/springframework/ldap/itest/core/support/DummyBaseLdapPathAware.java
+++ b/test/integration-tests/src/main/java/org/springframework/ldap/itest/core/support/DummyBaseLdapPathAware.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2010 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/test/integration-tests/src/main/java/org/springframework/ldap/itest/filter/DummyFilterConsumer.java b/test/integration-tests/src/main/java/org/springframework/ldap/itest/filter/DummyFilterConsumer.java
index 5e3fa48a72..771d560708 100644
--- a/test/integration-tests/src/main/java/org/springframework/ldap/itest/filter/DummyFilterConsumer.java
+++ b/test/integration-tests/src/main/java/org/springframework/ldap/itest/filter/DummyFilterConsumer.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2010 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/test/integration-tests/src/main/java/org/springframework/ldap/itest/odm/Group.java b/test/integration-tests/src/main/java/org/springframework/ldap/itest/odm/Group.java
index ce4f60f715..074facecab 100644
--- a/test/integration-tests/src/main/java/org/springframework/ldap/itest/odm/Group.java
+++ b/test/integration-tests/src/main/java/org/springframework/ldap/itest/odm/Group.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2013 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/test/integration-tests/src/main/java/org/springframework/ldap/itest/odm/Person.java b/test/integration-tests/src/main/java/org/springframework/ldap/itest/odm/Person.java
index 76bdc1e195..d38f07abfd 100644
--- a/test/integration-tests/src/main/java/org/springframework/ldap/itest/odm/Person.java
+++ b/test/integration-tests/src/main/java/org/springframework/ldap/itest/odm/Person.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2023 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/test/integration-tests/src/main/java/org/springframework/ldap/itest/odm/PersonWithDnAnnotations.java b/test/integration-tests/src/main/java/org/springframework/ldap/itest/odm/PersonWithDnAnnotations.java
index 61b7016dea..e8ce2c4d66 100644
--- a/test/integration-tests/src/main/java/org/springframework/ldap/itest/odm/PersonWithDnAnnotations.java
+++ b/test/integration-tests/src/main/java/org/springframework/ldap/itest/odm/PersonWithDnAnnotations.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2023 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/test/integration-tests/src/main/java/org/springframework/ldap/itest/support/springsecurity/MethodSecurityExpressionHandler.java b/test/integration-tests/src/main/java/org/springframework/ldap/itest/support/springsecurity/MethodSecurityExpressionHandler.java
index 99be46678a..073e3d178a 100644
--- a/test/integration-tests/src/main/java/org/springframework/ldap/itest/support/springsecurity/MethodSecurityExpressionHandler.java
+++ b/test/integration-tests/src/main/java/org/springframework/ldap/itest/support/springsecurity/MethodSecurityExpressionHandler.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2013 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/test/integration-tests/src/main/java/org/springframework/ldap/itest/transaction/compensating/manager/DummyDao.java b/test/integration-tests/src/main/java/org/springframework/ldap/itest/transaction/compensating/manager/DummyDao.java
index 3225d94c02..d608708a67 100644
--- a/test/integration-tests/src/main/java/org/springframework/ldap/itest/transaction/compensating/manager/DummyDao.java
+++ b/test/integration-tests/src/main/java/org/springframework/ldap/itest/transaction/compensating/manager/DummyDao.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2013 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/test/integration-tests/src/main/java/org/springframework/ldap/itest/transaction/compensating/manager/DummyException.java b/test/integration-tests/src/main/java/org/springframework/ldap/itest/transaction/compensating/manager/DummyException.java
index 0d1828b513..95bea1a23f 100644
--- a/test/integration-tests/src/main/java/org/springframework/ldap/itest/transaction/compensating/manager/DummyException.java
+++ b/test/integration-tests/src/main/java/org/springframework/ldap/itest/transaction/compensating/manager/DummyException.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2002-2007 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/test/integration-tests/src/main/java/org/springframework/ldap/itest/transaction/compensating/manager/DummyServiceImpl.java b/test/integration-tests/src/main/java/org/springframework/ldap/itest/transaction/compensating/manager/DummyServiceImpl.java
index dc940563c6..16053be7bc 100644
--- a/test/integration-tests/src/main/java/org/springframework/ldap/itest/transaction/compensating/manager/DummyServiceImpl.java
+++ b/test/integration-tests/src/main/java/org/springframework/ldap/itest/transaction/compensating/manager/DummyServiceImpl.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2002-2007 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/test/integration-tests/src/main/java/org/springframework/ldap/itest/transaction/compensating/manager/LdapDummyDaoImpl.java b/test/integration-tests/src/main/java/org/springframework/ldap/itest/transaction/compensating/manager/LdapDummyDaoImpl.java
index e3806e1858..35468e6c7a 100644
--- a/test/integration-tests/src/main/java/org/springframework/ldap/itest/transaction/compensating/manager/LdapDummyDaoImpl.java
+++ b/test/integration-tests/src/main/java/org/springframework/ldap/itest/transaction/compensating/manager/LdapDummyDaoImpl.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2013 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/test/integration-tests/src/test/java/org/apache/directory/server/core/avltree/ArrayMarshaller.java b/test/integration-tests/src/test/java/org/apache/directory/server/core/avltree/ArrayMarshaller.java
index 42f05560b3..9c8f76a962 100644
--- a/test/integration-tests/src/test/java/org/apache/directory/server/core/avltree/ArrayMarshaller.java
+++ b/test/integration-tests/src/test/java/org/apache/directory/server/core/avltree/ArrayMarshaller.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2002-2021 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/test/integration-tests/src/test/java/org/springframework/ldap/LdapConditionallyFilteredTestRunner.java b/test/integration-tests/src/test/java/org/springframework/ldap/LdapConditionallyFilteredTestRunner.java
index 7b88fb29fb..7ff21e18e6 100644
--- a/test/integration-tests/src/test/java/org/springframework/ldap/LdapConditionallyFilteredTestRunner.java
+++ b/test/integration-tests/src/test/java/org/springframework/ldap/LdapConditionallyFilteredTestRunner.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2013 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/test/integration-tests/src/test/java/org/springframework/ldap/itest/AbstractLdapTemplateIntegrationTests.java b/test/integration-tests/src/test/java/org/springframework/ldap/itest/AbstractLdapTemplateIntegrationTests.java
index e233062fc6..004c4f9765 100644
--- a/test/integration-tests/src/test/java/org/springframework/ldap/itest/AbstractLdapTemplateIntegrationTests.java
+++ b/test/integration-tests/src/test/java/org/springframework/ldap/itest/AbstractLdapTemplateIntegrationTests.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2013 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/test/integration-tests/src/test/java/org/springframework/ldap/itest/DefaultLdapClientAuthenticationITests.java b/test/integration-tests/src/test/java/org/springframework/ldap/itest/DefaultLdapClientAuthenticationITests.java
index 216625c182..d494e12d5a 100644
--- a/test/integration-tests/src/test/java/org/springframework/ldap/itest/DefaultLdapClientAuthenticationITests.java
+++ b/test/integration-tests/src/test/java/org/springframework/ldap/itest/DefaultLdapClientAuthenticationITests.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2023 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/test/integration-tests/src/test/java/org/springframework/ldap/itest/DefaultLdapClientBindUnbindITests.java b/test/integration-tests/src/test/java/org/springframework/ldap/itest/DefaultLdapClientBindUnbindITests.java
index daf7a9d8ce..699af3f68b 100644
--- a/test/integration-tests/src/test/java/org/springframework/ldap/itest/DefaultLdapClientBindUnbindITests.java
+++ b/test/integration-tests/src/test/java/org/springframework/ldap/itest/DefaultLdapClientBindUnbindITests.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2023 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/test/integration-tests/src/test/java/org/springframework/ldap/itest/DefaultLdapClientListITests.java b/test/integration-tests/src/test/java/org/springframework/ldap/itest/DefaultLdapClientListITests.java
index 7cec0c2150..254b68b7e6 100644
--- a/test/integration-tests/src/test/java/org/springframework/ldap/itest/DefaultLdapClientListITests.java
+++ b/test/integration-tests/src/test/java/org/springframework/ldap/itest/DefaultLdapClientListITests.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2023 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/test/integration-tests/src/test/java/org/springframework/ldap/itest/DefaultLdapClientLookupITests.java b/test/integration-tests/src/test/java/org/springframework/ldap/itest/DefaultLdapClientLookupITests.java
index 93bc9e4bf1..83068b4953 100644
--- a/test/integration-tests/src/test/java/org/springframework/ldap/itest/DefaultLdapClientLookupITests.java
+++ b/test/integration-tests/src/test/java/org/springframework/ldap/itest/DefaultLdapClientLookupITests.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2023 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/test/integration-tests/src/test/java/org/springframework/ldap/itest/DefaultLdapClientLookupMultiRdnITests.java b/test/integration-tests/src/test/java/org/springframework/ldap/itest/DefaultLdapClientLookupMultiRdnITests.java
index c8cb6eac06..69ca779fa5 100644
--- a/test/integration-tests/src/test/java/org/springframework/ldap/itest/DefaultLdapClientLookupMultiRdnITests.java
+++ b/test/integration-tests/src/test/java/org/springframework/ldap/itest/DefaultLdapClientLookupMultiRdnITests.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2023 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/test/integration-tests/src/test/java/org/springframework/ldap/itest/DefaultLdapClientModifyITests.java b/test/integration-tests/src/test/java/org/springframework/ldap/itest/DefaultLdapClientModifyITests.java
index 3842f56d17..70b858367b 100644
--- a/test/integration-tests/src/test/java/org/springframework/ldap/itest/DefaultLdapClientModifyITests.java
+++ b/test/integration-tests/src/test/java/org/springframework/ldap/itest/DefaultLdapClientModifyITests.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2023 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/test/integration-tests/src/test/java/org/springframework/ldap/itest/DefaultLdapClientRecursiveDeleteITests.java b/test/integration-tests/src/test/java/org/springframework/ldap/itest/DefaultLdapClientRecursiveDeleteITests.java
index 179aae66d3..9e57b8cfe5 100644
--- a/test/integration-tests/src/test/java/org/springframework/ldap/itest/DefaultLdapClientRecursiveDeleteITests.java
+++ b/test/integration-tests/src/test/java/org/springframework/ldap/itest/DefaultLdapClientRecursiveDeleteITests.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2023 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/test/integration-tests/src/test/java/org/springframework/ldap/itest/DefaultLdapClientRenameITests.java b/test/integration-tests/src/test/java/org/springframework/ldap/itest/DefaultLdapClientRenameITests.java
index 7d0d1b16ab..c725ab830f 100644
--- a/test/integration-tests/src/test/java/org/springframework/ldap/itest/DefaultLdapClientRenameITests.java
+++ b/test/integration-tests/src/test/java/org/springframework/ldap/itest/DefaultLdapClientRenameITests.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2023 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/test/integration-tests/src/test/java/org/springframework/ldap/itest/DefaultLdapClientSearchResultITests.java b/test/integration-tests/src/test/java/org/springframework/ldap/itest/DefaultLdapClientSearchResultITests.java
index 8a1e98ba5b..5652aa194b 100644
--- a/test/integration-tests/src/test/java/org/springframework/ldap/itest/DefaultLdapClientSearchResultITests.java
+++ b/test/integration-tests/src/test/java/org/springframework/ldap/itest/DefaultLdapClientSearchResultITests.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2023 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/test/integration-tests/src/test/java/org/springframework/ldap/itest/InvalidBackslashITests.java b/test/integration-tests/src/test/java/org/springframework/ldap/itest/InvalidBackslashITests.java
index 899bfb167e..c5d5f29701 100644
--- a/test/integration-tests/src/test/java/org/springframework/ldap/itest/InvalidBackslashITests.java
+++ b/test/integration-tests/src/test/java/org/springframework/ldap/itest/InvalidBackslashITests.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2016 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/test/integration-tests/src/test/java/org/springframework/ldap/itest/LdapTemplateAttributesMapperITests.java b/test/integration-tests/src/test/java/org/springframework/ldap/itest/LdapTemplateAttributesMapperITests.java
index ed01414c2c..2da0f20cc9 100644
--- a/test/integration-tests/src/test/java/org/springframework/ldap/itest/LdapTemplateAttributesMapperITests.java
+++ b/test/integration-tests/src/test/java/org/springframework/ldap/itest/LdapTemplateAttributesMapperITests.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2016 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/test/integration-tests/src/test/java/org/springframework/ldap/itest/LdapTemplateAuthenticationITests.java b/test/integration-tests/src/test/java/org/springframework/ldap/itest/LdapTemplateAuthenticationITests.java
index efde93ab56..838c02fe2b 100644
--- a/test/integration-tests/src/test/java/org/springframework/ldap/itest/LdapTemplateAuthenticationITests.java
+++ b/test/integration-tests/src/test/java/org/springframework/ldap/itest/LdapTemplateAuthenticationITests.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2016 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/test/integration-tests/src/test/java/org/springframework/ldap/itest/LdapTemplateBindUnbindITests.java b/test/integration-tests/src/test/java/org/springframework/ldap/itest/LdapTemplateBindUnbindITests.java
index 7ed92820fe..43289ff328 100644
--- a/test/integration-tests/src/test/java/org/springframework/ldap/itest/LdapTemplateBindUnbindITests.java
+++ b/test/integration-tests/src/test/java/org/springframework/ldap/itest/LdapTemplateBindUnbindITests.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2016 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/test/integration-tests/src/test/java/org/springframework/ldap/itest/LdapTemplateContextExecutorTests.java b/test/integration-tests/src/test/java/org/springframework/ldap/itest/LdapTemplateContextExecutorTests.java
index dd8c641047..e39c9f4036 100644
--- a/test/integration-tests/src/test/java/org/springframework/ldap/itest/LdapTemplateContextExecutorTests.java
+++ b/test/integration-tests/src/test/java/org/springframework/ldap/itest/LdapTemplateContextExecutorTests.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2016 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/test/integration-tests/src/test/java/org/springframework/ldap/itest/LdapTemplateContextMapperITests.java b/test/integration-tests/src/test/java/org/springframework/ldap/itest/LdapTemplateContextMapperITests.java
index 211aa664f5..67b75fb426 100644
--- a/test/integration-tests/src/test/java/org/springframework/ldap/itest/LdapTemplateContextMapperITests.java
+++ b/test/integration-tests/src/test/java/org/springframework/ldap/itest/LdapTemplateContextMapperITests.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2016 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/test/integration-tests/src/test/java/org/springframework/ldap/itest/LdapTemplateListITests.java b/test/integration-tests/src/test/java/org/springframework/ldap/itest/LdapTemplateListITests.java
index 1afb76173e..fa1365eee3 100644
--- a/test/integration-tests/src/test/java/org/springframework/ldap/itest/LdapTemplateListITests.java
+++ b/test/integration-tests/src/test/java/org/springframework/ldap/itest/LdapTemplateListITests.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2025 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/test/integration-tests/src/test/java/org/springframework/ldap/itest/LdapTemplateLookupITests.java b/test/integration-tests/src/test/java/org/springframework/ldap/itest/LdapTemplateLookupITests.java
index 32791e4055..484d4d43c5 100644
--- a/test/integration-tests/src/test/java/org/springframework/ldap/itest/LdapTemplateLookupITests.java
+++ b/test/integration-tests/src/test/java/org/springframework/ldap/itest/LdapTemplateLookupITests.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2016 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/test/integration-tests/src/test/java/org/springframework/ldap/itest/LdapTemplateLookupMultiRdnITests.java b/test/integration-tests/src/test/java/org/springframework/ldap/itest/LdapTemplateLookupMultiRdnITests.java
index 4801c65db6..eda34cd58e 100644
--- a/test/integration-tests/src/test/java/org/springframework/ldap/itest/LdapTemplateLookupMultiRdnITests.java
+++ b/test/integration-tests/src/test/java/org/springframework/ldap/itest/LdapTemplateLookupMultiRdnITests.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2016 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/test/integration-tests/src/test/java/org/springframework/ldap/itest/LdapTemplateModifyITests.java b/test/integration-tests/src/test/java/org/springframework/ldap/itest/LdapTemplateModifyITests.java
index 0721250c98..c862cbcfea 100644
--- a/test/integration-tests/src/test/java/org/springframework/ldap/itest/LdapTemplateModifyITests.java
+++ b/test/integration-tests/src/test/java/org/springframework/ldap/itest/LdapTemplateModifyITests.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2016 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/test/integration-tests/src/test/java/org/springframework/ldap/itest/LdapTemplateNoBaseSuffixITests.java b/test/integration-tests/src/test/java/org/springframework/ldap/itest/LdapTemplateNoBaseSuffixITests.java
index 3ef778cd7b..6f76ef01b2 100644
--- a/test/integration-tests/src/test/java/org/springframework/ldap/itest/LdapTemplateNoBaseSuffixITests.java
+++ b/test/integration-tests/src/test/java/org/springframework/ldap/itest/LdapTemplateNoBaseSuffixITests.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2016 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/test/integration-tests/src/test/java/org/springframework/ldap/itest/LdapTemplatePooledITests.java b/test/integration-tests/src/test/java/org/springframework/ldap/itest/LdapTemplatePooledITests.java
index 270ad94669..ffdb4ca329 100644
--- a/test/integration-tests/src/test/java/org/springframework/ldap/itest/LdapTemplatePooledITests.java
+++ b/test/integration-tests/src/test/java/org/springframework/ldap/itest/LdapTemplatePooledITests.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2016 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/test/integration-tests/src/test/java/org/springframework/ldap/itest/LdapTemplateRecursiveDeleteITests.java b/test/integration-tests/src/test/java/org/springframework/ldap/itest/LdapTemplateRecursiveDeleteITests.java
index e79f2f7589..00407417c9 100644
--- a/test/integration-tests/src/test/java/org/springframework/ldap/itest/LdapTemplateRecursiveDeleteITests.java
+++ b/test/integration-tests/src/test/java/org/springframework/ldap/itest/LdapTemplateRecursiveDeleteITests.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2013 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/test/integration-tests/src/test/java/org/springframework/ldap/itest/LdapTemplateRenameITests.java b/test/integration-tests/src/test/java/org/springframework/ldap/itest/LdapTemplateRenameITests.java
index 5e7a4ba019..ac6c35a143 100644
--- a/test/integration-tests/src/test/java/org/springframework/ldap/itest/LdapTemplateRenameITests.java
+++ b/test/integration-tests/src/test/java/org/springframework/ldap/itest/LdapTemplateRenameITests.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2016 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/test/integration-tests/src/test/java/org/springframework/ldap/itest/LdapTemplateSearchResultITests.java b/test/integration-tests/src/test/java/org/springframework/ldap/itest/LdapTemplateSearchResultITests.java
index 12505deb13..3658e47ccd 100644
--- a/test/integration-tests/src/test/java/org/springframework/ldap/itest/LdapTemplateSearchResultITests.java
+++ b/test/integration-tests/src/test/java/org/springframework/ldap/itest/LdapTemplateSearchResultITests.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2025 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/test/integration-tests/src/test/java/org/springframework/ldap/itest/LdapTemplateSearchResultNamespaceConfigITests.java b/test/integration-tests/src/test/java/org/springframework/ldap/itest/LdapTemplateSearchResultNamespaceConfigITests.java
index 0279656961..c81de1a80f 100644
--- a/test/integration-tests/src/test/java/org/springframework/ldap/itest/LdapTemplateSearchResultNamespaceConfigITests.java
+++ b/test/integration-tests/src/test/java/org/springframework/ldap/itest/LdapTemplateSearchResultNamespaceConfigITests.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2022 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/test/integration-tests/src/test/java/org/springframework/ldap/itest/control/SupportedControlsITests.java b/test/integration-tests/src/test/java/org/springframework/ldap/itest/control/SupportedControlsITests.java
index 9edaaa3de6..13ed4a5cfb 100644
--- a/test/integration-tests/src/test/java/org/springframework/ldap/itest/control/SupportedControlsITests.java
+++ b/test/integration-tests/src/test/java/org/springframework/ldap/itest/control/SupportedControlsITests.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2025 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/test/integration-tests/src/test/java/org/springframework/ldap/itest/core/DistinguishedNameEditorITests.java b/test/integration-tests/src/test/java/org/springframework/ldap/itest/core/DistinguishedNameEditorITests.java
index 6182bd7725..d9946fc89b 100644
--- a/test/integration-tests/src/test/java/org/springframework/ldap/itest/core/DistinguishedNameEditorITests.java
+++ b/test/integration-tests/src/test/java/org/springframework/ldap/itest/core/DistinguishedNameEditorITests.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2016 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/test/integration-tests/src/test/java/org/springframework/ldap/itest/core/DnParsePerformanceITests.java b/test/integration-tests/src/test/java/org/springframework/ldap/itest/core/DnParsePerformanceITests.java
index 8de18066a5..e8becf6cc3 100644
--- a/test/integration-tests/src/test/java/org/springframework/ldap/itest/core/DnParsePerformanceITests.java
+++ b/test/integration-tests/src/test/java/org/springframework/ldap/itest/core/DnParsePerformanceITests.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2010 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/test/integration-tests/src/test/java/org/springframework/ldap/itest/core/simple/SimpleLdapTemplateITests.java b/test/integration-tests/src/test/java/org/springframework/ldap/itest/core/simple/SimpleLdapTemplateITests.java
index 9d3f3ea439..7fc0e50981 100644
--- a/test/integration-tests/src/test/java/org/springframework/ldap/itest/core/simple/SimpleLdapTemplateITests.java
+++ b/test/integration-tests/src/test/java/org/springframework/ldap/itest/core/simple/SimpleLdapTemplateITests.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2025 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/test/integration-tests/src/test/java/org/springframework/ldap/itest/core/support/BaseLdapPathBeanPostprocessorITests.java b/test/integration-tests/src/test/java/org/springframework/ldap/itest/core/support/BaseLdapPathBeanPostprocessorITests.java
index cda8ca27bf..b748c900b2 100644
--- a/test/integration-tests/src/test/java/org/springframework/ldap/itest/core/support/BaseLdapPathBeanPostprocessorITests.java
+++ b/test/integration-tests/src/test/java/org/springframework/ldap/itest/core/support/BaseLdapPathBeanPostprocessorITests.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2016 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/test/integration-tests/src/test/java/org/springframework/ldap/itest/core/support/BaseLdapPathBeanPostprocessorNamespaceConfigITests.java b/test/integration-tests/src/test/java/org/springframework/ldap/itest/core/support/BaseLdapPathBeanPostprocessorNamespaceConfigITests.java
index 3c0d9cc5b4..252e3dff4b 100644
--- a/test/integration-tests/src/test/java/org/springframework/ldap/itest/core/support/BaseLdapPathBeanPostprocessorNamespaceConfigITests.java
+++ b/test/integration-tests/src/test/java/org/springframework/ldap/itest/core/support/BaseLdapPathBeanPostprocessorNamespaceConfigITests.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2016 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/test/integration-tests/src/test/java/org/springframework/ldap/itest/core/support/LdapContextSourceIntegrationTests.java b/test/integration-tests/src/test/java/org/springframework/ldap/itest/core/support/LdapContextSourceIntegrationTests.java
index 5a0eefc816..144beadae2 100644
--- a/test/integration-tests/src/test/java/org/springframework/ldap/itest/core/support/LdapContextSourceIntegrationTests.java
+++ b/test/integration-tests/src/test/java/org/springframework/ldap/itest/core/support/LdapContextSourceIntegrationTests.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2016 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/test/integration-tests/src/test/java/org/springframework/ldap/itest/core/support/LdapContextSourceMultiServerIntegrationTests.java b/test/integration-tests/src/test/java/org/springframework/ldap/itest/core/support/LdapContextSourceMultiServerIntegrationTests.java
index 72cd4d1715..89ee33539a 100644
--- a/test/integration-tests/src/test/java/org/springframework/ldap/itest/core/support/LdapContextSourceMultiServerIntegrationTests.java
+++ b/test/integration-tests/src/test/java/org/springframework/ldap/itest/core/support/LdapContextSourceMultiServerIntegrationTests.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2016 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/test/integration-tests/src/test/java/org/springframework/ldap/itest/filter/HardcodedFilterIntegrationTests.java b/test/integration-tests/src/test/java/org/springframework/ldap/itest/filter/HardcodedFilterIntegrationTests.java
index 39aba8a375..a6d329a6a6 100644
--- a/test/integration-tests/src/test/java/org/springframework/ldap/itest/filter/HardcodedFilterIntegrationTests.java
+++ b/test/integration-tests/src/test/java/org/springframework/ldap/itest/filter/HardcodedFilterIntegrationTests.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2016 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/test/integration-tests/src/test/java/org/springframework/ldap/itest/integration/JiraLdap247ITests.java b/test/integration-tests/src/test/java/org/springframework/ldap/itest/integration/JiraLdap247ITests.java
index 303c39ca37..b3cc14f24f 100644
--- a/test/integration-tests/src/test/java/org/springframework/ldap/itest/integration/JiraLdap247ITests.java
+++ b/test/integration-tests/src/test/java/org/springframework/ldap/itest/integration/JiraLdap247ITests.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2016 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/test/integration-tests/src/test/java/org/springframework/ldap/itest/ldap321/Ldap321Tests.java b/test/integration-tests/src/test/java/org/springframework/ldap/itest/ldap321/Ldap321Tests.java
index 1fda14de85..76d28a06b6 100644
--- a/test/integration-tests/src/test/java/org/springframework/ldap/itest/ldap321/Ldap321Tests.java
+++ b/test/integration-tests/src/test/java/org/springframework/ldap/itest/ldap321/Ldap321Tests.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2002-2016 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/test/integration-tests/src/test/java/org/springframework/ldap/itest/ldap321/RoleRepo.java b/test/integration-tests/src/test/java/org/springframework/ldap/itest/ldap321/RoleRepo.java
index c1e22a50f0..7932d3e86d 100644
--- a/test/integration-tests/src/test/java/org/springframework/ldap/itest/ldap321/RoleRepo.java
+++ b/test/integration-tests/src/test/java/org/springframework/ldap/itest/ldap321/RoleRepo.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2002-2015 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/test/integration-tests/src/test/java/org/springframework/ldap/itest/ldap473/Ldap473Tests.java b/test/integration-tests/src/test/java/org/springframework/ldap/itest/ldap473/Ldap473Tests.java
index 303c516b1b..8514a352f7 100644
--- a/test/integration-tests/src/test/java/org/springframework/ldap/itest/ldap473/Ldap473Tests.java
+++ b/test/integration-tests/src/test/java/org/springframework/ldap/itest/ldap473/Ldap473Tests.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2023 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/test/integration-tests/src/test/java/org/springframework/ldap/itest/manager/ContextSourceTransactionManagerIntegrationTests.java b/test/integration-tests/src/test/java/org/springframework/ldap/itest/manager/ContextSourceTransactionManagerIntegrationTests.java
index 5c63ea9f88..2a30c53952 100644
--- a/test/integration-tests/src/test/java/org/springframework/ldap/itest/manager/ContextSourceTransactionManagerIntegrationTests.java
+++ b/test/integration-tests/src/test/java/org/springframework/ldap/itest/manager/ContextSourceTransactionManagerIntegrationTests.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2016 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/test/integration-tests/src/test/java/org/springframework/ldap/itest/manager/ContextSourceTransactionManagerNamespaceIntegrationTests.java b/test/integration-tests/src/test/java/org/springframework/ldap/itest/manager/ContextSourceTransactionManagerNamespaceIntegrationTests.java
index 7433993dca..fbafb40d19 100644
--- a/test/integration-tests/src/test/java/org/springframework/ldap/itest/manager/ContextSourceTransactionManagerNamespaceIntegrationTests.java
+++ b/test/integration-tests/src/test/java/org/springframework/ldap/itest/manager/ContextSourceTransactionManagerNamespaceIntegrationTests.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2016 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/test/integration-tests/src/test/java/org/springframework/ldap/itest/manager/ContextSourceTransactionManagerSubtreeIntegrationTests.java b/test/integration-tests/src/test/java/org/springframework/ldap/itest/manager/ContextSourceTransactionManagerSubtreeIntegrationTests.java
index d8fd56e02e..5ea38579b4 100644
--- a/test/integration-tests/src/test/java/org/springframework/ldap/itest/manager/ContextSourceTransactionManagerSubtreeIntegrationTests.java
+++ b/test/integration-tests/src/test/java/org/springframework/ldap/itest/manager/ContextSourceTransactionManagerSubtreeIntegrationTests.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2016 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/test/integration-tests/src/test/java/org/springframework/ldap/itest/odm/LdapTemplateOdmGroupManipulationITests.java b/test/integration-tests/src/test/java/org/springframework/ldap/itest/odm/LdapTemplateOdmGroupManipulationITests.java
index 4e67181447..7851ca6eb5 100644
--- a/test/integration-tests/src/test/java/org/springframework/ldap/itest/odm/LdapTemplateOdmGroupManipulationITests.java
+++ b/test/integration-tests/src/test/java/org/springframework/ldap/itest/odm/LdapTemplateOdmGroupManipulationITests.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2025 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/test/integration-tests/src/test/java/org/springframework/ldap/itest/odm/LdapTemplateOdmWithDnAnnotationsITests.java b/test/integration-tests/src/test/java/org/springframework/ldap/itest/odm/LdapTemplateOdmWithDnAnnotationsITests.java
index 3028a324bf..151048e679 100644
--- a/test/integration-tests/src/test/java/org/springframework/ldap/itest/odm/LdapTemplateOdmWithDnAnnotationsITests.java
+++ b/test/integration-tests/src/test/java/org/springframework/ldap/itest/odm/LdapTemplateOdmWithDnAnnotationsITests.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2022 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/test/integration-tests/src/test/java/org/springframework/ldap/itest/odm/LdapTemplateOdmWithNoDnAnnotationsITests.java b/test/integration-tests/src/test/java/org/springframework/ldap/itest/odm/LdapTemplateOdmWithNoDnAnnotationsITests.java
index d54837503d..d4b7b1db9a 100644
--- a/test/integration-tests/src/test/java/org/springframework/ldap/itest/odm/LdapTemplateOdmWithNoDnAnnotationsITests.java
+++ b/test/integration-tests/src/test/java/org/springframework/ldap/itest/odm/LdapTemplateOdmWithNoDnAnnotationsITests.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2022 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
From 6485641971a9cae194fa64c67b9ca6151863a38c Mon Sep 17 00:00:00 2001
From: Josh Cummings <3627351+jzheaux@users.noreply.github.com>
Date: Thu, 7 Aug 2025 12:19:33 -0600
Subject: [PATCH 52/67] Revert "Remove 3.2.x from CI"
Support for 3.2.x as been extended to align with the
Boot 3.4 support window
This reverts commit 3053f270885749f2fc329ccbbe58cb3794af931a.
---
.github/dependabot.yml | 25 +++++++++++++++++++++++++
.github/workflows/release-scheduler.yml | 2 +-
2 files changed, 26 insertions(+), 1 deletion(-)
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
index 477ec4de35..33bad9eb99 100644
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -40,6 +40,31 @@ updates:
update-types:
- version-update:semver-major
- version-update:semver-minor
+ - package-ecosystem: gradle
+ target-branch: 3.2.x
+ milestone: 77 # 3.2.x
+ directory: /
+ schedule:
+ interval: daily
+ time: '03:40'
+ timezone: Etc/UTC
+ open-pull-requests-limit: 10
+ labels:
+ - 'type: dependency-upgrade'
+ - 'in: build'
+ ignore:
+ - dependency-name: org.apache.directory.server:*
+ - dependency-name: org.apache.directory.shared:*
+ - dependency-name: org.junit:junit-bom
+ update-types:
+ - version-update:semver-major
+ - dependency-name: org.mockito:mockito-bom
+ update-types:
+ - version-update:semver-major
+ - dependency-name: '*'
+ update-types:
+ - version-update:semver-major
+ - version-update:semver-minor
- package-ecosystem: github-actions
target-branch: main
diff --git a/.github/workflows/release-scheduler.yml b/.github/workflows/release-scheduler.yml
index 210c9a8825..f8ccc0bd4e 100644
--- a/.github/workflows/release-scheduler.yml
+++ b/.github/workflows/release-scheduler.yml
@@ -14,7 +14,7 @@ jobs:
strategy:
matrix:
# List of active maintenance branches.
- branch: [ main, 3.3.x, 2.4.x ]
+ branch: [ main, 3.3.x, 3.2.x, 2.4.x ]
runs-on: ubuntu-latest
steps:
- name: Checkout
From fb082d33aac7b5788d71a206714bd63f99b6b247 Mon Sep 17 00:00:00 2001
From: Josh Cummings <3627351+jzheaux@users.noreply.github.com>
Date: Thu, 7 Aug 2025 12:43:36 -0600
Subject: [PATCH 53/67] Rename License File
---
license.txt => LICENSE.txt | 0
1 file changed, 0 insertions(+), 0 deletions(-)
rename license.txt => LICENSE.txt (100%)
diff --git a/license.txt b/LICENSE.txt
similarity index 100%
rename from license.txt
rename to LICENSE.txt
From 30a87350e6012aaeea35ccbe4acf9442557ae944 Mon Sep 17 00:00:00 2001
From: Josh Cummings <3627351+jzheaux@users.noreply.github.com>
Date: Thu, 7 Aug 2025 12:48:47 -0600
Subject: [PATCH 54/67] Apply License File to Each Jar
Closes gh-1176
---
.../io/spring/gradle/convention/SpringModulePlugin.groovy | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/buildSrc/src/main/groovy/io/spring/gradle/convention/SpringModulePlugin.groovy b/buildSrc/src/main/groovy/io/spring/gradle/convention/SpringModulePlugin.groovy
index 55c8ef6398..2ba66b645b 100644
--- a/buildSrc/src/main/groovy/io/spring/gradle/convention/SpringModulePlugin.groovy
+++ b/buildSrc/src/main/groovy/io/spring/gradle/convention/SpringModulePlugin.groovy
@@ -20,6 +20,7 @@ import org.gradle.api.JavaVersion
import org.gradle.api.Project
import org.gradle.api.plugins.JavaLibraryPlugin
import org.gradle.api.plugins.PluginManager
+import org.gradle.api.tasks.bundling.Jar
import org.springframework.gradle.maven.SpringMavenPlugin
/**
@@ -40,6 +41,11 @@ class SpringModulePlugin extends AbstractSpringJavaPlugin {
if (!Utils.isRelease(project)) {
deployArtifacts.dependsOn project.tasks.artifactoryPublish
}
+ project.tasks.withType(Jar) {
+ from(project.rootProject.files('LICENSE.txt')) {
+ into('META-INF')
+ }
+ }
}
}
From 5f2cf1eed1e76cf84f18fd62ae2380aed379f517 Mon Sep 17 00:00:00 2001
From: Josh Cummings <3627351+jzheaux@users.noreply.github.com>
Date: Thu, 7 Aug 2025 13:03:33 -0600
Subject: [PATCH 55/67] Update Copyright Headers for XML and Groovy Files
Issue gh-1173
---
.../src/main/groovy/io/spring/gradle/IncludeRepoTask.groovy | 2 +-
.../io/spring/gradle/convention/AbstractSpringJavaPlugin.groovy | 2 +-
.../groovy/io/spring/gradle/convention/ArtifactoryPlugin.groovy | 2 +-
.../groovy/io/spring/gradle/convention/CheckstylePlugin.groovy | 2 +-
.../groovy/io/spring/gradle/convention/DeployDocsPlugin.groovy | 2 +-
.../io/spring/gradle/convention/IncludeCheckRemotePlugin.groovy | 2 +-
.../io/spring/gradle/convention/IntegrationTestPlugin.groovy | 2 +-
.../main/groovy/io/spring/gradle/convention/JacocoPlugin.groovy | 2 +-
.../groovy/io/spring/gradle/convention/JavadocApiPlugin.groovy | 2 +-
.../spring/gradle/convention/RepositoryConventionPlugin.groovy | 2 +-
.../groovy/io/spring/gradle/convention/RootProjectPlugin.groovy | 2 +-
.../groovy/io/spring/gradle/convention/SortedProperties.groovy | 2 +-
.../io/spring/gradle/convention/SpringModulePlugin.groovy | 2 +-
.../groovy/io/spring/gradle/convention/SpringTestPlugin.groovy | 2 +-
.../io/spring/gradle/convention/TestsConfigurationPlugin.groovy | 2 +-
.../gradle/propdeps/PropDepsEclipsePlugin.groovy | 2 +-
.../springframework/gradle/propdeps/PropDepsIdeaPlugin.groovy | 2 +-
.../org/springframework/gradle/propdeps/PropDepsPlugin.groovy | 2 +-
.../src/integration-test/groovy/sample/TheTest.groovy | 2 +-
.../ldap-namespace-config-transactional-datasource.xml | 2 +-
.../src/test/resources/conf/ldapTemplatePooledTestContext.xml | 2 +-
21 files changed, 21 insertions(+), 21 deletions(-)
diff --git a/buildSrc/src/main/groovy/io/spring/gradle/IncludeRepoTask.groovy b/buildSrc/src/main/groovy/io/spring/gradle/IncludeRepoTask.groovy
index b549ff7309..04933f0046 100644
--- a/buildSrc/src/main/groovy/io/spring/gradle/IncludeRepoTask.groovy
+++ b/buildSrc/src/main/groovy/io/spring/gradle/IncludeRepoTask.groovy
@@ -1,5 +1,5 @@
/*
- * Copyright 2002-2021 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* 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
diff --git a/buildSrc/src/main/groovy/io/spring/gradle/convention/AbstractSpringJavaPlugin.groovy b/buildSrc/src/main/groovy/io/spring/gradle/convention/AbstractSpringJavaPlugin.groovy
index 27a9fac8fc..aa14e6c9be 100644
--- a/buildSrc/src/main/groovy/io/spring/gradle/convention/AbstractSpringJavaPlugin.groovy
+++ b/buildSrc/src/main/groovy/io/spring/gradle/convention/AbstractSpringJavaPlugin.groovy
@@ -1,5 +1,5 @@
/*
- * Copyright 2002-2016 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* 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
diff --git a/buildSrc/src/main/groovy/io/spring/gradle/convention/ArtifactoryPlugin.groovy b/buildSrc/src/main/groovy/io/spring/gradle/convention/ArtifactoryPlugin.groovy
index 3292ca4b31..c0c0f5057e 100644
--- a/buildSrc/src/main/groovy/io/spring/gradle/convention/ArtifactoryPlugin.groovy
+++ b/buildSrc/src/main/groovy/io/spring/gradle/convention/ArtifactoryPlugin.groovy
@@ -1,5 +1,5 @@
/*
- * Copyright 2002-2017 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* 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
diff --git a/buildSrc/src/main/groovy/io/spring/gradle/convention/CheckstylePlugin.groovy b/buildSrc/src/main/groovy/io/spring/gradle/convention/CheckstylePlugin.groovy
index 4ed89b8bef..c87f4b4d02 100644
--- a/buildSrc/src/main/groovy/io/spring/gradle/convention/CheckstylePlugin.groovy
+++ b/buildSrc/src/main/groovy/io/spring/gradle/convention/CheckstylePlugin.groovy
@@ -1,5 +1,5 @@
/*
- * Copyright 2016-2019 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* 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
diff --git a/buildSrc/src/main/groovy/io/spring/gradle/convention/DeployDocsPlugin.groovy b/buildSrc/src/main/groovy/io/spring/gradle/convention/DeployDocsPlugin.groovy
index 050ece5abf..b7e55477c0 100644
--- a/buildSrc/src/main/groovy/io/spring/gradle/convention/DeployDocsPlugin.groovy
+++ b/buildSrc/src/main/groovy/io/spring/gradle/convention/DeployDocsPlugin.groovy
@@ -1,5 +1,5 @@
/*
- * Copyright 2002-2017 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* 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
diff --git a/buildSrc/src/main/groovy/io/spring/gradle/convention/IncludeCheckRemotePlugin.groovy b/buildSrc/src/main/groovy/io/spring/gradle/convention/IncludeCheckRemotePlugin.groovy
index c6a7a02001..f763516bbb 100644
--- a/buildSrc/src/main/groovy/io/spring/gradle/convention/IncludeCheckRemotePlugin.groovy
+++ b/buildSrc/src/main/groovy/io/spring/gradle/convention/IncludeCheckRemotePlugin.groovy
@@ -1,5 +1,5 @@
/*
- * Copyright 2002-2021 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* 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
diff --git a/buildSrc/src/main/groovy/io/spring/gradle/convention/IntegrationTestPlugin.groovy b/buildSrc/src/main/groovy/io/spring/gradle/convention/IntegrationTestPlugin.groovy
index 9858458b8f..ad2895c379 100644
--- a/buildSrc/src/main/groovy/io/spring/gradle/convention/IntegrationTestPlugin.groovy
+++ b/buildSrc/src/main/groovy/io/spring/gradle/convention/IntegrationTestPlugin.groovy
@@ -1,5 +1,5 @@
/*
- * Copyright 2016-2018 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* 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
diff --git a/buildSrc/src/main/groovy/io/spring/gradle/convention/JacocoPlugin.groovy b/buildSrc/src/main/groovy/io/spring/gradle/convention/JacocoPlugin.groovy
index 551958210d..73574c5254 100644
--- a/buildSrc/src/main/groovy/io/spring/gradle/convention/JacocoPlugin.groovy
+++ b/buildSrc/src/main/groovy/io/spring/gradle/convention/JacocoPlugin.groovy
@@ -1,5 +1,5 @@
/*
- * Copyright 2016-2018 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* 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
diff --git a/buildSrc/src/main/groovy/io/spring/gradle/convention/JavadocApiPlugin.groovy b/buildSrc/src/main/groovy/io/spring/gradle/convention/JavadocApiPlugin.groovy
index aea52507f6..6ea63cb564 100644
--- a/buildSrc/src/main/groovy/io/spring/gradle/convention/JavadocApiPlugin.groovy
+++ b/buildSrc/src/main/groovy/io/spring/gradle/convention/JavadocApiPlugin.groovy
@@ -1,5 +1,5 @@
/*
- * Copyright 2002-2016 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* 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
diff --git a/buildSrc/src/main/groovy/io/spring/gradle/convention/RepositoryConventionPlugin.groovy b/buildSrc/src/main/groovy/io/spring/gradle/convention/RepositoryConventionPlugin.groovy
index 407163d82a..8a005f6a9f 100644
--- a/buildSrc/src/main/groovy/io/spring/gradle/convention/RepositoryConventionPlugin.groovy
+++ b/buildSrc/src/main/groovy/io/spring/gradle/convention/RepositoryConventionPlugin.groovy
@@ -1,5 +1,5 @@
/*
- * Copyright 2016-2018 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* 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
diff --git a/buildSrc/src/main/groovy/io/spring/gradle/convention/RootProjectPlugin.groovy b/buildSrc/src/main/groovy/io/spring/gradle/convention/RootProjectPlugin.groovy
index f06b15f508..a12f3b6fdc 100644
--- a/buildSrc/src/main/groovy/io/spring/gradle/convention/RootProjectPlugin.groovy
+++ b/buildSrc/src/main/groovy/io/spring/gradle/convention/RootProjectPlugin.groovy
@@ -1,5 +1,5 @@
/*
- * Copyright 2016-2019 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* 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
diff --git a/buildSrc/src/main/groovy/io/spring/gradle/convention/SortedProperties.groovy b/buildSrc/src/main/groovy/io/spring/gradle/convention/SortedProperties.groovy
index ccb4d90ab1..4461ca36fa 100644
--- a/buildSrc/src/main/groovy/io/spring/gradle/convention/SortedProperties.groovy
+++ b/buildSrc/src/main/groovy/io/spring/gradle/convention/SortedProperties.groovy
@@ -1,5 +1,5 @@
/*
- * Copyright 2002-2017 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/buildSrc/src/main/groovy/io/spring/gradle/convention/SpringModulePlugin.groovy b/buildSrc/src/main/groovy/io/spring/gradle/convention/SpringModulePlugin.groovy
index 2ba66b645b..4cc0085588 100644
--- a/buildSrc/src/main/groovy/io/spring/gradle/convention/SpringModulePlugin.groovy
+++ b/buildSrc/src/main/groovy/io/spring/gradle/convention/SpringModulePlugin.groovy
@@ -1,5 +1,5 @@
/*
- * Copyright 2016-2019 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* 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
diff --git a/buildSrc/src/main/groovy/io/spring/gradle/convention/SpringTestPlugin.groovy b/buildSrc/src/main/groovy/io/spring/gradle/convention/SpringTestPlugin.groovy
index ff18dfc5df..552ec3b712 100644
--- a/buildSrc/src/main/groovy/io/spring/gradle/convention/SpringTestPlugin.groovy
+++ b/buildSrc/src/main/groovy/io/spring/gradle/convention/SpringTestPlugin.groovy
@@ -1,5 +1,5 @@
/*
- * Copyright 2002-2016 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* 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
diff --git a/buildSrc/src/main/groovy/io/spring/gradle/convention/TestsConfigurationPlugin.groovy b/buildSrc/src/main/groovy/io/spring/gradle/convention/TestsConfigurationPlugin.groovy
index 8d2fffd4d5..4c6778b011 100644
--- a/buildSrc/src/main/groovy/io/spring/gradle/convention/TestsConfigurationPlugin.groovy
+++ b/buildSrc/src/main/groovy/io/spring/gradle/convention/TestsConfigurationPlugin.groovy
@@ -1,5 +1,5 @@
/*
- * Copyright 2002-2017 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* 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
diff --git a/buildSrc/src/main/java/org/springframework/gradle/propdeps/PropDepsEclipsePlugin.groovy b/buildSrc/src/main/java/org/springframework/gradle/propdeps/PropDepsEclipsePlugin.groovy
index bf88ca6c7d..82d402524d 100644
--- a/buildSrc/src/main/java/org/springframework/gradle/propdeps/PropDepsEclipsePlugin.groovy
+++ b/buildSrc/src/main/java/org/springframework/gradle/propdeps/PropDepsEclipsePlugin.groovy
@@ -1,5 +1,5 @@
/*
- * Copyright 2002-2021 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/buildSrc/src/main/java/org/springframework/gradle/propdeps/PropDepsIdeaPlugin.groovy b/buildSrc/src/main/java/org/springframework/gradle/propdeps/PropDepsIdeaPlugin.groovy
index 4035971a7c..75eb608d35 100644
--- a/buildSrc/src/main/java/org/springframework/gradle/propdeps/PropDepsIdeaPlugin.groovy
+++ b/buildSrc/src/main/java/org/springframework/gradle/propdeps/PropDepsIdeaPlugin.groovy
@@ -1,5 +1,5 @@
/*
- * Copyright 2002-2021 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/buildSrc/src/main/java/org/springframework/gradle/propdeps/PropDepsPlugin.groovy b/buildSrc/src/main/java/org/springframework/gradle/propdeps/PropDepsPlugin.groovy
index e0893e6a88..5d3c248612 100644
--- a/buildSrc/src/main/java/org/springframework/gradle/propdeps/PropDepsPlugin.groovy
+++ b/buildSrc/src/main/java/org/springframework/gradle/propdeps/PropDepsPlugin.groovy
@@ -1,5 +1,5 @@
/*
- * Copyright 2002-2021 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/buildSrc/src/test/resources/samples/integrationtest/withgroovy/src/integration-test/groovy/sample/TheTest.groovy b/buildSrc/src/test/resources/samples/integrationtest/withgroovy/src/integration-test/groovy/sample/TheTest.groovy
index 36f17864aa..0b61becf60 100644
--- a/buildSrc/src/test/resources/samples/integrationtest/withgroovy/src/integration-test/groovy/sample/TheTest.groovy
+++ b/buildSrc/src/test/resources/samples/integrationtest/withgroovy/src/integration-test/groovy/sample/TheTest.groovy
@@ -1,5 +1,5 @@
/*
- * Copyright 2002-2017 the original author or authors.
+ * Copyright 2006-present the original author or authors.
*
* 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
diff --git a/core/src/test/resources/ldap-namespace-config-transactional-datasource.xml b/core/src/test/resources/ldap-namespace-config-transactional-datasource.xml
index bf0aa55c5f..b92eb00042 100644
--- a/core/src/test/resources/ldap-namespace-config-transactional-datasource.xml
+++ b/core/src/test/resources/ldap-namespace-config-transactional-datasource.xml
@@ -1,6 +1,6 @@