This is an automated email from the ASF dual-hosted git repository.

asf-gitbox-commits pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cayenne.git

commit 196ef876a3dd4aac5f4aebf501f00712585abdfe
Author: Andrus Adamchik <[email protected]>
AuthorDate: Wed May 13 12:19:19 2026 -0400

    Unit tests cleanup
---
 CLAUDE.md                                                        | 1 +
 .../test/java/org/apache/cayenne/tools/CgenWithConfigTest.java   | 3 ---
 .../cayenne/cache/invalidation/CacheGroupsHandlerTest.java       | 3 ---
 .../invalidation/CacheInvalidationCacheGroupsHandlerIT.java      | 5 -----
 .../cache/invalidation/CacheInvalidationCustomHandlerIT.java     | 4 ----
 cayenne-cgen/src/test/java/org/apache/cayenne/gen/CgenCase.java  | 2 --
 .../src/test/java/org/apache/cayenne/gen/CgenCaseModule.java     | 3 ---
 .../test/java/org/apache/cayenne/gen/CgenModuleProviderTest.java | 3 ---
 .../src/test/java/org/apache/cayenne/gen/PropertyUtilsTest.java  | 3 ---
 .../test/java/org/apache/cayenne/gen/mock/CustomProperty.java    | 3 ---
 .../org/apache/cayenne/gen/mock/CustomPropertyDescriptor.java    | 3 ---
 .../org/apache/cayenne/gen/mock/TestClassGenerationAction.java   | 3 ---
 .../java/org/apache/cayenne/gen/xml/CgenSaverDelegateTest.java   | 3 ---
 .../org/apache/cayenne/crypto/Runtime_AES128_GZIP_HMAC_IT.java   | 3 ---
 .../java/org/apache/cayenne/crypto/Runtime_AES128_HMAC_IT.java   | 3 ---
 .../apache/cayenne/crypto/transformer/bytes/HmacCreatorTest.java | 3 ---
 .../cayenne/crypto/transformer/bytes/HmacDecryptorTest.java      | 3 ---
 .../cayenne/crypto/transformer/bytes/HmacEncryptorTest.java      | 3 ---
 .../cayenne/crypto/transformer/value/DurationConverterTest.java  | 3 ---
 .../cayenne/crypto/transformer/value/PeriodConverterTest.java    | 3 ---
 .../java/org/apache/cayenne/dbsync/merge/builders/Builder.java   | 2 --
 .../org/apache/cayenne/dbsync/merge/builders/DataMapBuilder.java | 4 ----
 .../apache/cayenne/dbsync/merge/builders/DbAttributeBuilder.java | 3 ---
 .../apache/cayenne/dbsync/merge/builders/DbEntityBuilder.java    | 4 ----
 .../cayenne/dbsync/merge/builders/DbRelationshipBuilder.java     | 3 ---
 .../org/apache/cayenne/dbsync/merge/builders/DefaultBuilder.java | 4 ----
 .../cayenne/dbsync/merge/builders/ObjAttributeBuilder.java       | 3 ---
 .../apache/cayenne/dbsync/merge/builders/ObjEntityBuilder.java   | 4 ----
 .../org/apache/cayenne/dbsync/merge/builders/ObjectMother.java   | 2 --
 .../org/apache/cayenne/dbsync/merge/token/TokensReverseTest.java | 3 ---
 .../cayenne/dbsync/merge/token/TokensToModelExecutionTest.java   | 3 ---
 .../cayenne/dbsync/merge/token/db/SetGeneratedFlagToDbIT.java    | 2 --
 .../dbsync/merge/token/model/SetGeneratedFlagToModelIT.java      | 3 ---
 .../apache/cayenne/dbsync/reverse/dbload/ExportedKeyTest.java    | 3 ---
 .../di/mock/MockImplementation1_ListConfigurationMock5.java      | 3 ---
 .../cayenne/di/mock/MockImplementation1_MapWithWildcards.java    | 3 ---
 .../cayenne/di/mock/MockImplementation2_ListConfiguration.java   | 3 ---
 .../java/org/apache/cayenne/di/spi/CircularModuleProvider.java   | 3 ---
 .../java/org/apache/cayenne/di/spi/CustomModuleProvider.java     | 3 ---
 .../src/test/java/org/apache/cayenne/tools/BaseTaskIT.java       | 3 ---
 .../src/test/java/org/apache/cayenne/tools/CgenTaskIT.java       | 3 ---
 .../src/test/java/org/apache/cayenne/tools/CgenTaskTest.java     | 3 ---
 .../src/test/java/org/apache/cayenne/tools/DbGenerateTaskIT.java | 3 ---
 .../src/test/java/org/apache/cayenne/tools/DbImportIT.java       | 3 ---
 .../src/test/java/org/apache/cayenne/tools/DbImportTaskTest.java | 4 ----
 .../src/test/java/org/apache/cayenne/tools/GradlePluginTest.java | 3 ---
 .../java/org/apache/cayenne/tools/model/DbImportConfigTest.java  | 3 ---
 .../java/org/apache/cayenne/tools/model/FilterContainerTest.java | 5 -----
 .../java/org/apache/cayenne/tools/model/IncludeTableTest.java    | 3 ---
 .../java/org/apache/cayenne/tools/model/PatternParamTest.java    | 3 ---
 .../src/test/java/org/apache/cayenne/tools/DerbyManager.java     | 4 ----
 .../cayenne/project/compatibility/CompatibilityTestModule.java   | 3 ---
 .../project/compatibility/CompatibilityUpgradeServiceIT.java     | 3 ---
 .../compatibility/ProjectCompatibilityModuleProviderTest.java    | 3 ---
 .../CompatibilityDataChannelDescriptorLoaderIT.java              | 3 ---
 .../configuration/CompatibilityDataMapLoaderIT.java              | 3 ---
 .../cayenne/project/upgrade/DefaultUpgradeServiceTest.java       | 3 ---
 .../org/apache/cayenne/velocity/VelocityModuleProviderTest.java  | 3 ---
 cayenne/src/test/java/org/apache/cayenne/Cay2412IT.java          | 3 ---
 .../test/java/org/apache/cayenne/DataContextConcurrencyIT.java   | 3 ---
 .../test/java/org/apache/cayenne/HybridPersistentObjectIT.java   | 3 ---
 cayenne/src/test/java/org/apache/cayenne/LazyAttributesIT.java   | 3 ---
 cayenne/src/test/java/org/apache/cayenne/access/CAY2509IT.java   | 3 ---
 cayenne/src/test/java/org/apache/cayenne/access/Cay2032IT.java   | 3 ---
 cayenne/src/test/java/org/apache/cayenne/access/Cay2641IT.java   | 3 ---
 cayenne/src/test/java/org/apache/cayenne/access/Cay2666IT.java   | 4 ----
 .../src/test/java/org/apache/cayenne/access/ObjectStoreTest.java | 3 ---
 .../cayenne/access/VerticalInheritanceMultipleAttributesIT.java  | 3 ---
 .../cayenne/access/flush/ArcValuesCreationHandlerTest.java       | 3 ---
 .../cayenne/access/flush/DefaultDataDomainFlushActionTest.java   | 3 ---
 .../apache/cayenne/access/flush/DefaultDbRowOpSorterTest.java    | 3 ---
 .../java/org/apache/cayenne/access/flush/EffectiveOpIdTest.java  | 3 ---
 .../apache/cayenne/access/flush/operation/BaseDbRowOpTest.java   | 3 ---
 .../apache/cayenne/access/flush/operation/DbRowOpMergerTest.java | 3 ---
 .../org/apache/cayenne/access/flush/operation/QualifierTest.java | 3 ---
 .../org/apache/cayenne/access/flush/operation/ValuesTest.java    | 3 ---
 .../org/apache/cayenne/access/sqlbuilder/SelectBuilderTest.java  | 3 ---
 .../org/apache/cayenne/access/sqlbuilder/UpdateBuilderTest.java  | 3 ---
 .../org/apache/cayenne/access/sqlbuilder/sqltree/NodeTest.java   | 3 ---
 .../access/translator/select/BaseColumnExtractorTest.java        | 3 ---
 .../access/translator/select/ColumnDescriptorStageTest.java      | 3 ---
 .../access/translator/select/CustomColumnSetExtractorTest.java   | 3 ---
 .../translator/select/DefaultObjectSelectTranslatorIT.java       | 3 ---
 .../access/translator/select/DescriptorColumnExtractorTest.java  | 3 ---
 .../cayenne/access/translator/select/DistinctStageTest.java      | 3 ---
 .../cayenne/access/translator/select/GroupByStageTest.java       | 3 ---
 .../access/translator/select/HavingTranslationStageTest.java     | 3 ---
 .../cayenne/access/translator/select/LimitOffsetStageTest.java   | 3 ---
 .../access/translator/select/MockQueryMetadataBuilder.java       | 3 ---
 .../access/translator/select/MockQueryWrapperBuilder.java        | 3 ---
 .../cayenne/access/translator/select/ObjPathProcessorIT.java     | 3 ---
 .../cayenne/access/translator/select/OrderingStageTest.java      | 3 ---
 .../access/translator/select/QualifierTranslationStageTest.java  | 3 ---
 .../access/translator/select/QualifierTranslatorTest.java        | 3 ---
 .../access/translator/select/VerticalInheritanceJoinOrderIT.java | 3 ---
 .../cayenne/access/types/DefaultValueObjectTypeRegistryTest.java | 3 ---
 .../org/apache/cayenne/configuration/xml/BaseHandlerTest.java    | 3 ---
 .../apache/cayenne/configuration/xml/DbEntityHandlerTest.java    | 3 ---
 .../cayenne/configuration/xml/DbKeyGeneratorHandlerTest.java     | 4 ----
 .../cayenne/configuration/xml/DbRelationshipHandlerTest.java     | 3 ---
 .../apache/cayenne/configuration/xml/ObjEntityHandlerTest.java   | 3 ---
 .../cayenne/configuration/xml/ObjRelationshipHandlerTest.java    | 4 ----
 .../configuration/xml/PrefetchTypeForSelectQueryHandlerTest.java | 3 ---
 .../configuration/xml/PrefetchTypeForSqlTemplateHandlerTest.java | 3 ---
 .../cayenne/configuration/xml/VersionAwareHandlerTest.java       | 3 ---
 .../org/apache/cayenne/datafactory/CombinedValueProvider.java    | 3 ---
 .../test/java/org/apache/cayenne/datafactory/DataFactory.java    | 3 ---
 .../org/apache/cayenne/datafactory/DictionaryValueProvider.java  | 3 ---
 .../test/java/org/apache/cayenne/datafactory/ValueProvider.java  | 4 ----
 .../org/apache/cayenne/exp/FunctionExpressionFactoryTest.java    | 9 ---------
 .../src/test/java/org/apache/cayenne/exp/parser/ASTAbsTest.java  | 3 ---
 .../java/org/apache/cayenne/exp/parser/ASTAggregateTest.java     | 7 -------
 .../test/java/org/apache/cayenne/exp/parser/ASTConcatTest.java   | 3 ---
 .../java/org/apache/cayenne/exp/parser/ASTCurrentDateTest.java   | 3 ---
 .../java/org/apache/cayenne/exp/parser/ASTCurrentTimeTest.java   | 3 ---
 .../org/apache/cayenne/exp/parser/ASTCurrentTimestampTest.java   | 3 ---
 .../org/apache/cayenne/exp/parser/ASTCustomFunctionTest.java     | 3 ---
 .../org/apache/cayenne/exp/parser/ASTCustomOperatorTest.java     | 4 ----
 .../test/java/org/apache/cayenne/exp/parser/ASTDbIdPathTest.java | 3 ---
 .../test/java/org/apache/cayenne/exp/parser/ASTExtractIT.java    | 3 ---
 .../test/java/org/apache/cayenne/exp/parser/ASTExtractTest.java  | 3 ---
 .../org/apache/cayenne/exp/parser/ASTFunctionCallDateIT.java     | 3 ---
 .../org/apache/cayenne/exp/parser/ASTFunctionCallMathIT.java     | 3 ---
 .../org/apache/cayenne/exp/parser/ASTFunctionCallStringIT.java   | 3 ---
 .../java/org/apache/cayenne/exp/parser/ASTFunctionCallTest.java  | 3 ---
 .../test/java/org/apache/cayenne/exp/parser/ASTLengthTest.java   | 3 ---
 .../test/java/org/apache/cayenne/exp/parser/ASTLocateTest.java   | 3 ---
 .../test/java/org/apache/cayenne/exp/parser/ASTLowerTest.java    | 3 ---
 .../src/test/java/org/apache/cayenne/exp/parser/ASTModTest.java  | 3 ---
 .../test/java/org/apache/cayenne/exp/parser/ASTScalarTest.java   | 3 ---
 .../src/test/java/org/apache/cayenne/exp/parser/ASTSqrtTest.java | 3 ---
 .../java/org/apache/cayenne/exp/parser/ASTSubstringTest.java     | 3 ---
 .../src/test/java/org/apache/cayenne/exp/parser/ASTTrimTest.java | 3 ---
 .../test/java/org/apache/cayenne/exp/parser/ASTUpperTest.java    | 3 ---
 .../cayenne/exp/parser/ExpressionCollectionEvaluationIT.java     | 3 ---
 .../org/apache/cayenne/exp/parser/ExpressionEvaluationIT.java    | 2 --
 .../java/org/apache/cayenne/exp/property/BasePropertyTest.java   | 4 ----
 .../java/org/apache/cayenne/exp/property/DatePropertyTest.java   | 3 ---
 .../java/org/apache/cayenne/exp/property/EntityPropertyTest.java | 3 ---
 .../test/java/org/apache/cayenne/exp/property/IdPropertyIT.java  | 3 ---
 .../java/org/apache/cayenne/exp/property/IdPropertyTest.java     | 4 ----
 .../java/org/apache/cayenne/exp/property/ListPropertyTest.java   | 4 ----
 .../java/org/apache/cayenne/exp/property/MapPropertyTest.java    | 3 ---
 .../org/apache/cayenne/exp/property/NumericPropertyTest.java     | 3 ---
 .../test/java/org/apache/cayenne/exp/property/PathAliasesIT.java | 6 ------
 .../org/apache/cayenne/exp/property/PropertyFactoryTest.java     | 3 ---
 .../java/org/apache/cayenne/exp/property/SetPropertyTest.java    | 3 ---
 .../java/org/apache/cayenne/exp/property/StringPropertyTest.java | 3 ---
 cayenne/src/test/java/org/apache/cayenne/map/AnnotationIT.java   | 3 ---
 .../src/test/java/org/apache/cayenne/query/ColumnSelectIT.java   | 7 -------
 .../src/test/java/org/apache/cayenne/query/ColumnSelectTest.java | 5 -----
 .../java/org/apache/cayenne/query/ObjectSelect_AggregateIT.java  | 3 ---
 .../apache/cayenne/query/ObjectSelect_PrimitiveColumnsIT.java    | 3 ---
 .../java/org/apache/cayenne/query/ObjectSelect_SubqueryIT.java   | 3 ---
 .../java/org/apache/cayenne/query/QueryWithCompoundJoinIT.java   | 1 -
 .../org/apache/cayenne/query/QueryWithInheritancePrefetchIT.java | 2 --
 .../apache/cayenne/query/SelectQueryMetadataCacheKeyTest.java    | 2 --
 .../apache/cayenne/reflect/LifecycleCallbackRegistryTest.java    | 3 ---
 .../src/test/java/org/apache/cayenne/reflect/PojoMapperTest.java | 3 ---
 .../apache/cayenne/template/CayenneSQLTemplateProcessorTest.java | 3 ---
 .../java/org/apache/cayenne/template/TemplateParserPoolTest.java | 3 ---
 .../apache/cayenne/template/parser/SQLTemplateParserTest.java    | 4 ----
 .../org/apache/cayenne/testdo/inheritance_with_enum/Type.java    | 3 ---
 .../org/apache/cayenne/tx/TransactionCustomConnectionIT.java     | 1 -
 .../test/java/org/apache/cayenne/tx/TransactionIsolationIT.java  | 3 ---
 .../org/apache/cayenne/tx/TransactionPropagationRollbackIT.java  | 1 -
 .../java/org/apache/cayenne/unit/SQLServerUnitDbAdapter.java     | 3 ---
 cayenne/src/test/java/org/apache/cayenne/unit/UnitDbAdapter.java | 1 -
 .../unit/di/runtime/CayenneRuntimeProviderContextsSync.java      | 3 ---
 .../apache/cayenne/unit/di/runtime/RuntimeCaseExtraModules.java  | 3 ---
 cayenne/src/test/java/org/apache/cayenne/util/ArrayUtilTest.java | 3 ---
 .../test/java/org/apache/cayenne/util/SingleEntryMapTest.java    | 3 ---
 .../src/test/java/org/apache/cayenne/util/WeakValueMapTest.java  | 2 --
 .../test/java/org/apache/cayenne/value/json/JsonReaderTest.java  | 3 ---
 .../java/org/apache/cayenne/value/json/JsonTokenizerTest.java    | 4 ----
 .../test/java/org/apache/cayenne/value/json/JsonUtilsTest.java   | 3 ---
 176 files changed, 1 insertion(+), 549 deletions(-)

diff --git a/CLAUDE.md b/CLAUDE.md
index 4508fb411..49f34d515 100644
--- a/CLAUDE.md
+++ b/CLAUDE.md
@@ -61,6 +61,7 @@ mvn test -Dtest=SomeTest -DcayenneTestConnection=h2
 
 Test naming: `*Test.java` = unit tests (Surefire), `*IT.java` = integration 
tests (Failsafe).
 All new tests must use JUnit 5. Test classes and methods must be `public`. 
Method names must not use the `test` prefix (e.g. `someFeature()` not 
`testSomeFeature()`).
+Do not add `@since` tags to test classes — version tags are only meaningful on 
public API.
 
 ## `pom.xml` Style
 
diff --git 
a/cayenne-ant/src/test/java/org/apache/cayenne/tools/CgenWithConfigTest.java 
b/cayenne-ant/src/test/java/org/apache/cayenne/tools/CgenWithConfigTest.java
index 72e441bb6..6206d3ffc 100644
--- a/cayenne-ant/src/test/java/org/apache/cayenne/tools/CgenWithConfigTest.java
+++ b/cayenne-ant/src/test/java/org/apache/cayenne/tools/CgenWithConfigTest.java
@@ -32,9 +32,6 @@ import java.nio.file.Path;
 import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
-/**
- * @since 4.1
- */
 public class CgenWithConfigTest {
 
     @TempDir
diff --git 
a/cayenne-cache-invalidation/src/test/java/org/apache/cayenne/cache/invalidation/CacheGroupsHandlerTest.java
 
b/cayenne-cache-invalidation/src/test/java/org/apache/cayenne/cache/invalidation/CacheGroupsHandlerTest.java
index 5d211f986..9e3bc8b3e 100644
--- 
a/cayenne-cache-invalidation/src/test/java/org/apache/cayenne/cache/invalidation/CacheGroupsHandlerTest.java
+++ 
b/cayenne-cache-invalidation/src/test/java/org/apache/cayenne/cache/invalidation/CacheGroupsHandlerTest.java
@@ -30,9 +30,6 @@ import org.junit.jupiter.api.Test;
 
 import static org.junit.jupiter.api.Assertions.*;
 
-/**
- * @since 4.0
- */
 public class CacheGroupsHandlerTest {
 
     @Test
diff --git 
a/cayenne-cache-invalidation/src/test/java/org/apache/cayenne/cache/invalidation/CacheInvalidationCacheGroupsHandlerIT.java
 
b/cayenne-cache-invalidation/src/test/java/org/apache/cayenne/cache/invalidation/CacheInvalidationCacheGroupsHandlerIT.java
index 3071c5bb8..1a282ff60 100644
--- 
a/cayenne-cache-invalidation/src/test/java/org/apache/cayenne/cache/invalidation/CacheInvalidationCacheGroupsHandlerIT.java
+++ 
b/cayenne-cache-invalidation/src/test/java/org/apache/cayenne/cache/invalidation/CacheInvalidationCacheGroupsHandlerIT.java
@@ -33,9 +33,6 @@ import java.util.concurrent.atomic.AtomicInteger;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
-/**
- * @since 4.0
- */
 public class CacheInvalidationCacheGroupsHandlerIT extends 
CacheInvalidationCase {
 
     private AtomicInteger removeGroupUntypedCounter;
@@ -86,7 +83,6 @@ public class CacheInvalidationCacheGroupsHandlerIT extends 
CacheInvalidationCase
         assertEquals(0, g1.selectCount(context));
         assertEquals(0, g2.selectCount(context));
 
-
         context.newObject(E1.class);
         context.commitChanges();
 
@@ -123,7 +119,6 @@ public class CacheInvalidationCacheGroupsHandlerIT extends 
CacheInvalidationCase
         assertEquals(0, g3.selectCount(context));
         assertEquals(0, g5.selectCount(context));
 
-
         context.newObject(E2.class);
         context.commitChanges();
 
diff --git 
a/cayenne-cache-invalidation/src/test/java/org/apache/cayenne/cache/invalidation/CacheInvalidationCustomHandlerIT.java
 
b/cayenne-cache-invalidation/src/test/java/org/apache/cayenne/cache/invalidation/CacheInvalidationCustomHandlerIT.java
index 22601e8ec..1fae6200e 100644
--- 
a/cayenne-cache-invalidation/src/test/java/org/apache/cayenne/cache/invalidation/CacheInvalidationCustomHandlerIT.java
+++ 
b/cayenne-cache-invalidation/src/test/java/org/apache/cayenne/cache/invalidation/CacheInvalidationCustomHandlerIT.java
@@ -31,9 +31,6 @@ import java.util.function.Function;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
-/**
- * @since 4.0
- */
 public class CacheInvalidationCustomHandlerIT extends CacheInvalidationCase {
 
     @Override
@@ -61,7 +58,6 @@ public class CacheInvalidationCustomHandlerIT extends 
CacheInvalidationCase {
         assertEquals(0, g1.selectCount(context));
         assertEquals(0, g2.selectCount(context));
 
-
         E1 e1 = context.newObject(E1.class);
         context.commitChanges();
 
diff --git a/cayenne-cgen/src/test/java/org/apache/cayenne/gen/CgenCase.java 
b/cayenne-cgen/src/test/java/org/apache/cayenne/gen/CgenCase.java
index 0e780e378..1a40c2747 100644
--- a/cayenne-cgen/src/test/java/org/apache/cayenne/gen/CgenCase.java
+++ b/cayenne-cgen/src/test/java/org/apache/cayenne/gen/CgenCase.java
@@ -29,8 +29,6 @@ import org.slf4j.LoggerFactory;
 /**
  * Shared DI injector for cgen tests. No DB schema or lifecycle; subclasses
  * pull dependencies via {@link #getUnitTestInjector()}.
- *
- * @since 4.2
  */
 public class CgenCase {
 
diff --git 
a/cayenne-cgen/src/test/java/org/apache/cayenne/gen/CgenCaseModule.java 
b/cayenne-cgen/src/test/java/org/apache/cayenne/gen/CgenCaseModule.java
index d7d043793..efec37782 100644
--- a/cayenne-cgen/src/test/java/org/apache/cayenne/gen/CgenCaseModule.java
+++ b/cayenne-cgen/src/test/java/org/apache/cayenne/gen/CgenCaseModule.java
@@ -26,9 +26,6 @@ import org.apache.cayenne.gen.mock.CustomPropertyDescriptor;
 import org.apache.cayenne.unit.di.runtime.RuntimeCaseExtraModules;
 import org.apache.cayenne.unit.di.runtime.RuntimeCaseProperties;
 
-/**
- * @since 4.2
- */
 public class CgenCaseModule implements Module {
 
     protected DefaultScope testScope;
diff --git 
a/cayenne-cgen/src/test/java/org/apache/cayenne/gen/CgenModuleProviderTest.java 
b/cayenne-cgen/src/test/java/org/apache/cayenne/gen/CgenModuleProviderTest.java
index 27d415412..ad81c14f9 100644
--- 
a/cayenne-cgen/src/test/java/org/apache/cayenne/gen/CgenModuleProviderTest.java
+++ 
b/cayenne-cgen/src/test/java/org/apache/cayenne/gen/CgenModuleProviderTest.java
@@ -23,9 +23,6 @@ import org.apache.cayenne.tools.CayenneToolsModuleProvider;
 import org.apache.cayenne.unit.util.ModuleProviderChecker;
 import org.junit.jupiter.api.Test;
 
-/**
- * @since 4.2
- */
 public class CgenModuleProviderTest {
     @Test
     public void providerPresent() {
diff --git 
a/cayenne-cgen/src/test/java/org/apache/cayenne/gen/PropertyUtilsTest.java 
b/cayenne-cgen/src/test/java/org/apache/cayenne/gen/PropertyUtilsTest.java
index 269d6f0fd..993c251f5 100644
--- a/cayenne-cgen/src/test/java/org/apache/cayenne/gen/PropertyUtilsTest.java
+++ b/cayenne-cgen/src/test/java/org/apache/cayenne/gen/PropertyUtilsTest.java
@@ -53,9 +53,6 @@ import static org.mockito.ArgumentMatchers.anyString;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
-/**
- * @since 4.2
- */
 public class PropertyUtilsTest {
 
     PropertyUtils propertyUtils;
diff --git 
a/cayenne-cgen/src/test/java/org/apache/cayenne/gen/mock/CustomProperty.java 
b/cayenne-cgen/src/test/java/org/apache/cayenne/gen/mock/CustomProperty.java
index 7f83a96e9..55a9fb0e2 100644
--- a/cayenne-cgen/src/test/java/org/apache/cayenne/gen/mock/CustomProperty.java
+++ b/cayenne-cgen/src/test/java/org/apache/cayenne/gen/mock/CustomProperty.java
@@ -23,9 +23,6 @@ import org.apache.cayenne.exp.Expression;
 import org.apache.cayenne.exp.path.CayennePath;
 import org.apache.cayenne.exp.property.BaseProperty;
 
-/**
- * @since 4.2
- */
 public class CustomProperty extends BaseProperty<TimestampType> {
 
     public CustomProperty(String name, Class<? super TimestampType> type) {
diff --git 
a/cayenne-cgen/src/test/java/org/apache/cayenne/gen/mock/CustomPropertyDescriptor.java
 
b/cayenne-cgen/src/test/java/org/apache/cayenne/gen/mock/CustomPropertyDescriptor.java
index 737905ac8..179c53af3 100644
--- 
a/cayenne-cgen/src/test/java/org/apache/cayenne/gen/mock/CustomPropertyDescriptor.java
+++ 
b/cayenne-cgen/src/test/java/org/apache/cayenne/gen/mock/CustomPropertyDescriptor.java
@@ -24,9 +24,6 @@ import org.apache.cayenne.access.types.TimestampType;
 import org.apache.cayenne.gen.PropertyDescriptor;
 import org.apache.cayenne.gen.property.PropertyDescriptorCreator;
 
-/**
- * @since 4.2
- */
 public class CustomPropertyDescriptor implements PropertyDescriptorCreator {
 
     @Override
diff --git 
a/cayenne-cgen/src/test/java/org/apache/cayenne/gen/mock/TestClassGenerationAction.java
 
b/cayenne-cgen/src/test/java/org/apache/cayenne/gen/mock/TestClassGenerationAction.java
index b58b5183a..6907e7594 100644
--- 
a/cayenne-cgen/src/test/java/org/apache/cayenne/gen/mock/TestClassGenerationAction.java
+++ 
b/cayenne-cgen/src/test/java/org/apache/cayenne/gen/mock/TestClassGenerationAction.java
@@ -25,9 +25,6 @@ import java.util.Collection;
 import org.apache.cayenne.gen.ClassGenerationAction;
 import org.apache.cayenne.gen.TemplateType;
 
-/**
- * @since 4.2
- */
 public class TestClassGenerationAction extends ClassGenerationAction {
 
     private Collection<StringWriter> writers;
diff --git 
a/cayenne-cgen/src/test/java/org/apache/cayenne/gen/xml/CgenSaverDelegateTest.java
 
b/cayenne-cgen/src/test/java/org/apache/cayenne/gen/xml/CgenSaverDelegateTest.java
index 90c49496b..cc7f8a831 100644
--- 
a/cayenne-cgen/src/test/java/org/apache/cayenne/gen/xml/CgenSaverDelegateTest.java
+++ 
b/cayenne-cgen/src/test/java/org/apache/cayenne/gen/xml/CgenSaverDelegateTest.java
@@ -27,9 +27,6 @@ import org.junit.jupiter.api.Test;
 
 import static org.junit.jupiter.api.Assertions.*;
 
-/**
- * @since 4.2
- */
 public class CgenSaverDelegateTest {
 
     @Test
diff --git 
a/cayenne-crypto/src/test/java/org/apache/cayenne/crypto/Runtime_AES128_GZIP_HMAC_IT.java
 
b/cayenne-crypto/src/test/java/org/apache/cayenne/crypto/Runtime_AES128_GZIP_HMAC_IT.java
index b594e0b8b..7fbb97011 100644
--- 
a/cayenne-crypto/src/test/java/org/apache/cayenne/crypto/Runtime_AES128_GZIP_HMAC_IT.java
+++ 
b/cayenne-crypto/src/test/java/org/apache/cayenne/crypto/Runtime_AES128_GZIP_HMAC_IT.java
@@ -21,9 +21,6 @@ package org.apache.cayenne.crypto;
 
 import org.junit.jupiter.api.BeforeEach;
 
-/**
- * @since 4.0
- */
 public class Runtime_AES128_GZIP_HMAC_IT extends Runtime_AES128_GZIP_IT {
 
     @BeforeEach
diff --git 
a/cayenne-crypto/src/test/java/org/apache/cayenne/crypto/Runtime_AES128_HMAC_IT.java
 
b/cayenne-crypto/src/test/java/org/apache/cayenne/crypto/Runtime_AES128_HMAC_IT.java
index bf6117b31..cc7d99b64 100644
--- 
a/cayenne-crypto/src/test/java/org/apache/cayenne/crypto/Runtime_AES128_HMAC_IT.java
+++ 
b/cayenne-crypto/src/test/java/org/apache/cayenne/crypto/Runtime_AES128_HMAC_IT.java
@@ -21,9 +21,6 @@ package org.apache.cayenne.crypto;
 
 import org.junit.jupiter.api.BeforeEach;
 
-/**
- * @since 4.0
- */
 public class Runtime_AES128_HMAC_IT extends Runtime_AES128_IT {
 
     @BeforeEach
diff --git 
a/cayenne-crypto/src/test/java/org/apache/cayenne/crypto/transformer/bytes/HmacCreatorTest.java
 
b/cayenne-crypto/src/test/java/org/apache/cayenne/crypto/transformer/bytes/HmacCreatorTest.java
index c5c0ee5ad..dc3d179de 100644
--- 
a/cayenne-crypto/src/test/java/org/apache/cayenne/crypto/transformer/bytes/HmacCreatorTest.java
+++ 
b/cayenne-crypto/src/test/java/org/apache/cayenne/crypto/transformer/bytes/HmacCreatorTest.java
@@ -35,9 +35,6 @@ import static org.mockito.Mockito.doAnswer;
 import static org.mockito.Mockito.doReturn;
 import static org.mockito.Mockito.mock;
 
-/**
- * @since 4.0
- */
 public class HmacCreatorTest {
 
     /**
diff --git 
a/cayenne-crypto/src/test/java/org/apache/cayenne/crypto/transformer/bytes/HmacDecryptorTest.java
 
b/cayenne-crypto/src/test/java/org/apache/cayenne/crypto/transformer/bytes/HmacDecryptorTest.java
index 7e9bccaa0..b38f60c33 100644
--- 
a/cayenne-crypto/src/test/java/org/apache/cayenne/crypto/transformer/bytes/HmacDecryptorTest.java
+++ 
b/cayenne-crypto/src/test/java/org/apache/cayenne/crypto/transformer/bytes/HmacDecryptorTest.java
@@ -30,9 +30,6 @@ import static org.mockito.ArgumentMatchers.anyInt;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
-/**
- * @since 4.0
- */
 public class HmacDecryptorTest {
 
     @Test
diff --git 
a/cayenne-crypto/src/test/java/org/apache/cayenne/crypto/transformer/bytes/HmacEncryptorTest.java
 
b/cayenne-crypto/src/test/java/org/apache/cayenne/crypto/transformer/bytes/HmacEncryptorTest.java
index 8824a96f3..1e414d143 100644
--- 
a/cayenne-crypto/src/test/java/org/apache/cayenne/crypto/transformer/bytes/HmacEncryptorTest.java
+++ 
b/cayenne-crypto/src/test/java/org/apache/cayenne/crypto/transformer/bytes/HmacEncryptorTest.java
@@ -28,9 +28,6 @@ import static org.mockito.ArgumentMatchers.anyInt;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
-/**
- * @since 4.0
- */
 public class HmacEncryptorTest {
 
     @Test
diff --git 
a/cayenne-crypto/src/test/java/org/apache/cayenne/crypto/transformer/value/DurationConverterTest.java
 
b/cayenne-crypto/src/test/java/org/apache/cayenne/crypto/transformer/value/DurationConverterTest.java
index 44f5bf8dd..1b4ed942c 100644
--- 
a/cayenne-crypto/src/test/java/org/apache/cayenne/crypto/transformer/value/DurationConverterTest.java
+++ 
b/cayenne-crypto/src/test/java/org/apache/cayenne/crypto/transformer/value/DurationConverterTest.java
@@ -26,9 +26,6 @@ import org.junit.jupiter.api.Test;
 import static org.junit.jupiter.api.Assertions.assertArrayEquals;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
-/**
- * @since 4.2
- */
 public class DurationConverterTest {
 
     @Test
diff --git 
a/cayenne-crypto/src/test/java/org/apache/cayenne/crypto/transformer/value/PeriodConverterTest.java
 
b/cayenne-crypto/src/test/java/org/apache/cayenne/crypto/transformer/value/PeriodConverterTest.java
index 0d2f91c51..d0a42a41e 100644
--- 
a/cayenne-crypto/src/test/java/org/apache/cayenne/crypto/transformer/value/PeriodConverterTest.java
+++ 
b/cayenne-crypto/src/test/java/org/apache/cayenne/crypto/transformer/value/PeriodConverterTest.java
@@ -26,9 +26,6 @@ import org.junit.jupiter.api.Test;
 import static org.junit.jupiter.api.Assertions.assertArrayEquals;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
-/**
- * @since 4.2
- */
 public class PeriodConverterTest {
 
     @Test
diff --git 
a/cayenne-dbsync/src/test/java/org/apache/cayenne/dbsync/merge/builders/Builder.java
 
b/cayenne-dbsync/src/test/java/org/apache/cayenne/dbsync/merge/builders/Builder.java
index 99a5419c0..8560e3a19 100644
--- 
a/cayenne-dbsync/src/test/java/org/apache/cayenne/dbsync/merge/builders/Builder.java
+++ 
b/cayenne-dbsync/src/test/java/org/apache/cayenne/dbsync/merge/builders/Builder.java
@@ -20,8 +20,6 @@ package org.apache.cayenne.dbsync.merge.builders;
 
 /**
  * Base interface for all domain builders
- *
- * @since 4.0.
  */
 public interface Builder<T> {
 
diff --git 
a/cayenne-dbsync/src/test/java/org/apache/cayenne/dbsync/merge/builders/DataMapBuilder.java
 
b/cayenne-dbsync/src/test/java/org/apache/cayenne/dbsync/merge/builders/DataMapBuilder.java
index 5a7d518aa..cdd6a173c 100644
--- 
a/cayenne-dbsync/src/test/java/org/apache/cayenne/dbsync/merge/builders/DataMapBuilder.java
+++ 
b/cayenne-dbsync/src/test/java/org/apache/cayenne/dbsync/merge/builders/DataMapBuilder.java
@@ -26,9 +26,6 @@ import org.apache.cayenne.map.EntityResolver;
 import org.apache.cayenne.map.ObjEntity;
 import org.apache.cayenne.map.Procedure;
 
-/**
- * @since 4.0.
- */
 public class DataMapBuilder extends DefaultBuilder<DataMap> {
 
     public DataMapBuilder() {
@@ -139,7 +136,6 @@ public class DataMapBuilder extends DefaultBuilder<DataMap> 
{
             withDbEntities(dataFactory.getNumberUpTo(10));
         }
 
-
         return build();
     }
 }
diff --git 
a/cayenne-dbsync/src/test/java/org/apache/cayenne/dbsync/merge/builders/DbAttributeBuilder.java
 
b/cayenne-dbsync/src/test/java/org/apache/cayenne/dbsync/merge/builders/DbAttributeBuilder.java
index 77e403b8a..1f7b2ba0c 100644
--- 
a/cayenne-dbsync/src/test/java/org/apache/cayenne/dbsync/merge/builders/DbAttributeBuilder.java
+++ 
b/cayenne-dbsync/src/test/java/org/apache/cayenne/dbsync/merge/builders/DbAttributeBuilder.java
@@ -24,9 +24,6 @@ import org.apache.cayenne.dba.TypesMapping;
 import org.apache.cayenne.map.DbAttribute;
 import org.apache.cayenne.util.Util;
 
-/**
- * @since 4.0.
- */
 public class DbAttributeBuilder extends DefaultBuilder<DbAttribute> {
 
     private static final ValueProvider<String> TYPES_RANDOM = new 
DictionaryValueProvider<String>(ValueProvider.RANDOM) {
diff --git 
a/cayenne-dbsync/src/test/java/org/apache/cayenne/dbsync/merge/builders/DbEntityBuilder.java
 
b/cayenne-dbsync/src/test/java/org/apache/cayenne/dbsync/merge/builders/DbEntityBuilder.java
index 864578e67..e250588a5 100644
--- 
a/cayenne-dbsync/src/test/java/org/apache/cayenne/dbsync/merge/builders/DbEntityBuilder.java
+++ 
b/cayenne-dbsync/src/test/java/org/apache/cayenne/dbsync/merge/builders/DbEntityBuilder.java
@@ -22,9 +22,6 @@ import org.apache.cayenne.map.DbAttribute;
 import org.apache.cayenne.map.DbEntity;
 import org.apache.cayenne.util.Util;
 
-/**
- * @since 4.0.
- */
 public class DbEntityBuilder extends DefaultBuilder<DbEntity> {
 
     public DbEntityBuilder() {
@@ -69,7 +66,6 @@ public class DbEntityBuilder extends DefaultBuilder<DbEntity> 
{
         return this;
     }
 
-
     @Override
     public DbEntity build() {
         if (obj.getName() == null) {
diff --git 
a/cayenne-dbsync/src/test/java/org/apache/cayenne/dbsync/merge/builders/DbRelationshipBuilder.java
 
b/cayenne-dbsync/src/test/java/org/apache/cayenne/dbsync/merge/builders/DbRelationshipBuilder.java
index d9d8553e2..5b930fe90 100644
--- 
a/cayenne-dbsync/src/test/java/org/apache/cayenne/dbsync/merge/builders/DbRelationshipBuilder.java
+++ 
b/cayenne-dbsync/src/test/java/org/apache/cayenne/dbsync/merge/builders/DbRelationshipBuilder.java
@@ -22,9 +22,6 @@ import org.apache.cayenne.map.DbEntity;
 import org.apache.cayenne.map.DbJoin;
 import org.apache.cayenne.map.DbRelationship;
 
-/**
- * @since 4.0.
- */
 public class DbRelationshipBuilder extends DefaultBuilder<DbRelationship> {
 
     private String[] from;
diff --git 
a/cayenne-dbsync/src/test/java/org/apache/cayenne/dbsync/merge/builders/DefaultBuilder.java
 
b/cayenne-dbsync/src/test/java/org/apache/cayenne/dbsync/merge/builders/DefaultBuilder.java
index 719ad9795..6366ce792 100644
--- 
a/cayenne-dbsync/src/test/java/org/apache/cayenne/dbsync/merge/builders/DefaultBuilder.java
+++ 
b/cayenne-dbsync/src/test/java/org/apache/cayenne/dbsync/merge/builders/DefaultBuilder.java
@@ -21,15 +21,11 @@ package org.apache.cayenne.dbsync.merge.builders;
 import org.apache.cayenne.datafactory.DataFactory;
 import org.apache.cayenne.util.Util;
 
-/**
- * @since 4.0.
- */
 public abstract class DefaultBuilder<T> implements Builder<T> {
 
     protected final DataFactory dataFactory;
     protected final T obj;
 
-
     protected DefaultBuilder(T obj) {
         this.dataFactory = new DataFactory();
         this.obj = obj;
diff --git 
a/cayenne-dbsync/src/test/java/org/apache/cayenne/dbsync/merge/builders/ObjAttributeBuilder.java
 
b/cayenne-dbsync/src/test/java/org/apache/cayenne/dbsync/merge/builders/ObjAttributeBuilder.java
index 4804b862e..abd8e6b72 100644
--- 
a/cayenne-dbsync/src/test/java/org/apache/cayenne/dbsync/merge/builders/ObjAttributeBuilder.java
+++ 
b/cayenne-dbsync/src/test/java/org/apache/cayenne/dbsync/merge/builders/ObjAttributeBuilder.java
@@ -20,9 +20,6 @@ package org.apache.cayenne.dbsync.merge.builders;
 
 import org.apache.cayenne.map.ObjAttribute;
 
-/**
- * @since 4.0.
- */
 public class ObjAttributeBuilder extends DefaultBuilder<ObjAttribute> {
 
     public ObjAttributeBuilder() {
diff --git 
a/cayenne-dbsync/src/test/java/org/apache/cayenne/dbsync/merge/builders/ObjEntityBuilder.java
 
b/cayenne-dbsync/src/test/java/org/apache/cayenne/dbsync/merge/builders/ObjEntityBuilder.java
index 52b90811d..08063d48f 100644
--- 
a/cayenne-dbsync/src/test/java/org/apache/cayenne/dbsync/merge/builders/ObjEntityBuilder.java
+++ 
b/cayenne-dbsync/src/test/java/org/apache/cayenne/dbsync/merge/builders/ObjEntityBuilder.java
@@ -22,9 +22,6 @@ import org.apache.cayenne.map.ObjAttribute;
 import org.apache.cayenne.map.ObjEntity;
 import org.apache.cayenne.util.Util;
 
-/**
- * @since 4.0.
- */
 public class ObjEntityBuilder extends DefaultBuilder<ObjEntity> {
 
     public ObjEntityBuilder() {
@@ -65,7 +62,6 @@ public class ObjEntityBuilder extends 
DefaultBuilder<ObjEntity> {
         return this;
     }
 
-
     @Override
     public ObjEntity build() {
         if (obj.getName() == null) {
diff --git 
a/cayenne-dbsync/src/test/java/org/apache/cayenne/dbsync/merge/builders/ObjectMother.java
 
b/cayenne-dbsync/src/test/java/org/apache/cayenne/dbsync/merge/builders/ObjectMother.java
index 51a1af49a..f01f8dad7 100644
--- 
a/cayenne-dbsync/src/test/java/org/apache/cayenne/dbsync/merge/builders/ObjectMother.java
+++ 
b/cayenne-dbsync/src/test/java/org/apache/cayenne/dbsync/merge/builders/ObjectMother.java
@@ -23,8 +23,6 @@ import org.apache.cayenne.map.DataMap;
 /**
  * Factory for test data see pattern definition:
  * http://martinfowler.com/bliki/ObjectMother.html
- *
- * @since 4.0.
  */
 public class ObjectMother {
 
diff --git 
a/cayenne-dbsync/src/test/java/org/apache/cayenne/dbsync/merge/token/TokensReverseTest.java
 
b/cayenne-dbsync/src/test/java/org/apache/cayenne/dbsync/merge/token/TokensReverseTest.java
index 572c81f2a..5ecb47591 100644
--- 
a/cayenne-dbsync/src/test/java/org/apache/cayenne/dbsync/merge/token/TokensReverseTest.java
+++ 
b/cayenne-dbsync/src/test/java/org/apache/cayenne/dbsync/merge/token/TokensReverseTest.java
@@ -34,9 +34,6 @@ import static 
org.apache.cayenne.dbsync.merge.builders.ObjectMother.dbAttr;
 import static org.apache.cayenne.dbsync.merge.builders.ObjectMother.dbEntity;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
-/**
- * @since 4.0.
- */
 public class TokensReverseTest {
 
     @Test
diff --git 
a/cayenne-dbsync/src/test/java/org/apache/cayenne/dbsync/merge/token/TokensToModelExecutionTest.java
 
b/cayenne-dbsync/src/test/java/org/apache/cayenne/dbsync/merge/token/TokensToModelExecutionTest.java
index 4bb44835d..ace4367ea 100644
--- 
a/cayenne-dbsync/src/test/java/org/apache/cayenne/dbsync/merge/token/TokensToModelExecutionTest.java
+++ 
b/cayenne-dbsync/src/test/java/org/apache/cayenne/dbsync/merge/token/TokensToModelExecutionTest.java
@@ -33,9 +33,6 @@ import static 
org.apache.cayenne.dbsync.merge.builders.ObjectMother.dbEntity;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
-/**
- * @since 4.0.
- */
 public class TokensToModelExecutionTest {
 
     @Test
diff --git 
a/cayenne-dbsync/src/test/java/org/apache/cayenne/dbsync/merge/token/db/SetGeneratedFlagToDbIT.java
 
b/cayenne-dbsync/src/test/java/org/apache/cayenne/dbsync/merge/token/db/SetGeneratedFlagToDbIT.java
index cc2c645d8..5d50cf0e4 100644
--- 
a/cayenne-dbsync/src/test/java/org/apache/cayenne/dbsync/merge/token/db/SetGeneratedFlagToDbIT.java
+++ 
b/cayenne-dbsync/src/test/java/org/apache/cayenne/dbsync/merge/token/db/SetGeneratedFlagToDbIT.java
@@ -57,8 +57,6 @@ import static org.junit.jupiter.api.Assertions.fail;
  * @see UnitDbAdapter#supportsGeneratedKeys()
  * @see UnitDbAdapter#supportsGeneratedKeysAdd()
  * @see UnitDbAdapter#supportsGeneratedKeysDrop()
- *
- * @since 4.0
  */
 public class SetGeneratedFlagToDbIT extends MergeCase {
 
diff --git 
a/cayenne-dbsync/src/test/java/org/apache/cayenne/dbsync/merge/token/model/SetGeneratedFlagToModelIT.java
 
b/cayenne-dbsync/src/test/java/org/apache/cayenne/dbsync/merge/token/model/SetGeneratedFlagToModelIT.java
index 8b5a32f40..9d54d3210 100644
--- 
a/cayenne-dbsync/src/test/java/org/apache/cayenne/dbsync/merge/token/model/SetGeneratedFlagToModelIT.java
+++ 
b/cayenne-dbsync/src/test/java/org/apache/cayenne/dbsync/merge/token/model/SetGeneratedFlagToModelIT.java
@@ -32,9 +32,6 @@ import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
-/**
- * @since 4.0
- */
 public class SetGeneratedFlagToModelIT extends MergeCase {
 
     @Test
diff --git 
a/cayenne-dbsync/src/test/java/org/apache/cayenne/dbsync/reverse/dbload/ExportedKeyTest.java
 
b/cayenne-dbsync/src/test/java/org/apache/cayenne/dbsync/reverse/dbload/ExportedKeyTest.java
index 04abc8d31..28de385bc 100644
--- 
a/cayenne-dbsync/src/test/java/org/apache/cayenne/dbsync/reverse/dbload/ExportedKeyTest.java
+++ 
b/cayenne-dbsync/src/test/java/org/apache/cayenne/dbsync/reverse/dbload/ExportedKeyTest.java
@@ -29,9 +29,6 @@ import static org.junit.jupiter.api.Assertions.assertTrue;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
-/**
- * @since 4.0
- */
 public class ExportedKeyTest {
 
     @Test
diff --git 
a/cayenne-di/src/test/java/org/apache/cayenne/di/mock/MockImplementation1_ListConfigurationMock5.java
 
b/cayenne-di/src/test/java/org/apache/cayenne/di/mock/MockImplementation1_ListConfigurationMock5.java
index e3289aeef..bcc9e7af7 100644
--- 
a/cayenne-di/src/test/java/org/apache/cayenne/di/mock/MockImplementation1_ListConfigurationMock5.java
+++ 
b/cayenne-di/src/test/java/org/apache/cayenne/di/mock/MockImplementation1_ListConfigurationMock5.java
@@ -23,9 +23,6 @@ import java.util.List;
 
 import org.apache.cayenne.di.Inject;
 
-/**
- * @since 4.0
- */
 public class MockImplementation1_ListConfigurationMock5 implements 
MockInterface1 {
 
     private List<MockInterface5> configuration;
diff --git 
a/cayenne-di/src/test/java/org/apache/cayenne/di/mock/MockImplementation1_MapWithWildcards.java
 
b/cayenne-di/src/test/java/org/apache/cayenne/di/mock/MockImplementation1_MapWithWildcards.java
index 31e35f84a..d803f424b 100644
--- 
a/cayenne-di/src/test/java/org/apache/cayenne/di/mock/MockImplementation1_MapWithWildcards.java
+++ 
b/cayenne-di/src/test/java/org/apache/cayenne/di/mock/MockImplementation1_MapWithWildcards.java
@@ -23,9 +23,6 @@ import java.util.Map;
 
 import org.apache.cayenne.di.Inject;
 
-/**
- * @since 4.0
- */
 public class MockImplementation1_MapWithWildcards implements MockInterface1 {
 
     @Inject
diff --git 
a/cayenne-di/src/test/java/org/apache/cayenne/di/mock/MockImplementation2_ListConfiguration.java
 
b/cayenne-di/src/test/java/org/apache/cayenne/di/mock/MockImplementation2_ListConfiguration.java
index 143f25947..3408e621c 100644
--- 
a/cayenne-di/src/test/java/org/apache/cayenne/di/mock/MockImplementation2_ListConfiguration.java
+++ 
b/cayenne-di/src/test/java/org/apache/cayenne/di/mock/MockImplementation2_ListConfiguration.java
@@ -23,9 +23,6 @@ import java.util.List;
 
 import org.apache.cayenne.di.Inject;
 
-/**
- * @since 4.0
- */
 public class MockImplementation2_ListConfiguration implements MockInterface2 {
 
     private List<Object> configuration;
diff --git 
a/cayenne-di/src/test/java/org/apache/cayenne/di/spi/CircularModuleProvider.java
 
b/cayenne-di/src/test/java/org/apache/cayenne/di/spi/CircularModuleProvider.java
index 578788c8d..4f81f3a97 100644
--- 
a/cayenne-di/src/test/java/org/apache/cayenne/di/spi/CircularModuleProvider.java
+++ 
b/cayenne-di/src/test/java/org/apache/cayenne/di/spi/CircularModuleProvider.java
@@ -19,8 +19,5 @@
 
 package org.apache.cayenne.di.spi;
 
-/**
- * @since 5.0
- */
 public interface CircularModuleProvider extends ModuleProvider {
 }
diff --git 
a/cayenne-di/src/test/java/org/apache/cayenne/di/spi/CustomModuleProvider.java 
b/cayenne-di/src/test/java/org/apache/cayenne/di/spi/CustomModuleProvider.java
index ec5a7abed..299c9c74a 100644
--- 
a/cayenne-di/src/test/java/org/apache/cayenne/di/spi/CustomModuleProvider.java
+++ 
b/cayenne-di/src/test/java/org/apache/cayenne/di/spi/CustomModuleProvider.java
@@ -19,8 +19,5 @@
 
 package org.apache.cayenne.di.spi;
 
-/**
- * @since 4.0
- */
 public interface CustomModuleProvider extends ModuleProvider {
 }
diff --git 
a/cayenne-gradle-plugin/src/test/java/org/apache/cayenne/tools/BaseTaskIT.java 
b/cayenne-gradle-plugin/src/test/java/org/apache/cayenne/tools/BaseTaskIT.java
index ec428f6c0..3691e40d3 100644
--- 
a/cayenne-gradle-plugin/src/test/java/org/apache/cayenne/tools/BaseTaskIT.java
+++ 
b/cayenne-gradle-plugin/src/test/java/org/apache/cayenne/tools/BaseTaskIT.java
@@ -34,9 +34,6 @@ import org.gradle.testkit.runner.GradleRunner;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.io.TempDir;
 
-/**
- * @since 4.0
- */
 public class BaseTaskIT {
 
     @TempDir
diff --git 
a/cayenne-gradle-plugin/src/test/java/org/apache/cayenne/tools/CgenTaskIT.java 
b/cayenne-gradle-plugin/src/test/java/org/apache/cayenne/tools/CgenTaskIT.java
index 12b759bce..ee7b27781 100644
--- 
a/cayenne-gradle-plugin/src/test/java/org/apache/cayenne/tools/CgenTaskIT.java
+++ 
b/cayenne-gradle-plugin/src/test/java/org/apache/cayenne/tools/CgenTaskIT.java
@@ -34,9 +34,6 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
-/**
- * @since 4.0
- */
 public class CgenTaskIT extends BaseTaskIT {
 
     @Test
diff --git 
a/cayenne-gradle-plugin/src/test/java/org/apache/cayenne/tools/CgenTaskTest.java
 
b/cayenne-gradle-plugin/src/test/java/org/apache/cayenne/tools/CgenTaskTest.java
index 2d7969500..a345e985d 100644
--- 
a/cayenne-gradle-plugin/src/test/java/org/apache/cayenne/tools/CgenTaskTest.java
+++ 
b/cayenne-gradle-plugin/src/test/java/org/apache/cayenne/tools/CgenTaskTest.java
@@ -34,9 +34,6 @@ import static org.junit.jupiter.api.Assertions.assertNotNull;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 import static org.mockito.Mockito.*;
 
-/**
- * @since 4.0
- */
 public class CgenTaskTest {
 
     @TempDir
diff --git 
a/cayenne-gradle-plugin/src/test/java/org/apache/cayenne/tools/DbGenerateTaskIT.java
 
b/cayenne-gradle-plugin/src/test/java/org/apache/cayenne/tools/DbGenerateTaskIT.java
index 15554ccde..adb6a457b 100644
--- 
a/cayenne-gradle-plugin/src/test/java/org/apache/cayenne/tools/DbGenerateTaskIT.java
+++ 
b/cayenne-gradle-plugin/src/test/java/org/apache/cayenne/tools/DbGenerateTaskIT.java
@@ -28,9 +28,6 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
-/**
- * @since 4.0
- */
 public class DbGenerateTaskIT extends BaseTaskIT {
 
     @Test
diff --git 
a/cayenne-gradle-plugin/src/test/java/org/apache/cayenne/tools/DbImportIT.java 
b/cayenne-gradle-plugin/src/test/java/org/apache/cayenne/tools/DbImportIT.java
index bedbe03eb..b8b62612c 100644
--- 
a/cayenne-gradle-plugin/src/test/java/org/apache/cayenne/tools/DbImportIT.java
+++ 
b/cayenne-gradle-plugin/src/test/java/org/apache/cayenne/tools/DbImportIT.java
@@ -38,9 +38,6 @@ import org.junit.jupiter.api.Test;
 
 import static org.junit.jupiter.api.Assertions.*;
 
-/**
- * @since 4.0
- */
 public class DbImportIT extends BaseTaskIT {
 
     @Test
diff --git 
a/cayenne-gradle-plugin/src/test/java/org/apache/cayenne/tools/DbImportTaskTest.java
 
b/cayenne-gradle-plugin/src/test/java/org/apache/cayenne/tools/DbImportTaskTest.java
index 18a67302e..82bf3165e 100644
--- 
a/cayenne-gradle-plugin/src/test/java/org/apache/cayenne/tools/DbImportTaskTest.java
+++ 
b/cayenne-gradle-plugin/src/test/java/org/apache/cayenne/tools/DbImportTaskTest.java
@@ -36,9 +36,6 @@ import org.junit.jupiter.api.Test;
 import static org.junit.jupiter.api.Assertions.*;
 import static org.mockito.Mockito.mock;
 
-/**
- * @since 4.0
- */
 public class DbImportTaskTest {
 
     private DbImportTask task;
@@ -122,5 +119,4 @@ public class DbImportTaskTest {
         assertFalse(dbImportConfiguration.isUsePrimitives());
     }
 
-
 }
\ No newline at end of file
diff --git 
a/cayenne-gradle-plugin/src/test/java/org/apache/cayenne/tools/GradlePluginTest.java
 
b/cayenne-gradle-plugin/src/test/java/org/apache/cayenne/tools/GradlePluginTest.java
index 83bd3200e..1bb04bccd 100644
--- 
a/cayenne-gradle-plugin/src/test/java/org/apache/cayenne/tools/GradlePluginTest.java
+++ 
b/cayenne-gradle-plugin/src/test/java/org/apache/cayenne/tools/GradlePluginTest.java
@@ -25,9 +25,6 @@ import org.junit.jupiter.api.Test;
 
 import static org.junit.jupiter.api.Assertions.*;
 
-/**
- * @since 4.0
- */
 public class GradlePluginTest {
 
     @Test
diff --git 
a/cayenne-gradle-plugin/src/test/java/org/apache/cayenne/tools/model/DbImportConfigTest.java
 
b/cayenne-gradle-plugin/src/test/java/org/apache/cayenne/tools/model/DbImportConfigTest.java
index b6a6d54c2..d6840856c 100644
--- 
a/cayenne-gradle-plugin/src/test/java/org/apache/cayenne/tools/model/DbImportConfigTest.java
+++ 
b/cayenne-gradle-plugin/src/test/java/org/apache/cayenne/tools/model/DbImportConfigTest.java
@@ -24,9 +24,6 @@ import org.junit.jupiter.api.Test;
 
 import static org.junit.jupiter.api.Assertions.*;
 
-/**
- * @since 4.0
- */
 public class DbImportConfigTest {
 
     @Test
diff --git 
a/cayenne-gradle-plugin/src/test/java/org/apache/cayenne/tools/model/FilterContainerTest.java
 
b/cayenne-gradle-plugin/src/test/java/org/apache/cayenne/tools/model/FilterContainerTest.java
index c7afd04be..f1669ade6 100644
--- 
a/cayenne-gradle-plugin/src/test/java/org/apache/cayenne/tools/model/FilterContainerTest.java
+++ 
b/cayenne-gradle-plugin/src/test/java/org/apache/cayenne/tools/model/FilterContainerTest.java
@@ -26,9 +26,6 @@ import org.junit.jupiter.api.Test;
 
 import static org.junit.jupiter.api.Assertions.*;
 
-/**
- * @since 4.0
- */
 public class FilterContainerTest {
 
     @Test
@@ -68,7 +65,6 @@ public class FilterContainerTest {
         assertEquals("table_from_closure", 
schema.getIncludeTables().iterator().next().getPattern());
     }
 
-
     @Test
     public void fillContainer() throws Exception {
 
@@ -117,5 +113,4 @@ public class FilterContainerTest {
         assertEquals("proc4", 
catalog.getExcludeProcedures().iterator().next().getPattern());
     }
 
-
 }
diff --git 
a/cayenne-gradle-plugin/src/test/java/org/apache/cayenne/tools/model/IncludeTableTest.java
 
b/cayenne-gradle-plugin/src/test/java/org/apache/cayenne/tools/model/IncludeTableTest.java
index a502996d7..10fd53e4a 100644
--- 
a/cayenne-gradle-plugin/src/test/java/org/apache/cayenne/tools/model/IncludeTableTest.java
+++ 
b/cayenne-gradle-plugin/src/test/java/org/apache/cayenne/tools/model/IncludeTableTest.java
@@ -28,9 +28,6 @@ import org.junit.jupiter.api.Test;
 
 import static org.junit.jupiter.api.Assertions.*;
 
-/**
- * @since 4.0
- */
 public class IncludeTableTest {
 
     @Test
diff --git 
a/cayenne-gradle-plugin/src/test/java/org/apache/cayenne/tools/model/PatternParamTest.java
 
b/cayenne-gradle-plugin/src/test/java/org/apache/cayenne/tools/model/PatternParamTest.java
index c63c4d981..dd7740556 100644
--- 
a/cayenne-gradle-plugin/src/test/java/org/apache/cayenne/tools/model/PatternParamTest.java
+++ 
b/cayenne-gradle-plugin/src/test/java/org/apache/cayenne/tools/model/PatternParamTest.java
@@ -29,9 +29,6 @@ import org.junit.jupiter.api.Test;
 
 import static org.junit.jupiter.api.Assertions.*;
 
-/**
- * @since 4.0
- */
 public class PatternParamTest {
 
     private PatternParam param;
diff --git 
a/cayenne-maven-plugin/src/test/java/org/apache/cayenne/tools/DerbyManager.java 
b/cayenne-maven-plugin/src/test/java/org/apache/cayenne/tools/DerbyManager.java
index 4f9b1ea5e..9de077bbc 100644
--- 
a/cayenne-maven-plugin/src/test/java/org/apache/cayenne/tools/DerbyManager.java
+++ 
b/cayenne-maven-plugin/src/test/java/org/apache/cayenne/tools/DerbyManager.java
@@ -18,10 +18,6 @@
  */
 package org.apache.cayenne.tools;
 
-/**
- * @since 4.0
- */
-
 import java.io.File;
 import java.io.IOException;
 import java.io.OutputStream;
diff --git 
a/cayenne-project-compatibility/src/test/java/org/apache/cayenne/project/compatibility/CompatibilityTestModule.java
 
b/cayenne-project-compatibility/src/test/java/org/apache/cayenne/project/compatibility/CompatibilityTestModule.java
index 8d5f1bfa3..a2b8cbf78 100644
--- 
a/cayenne-project-compatibility/src/test/java/org/apache/cayenne/project/compatibility/CompatibilityTestModule.java
+++ 
b/cayenne-project-compatibility/src/test/java/org/apache/cayenne/project/compatibility/CompatibilityTestModule.java
@@ -42,9 +42,6 @@ import 
org.apache.cayenne.project.upgrade.handlers.UpgradeHandler_V9;
 
 import static org.mockito.Mockito.mock;
 
-/**
- * @since 4.1
- */
 public class CompatibilityTestModule implements Module {
 
     @Override
diff --git 
a/cayenne-project-compatibility/src/test/java/org/apache/cayenne/project/compatibility/CompatibilityUpgradeServiceIT.java
 
b/cayenne-project-compatibility/src/test/java/org/apache/cayenne/project/compatibility/CompatibilityUpgradeServiceIT.java
index 4f7daa6aa..d62ed1634 100644
--- 
a/cayenne-project-compatibility/src/test/java/org/apache/cayenne/project/compatibility/CompatibilityUpgradeServiceIT.java
+++ 
b/cayenne-project-compatibility/src/test/java/org/apache/cayenne/project/compatibility/CompatibilityUpgradeServiceIT.java
@@ -31,9 +31,6 @@ import org.w3c.dom.Document;
 
 import static org.junit.jupiter.api.Assertions.*;
 
-/**
- * @since 4.1
- */
 public class CompatibilityUpgradeServiceIT {
 
     @Test
diff --git 
a/cayenne-project-compatibility/src/test/java/org/apache/cayenne/project/compatibility/ProjectCompatibilityModuleProviderTest.java
 
b/cayenne-project-compatibility/src/test/java/org/apache/cayenne/project/compatibility/ProjectCompatibilityModuleProviderTest.java
index b3e581e36..5a42b5123 100644
--- 
a/cayenne-project-compatibility/src/test/java/org/apache/cayenne/project/compatibility/ProjectCompatibilityModuleProviderTest.java
+++ 
b/cayenne-project-compatibility/src/test/java/org/apache/cayenne/project/compatibility/ProjectCompatibilityModuleProviderTest.java
@@ -23,9 +23,6 @@ import 
org.apache.cayenne.runtime.CayenneRuntimeModuleProvider;
 import org.apache.cayenne.unit.util.ModuleProviderChecker;
 import org.junit.jupiter.api.Test;
 
-/**
- * @since 4.1
- */
 public class ProjectCompatibilityModuleProviderTest {
 
     @Test
diff --git 
a/cayenne-project-compatibility/src/test/java/org/apache/cayenne/project/compatibility/configuration/CompatibilityDataChannelDescriptorLoaderIT.java
 
b/cayenne-project-compatibility/src/test/java/org/apache/cayenne/project/compatibility/configuration/CompatibilityDataChannelDescriptorLoaderIT.java
index 340eca9bb..a727baf6e 100644
--- 
a/cayenne-project-compatibility/src/test/java/org/apache/cayenne/project/compatibility/configuration/CompatibilityDataChannelDescriptorLoaderIT.java
+++ 
b/cayenne-project-compatibility/src/test/java/org/apache/cayenne/project/compatibility/configuration/CompatibilityDataChannelDescriptorLoaderIT.java
@@ -37,9 +37,6 @@ import org.xml.sax.XMLReader;
 
 import static org.junit.jupiter.api.Assertions.*;
 
-/**
- * @since 4.1
- */
 public class CompatibilityDataChannelDescriptorLoaderIT {
 
     @Test
diff --git 
a/cayenne-project-compatibility/src/test/java/org/apache/cayenne/project/compatibility/configuration/CompatibilityDataMapLoaderIT.java
 
b/cayenne-project-compatibility/src/test/java/org/apache/cayenne/project/compatibility/configuration/CompatibilityDataMapLoaderIT.java
index 8db1bda95..7df30acef 100644
--- 
a/cayenne-project-compatibility/src/test/java/org/apache/cayenne/project/compatibility/configuration/CompatibilityDataMapLoaderIT.java
+++ 
b/cayenne-project-compatibility/src/test/java/org/apache/cayenne/project/compatibility/configuration/CompatibilityDataMapLoaderIT.java
@@ -36,9 +36,6 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
-/**
- * @since 4.1
- */
 public class CompatibilityDataMapLoaderIT {
 
     @Test
diff --git 
a/cayenne-project/src/test/java/org/apache/cayenne/project/upgrade/DefaultUpgradeServiceTest.java
 
b/cayenne-project/src/test/java/org/apache/cayenne/project/upgrade/DefaultUpgradeServiceTest.java
index f41bce648..66687d1bb 100644
--- 
a/cayenne-project/src/test/java/org/apache/cayenne/project/upgrade/DefaultUpgradeServiceTest.java
+++ 
b/cayenne-project/src/test/java/org/apache/cayenne/project/upgrade/DefaultUpgradeServiceTest.java
@@ -43,9 +43,6 @@ import static org.junit.jupiter.api.Assertions.assertTrue;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.*;
 
-/**
- * @since 4.1
- */
 public class DefaultUpgradeServiceTest {
 
     DefaultUpgradeService upgradeService;
diff --git 
a/cayenne-velocity/src/test/java/org/apache/cayenne/velocity/VelocityModuleProviderTest.java
 
b/cayenne-velocity/src/test/java/org/apache/cayenne/velocity/VelocityModuleProviderTest.java
index 810278e0f..a97133f30 100644
--- 
a/cayenne-velocity/src/test/java/org/apache/cayenne/velocity/VelocityModuleProviderTest.java
+++ 
b/cayenne-velocity/src/test/java/org/apache/cayenne/velocity/VelocityModuleProviderTest.java
@@ -23,9 +23,6 @@ import 
org.apache.cayenne.runtime.CayenneRuntimeModuleProvider;
 import org.apache.cayenne.unit.util.ModuleProviderChecker;
 import org.junit.jupiter.api.Test;
 
-/**
- * @since 4.1
- */
 public class VelocityModuleProviderTest {
 
     @Test
diff --git a/cayenne/src/test/java/org/apache/cayenne/Cay2412IT.java 
b/cayenne/src/test/java/org/apache/cayenne/Cay2412IT.java
index d41907347..f1f0d02d5 100644
--- a/cayenne/src/test/java/org/apache/cayenne/Cay2412IT.java
+++ b/cayenne/src/test/java/org/apache/cayenne/Cay2412IT.java
@@ -34,9 +34,6 @@ import org.junit.jupiter.api.extension.RegisterExtension;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
-/**
- * @since 4.1
- */
 public class Cay2412IT {
 
     @RegisterExtension
diff --git 
a/cayenne/src/test/java/org/apache/cayenne/DataContextConcurrencyIT.java 
b/cayenne/src/test/java/org/apache/cayenne/DataContextConcurrencyIT.java
index 3590b8e34..6c798dd86 100644
--- a/cayenne/src/test/java/org/apache/cayenne/DataContextConcurrencyIT.java
+++ b/cayenne/src/test/java/org/apache/cayenne/DataContextConcurrencyIT.java
@@ -36,9 +36,6 @@ import org.slf4j.LoggerFactory;
 
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
-/**
- * @since 4.1
- */
 public class DataContextConcurrencyIT {
 
     @RegisterExtension
diff --git 
a/cayenne/src/test/java/org/apache/cayenne/HybridPersistentObjectIT.java 
b/cayenne/src/test/java/org/apache/cayenne/HybridPersistentObjectIT.java
index 3f093592f..d259aaf95 100644
--- a/cayenne/src/test/java/org/apache/cayenne/HybridPersistentObjectIT.java
+++ b/cayenne/src/test/java/org/apache/cayenne/HybridPersistentObjectIT.java
@@ -36,9 +36,6 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
 import static org.junit.jupiter.api.Assertions.assertNull;
 
-/**
- * @since 4.1
- */
 public class HybridPersistentObjectIT {
 
     @RegisterExtension
diff --git a/cayenne/src/test/java/org/apache/cayenne/LazyAttributesIT.java 
b/cayenne/src/test/java/org/apache/cayenne/LazyAttributesIT.java
index 6430877b7..5381b747a 100644
--- a/cayenne/src/test/java/org/apache/cayenne/LazyAttributesIT.java
+++ b/cayenne/src/test/java/org/apache/cayenne/LazyAttributesIT.java
@@ -34,9 +34,6 @@ import static 
org.junit.jupiter.api.Assertions.assertArrayEquals;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertInstanceOf;
 
-/**
- * @since 4.2
- */
 public class LazyAttributesIT {
 
     @RegisterExtension
diff --git a/cayenne/src/test/java/org/apache/cayenne/access/CAY2509IT.java 
b/cayenne/src/test/java/org/apache/cayenne/access/CAY2509IT.java
index b035e12a6..52e2906d8 100644
--- a/cayenne/src/test/java/org/apache/cayenne/access/CAY2509IT.java
+++ b/cayenne/src/test/java/org/apache/cayenne/access/CAY2509IT.java
@@ -34,9 +34,6 @@ import org.junit.jupiter.api.extension.RegisterExtension;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
-/**
- * @since 4.2
- */
 public class CAY2509IT {
 
     @RegisterExtension
diff --git a/cayenne/src/test/java/org/apache/cayenne/access/Cay2032IT.java 
b/cayenne/src/test/java/org/apache/cayenne/access/Cay2032IT.java
index 4f1cef19c..f67545a58 100644
--- a/cayenne/src/test/java/org/apache/cayenne/access/Cay2032IT.java
+++ b/cayenne/src/test/java/org/apache/cayenne/access/Cay2032IT.java
@@ -33,9 +33,6 @@ import org.junit.jupiter.api.extension.RegisterExtension;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
 
-/**
- * @since 4.0
- */
 public class Cay2032IT {
 
     @RegisterExtension
diff --git a/cayenne/src/test/java/org/apache/cayenne/access/Cay2641IT.java 
b/cayenne/src/test/java/org/apache/cayenne/access/Cay2641IT.java
index 45b86f911..5690b368c 100644
--- a/cayenne/src/test/java/org/apache/cayenne/access/Cay2641IT.java
+++ b/cayenne/src/test/java/org/apache/cayenne/access/Cay2641IT.java
@@ -40,9 +40,6 @@ import java.util.List;
 
 import static org.junit.jupiter.api.Assertions.*;
 
-/**
- * @since 4.2
- */
 public class Cay2641IT {
 
     @RegisterExtension
diff --git a/cayenne/src/test/java/org/apache/cayenne/access/Cay2666IT.java 
b/cayenne/src/test/java/org/apache/cayenne/access/Cay2666IT.java
index 8c4acf3f0..a27eda865 100644
--- a/cayenne/src/test/java/org/apache/cayenne/access/Cay2666IT.java
+++ b/cayenne/src/test/java/org/apache/cayenne/access/Cay2666IT.java
@@ -37,9 +37,6 @@ import java.util.List;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNotEquals;
 
-/**
- * @since 4.2
- */
 public class Cay2666IT {
 
     @RegisterExtension
@@ -120,7 +117,6 @@ public class Cay2666IT {
         expression = new ASTEqual(new ASTObjPath("x$"), "A");
         assertEquals(exp, expression);
 
-
         exp = ExpressionFactory.exp("obj:x$ = $name", "A");
         expression = new ASTEqual(new ASTObjPath("x$"), "A");
         assertEquals(exp, expression);
diff --git 
a/cayenne/src/test/java/org/apache/cayenne/access/ObjectStoreTest.java 
b/cayenne/src/test/java/org/apache/cayenne/access/ObjectStoreTest.java
index a6e3f0f3e..51dde7444 100644
--- a/cayenne/src/test/java/org/apache/cayenne/access/ObjectStoreTest.java
+++ b/cayenne/src/test/java/org/apache/cayenne/access/ObjectStoreTest.java
@@ -32,9 +32,6 @@ import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
 
-/**
- * @since 4.0
- */
 public class ObjectStoreTest {
 
     private ObjectStore objectStore;
diff --git 
a/cayenne/src/test/java/org/apache/cayenne/access/VerticalInheritanceMultipleAttributesIT.java
 
b/cayenne/src/test/java/org/apache/cayenne/access/VerticalInheritanceMultipleAttributesIT.java
index 6b00041a1..21a96356e 100644
--- 
a/cayenne/src/test/java/org/apache/cayenne/access/VerticalInheritanceMultipleAttributesIT.java
+++ 
b/cayenne/src/test/java/org/apache/cayenne/access/VerticalInheritanceMultipleAttributesIT.java
@@ -39,9 +39,6 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNull;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
-/**
- * @since 4.1
- */
 public class VerticalInheritanceMultipleAttributesIT {
 
     @RegisterExtension
diff --git 
a/cayenne/src/test/java/org/apache/cayenne/access/flush/ArcValuesCreationHandlerTest.java
 
b/cayenne/src/test/java/org/apache/cayenne/access/flush/ArcValuesCreationHandlerTest.java
index a2fb5a8c9..3a75aad85 100644
--- 
a/cayenne/src/test/java/org/apache/cayenne/access/flush/ArcValuesCreationHandlerTest.java
+++ 
b/cayenne/src/test/java/org/apache/cayenne/access/flush/ArcValuesCreationHandlerTest.java
@@ -43,9 +43,6 @@ import static org.junit.jupiter.api.Assertions.*;
 import static org.mockito.ArgumentMatchers.*;
 import static org.mockito.Mockito.*;
 
-/**
- * @since 4.2
- */
 public class ArcValuesCreationHandlerTest {
 
     private ArcValuesCreationHandler handler;
diff --git 
a/cayenne/src/test/java/org/apache/cayenne/access/flush/DefaultDataDomainFlushActionTest.java
 
b/cayenne/src/test/java/org/apache/cayenne/access/flush/DefaultDataDomainFlushActionTest.java
index ff70243bb..e997cdda1 100644
--- 
a/cayenne/src/test/java/org/apache/cayenne/access/flush/DefaultDataDomainFlushActionTest.java
+++ 
b/cayenne/src/test/java/org/apache/cayenne/access/flush/DefaultDataDomainFlushActionTest.java
@@ -44,9 +44,6 @@ import static org.junit.jupiter.api.Assertions.*;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.*;
 
-/**
- * @since 4.2
- */
 public class DefaultDataDomainFlushActionTest {
 
     @Test
diff --git 
a/cayenne/src/test/java/org/apache/cayenne/access/flush/DefaultDbRowOpSorterTest.java
 
b/cayenne/src/test/java/org/apache/cayenne/access/flush/DefaultDbRowOpSorterTest.java
index e67d05630..59b03847e 100644
--- 
a/cayenne/src/test/java/org/apache/cayenne/access/flush/DefaultDbRowOpSorterTest.java
+++ 
b/cayenne/src/test/java/org/apache/cayenne/access/flush/DefaultDbRowOpSorterTest.java
@@ -46,9 +46,6 @@ import static org.junit.jupiter.api.Assertions.*;
 import static org.mockito.ArgumentMatchers.*;
 import static org.mockito.Mockito.*;
 
-/**
- * @since 4.2
- */
 public class DefaultDbRowOpSorterTest {
 
     private EntitySorter entitySorter;
diff --git 
a/cayenne/src/test/java/org/apache/cayenne/access/flush/EffectiveOpIdTest.java 
b/cayenne/src/test/java/org/apache/cayenne/access/flush/EffectiveOpIdTest.java
index 2d067089f..d2ee1f7e6 100644
--- 
a/cayenne/src/test/java/org/apache/cayenne/access/flush/EffectiveOpIdTest.java
+++ 
b/cayenne/src/test/java/org/apache/cayenne/access/flush/EffectiveOpIdTest.java
@@ -26,9 +26,6 @@ import org.junit.jupiter.api.Test;
 
 import static org.junit.jupiter.api.Assertions.*;
 
-/**
- * @since 4.2
- */
 public class EffectiveOpIdTest {
 
     @Test
diff --git 
a/cayenne/src/test/java/org/apache/cayenne/access/flush/operation/BaseDbRowOpTest.java
 
b/cayenne/src/test/java/org/apache/cayenne/access/flush/operation/BaseDbRowOpTest.java
index 3d3889ddd..8abb17f77 100644
--- 
a/cayenne/src/test/java/org/apache/cayenne/access/flush/operation/BaseDbRowOpTest.java
+++ 
b/cayenne/src/test/java/org/apache/cayenne/access/flush/operation/BaseDbRowOpTest.java
@@ -30,9 +30,6 @@ import static org.junit.jupiter.api.Assertions.*;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
-/**
- * @since 4.2
- */
 public class BaseDbRowOpTest {
 
     @Test
diff --git 
a/cayenne/src/test/java/org/apache/cayenne/access/flush/operation/DbRowOpMergerTest.java
 
b/cayenne/src/test/java/org/apache/cayenne/access/flush/operation/DbRowOpMergerTest.java
index 2629c9309..dd39fa47c 100644
--- 
a/cayenne/src/test/java/org/apache/cayenne/access/flush/operation/DbRowOpMergerTest.java
+++ 
b/cayenne/src/test/java/org/apache/cayenne/access/flush/operation/DbRowOpMergerTest.java
@@ -32,9 +32,6 @@ import static org.junit.jupiter.api.Assertions.*;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
-/**
- * @since 4.2
- */
 public class DbRowOpMergerTest {
 
     @Test
diff --git 
a/cayenne/src/test/java/org/apache/cayenne/access/flush/operation/QualifierTest.java
 
b/cayenne/src/test/java/org/apache/cayenne/access/flush/operation/QualifierTest.java
index 7a88f6628..195a50796 100644
--- 
a/cayenne/src/test/java/org/apache/cayenne/access/flush/operation/QualifierTest.java
+++ 
b/cayenne/src/test/java/org/apache/cayenne/access/flush/operation/QualifierTest.java
@@ -34,9 +34,6 @@ import static org.junit.jupiter.api.Assertions.*;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
-/**
- * @since 4.2
- */
 public class QualifierTest {
 
     @Test
diff --git 
a/cayenne/src/test/java/org/apache/cayenne/access/flush/operation/ValuesTest.java
 
b/cayenne/src/test/java/org/apache/cayenne/access/flush/operation/ValuesTest.java
index 9ec2a7f98..b7cc01593 100644
--- 
a/cayenne/src/test/java/org/apache/cayenne/access/flush/operation/ValuesTest.java
+++ 
b/cayenne/src/test/java/org/apache/cayenne/access/flush/operation/ValuesTest.java
@@ -32,9 +32,6 @@ import static org.junit.jupiter.api.Assertions.*;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
-/**
- * @since 4.2
- */
 public class ValuesTest {
 
     @Test
diff --git 
a/cayenne/src/test/java/org/apache/cayenne/access/sqlbuilder/SelectBuilderTest.java
 
b/cayenne/src/test/java/org/apache/cayenne/access/sqlbuilder/SelectBuilderTest.java
index 7fa35200f..a44f781e4 100644
--- 
a/cayenne/src/test/java/org/apache/cayenne/access/sqlbuilder/SelectBuilderTest.java
+++ 
b/cayenne/src/test/java/org/apache/cayenne/access/sqlbuilder/SelectBuilderTest.java
@@ -29,9 +29,6 @@ import static 
org.apache.cayenne.access.sqlbuilder.SQLBuilder.*;
 import static org.junit.jupiter.api.Assertions.assertInstanceOf;
 import static org.junit.jupiter.api.Assertions.assertThrows;
 
-/**
- * @since 4.2
- */
 public class SelectBuilderTest extends BaseSqlBuilderTest  {
 
     @Test
diff --git 
a/cayenne/src/test/java/org/apache/cayenne/access/sqlbuilder/UpdateBuilderTest.java
 
b/cayenne/src/test/java/org/apache/cayenne/access/sqlbuilder/UpdateBuilderTest.java
index 66397715d..4ddece260 100644
--- 
a/cayenne/src/test/java/org/apache/cayenne/access/sqlbuilder/UpdateBuilderTest.java
+++ 
b/cayenne/src/test/java/org/apache/cayenne/access/sqlbuilder/UpdateBuilderTest.java
@@ -27,9 +27,6 @@ import org.junit.jupiter.api.Test;
 import static org.apache.cayenne.access.sqlbuilder.SQLBuilder.*;
 import static org.junit.jupiter.api.Assertions.assertInstanceOf;
 
-/**
- * @since 4.2
- */
 public class UpdateBuilderTest extends BaseSqlBuilderTest {
 
     @Test
diff --git 
a/cayenne/src/test/java/org/apache/cayenne/access/sqlbuilder/sqltree/NodeTest.java
 
b/cayenne/src/test/java/org/apache/cayenne/access/sqlbuilder/sqltree/NodeTest.java
index c2c48ccc0..9f058de29 100644
--- 
a/cayenne/src/test/java/org/apache/cayenne/access/sqlbuilder/sqltree/NodeTest.java
+++ 
b/cayenne/src/test/java/org/apache/cayenne/access/sqlbuilder/sqltree/NodeTest.java
@@ -25,9 +25,6 @@ import org.junit.jupiter.api.Test;
 
 import static org.junit.jupiter.api.Assertions.*;
 
-/**
- * @since 4.2
- */
 public class NodeTest {
 
     static private class TestNode extends Node {
diff --git 
a/cayenne/src/test/java/org/apache/cayenne/access/translator/select/BaseColumnExtractorTest.java
 
b/cayenne/src/test/java/org/apache/cayenne/access/translator/select/BaseColumnExtractorTest.java
index 26a793ccc..546b0d429 100644
--- 
a/cayenne/src/test/java/org/apache/cayenne/access/translator/select/BaseColumnExtractorTest.java
+++ 
b/cayenne/src/test/java/org/apache/cayenne/access/translator/select/BaseColumnExtractorTest.java
@@ -24,9 +24,6 @@ import java.sql.Types;
 import org.apache.cayenne.map.DbAttribute;
 import org.apache.cayenne.map.DbEntity;
 
-/**
- * @since 4.2
- */
 public class BaseColumnExtractorTest {
 
     DbEntity createMockDbEntity(String entityName) {
diff --git 
a/cayenne/src/test/java/org/apache/cayenne/access/translator/select/ColumnDescriptorStageTest.java
 
b/cayenne/src/test/java/org/apache/cayenne/access/translator/select/ColumnDescriptorStageTest.java
index 17179b7c3..de5318b6c 100644
--- 
a/cayenne/src/test/java/org/apache/cayenne/access/translator/select/ColumnDescriptorStageTest.java
+++ 
b/cayenne/src/test/java/org/apache/cayenne/access/translator/select/ColumnDescriptorStageTest.java
@@ -27,9 +27,6 @@ import org.junit.jupiter.api.Test;
 
 import static org.junit.jupiter.api.Assertions.*;
 
-/**
- * @since 4.2
- */
 public class ColumnDescriptorStageTest {
 
     @Test
diff --git 
a/cayenne/src/test/java/org/apache/cayenne/access/translator/select/CustomColumnSetExtractorTest.java
 
b/cayenne/src/test/java/org/apache/cayenne/access/translator/select/CustomColumnSetExtractorTest.java
index 40f1e31f3..95f155e42 100644
--- 
a/cayenne/src/test/java/org/apache/cayenne/access/translator/select/CustomColumnSetExtractorTest.java
+++ 
b/cayenne/src/test/java/org/apache/cayenne/access/translator/select/CustomColumnSetExtractorTest.java
@@ -37,9 +37,6 @@ import org.junit.jupiter.api.Test;
 
 import static org.junit.jupiter.api.Assertions.*;
 
-/**
- * @since 4.2
- */
 public class CustomColumnSetExtractorTest extends BaseColumnExtractorTest {
 
     @Test
diff --git 
a/cayenne/src/test/java/org/apache/cayenne/access/translator/select/DefaultObjectSelectTranslatorIT.java
 
b/cayenne/src/test/java/org/apache/cayenne/access/translator/select/DefaultObjectSelectTranslatorIT.java
index f258e46c7..b0fc01b88 100644
--- 
a/cayenne/src/test/java/org/apache/cayenne/access/translator/select/DefaultObjectSelectTranslatorIT.java
+++ 
b/cayenne/src/test/java/org/apache/cayenne/access/translator/select/DefaultObjectSelectTranslatorIT.java
@@ -30,9 +30,6 @@ import org.junit.jupiter.api.extension.RegisterExtension;
 import org.junit.jupiter.api.Test;
 import static org.junit.jupiter.api.Assertions.*;
 
-/**
- * @since 4.2
- */
 public class DefaultObjectSelectTranslatorIT {
 
     @RegisterExtension
diff --git 
a/cayenne/src/test/java/org/apache/cayenne/access/translator/select/DescriptorColumnExtractorTest.java
 
b/cayenne/src/test/java/org/apache/cayenne/access/translator/select/DescriptorColumnExtractorTest.java
index 72f97d0f6..2d38fd3b2 100644
--- 
a/cayenne/src/test/java/org/apache/cayenne/access/translator/select/DescriptorColumnExtractorTest.java
+++ 
b/cayenne/src/test/java/org/apache/cayenne/access/translator/select/DescriptorColumnExtractorTest.java
@@ -36,9 +36,6 @@ import org.junit.jupiter.api.Test;
 import static org.junit.jupiter.api.Assertions.*;
 import static org.mockito.Mockito.mock;
 
-/**
- * @since 4.2
- */
 public class DescriptorColumnExtractorTest extends BaseColumnExtractorTest {
 
     @Test
diff --git 
a/cayenne/src/test/java/org/apache/cayenne/access/translator/select/DistinctStageTest.java
 
b/cayenne/src/test/java/org/apache/cayenne/access/translator/select/DistinctStageTest.java
index e4ef1ea13..d91911663 100644
--- 
a/cayenne/src/test/java/org/apache/cayenne/access/translator/select/DistinctStageTest.java
+++ 
b/cayenne/src/test/java/org/apache/cayenne/access/translator/select/DistinctStageTest.java
@@ -28,9 +28,6 @@ import org.junit.jupiter.api.Test;
 
 import static org.junit.jupiter.api.Assertions.*;
 
-/**
- * @since 4.2
- */
 public class DistinctStageTest {
 
     @Test
diff --git 
a/cayenne/src/test/java/org/apache/cayenne/access/translator/select/GroupByStageTest.java
 
b/cayenne/src/test/java/org/apache/cayenne/access/translator/select/GroupByStageTest.java
index b13b2dc1d..d93c434b9 100644
--- 
a/cayenne/src/test/java/org/apache/cayenne/access/translator/select/GroupByStageTest.java
+++ 
b/cayenne/src/test/java/org/apache/cayenne/access/translator/select/GroupByStageTest.java
@@ -30,9 +30,6 @@ import org.junit.jupiter.api.Test;
 
 import static org.junit.jupiter.api.Assertions.*;
 
-/**
- * @since 4.2
- */
 public class GroupByStageTest {
 
     private TranslatorContext context;
diff --git 
a/cayenne/src/test/java/org/apache/cayenne/access/translator/select/HavingTranslationStageTest.java
 
b/cayenne/src/test/java/org/apache/cayenne/access/translator/select/HavingTranslationStageTest.java
index 8ac496878..f0e076fa9 100644
--- 
a/cayenne/src/test/java/org/apache/cayenne/access/translator/select/HavingTranslationStageTest.java
+++ 
b/cayenne/src/test/java/org/apache/cayenne/access/translator/select/HavingTranslationStageTest.java
@@ -32,9 +32,6 @@ import org.junit.jupiter.api.Test;
 
 import static org.junit.jupiter.api.Assertions.*;
 
-/**
- * @since 4.2
- */
 public class HavingTranslationStageTest {
 
     private TranslatorContext context;
diff --git 
a/cayenne/src/test/java/org/apache/cayenne/access/translator/select/LimitOffsetStageTest.java
 
b/cayenne/src/test/java/org/apache/cayenne/access/translator/select/LimitOffsetStageTest.java
index d99a8f871..fbfc30658 100644
--- 
a/cayenne/src/test/java/org/apache/cayenne/access/translator/select/LimitOffsetStageTest.java
+++ 
b/cayenne/src/test/java/org/apache/cayenne/access/translator/select/LimitOffsetStageTest.java
@@ -27,9 +27,6 @@ import org.junit.jupiter.api.Test;
 
 import static org.junit.jupiter.api.Assertions.*;
 
-/**
- * @since 4.2
- */
 public class LimitOffsetStageTest {
 
     private TranslatorContext context;
diff --git 
a/cayenne/src/test/java/org/apache/cayenne/access/translator/select/MockQueryMetadataBuilder.java
 
b/cayenne/src/test/java/org/apache/cayenne/access/translator/select/MockQueryMetadataBuilder.java
index 11571e986..081d65400 100644
--- 
a/cayenne/src/test/java/org/apache/cayenne/access/translator/select/MockQueryMetadataBuilder.java
+++ 
b/cayenne/src/test/java/org/apache/cayenne/access/translator/select/MockQueryMetadataBuilder.java
@@ -27,9 +27,6 @@ import org.apache.cayenne.map.ObjEntity;
 import org.apache.cayenne.query.MockQueryMetadata;
 import org.apache.cayenne.query.QueryMetadata;
 
-/**
- * @since 4.2
- */
 class MockQueryMetadataBuilder {
 
     private ObjEntity objEntity;
diff --git 
a/cayenne/src/test/java/org/apache/cayenne/access/translator/select/MockQueryWrapperBuilder.java
 
b/cayenne/src/test/java/org/apache/cayenne/access/translator/select/MockQueryWrapperBuilder.java
index 27522654a..d39f42709 100644
--- 
a/cayenne/src/test/java/org/apache/cayenne/access/translator/select/MockQueryWrapperBuilder.java
+++ 
b/cayenne/src/test/java/org/apache/cayenne/access/translator/select/MockQueryWrapperBuilder.java
@@ -31,9 +31,6 @@ import org.apache.cayenne.query.PrefetchTreeNode;
 import org.apache.cayenne.query.QueryMetadata;
 import org.apache.cayenne.query.Select;
 
-/**
- * @since 4.2
- */
 class MockQueryWrapperBuilder {
 
     private boolean distinct;
diff --git 
a/cayenne/src/test/java/org/apache/cayenne/access/translator/select/ObjPathProcessorIT.java
 
b/cayenne/src/test/java/org/apache/cayenne/access/translator/select/ObjPathProcessorIT.java
index 574254a89..bc774afc0 100644
--- 
a/cayenne/src/test/java/org/apache/cayenne/access/translator/select/ObjPathProcessorIT.java
+++ 
b/cayenne/src/test/java/org/apache/cayenne/access/translator/select/ObjPathProcessorIT.java
@@ -31,9 +31,6 @@ import org.mockito.Mockito;
 
 import static org.junit.jupiter.api.Assertions.*;
 
-/**
- * @since 4.2
- */
 public class ObjPathProcessorIT {
 
     @RegisterExtension
diff --git 
a/cayenne/src/test/java/org/apache/cayenne/access/translator/select/OrderingStageTest.java
 
b/cayenne/src/test/java/org/apache/cayenne/access/translator/select/OrderingStageTest.java
index 99784bc2c..958db1471 100644
--- 
a/cayenne/src/test/java/org/apache/cayenne/access/translator/select/OrderingStageTest.java
+++ 
b/cayenne/src/test/java/org/apache/cayenne/access/translator/select/OrderingStageTest.java
@@ -37,9 +37,6 @@ import org.junit.jupiter.api.Test;
 
 import static org.junit.jupiter.api.Assertions.*;
 
-/**
- * @since 4.2
- */
 public class OrderingStageTest {
 
     private TranslatorContext context;
diff --git 
a/cayenne/src/test/java/org/apache/cayenne/access/translator/select/QualifierTranslationStageTest.java
 
b/cayenne/src/test/java/org/apache/cayenne/access/translator/select/QualifierTranslationStageTest.java
index a29ee5468..1aba1c17e 100644
--- 
a/cayenne/src/test/java/org/apache/cayenne/access/translator/select/QualifierTranslationStageTest.java
+++ 
b/cayenne/src/test/java/org/apache/cayenne/access/translator/select/QualifierTranslationStageTest.java
@@ -31,9 +31,6 @@ import org.junit.jupiter.api.Test;
 
 import static org.junit.jupiter.api.Assertions.*;
 
-/**
- * @since 4.2
- */
 public class QualifierTranslationStageTest {
 
     private TranslatorContext context;
diff --git 
a/cayenne/src/test/java/org/apache/cayenne/access/translator/select/QualifierTranslatorTest.java
 
b/cayenne/src/test/java/org/apache/cayenne/access/translator/select/QualifierTranslatorTest.java
index 46044db35..756c6f6bf 100644
--- 
a/cayenne/src/test/java/org/apache/cayenne/access/translator/select/QualifierTranslatorTest.java
+++ 
b/cayenne/src/test/java/org/apache/cayenne/access/translator/select/QualifierTranslatorTest.java
@@ -39,9 +39,6 @@ import java.util.List;
 
 import static org.junit.jupiter.api.Assertions.*;
 
-/**
- * @since 4.2
- */
 public class QualifierTranslatorTest {
 
     private QualifierTranslator translator;
diff --git 
a/cayenne/src/test/java/org/apache/cayenne/access/translator/select/VerticalInheritanceJoinOrderIT.java
 
b/cayenne/src/test/java/org/apache/cayenne/access/translator/select/VerticalInheritanceJoinOrderIT.java
index bc3365745..c9dda19de 100644
--- 
a/cayenne/src/test/java/org/apache/cayenne/access/translator/select/VerticalInheritanceJoinOrderIT.java
+++ 
b/cayenne/src/test/java/org/apache/cayenne/access/translator/select/VerticalInheritanceJoinOrderIT.java
@@ -31,9 +31,6 @@ import org.junit.jupiter.api.extension.RegisterExtension;
 import org.junit.jupiter.api.Test;
 import static org.junit.jupiter.api.Assertions.*;
 
-/**
- * @since 5.0
- */
 public class VerticalInheritanceJoinOrderIT {
 
     @RegisterExtension
diff --git 
a/cayenne/src/test/java/org/apache/cayenne/access/types/DefaultValueObjectTypeRegistryTest.java
 
b/cayenne/src/test/java/org/apache/cayenne/access/types/DefaultValueObjectTypeRegistryTest.java
index 38e359b65..5841b590e 100644
--- 
a/cayenne/src/test/java/org/apache/cayenne/access/types/DefaultValueObjectTypeRegistryTest.java
+++ 
b/cayenne/src/test/java/org/apache/cayenne/access/types/DefaultValueObjectTypeRegistryTest.java
@@ -29,9 +29,6 @@ import static org.junit.jupiter.api.Assertions.*;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
-/**
- * @since 4.0
- */
 public class DefaultValueObjectTypeRegistryTest {
 
     DefaultValueObjectTypeRegistry registry;
diff --git 
a/cayenne/src/test/java/org/apache/cayenne/configuration/xml/BaseHandlerTest.java
 
b/cayenne/src/test/java/org/apache/cayenne/configuration/xml/BaseHandlerTest.java
index 126646c0f..0b6497d4b 100644
--- 
a/cayenne/src/test/java/org/apache/cayenne/configuration/xml/BaseHandlerTest.java
+++ 
b/cayenne/src/test/java/org/apache/cayenne/configuration/xml/BaseHandlerTest.java
@@ -29,9 +29,6 @@ import org.xml.sax.SAXException;
 import org.xml.sax.XMLReader;
 import org.xml.sax.helpers.DefaultHandler;
 
-/**
- * @since 4.1
- */
 public abstract class BaseHandlerTest {
 
     protected void parse(String tag, HandlerFactory factory) throws Exception {
diff --git 
a/cayenne/src/test/java/org/apache/cayenne/configuration/xml/DbEntityHandlerTest.java
 
b/cayenne/src/test/java/org/apache/cayenne/configuration/xml/DbEntityHandlerTest.java
index 74e79dbca..44dd81a67 100644
--- 
a/cayenne/src/test/java/org/apache/cayenne/configuration/xml/DbEntityHandlerTest.java
+++ 
b/cayenne/src/test/java/org/apache/cayenne/configuration/xml/DbEntityHandlerTest.java
@@ -28,9 +28,6 @@ import org.junit.jupiter.api.Test;
 
 import static org.junit.jupiter.api.Assertions.*;
 
-/**
- * @since 4.1
- */
 public class DbEntityHandlerTest extends BaseHandlerTest {
 
     @Test
diff --git 
a/cayenne/src/test/java/org/apache/cayenne/configuration/xml/DbKeyGeneratorHandlerTest.java
 
b/cayenne/src/test/java/org/apache/cayenne/configuration/xml/DbKeyGeneratorHandlerTest.java
index 94e147a85..25263c4d7 100644
--- 
a/cayenne/src/test/java/org/apache/cayenne/configuration/xml/DbKeyGeneratorHandlerTest.java
+++ 
b/cayenne/src/test/java/org/apache/cayenne/configuration/xml/DbKeyGeneratorHandlerTest.java
@@ -25,9 +25,6 @@ import org.junit.jupiter.api.Test;
 
 import static org.junit.jupiter.api.Assertions.*;
 
-/**
- * @since 4.1
- */
 public class DbKeyGeneratorHandlerTest extends BaseHandlerTest {
 
     @Test
@@ -47,5 +44,4 @@ public class DbKeyGeneratorHandlerTest extends 
BaseHandlerTest {
         assertEquals(DbKeyGenerator.ORACLE_TYPE, 
dbEntity.getPrimaryKeyGenerator().getGeneratorType());
     }
 
-
 }
\ No newline at end of file
diff --git 
a/cayenne/src/test/java/org/apache/cayenne/configuration/xml/DbRelationshipHandlerTest.java
 
b/cayenne/src/test/java/org/apache/cayenne/configuration/xml/DbRelationshipHandlerTest.java
index 81030635b..09fa0a365 100644
--- 
a/cayenne/src/test/java/org/apache/cayenne/configuration/xml/DbRelationshipHandlerTest.java
+++ 
b/cayenne/src/test/java/org/apache/cayenne/configuration/xml/DbRelationshipHandlerTest.java
@@ -26,9 +26,6 @@ import org.junit.jupiter.api.Test;
 
 import static org.junit.jupiter.api.Assertions.*;
 
-/**
- * @since 4.1
- */
 public class DbRelationshipHandlerTest extends BaseHandlerTest {
 
     @Test
diff --git 
a/cayenne/src/test/java/org/apache/cayenne/configuration/xml/ObjEntityHandlerTest.java
 
b/cayenne/src/test/java/org/apache/cayenne/configuration/xml/ObjEntityHandlerTest.java
index 47fcbd81b..e5ffa3037 100644
--- 
a/cayenne/src/test/java/org/apache/cayenne/configuration/xml/ObjEntityHandlerTest.java
+++ 
b/cayenne/src/test/java/org/apache/cayenne/configuration/xml/ObjEntityHandlerTest.java
@@ -27,9 +27,6 @@ import org.junit.jupiter.api.Test;
 
 import static org.junit.jupiter.api.Assertions.*;
 
-/**
- * @since 4.1
- */
 public class ObjEntityHandlerTest extends BaseHandlerTest {
 
     @Test
diff --git 
a/cayenne/src/test/java/org/apache/cayenne/configuration/xml/ObjRelationshipHandlerTest.java
 
b/cayenne/src/test/java/org/apache/cayenne/configuration/xml/ObjRelationshipHandlerTest.java
index c0c4107d9..95f36cb39 100644
--- 
a/cayenne/src/test/java/org/apache/cayenne/configuration/xml/ObjRelationshipHandlerTest.java
+++ 
b/cayenne/src/test/java/org/apache/cayenne/configuration/xml/ObjRelationshipHandlerTest.java
@@ -27,9 +27,6 @@ import org.junit.jupiter.api.Test;
 
 import static org.junit.jupiter.api.Assertions.*;
 
-/**
- * @since 4.1
- */
 public class ObjRelationshipHandlerTest extends BaseHandlerTest {
 
     @Test
@@ -40,7 +37,6 @@ public class ObjRelationshipHandlerTest extends 
BaseHandlerTest {
         map.addObjEntity(entity);
         assertEquals(0, entity.getRelationships().size());
 
-
         parse("obj-relationship", new HandlerFactory() {
             @Override
             public NamespaceAwareNestedTagHandler 
createHandler(NamespaceAwareNestedTagHandler parent) {
diff --git 
a/cayenne/src/test/java/org/apache/cayenne/configuration/xml/PrefetchTypeForSelectQueryHandlerTest.java
 
b/cayenne/src/test/java/org/apache/cayenne/configuration/xml/PrefetchTypeForSelectQueryHandlerTest.java
index 6f5d900a1..abd068030 100644
--- 
a/cayenne/src/test/java/org/apache/cayenne/configuration/xml/PrefetchTypeForSelectQueryHandlerTest.java
+++ 
b/cayenne/src/test/java/org/apache/cayenne/configuration/xml/PrefetchTypeForSelectQueryHandlerTest.java
@@ -25,9 +25,6 @@ import org.junit.jupiter.api.Test;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
-/**
- * @since 4.1
- */
 public class PrefetchTypeForSelectQueryHandlerTest extends BaseHandlerTest{
 
     @Test
diff --git 
a/cayenne/src/test/java/org/apache/cayenne/configuration/xml/PrefetchTypeForSqlTemplateHandlerTest.java
 
b/cayenne/src/test/java/org/apache/cayenne/configuration/xml/PrefetchTypeForSqlTemplateHandlerTest.java
index 3eead4cb5..811f944d0 100644
--- 
a/cayenne/src/test/java/org/apache/cayenne/configuration/xml/PrefetchTypeForSqlTemplateHandlerTest.java
+++ 
b/cayenne/src/test/java/org/apache/cayenne/configuration/xml/PrefetchTypeForSqlTemplateHandlerTest.java
@@ -25,9 +25,6 @@ import org.junit.jupiter.api.Test;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
-/**
- * @since 4.1
- */
 public class PrefetchTypeForSqlTemplateHandlerTest extends BaseHandlerTest {
 
     @Test
diff --git 
a/cayenne/src/test/java/org/apache/cayenne/configuration/xml/VersionAwareHandlerTest.java
 
b/cayenne/src/test/java/org/apache/cayenne/configuration/xml/VersionAwareHandlerTest.java
index 1bf8add28..c35f63f5b 100644
--- 
a/cayenne/src/test/java/org/apache/cayenne/configuration/xml/VersionAwareHandlerTest.java
+++ 
b/cayenne/src/test/java/org/apache/cayenne/configuration/xml/VersionAwareHandlerTest.java
@@ -27,9 +27,6 @@ import org.xml.sax.helpers.AttributesImpl;
 
 import static org.junit.jupiter.api.Assertions.assertThrows;
 
-/**
- * @since 4.1
- */
 public class VersionAwareHandlerTest {
 
     private static String[] VERSION_SET_1 = {"10", "11", "9"}; // sorted as 
strings
diff --git 
a/cayenne/src/test/java/org/apache/cayenne/datafactory/CombinedValueProvider.java
 
b/cayenne/src/test/java/org/apache/cayenne/datafactory/CombinedValueProvider.java
index 2e440eb0d..018e48a13 100644
--- 
a/cayenne/src/test/java/org/apache/cayenne/datafactory/CombinedValueProvider.java
+++ 
b/cayenne/src/test/java/org/apache/cayenne/datafactory/CombinedValueProvider.java
@@ -18,8 +18,5 @@
  ****************************************************************/
 package org.apache.cayenne.datafactory;
 
-/**
- * @since 4.0
- */
 public class CombinedValueProvider {
 }
diff --git 
a/cayenne/src/test/java/org/apache/cayenne/datafactory/DataFactory.java 
b/cayenne/src/test/java/org/apache/cayenne/datafactory/DataFactory.java
index 42b0df5a8..0cb83f446 100644
--- a/cayenne/src/test/java/org/apache/cayenne/datafactory/DataFactory.java
+++ b/cayenne/src/test/java/org/apache/cayenne/datafactory/DataFactory.java
@@ -22,9 +22,6 @@ import java.util.Calendar;
 import java.util.Date;
 import java.util.Random;
 
-/**
- * @since 4.0
- */
 public class DataFactory {
 
     private Random random = ValueProvider.RANDOM;
diff --git 
a/cayenne/src/test/java/org/apache/cayenne/datafactory/DictionaryValueProvider.java
 
b/cayenne/src/test/java/org/apache/cayenne/datafactory/DictionaryValueProvider.java
index f1dd42427..29f082d03 100644
--- 
a/cayenne/src/test/java/org/apache/cayenne/datafactory/DictionaryValueProvider.java
+++ 
b/cayenne/src/test/java/org/apache/cayenne/datafactory/DictionaryValueProvider.java
@@ -20,9 +20,6 @@ package org.apache.cayenne.datafactory;
 
 import java.util.Random;
 
-/**
- * @since 4.0
- */
 public abstract class DictionaryValueProvider<T> implements ValueProvider<T> {
 
     private Random random = ValueProvider.RANDOM;
diff --git 
a/cayenne/src/test/java/org/apache/cayenne/datafactory/ValueProvider.java 
b/cayenne/src/test/java/org/apache/cayenne/datafactory/ValueProvider.java
index 5e577bea7..2c8daccef 100644
--- a/cayenne/src/test/java/org/apache/cayenne/datafactory/ValueProvider.java
+++ b/cayenne/src/test/java/org/apache/cayenne/datafactory/ValueProvider.java
@@ -20,9 +20,6 @@ package org.apache.cayenne.datafactory;
 
 import java.util.Random;
 
-/**
- * @since 4.0
- */
 public interface ValueProvider<T> {
     Random RANDOM = new Random();
 
@@ -695,7 +692,6 @@ public interface ValueProvider<T> {
         }
     };
 
-
     T randomValue();
 
     T randomValue(int chance);
diff --git 
a/cayenne/src/test/java/org/apache/cayenne/exp/FunctionExpressionFactoryTest.java
 
b/cayenne/src/test/java/org/apache/cayenne/exp/FunctionExpressionFactoryTest.java
index ffaeaa31b..51965b53e 100644
--- 
a/cayenne/src/test/java/org/apache/cayenne/exp/FunctionExpressionFactoryTest.java
+++ 
b/cayenne/src/test/java/org/apache/cayenne/exp/FunctionExpressionFactoryTest.java
@@ -47,10 +47,6 @@ import org.junit.jupiter.api.Test;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
-
-/**
- * @since 4.0
- */
 public class FunctionExpressionFactoryTest {
 
     @Test
@@ -122,7 +118,6 @@ public class FunctionExpressionFactoryTest {
         assertEquals(exp1, exp2);
     }
 
-
     @Test
     public void locateExp() throws Exception {
         Expression exp1 = FunctionExpressionFactory.locateExp("abc", 
Artist.ARTIST_NAME.getExpression());
@@ -139,7 +134,6 @@ public class FunctionExpressionFactoryTest {
         assertEquals(exp2, exp3);
     }
 
-
     @Test
     public void absExp() throws Exception {
         Expression exp1 = 
FunctionExpressionFactory.absExp(Artist.ARTIST_NAME.getExpression());
@@ -166,7 +160,6 @@ public class FunctionExpressionFactoryTest {
         assertEquals(exp1, exp2);
     }
 
-
     @Test
     public void modExp() throws Exception {
         Expression exp1 = 
FunctionExpressionFactory.modExp(Artist.ARTIST_NAME.getExpression(), 10);
@@ -183,7 +176,6 @@ public class FunctionExpressionFactoryTest {
         assertEquals(exp2, exp3);
     }
 
-
     @Test
     public void concatExp() throws Exception {
         Expression exp1 = 
FunctionExpressionFactory.concatExp(Artist.ARTIST_NAME.getExpression(), new 
ASTScalar("abc"), Artist.DATE_OF_BIRTH.getExpression());
@@ -194,7 +186,6 @@ public class FunctionExpressionFactoryTest {
         assertEquals("abc", exp1.getOperand(1));
         assertEquals(Artist.DATE_OF_BIRTH.getExpression(), exp1.getOperand(2));
 
-
         Expression exp2 = 
FunctionExpressionFactory.concatExp(Artist.ARTIST_NAME.getName(), 
Artist.DATE_OF_BIRTH.getName(), Artist.PAINTING_ARRAY.getName());
         assertTrue(exp2 instanceof ASTConcat);
         assertEquals(3, exp2.getOperandCount());
diff --git 
a/cayenne/src/test/java/org/apache/cayenne/exp/parser/ASTAbsTest.java 
b/cayenne/src/test/java/org/apache/cayenne/exp/parser/ASTAbsTest.java
index 23049c18f..78059141d 100644
--- a/cayenne/src/test/java/org/apache/cayenne/exp/parser/ASTAbsTest.java
+++ b/cayenne/src/test/java/org/apache/cayenne/exp/parser/ASTAbsTest.java
@@ -26,9 +26,6 @@ import org.junit.jupiter.api.Test;
 
 import static org.junit.jupiter.api.Assertions.*;
 
-/**
- * @since 4.0
- */
 public class ASTAbsTest {
 
     @Test
diff --git 
a/cayenne/src/test/java/org/apache/cayenne/exp/parser/ASTAggregateTest.java 
b/cayenne/src/test/java/org/apache/cayenne/exp/parser/ASTAggregateTest.java
index 7d0f68d6a..709e93a23 100644
--- a/cayenne/src/test/java/org/apache/cayenne/exp/parser/ASTAggregateTest.java
+++ b/cayenne/src/test/java/org/apache/cayenne/exp/parser/ASTAggregateTest.java
@@ -28,9 +28,6 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertThrows;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
-/**
- * @since 4.0
- */
 public class ASTAggregateTest {
 
     @Test
@@ -50,7 +47,6 @@ public class ASTAggregateTest {
         });
     }
 
-
     @Test
     public void avgParse() {
         String expressionString = "avg(artistName)";
@@ -155,9 +151,6 @@ public class ASTAggregateTest {
         assertEquals(expressionString, exp.toString());
     }
 
-    /**
-     * @since 5.0
-     */
     @Test
     public void customConstruct() {
         AggregateCustom sum = new AggregateCustom();
diff --git 
a/cayenne/src/test/java/org/apache/cayenne/exp/parser/ASTConcatTest.java 
b/cayenne/src/test/java/org/apache/cayenne/exp/parser/ASTConcatTest.java
index 9466509e6..24d105e84 100644
--- a/cayenne/src/test/java/org/apache/cayenne/exp/parser/ASTConcatTest.java
+++ b/cayenne/src/test/java/org/apache/cayenne/exp/parser/ASTConcatTest.java
@@ -27,9 +27,6 @@ import org.junit.jupiter.api.Test;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
-/**
- * @since 4.0
- */
 public class ASTConcatTest {
 
     @Test
diff --git 
a/cayenne/src/test/java/org/apache/cayenne/exp/parser/ASTCurrentDateTest.java 
b/cayenne/src/test/java/org/apache/cayenne/exp/parser/ASTCurrentDateTest.java
index 9bc6c0df6..b4ca2ed26 100644
--- 
a/cayenne/src/test/java/org/apache/cayenne/exp/parser/ASTCurrentDateTest.java
+++ 
b/cayenne/src/test/java/org/apache/cayenne/exp/parser/ASTCurrentDateTest.java
@@ -28,9 +28,6 @@ import org.junit.jupiter.api.Test;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
-/**
- * @since 4.0
- */
 public class ASTCurrentDateTest {
 
     @Test
diff --git 
a/cayenne/src/test/java/org/apache/cayenne/exp/parser/ASTCurrentTimeTest.java 
b/cayenne/src/test/java/org/apache/cayenne/exp/parser/ASTCurrentTimeTest.java
index 90751ab91..caf685901 100644
--- 
a/cayenne/src/test/java/org/apache/cayenne/exp/parser/ASTCurrentTimeTest.java
+++ 
b/cayenne/src/test/java/org/apache/cayenne/exp/parser/ASTCurrentTimeTest.java
@@ -28,9 +28,6 @@ import org.junit.jupiter.api.Test;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
-/**
- * @since 4.0
- */
 public class ASTCurrentTimeTest {
 
     @Test
diff --git 
a/cayenne/src/test/java/org/apache/cayenne/exp/parser/ASTCurrentTimestampTest.java
 
b/cayenne/src/test/java/org/apache/cayenne/exp/parser/ASTCurrentTimestampTest.java
index 23dec55e1..532c8ab07 100644
--- 
a/cayenne/src/test/java/org/apache/cayenne/exp/parser/ASTCurrentTimestampTest.java
+++ 
b/cayenne/src/test/java/org/apache/cayenne/exp/parser/ASTCurrentTimestampTest.java
@@ -28,9 +28,6 @@ import org.junit.jupiter.api.Test;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
-/**
- * @since 4.0
- */
 public class ASTCurrentTimestampTest {
 
     @Test
diff --git 
a/cayenne/src/test/java/org/apache/cayenne/exp/parser/ASTCustomFunctionTest.java
 
b/cayenne/src/test/java/org/apache/cayenne/exp/parser/ASTCustomFunctionTest.java
index ff96673b1..4a2e9b322 100644
--- 
a/cayenne/src/test/java/org/apache/cayenne/exp/parser/ASTCustomFunctionTest.java
+++ 
b/cayenne/src/test/java/org/apache/cayenne/exp/parser/ASTCustomFunctionTest.java
@@ -26,9 +26,6 @@ import org.junit.jupiter.api.Test;
 
 import static org.junit.jupiter.api.Assertions.*;
 
-/**
- * @since 4.2
- */
 public class ASTCustomFunctionTest {
 
     @Test
diff --git 
a/cayenne/src/test/java/org/apache/cayenne/exp/parser/ASTCustomOperatorTest.java
 
b/cayenne/src/test/java/org/apache/cayenne/exp/parser/ASTCustomOperatorTest.java
index a5bf90d9a..300c3fc9d 100644
--- 
a/cayenne/src/test/java/org/apache/cayenne/exp/parser/ASTCustomOperatorTest.java
+++ 
b/cayenne/src/test/java/org/apache/cayenne/exp/parser/ASTCustomOperatorTest.java
@@ -26,9 +26,6 @@ import org.junit.jupiter.api.Test;
 
 import static org.junit.jupiter.api.Assertions.*;
 
-/**
- * @since 4.2
- */
 public class ASTCustomOperatorTest {
 
     @Test
@@ -50,5 +47,4 @@ public class ASTCustomOperatorTest {
         });
     }
 
-
 }
\ No newline at end of file
diff --git 
a/cayenne/src/test/java/org/apache/cayenne/exp/parser/ASTDbIdPathTest.java 
b/cayenne/src/test/java/org/apache/cayenne/exp/parser/ASTDbIdPathTest.java
index 66e2efab3..61f73e517 100644
--- a/cayenne/src/test/java/org/apache/cayenne/exp/parser/ASTDbIdPathTest.java
+++ b/cayenne/src/test/java/org/apache/cayenne/exp/parser/ASTDbIdPathTest.java
@@ -27,9 +27,6 @@ import org.junit.jupiter.api.Test;
 
 import static org.junit.jupiter.api.Assertions.*;
 
-/**
- * @since 4.2
- */
 public class ASTDbIdPathTest {
 
     @Test
diff --git 
a/cayenne/src/test/java/org/apache/cayenne/exp/parser/ASTExtractIT.java 
b/cayenne/src/test/java/org/apache/cayenne/exp/parser/ASTExtractIT.java
index 5ce8bfb13..e918b2f46 100644
--- a/cayenne/src/test/java/org/apache/cayenne/exp/parser/ASTExtractIT.java
+++ b/cayenne/src/test/java/org/apache/cayenne/exp/parser/ASTExtractIT.java
@@ -37,9 +37,6 @@ import org.junit.jupiter.api.extension.RegisterExtension;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
-/**
- * @since 4.0
- */
 public class ASTExtractIT {
 
     @RegisterExtension
diff --git 
a/cayenne/src/test/java/org/apache/cayenne/exp/parser/ASTExtractTest.java 
b/cayenne/src/test/java/org/apache/cayenne/exp/parser/ASTExtractTest.java
index 2a2ec9416..337e7a15a 100644
--- a/cayenne/src/test/java/org/apache/cayenne/exp/parser/ASTExtractTest.java
+++ b/cayenne/src/test/java/org/apache/cayenne/exp/parser/ASTExtractTest.java
@@ -27,9 +27,6 @@ import org.junit.jupiter.api.Test;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
-/**
- * @since 4.0
- */
 public class ASTExtractTest {
 
     @Test
diff --git 
a/cayenne/src/test/java/org/apache/cayenne/exp/parser/ASTFunctionCallDateIT.java
 
b/cayenne/src/test/java/org/apache/cayenne/exp/parser/ASTFunctionCallDateIT.java
index 8bf5c56ef..cc500a6de 100644
--- 
a/cayenne/src/test/java/org/apache/cayenne/exp/parser/ASTFunctionCallDateIT.java
+++ 
b/cayenne/src/test/java/org/apache/cayenne/exp/parser/ASTFunctionCallDateIT.java
@@ -36,9 +36,6 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNotEquals;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
 
-/**
- * @since 4.0
- */
 public class ASTFunctionCallDateIT {
 
     @RegisterExtension
diff --git 
a/cayenne/src/test/java/org/apache/cayenne/exp/parser/ASTFunctionCallMathIT.java
 
b/cayenne/src/test/java/org/apache/cayenne/exp/parser/ASTFunctionCallMathIT.java
index a65d8e796..32ae797fd 100644
--- 
a/cayenne/src/test/java/org/apache/cayenne/exp/parser/ASTFunctionCallMathIT.java
+++ 
b/cayenne/src/test/java/org/apache/cayenne/exp/parser/ASTFunctionCallMathIT.java
@@ -33,9 +33,6 @@ import org.junit.jupiter.api.extension.RegisterExtension;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
-/**
- * @since 4.0
- */
 public class ASTFunctionCallMathIT {
 
     @RegisterExtension
diff --git 
a/cayenne/src/test/java/org/apache/cayenne/exp/parser/ASTFunctionCallStringIT.java
 
b/cayenne/src/test/java/org/apache/cayenne/exp/parser/ASTFunctionCallStringIT.java
index 54c5c7695..f31d5b9dd 100644
--- 
a/cayenne/src/test/java/org/apache/cayenne/exp/parser/ASTFunctionCallStringIT.java
+++ 
b/cayenne/src/test/java/org/apache/cayenne/exp/parser/ASTFunctionCallStringIT.java
@@ -37,9 +37,6 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNull;
 import static org.junit.jupiter.api.Assumptions.assumeFalse;
 
-/**
- * @since 4.0
- */
 public class ASTFunctionCallStringIT {
 
     @RegisterExtension
diff --git 
a/cayenne/src/test/java/org/apache/cayenne/exp/parser/ASTFunctionCallTest.java 
b/cayenne/src/test/java/org/apache/cayenne/exp/parser/ASTFunctionCallTest.java
index a9f53bc0f..59e38d21a 100644
--- 
a/cayenne/src/test/java/org/apache/cayenne/exp/parser/ASTFunctionCallTest.java
+++ 
b/cayenne/src/test/java/org/apache/cayenne/exp/parser/ASTFunctionCallTest.java
@@ -23,9 +23,6 @@ import org.junit.jupiter.api.Test;
 
 import static org.junit.jupiter.api.Assertions.*;
 
-/**
- * @since 4.0
- */
 public class ASTFunctionCallTest {
 
     @Test
diff --git 
a/cayenne/src/test/java/org/apache/cayenne/exp/parser/ASTLengthTest.java 
b/cayenne/src/test/java/org/apache/cayenne/exp/parser/ASTLengthTest.java
index 68f0795fa..2205c4aac 100644
--- a/cayenne/src/test/java/org/apache/cayenne/exp/parser/ASTLengthTest.java
+++ b/cayenne/src/test/java/org/apache/cayenne/exp/parser/ASTLengthTest.java
@@ -26,9 +26,6 @@ import org.junit.jupiter.api.Test;
 
 import static org.junit.jupiter.api.Assertions.*;
 
-/**
- * @since 4.0
- */
 public class ASTLengthTest {
 
     @Test
diff --git 
a/cayenne/src/test/java/org/apache/cayenne/exp/parser/ASTLocateTest.java 
b/cayenne/src/test/java/org/apache/cayenne/exp/parser/ASTLocateTest.java
index 8eab17b28..b5a254b0b 100644
--- a/cayenne/src/test/java/org/apache/cayenne/exp/parser/ASTLocateTest.java
+++ b/cayenne/src/test/java/org/apache/cayenne/exp/parser/ASTLocateTest.java
@@ -27,9 +27,6 @@ import org.junit.jupiter.api.Test;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
-/**
- * @since 4.0
- */
 public class ASTLocateTest {
 
     @Test
diff --git 
a/cayenne/src/test/java/org/apache/cayenne/exp/parser/ASTLowerTest.java 
b/cayenne/src/test/java/org/apache/cayenne/exp/parser/ASTLowerTest.java
index 60f4e758b..40bbcbfcf 100644
--- a/cayenne/src/test/java/org/apache/cayenne/exp/parser/ASTLowerTest.java
+++ b/cayenne/src/test/java/org/apache/cayenne/exp/parser/ASTLowerTest.java
@@ -27,9 +27,6 @@ import org.junit.jupiter.api.Test;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
-/**
- * @since 4.0
- */
 public class ASTLowerTest {
 
     @Test
diff --git 
a/cayenne/src/test/java/org/apache/cayenne/exp/parser/ASTModTest.java 
b/cayenne/src/test/java/org/apache/cayenne/exp/parser/ASTModTest.java
index 036b7bddf..623bd698e 100644
--- a/cayenne/src/test/java/org/apache/cayenne/exp/parser/ASTModTest.java
+++ b/cayenne/src/test/java/org/apache/cayenne/exp/parser/ASTModTest.java
@@ -26,9 +26,6 @@ import org.junit.jupiter.api.Test;
 
 import static org.junit.jupiter.api.Assertions.*;
 
-/**
- * @since 4.0
- */
 public class ASTModTest {
 
     @Test
diff --git 
a/cayenne/src/test/java/org/apache/cayenne/exp/parser/ASTScalarTest.java 
b/cayenne/src/test/java/org/apache/cayenne/exp/parser/ASTScalarTest.java
index 6872983be..c71c8b0ea 100644
--- a/cayenne/src/test/java/org/apache/cayenne/exp/parser/ASTScalarTest.java
+++ b/cayenne/src/test/java/org/apache/cayenne/exp/parser/ASTScalarTest.java
@@ -23,9 +23,6 @@ import org.junit.jupiter.api.Test;
 
 import static org.junit.jupiter.api.Assertions.*;
 
-/**
- * @since 4.0
- */
 public class ASTScalarTest {
 
     @Test
diff --git 
a/cayenne/src/test/java/org/apache/cayenne/exp/parser/ASTSqrtTest.java 
b/cayenne/src/test/java/org/apache/cayenne/exp/parser/ASTSqrtTest.java
index a68fd2ad4..7bc96967c 100644
--- a/cayenne/src/test/java/org/apache/cayenne/exp/parser/ASTSqrtTest.java
+++ b/cayenne/src/test/java/org/apache/cayenne/exp/parser/ASTSqrtTest.java
@@ -26,9 +26,6 @@ import org.junit.jupiter.api.Test;
 
 import static org.junit.jupiter.api.Assertions.*;
 
-/**
- * @since 4.0
- */
 public class ASTSqrtTest {
     @Test
     public void evaluateNode() throws Exception {
diff --git 
a/cayenne/src/test/java/org/apache/cayenne/exp/parser/ASTSubstringTest.java 
b/cayenne/src/test/java/org/apache/cayenne/exp/parser/ASTSubstringTest.java
index ff61b4e4b..ee18a5971 100644
--- a/cayenne/src/test/java/org/apache/cayenne/exp/parser/ASTSubstringTest.java
+++ b/cayenne/src/test/java/org/apache/cayenne/exp/parser/ASTSubstringTest.java
@@ -27,9 +27,6 @@ import org.junit.jupiter.api.Test;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
-/**
- * @since 4.0
- */
 public class ASTSubstringTest {
 
     @Test
diff --git 
a/cayenne/src/test/java/org/apache/cayenne/exp/parser/ASTTrimTest.java 
b/cayenne/src/test/java/org/apache/cayenne/exp/parser/ASTTrimTest.java
index 8cdbba78b..73865aa37 100644
--- a/cayenne/src/test/java/org/apache/cayenne/exp/parser/ASTTrimTest.java
+++ b/cayenne/src/test/java/org/apache/cayenne/exp/parser/ASTTrimTest.java
@@ -27,9 +27,6 @@ import org.junit.jupiter.api.Test;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
-/**
- * @since 4.0
- */
 public class ASTTrimTest {
 
     @Test
diff --git 
a/cayenne/src/test/java/org/apache/cayenne/exp/parser/ASTUpperTest.java 
b/cayenne/src/test/java/org/apache/cayenne/exp/parser/ASTUpperTest.java
index 0d3df6173..85539d08c 100644
--- a/cayenne/src/test/java/org/apache/cayenne/exp/parser/ASTUpperTest.java
+++ b/cayenne/src/test/java/org/apache/cayenne/exp/parser/ASTUpperTest.java
@@ -27,9 +27,6 @@ import org.junit.jupiter.api.Test;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
-/**
- * @since 4.0
- */
 public class ASTUpperTest {
 
     @Test
diff --git 
a/cayenne/src/test/java/org/apache/cayenne/exp/parser/ExpressionCollectionEvaluationIT.java
 
b/cayenne/src/test/java/org/apache/cayenne/exp/parser/ExpressionCollectionEvaluationIT.java
index 65ea76093..6b3df9ada 100644
--- 
a/cayenne/src/test/java/org/apache/cayenne/exp/parser/ExpressionCollectionEvaluationIT.java
+++ 
b/cayenne/src/test/java/org/apache/cayenne/exp/parser/ExpressionCollectionEvaluationIT.java
@@ -38,9 +38,6 @@ import org.junit.jupiter.api.extension.RegisterExtension;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
-/**
- * @since 4.0
- */
 public class ExpressionCollectionEvaluationIT {
 
     @RegisterExtension
diff --git 
a/cayenne/src/test/java/org/apache/cayenne/exp/parser/ExpressionEvaluationIT.java
 
b/cayenne/src/test/java/org/apache/cayenne/exp/parser/ExpressionEvaluationIT.java
index eb82e04aa..27c0e0324 100644
--- 
a/cayenne/src/test/java/org/apache/cayenne/exp/parser/ExpressionEvaluationIT.java
+++ 
b/cayenne/src/test/java/org/apache/cayenne/exp/parser/ExpressionEvaluationIT.java
@@ -46,8 +46,6 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
  *  - To-Many relationships comparisons
  *  - Null comparisons
  *  - Null in AND and OR expressions
- *
- * @since 4.0
  */
 public class ExpressionEvaluationIT {
 
diff --git 
a/cayenne/src/test/java/org/apache/cayenne/exp/property/BasePropertyTest.java 
b/cayenne/src/test/java/org/apache/cayenne/exp/property/BasePropertyTest.java
index ec8974df5..3beffd5ac 100644
--- 
a/cayenne/src/test/java/org/apache/cayenne/exp/property/BasePropertyTest.java
+++ 
b/cayenne/src/test/java/org/apache/cayenne/exp/property/BasePropertyTest.java
@@ -33,9 +33,6 @@ import org.junit.jupiter.api.Test;
 
 import static org.junit.jupiter.api.Assertions.*;
 
-/**
- * @since 4.2
- */
 public class BasePropertyTest {
 
     private BaseProperty<Integer> property;
@@ -45,7 +42,6 @@ public class BasePropertyTest {
         property = new BaseProperty<>(CayennePath.of("path"), null, 
Integer.class);
     }
 
-
     @Test
     public void pathExpConstructor() {
         assertEquals(new ASTObjPath("path"), property.getExpression());
diff --git 
a/cayenne/src/test/java/org/apache/cayenne/exp/property/DatePropertyTest.java 
b/cayenne/src/test/java/org/apache/cayenne/exp/property/DatePropertyTest.java
index 69ac25760..f7acf9a7a 100644
--- 
a/cayenne/src/test/java/org/apache/cayenne/exp/property/DatePropertyTest.java
+++ 
b/cayenne/src/test/java/org/apache/cayenne/exp/property/DatePropertyTest.java
@@ -29,9 +29,6 @@ import org.junit.jupiter.api.Test;
 import static org.apache.cayenne.exp.ExpressionFactory.exp;
 import static org.junit.jupiter.api.Assertions.*;
 
-/**
- * @since 4.2
- */
 public class DatePropertyTest {
 
     private DateProperty<LocalDate> property;
diff --git 
a/cayenne/src/test/java/org/apache/cayenne/exp/property/EntityPropertyTest.java 
b/cayenne/src/test/java/org/apache/cayenne/exp/property/EntityPropertyTest.java
index 45f28bb77..9ae292426 100644
--- 
a/cayenne/src/test/java/org/apache/cayenne/exp/property/EntityPropertyTest.java
+++ 
b/cayenne/src/test/java/org/apache/cayenne/exp/property/EntityPropertyTest.java
@@ -30,9 +30,6 @@ import org.junit.jupiter.api.Test;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
-/**
- * @since 4.2
- */
 public class EntityPropertyTest {
 
     private EntityProperty<Artist> property;
diff --git 
a/cayenne/src/test/java/org/apache/cayenne/exp/property/IdPropertyIT.java 
b/cayenne/src/test/java/org/apache/cayenne/exp/property/IdPropertyIT.java
index b044ebbe5..b114d1001 100644
--- a/cayenne/src/test/java/org/apache/cayenne/exp/property/IdPropertyIT.java
+++ b/cayenne/src/test/java/org/apache/cayenne/exp/property/IdPropertyIT.java
@@ -39,9 +39,6 @@ import org.junit.jupiter.api.extension.RegisterExtension;
 
 import static org.junit.jupiter.api.Assertions.*;
 
-/**
- * @since 4.2
- */
 public class IdPropertyIT {
 
     @RegisterExtension
diff --git 
a/cayenne/src/test/java/org/apache/cayenne/exp/property/IdPropertyTest.java 
b/cayenne/src/test/java/org/apache/cayenne/exp/property/IdPropertyTest.java
index c5ed61527..3e0bf7b6a 100644
--- a/cayenne/src/test/java/org/apache/cayenne/exp/property/IdPropertyTest.java
+++ b/cayenne/src/test/java/org/apache/cayenne/exp/property/IdPropertyTest.java
@@ -30,9 +30,6 @@ import static org.apache.cayenne.exp.ExpressionFactory.*;
 import static org.apache.cayenne.exp.property.PropertyFactory.createNumericId;
 import static org.junit.jupiter.api.Assertions.*;
 
-/**
- * @since 4.2
- */
 public class IdPropertyTest {
 
     @Test
@@ -65,7 +62,6 @@ public class IdPropertyTest {
         });
     }
 
-
     @Test
     public void eqObjectIdCompound() {
         Map<String, Object> key = new HashMap<>();
diff --git 
a/cayenne/src/test/java/org/apache/cayenne/exp/property/ListPropertyTest.java 
b/cayenne/src/test/java/org/apache/cayenne/exp/property/ListPropertyTest.java
index 4b5e18ec7..a477a298c 100644
--- 
a/cayenne/src/test/java/org/apache/cayenne/exp/property/ListPropertyTest.java
+++ 
b/cayenne/src/test/java/org/apache/cayenne/exp/property/ListPropertyTest.java
@@ -32,9 +32,6 @@ import org.junit.jupiter.api.Test;
 
 import static org.junit.jupiter.api.Assertions.*;
 
-/**
- * @since 4.2
- */
 public class ListPropertyTest {
 
     private ListProperty<Artist> property;
@@ -46,7 +43,6 @@ public class ListPropertyTest {
         property1 = new ListProperty<>(CayennePath.of("path.artist"), null, 
Artist.class);
     }
 
-
     @Test
     public void alias() {
         assertEquals("path", property.getName());
diff --git 
a/cayenne/src/test/java/org/apache/cayenne/exp/property/MapPropertyTest.java 
b/cayenne/src/test/java/org/apache/cayenne/exp/property/MapPropertyTest.java
index 7d0844510..c08ab5639 100644
--- a/cayenne/src/test/java/org/apache/cayenne/exp/property/MapPropertyTest.java
+++ b/cayenne/src/test/java/org/apache/cayenne/exp/property/MapPropertyTest.java
@@ -30,9 +30,6 @@ import org.junit.jupiter.api.Test;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
-/**
- * @since 4.2
- */
 public class MapPropertyTest {
 
     private MapProperty<Integer, Artist> property;
diff --git 
a/cayenne/src/test/java/org/apache/cayenne/exp/property/NumericPropertyTest.java
 
b/cayenne/src/test/java/org/apache/cayenne/exp/property/NumericPropertyTest.java
index 9afb63eed..cdcc66d1a 100644
--- 
a/cayenne/src/test/java/org/apache/cayenne/exp/property/NumericPropertyTest.java
+++ 
b/cayenne/src/test/java/org/apache/cayenne/exp/property/NumericPropertyTest.java
@@ -29,9 +29,6 @@ import org.junit.jupiter.api.Test;
 import static org.junit.jupiter.api.Assertions.*;
 import static org.apache.cayenne.exp.ExpressionFactory.exp;
 
-/**
- * @since 4.2
- */
 public class NumericPropertyTest {
 
     private NumericProperty<Integer> property;
diff --git 
a/cayenne/src/test/java/org/apache/cayenne/exp/property/PathAliasesIT.java 
b/cayenne/src/test/java/org/apache/cayenne/exp/property/PathAliasesIT.java
index 311a601a1..7fde02841 100644
--- a/cayenne/src/test/java/org/apache/cayenne/exp/property/PathAliasesIT.java
+++ b/cayenne/src/test/java/org/apache/cayenne/exp/property/PathAliasesIT.java
@@ -46,9 +46,6 @@ import static org.junit.jupiter.api.Assertions.assertNotNull;
 import static org.junit.jupiter.api.Assertions.assertThrows;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
-/**
- * @since 4.2
- */
 public class PathAliasesIT {
 
     @RegisterExtension
@@ -183,7 +180,6 @@ public class PathAliasesIT {
         });
     }
 
-
     @Test
 
     public void theSameAliasesToDifferentProperties() {
@@ -197,7 +193,6 @@ public class PathAliasesIT {
         });
     }
 
-
     @Test
     public void expWithAliases() {
         Expression e1 = ExpressionFactory.exp("paintingArray#p1.paintingTitle 
= 'painting2'");
@@ -314,7 +309,6 @@ public class PathAliasesIT {
         });
     }
 
-
     @Test
 
     public void expWithAliasNotToRelSegment() {
diff --git 
a/cayenne/src/test/java/org/apache/cayenne/exp/property/PropertyFactoryTest.java
 
b/cayenne/src/test/java/org/apache/cayenne/exp/property/PropertyFactoryTest.java
index 93e29ced5..e4af1b349 100644
--- 
a/cayenne/src/test/java/org/apache/cayenne/exp/property/PropertyFactoryTest.java
+++ 
b/cayenne/src/test/java/org/apache/cayenne/exp/property/PropertyFactoryTest.java
@@ -30,9 +30,6 @@ import org.junit.jupiter.api.Test;
 import static org.apache.cayenne.exp.ExpressionFactory.*;
 import static org.junit.jupiter.api.Assertions.*;
 
-/**
- * @since 4.2
- */
 public class PropertyFactoryTest {
 
     @Test
diff --git 
a/cayenne/src/test/java/org/apache/cayenne/exp/property/SetPropertyTest.java 
b/cayenne/src/test/java/org/apache/cayenne/exp/property/SetPropertyTest.java
index 94e37b6c8..c9ec3ba35 100644
--- a/cayenne/src/test/java/org/apache/cayenne/exp/property/SetPropertyTest.java
+++ b/cayenne/src/test/java/org/apache/cayenne/exp/property/SetPropertyTest.java
@@ -28,9 +28,6 @@ import org.junit.jupiter.api.Test;
 
 import static org.junit.jupiter.api.Assertions.*;
 
-/**
- * @since 4.2
- */
 public class SetPropertyTest {
 
     private SetProperty<Artist> property;
diff --git 
a/cayenne/src/test/java/org/apache/cayenne/exp/property/StringPropertyTest.java 
b/cayenne/src/test/java/org/apache/cayenne/exp/property/StringPropertyTest.java
index 873fdd053..20cb2bb6a 100644
--- 
a/cayenne/src/test/java/org/apache/cayenne/exp/property/StringPropertyTest.java
+++ 
b/cayenne/src/test/java/org/apache/cayenne/exp/property/StringPropertyTest.java
@@ -26,9 +26,6 @@ import org.junit.jupiter.api.Test;
 import static org.apache.cayenne.exp.ExpressionFactory.exp;
 import static org.junit.jupiter.api.Assertions.*;
 
-/**
- * @since 4.2
- */
 public class StringPropertyTest {
 
     private StringProperty<String> property;
diff --git a/cayenne/src/test/java/org/apache/cayenne/map/AnnotationIT.java 
b/cayenne/src/test/java/org/apache/cayenne/map/AnnotationIT.java
index c2e6129ef..bd83739b8 100644
--- a/cayenne/src/test/java/org/apache/cayenne/map/AnnotationIT.java
+++ b/cayenne/src/test/java/org/apache/cayenne/map/AnnotationIT.java
@@ -29,9 +29,6 @@ import org.junit.jupiter.api.extension.RegisterExtension;
 
 import static org.junit.jupiter.api.Assertions.*;
 
-/**
- * @since 4.2
- */
 public class AnnotationIT {
 
     @RegisterExtension
diff --git a/cayenne/src/test/java/org/apache/cayenne/query/ColumnSelectIT.java 
b/cayenne/src/test/java/org/apache/cayenne/query/ColumnSelectIT.java
index 912070852..23c2654e3 100644
--- a/cayenne/src/test/java/org/apache/cayenne/query/ColumnSelectIT.java
+++ b/cayenne/src/test/java/org/apache/cayenne/query/ColumnSelectIT.java
@@ -56,9 +56,6 @@ import org.junit.jupiter.api.extension.RegisterExtension;
 
 import static org.junit.jupiter.api.Assertions.*;
 
-/**
- * @since 4.0
- */
 public class ColumnSelectIT {
 
     @RegisterExtension
@@ -336,9 +333,6 @@ public class ColumnSelectIT {
         assertEquals(20L, minMaxAvgPrice[4]);
     }
 
-    /**
-     * @since 5.0
-     */
     @Test
     public void aggregateOnRelation_withCustomAggregates() {
         BigDecimal min = new BigDecimal(3);
@@ -965,7 +959,6 @@ public class ColumnSelectIT {
         assertEquals(20, result.size());
     }
 
-
     @Test
     public void suppressDistinct() throws Exception {
         // create non unique artist name / painting name pair
diff --git 
a/cayenne/src/test/java/org/apache/cayenne/query/ColumnSelectTest.java 
b/cayenne/src/test/java/org/apache/cayenne/query/ColumnSelectTest.java
index d5da5376a..83d446a85 100644
--- a/cayenne/src/test/java/org/apache/cayenne/query/ColumnSelectTest.java
+++ b/cayenne/src/test/java/org/apache/cayenne/query/ColumnSelectTest.java
@@ -34,9 +34,6 @@ import org.junit.jupiter.api.Test;
 
 import static org.junit.jupiter.api.Assertions.*;
 
-/**
- * @since 4.0
- */
 public class ColumnSelectTest {
 
     @Test
@@ -120,7 +117,6 @@ public class ColumnSelectTest {
         assertEquals(Arrays.asList(Artist.ARTIST_NAME, Artist.DATE_OF_BIRTH, 
Artist.PAINTING_ARRAY), q.getColumns());
     }
 
-
     @Test
     public void havingExpression() {
         ColumnSelect<?> q = new ColumnSelect<>();
@@ -193,7 +189,6 @@ public class ColumnSelectTest {
         assertEquals(ExpressionFactory.exp("true or true"), q.getWhere());
     }
 
-
     @Test
     public void testColumnsAddByOne() {
         ColumnSelect<Artist> q = new ColumnSelect<>();
diff --git 
a/cayenne/src/test/java/org/apache/cayenne/query/ObjectSelect_AggregateIT.java 
b/cayenne/src/test/java/org/apache/cayenne/query/ObjectSelect_AggregateIT.java
index 9abef6d2a..5a8e1db94 100644
--- 
a/cayenne/src/test/java/org/apache/cayenne/query/ObjectSelect_AggregateIT.java
+++ 
b/cayenne/src/test/java/org/apache/cayenne/query/ObjectSelect_AggregateIT.java
@@ -45,9 +45,6 @@ import org.junit.jupiter.api.extension.RegisterExtension;
 import static org.apache.cayenne.exp.FunctionExpressionFactory.*;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
-/**
- * @since 4.0
- */
 public class ObjectSelect_AggregateIT {
 
     @RegisterExtension
diff --git 
a/cayenne/src/test/java/org/apache/cayenne/query/ObjectSelect_PrimitiveColumnsIT.java
 
b/cayenne/src/test/java/org/apache/cayenne/query/ObjectSelect_PrimitiveColumnsIT.java
index e8b827417..937c3169b 100644
--- 
a/cayenne/src/test/java/org/apache/cayenne/query/ObjectSelect_PrimitiveColumnsIT.java
+++ 
b/cayenne/src/test/java/org/apache/cayenne/query/ObjectSelect_PrimitiveColumnsIT.java
@@ -39,9 +39,6 @@ import static 
org.junit.jupiter.api.Assertions.assertArrayEquals;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertFalse;
 
-/**
- * @since 4.0
- */
 public class ObjectSelect_PrimitiveColumnsIT {
 
     @RegisterExtension
diff --git 
a/cayenne/src/test/java/org/apache/cayenne/query/ObjectSelect_SubqueryIT.java 
b/cayenne/src/test/java/org/apache/cayenne/query/ObjectSelect_SubqueryIT.java
index a3f2a88fd..44712cea3 100644
--- 
a/cayenne/src/test/java/org/apache/cayenne/query/ObjectSelect_SubqueryIT.java
+++ 
b/cayenne/src/test/java/org/apache/cayenne/query/ObjectSelect_SubqueryIT.java
@@ -36,9 +36,6 @@ import org.junit.jupiter.api.extension.RegisterExtension;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
-/**
- * @since 4.2
- */
 public class ObjectSelect_SubqueryIT {
 
     @RegisterExtension
diff --git 
a/cayenne/src/test/java/org/apache/cayenne/query/QueryWithCompoundJoinIT.java 
b/cayenne/src/test/java/org/apache/cayenne/query/QueryWithCompoundJoinIT.java
index 840ed1c78..038eb00bf 100644
--- 
a/cayenne/src/test/java/org/apache/cayenne/query/QueryWithCompoundJoinIT.java
+++ 
b/cayenne/src/test/java/org/apache/cayenne/query/QueryWithCompoundJoinIT.java
@@ -38,7 +38,6 @@ import static org.junit.jupiter.api.Assertions.assertTrue;
 /**
  * Test join on compound primary key
  * @see <a href="https://issues.apache.org/jira/browse/CAY-2137";>CAY-2137</a>
- * @since 4.0
  */
 public class QueryWithCompoundJoinIT {
 
diff --git 
a/cayenne/src/test/java/org/apache/cayenne/query/QueryWithInheritancePrefetchIT.java
 
b/cayenne/src/test/java/org/apache/cayenne/query/QueryWithInheritancePrefetchIT.java
index 85b48be7c..67bb0118e 100644
--- 
a/cayenne/src/test/java/org/apache/cayenne/query/QueryWithInheritancePrefetchIT.java
+++ 
b/cayenne/src/test/java/org/apache/cayenne/query/QueryWithInheritancePrefetchIT.java
@@ -42,8 +42,6 @@ import static org.junit.jupiter.api.Assertions.assertTrue;
 /**
  *
  * This one is about https://issues.apache.org/jira/browse/CAY-2405
- *
- * @since 4.1
  */
 public class QueryWithInheritancePrefetchIT {
 
diff --git 
a/cayenne/src/test/java/org/apache/cayenne/query/SelectQueryMetadataCacheKeyTest.java
 
b/cayenne/src/test/java/org/apache/cayenne/query/SelectQueryMetadataCacheKeyTest.java
index 4983d4ef4..0e246da91 100644
--- 
a/cayenne/src/test/java/org/apache/cayenne/query/SelectQueryMetadataCacheKeyTest.java
+++ 
b/cayenne/src/test/java/org/apache/cayenne/query/SelectQueryMetadataCacheKeyTest.java
@@ -38,8 +38,6 @@ import static org.mockito.Mockito.when;
 
 /**
  * This class is testing converting Expressions to cache key part.
- *
- * @since 4.0
  */
 public class SelectQueryMetadataCacheKeyTest {
 
diff --git 
a/cayenne/src/test/java/org/apache/cayenne/reflect/LifecycleCallbackRegistryTest.java
 
b/cayenne/src/test/java/org/apache/cayenne/reflect/LifecycleCallbackRegistryTest.java
index 3a31c6b62..f2d9d828e 100644
--- 
a/cayenne/src/test/java/org/apache/cayenne/reflect/LifecycleCallbackRegistryTest.java
+++ 
b/cayenne/src/test/java/org/apache/cayenne/reflect/LifecycleCallbackRegistryTest.java
@@ -36,9 +36,6 @@ import org.junit.jupiter.api.Test;
 import static org.junit.jupiter.api.Assertions.*;
 import static org.mockito.Mockito.mock;
 
-/**
- * @since 4.0
- */
 public class LifecycleCallbackRegistryTest {
 
     LifecycleCallbackRegistry registry;
diff --git 
a/cayenne/src/test/java/org/apache/cayenne/reflect/PojoMapperTest.java 
b/cayenne/src/test/java/org/apache/cayenne/reflect/PojoMapperTest.java
index 62bff00c6..fa076291a 100644
--- a/cayenne/src/test/java/org/apache/cayenne/reflect/PojoMapperTest.java
+++ b/cayenne/src/test/java/org/apache/cayenne/reflect/PojoMapperTest.java
@@ -24,9 +24,6 @@ import org.junit.jupiter.api.Test;
 
 import static org.junit.jupiter.api.Assertions.*;
 
-/**
- * @since 4.2
- */
 public class PojoMapperTest {
 
     @Test
diff --git 
a/cayenne/src/test/java/org/apache/cayenne/template/CayenneSQLTemplateProcessorTest.java
 
b/cayenne/src/test/java/org/apache/cayenne/template/CayenneSQLTemplateProcessorTest.java
index 9b079733f..97aa7b505 100644
--- 
a/cayenne/src/test/java/org/apache/cayenne/template/CayenneSQLTemplateProcessorTest.java
+++ 
b/cayenne/src/test/java/org/apache/cayenne/template/CayenneSQLTemplateProcessorTest.java
@@ -35,9 +35,6 @@ import org.junit.jupiter.api.Test;
 
 import static org.junit.jupiter.api.Assertions.*;
 
-/**
- * @since 4.1
- */
 public class CayenneSQLTemplateProcessorTest {
 
     private CayenneSQLTemplateProcessor processor;
diff --git 
a/cayenne/src/test/java/org/apache/cayenne/template/TemplateParserPoolTest.java 
b/cayenne/src/test/java/org/apache/cayenne/template/TemplateParserPoolTest.java
index df065fd7c..4cf6bcfaf 100644
--- 
a/cayenne/src/test/java/org/apache/cayenne/template/TemplateParserPoolTest.java
+++ 
b/cayenne/src/test/java/org/apache/cayenne/template/TemplateParserPoolTest.java
@@ -27,9 +27,6 @@ import org.junit.jupiter.api.Test;
 
 import static org.junit.jupiter.api.Assertions.*;
 
-/**
- * @since 4.1
- */
 public class TemplateParserPoolTest {
 
     TemplateParserPool parserPool;
diff --git 
a/cayenne/src/test/java/org/apache/cayenne/template/parser/SQLTemplateParserTest.java
 
b/cayenne/src/test/java/org/apache/cayenne/template/parser/SQLTemplateParserTest.java
index c811e1abd..f0080871f 100644
--- 
a/cayenne/src/test/java/org/apache/cayenne/template/parser/SQLTemplateParserTest.java
+++ 
b/cayenne/src/test/java/org/apache/cayenne/template/parser/SQLTemplateParserTest.java
@@ -34,9 +34,6 @@ import org.junit.jupiter.api.Test;
 
 import static org.junit.jupiter.api.Assertions.*;
 
-/**
- * @since 4.1
- */
 public class SQLTemplateParserTest {
 
     private TemplateContextFactory contextFactory;
@@ -94,7 +91,6 @@ public class SQLTemplateParserTest {
         assertEquals("var", context.getParameterBindings()[0].getValue());
     }
 
-
     @Test
     public void complexParse() throws Exception {
         class Helper {
diff --git 
a/cayenne/src/test/java/org/apache/cayenne/testdo/inheritance_with_enum/Type.java
 
b/cayenne/src/test/java/org/apache/cayenne/testdo/inheritance_with_enum/Type.java
index 8cb7a2010..5cfbde3cd 100644
--- 
a/cayenne/src/test/java/org/apache/cayenne/testdo/inheritance_with_enum/Type.java
+++ 
b/cayenne/src/test/java/org/apache/cayenne/testdo/inheritance_with_enum/Type.java
@@ -19,9 +19,6 @@
 
 package org.apache.cayenne.testdo.inheritance_with_enum;
 
-/**
- * @since 4.1
- */
 public enum Type {
     type1,
     type2
diff --git 
a/cayenne/src/test/java/org/apache/cayenne/tx/TransactionCustomConnectionIT.java
 
b/cayenne/src/test/java/org/apache/cayenne/tx/TransactionCustomConnectionIT.java
index 57719ccaf..d1de72ac6 100644
--- 
a/cayenne/src/test/java/org/apache/cayenne/tx/TransactionCustomConnectionIT.java
+++ 
b/cayenne/src/test/java/org/apache/cayenne/tx/TransactionCustomConnectionIT.java
@@ -46,7 +46,6 @@ import static org.mockito.Mockito.*;
  * has major priority
  *
  * @see BaseTransaction,TransactionDescriptor
- * @since 4.2
  */
 public class TransactionCustomConnectionIT {
 
diff --git 
a/cayenne/src/test/java/org/apache/cayenne/tx/TransactionIsolationIT.java 
b/cayenne/src/test/java/org/apache/cayenne/tx/TransactionIsolationIT.java
index 9a3d7302e..c34f23712 100644
--- a/cayenne/src/test/java/org/apache/cayenne/tx/TransactionIsolationIT.java
+++ b/cayenne/src/test/java/org/apache/cayenne/tx/TransactionIsolationIT.java
@@ -41,9 +41,6 @@ import org.slf4j.LoggerFactory;
 
 import static org.junit.jupiter.api.Assertions.*;
 
-/**
- * @since 4.1
- */
 public class TransactionIsolationIT {
 
     @RegisterExtension
diff --git 
a/cayenne/src/test/java/org/apache/cayenne/tx/TransactionPropagationRollbackIT.java
 
b/cayenne/src/test/java/org/apache/cayenne/tx/TransactionPropagationRollbackIT.java
index 31b23859d..f360c4c6a 100644
--- 
a/cayenne/src/test/java/org/apache/cayenne/tx/TransactionPropagationRollbackIT.java
+++ 
b/cayenne/src/test/java/org/apache/cayenne/tx/TransactionPropagationRollbackIT.java
@@ -41,7 +41,6 @@ import static org.junit.jupiter.api.Assertions.assertThrows;
  * This test checks rollback behaviour of different propagation modes.
  *
  * @see TransactionPropagation
- * @since 4.1
  */
 public class TransactionPropagationRollbackIT {
 
diff --git 
a/cayenne/src/test/java/org/apache/cayenne/unit/SQLServerUnitDbAdapter.java 
b/cayenne/src/test/java/org/apache/cayenne/unit/SQLServerUnitDbAdapter.java
index ddef528b5..0e6c41ba8 100644
--- a/cayenne/src/test/java/org/apache/cayenne/unit/SQLServerUnitDbAdapter.java
+++ b/cayenne/src/test/java/org/apache/cayenne/unit/SQLServerUnitDbAdapter.java
@@ -26,9 +26,6 @@ import org.apache.cayenne.configuration.Constants;
 import org.apache.cayenne.dba.DbAdapter;
 import org.apache.cayenne.map.DataMap;
 
-/**
- * @since 1.1
- */
 public class SQLServerUnitDbAdapter extends SybaseUnitDbAdapter {
 
     public SQLServerUnitDbAdapter(DbAdapter adapter) {
diff --git a/cayenne/src/test/java/org/apache/cayenne/unit/UnitDbAdapter.java 
b/cayenne/src/test/java/org/apache/cayenne/unit/UnitDbAdapter.java
index 80d32ecc5..91d78b0d1 100644
--- a/cayenne/src/test/java/org/apache/cayenne/unit/UnitDbAdapter.java
+++ b/cayenne/src/test/java/org/apache/cayenne/unit/UnitDbAdapter.java
@@ -433,7 +433,6 @@ public class UnitDbAdapter {
 
     /**
      * Returns true if the target database has time type with fractional 
seconds.
-     * @since 5.0
      */
     public boolean supportsPreciseTime() {
         return true;
diff --git 
a/cayenne/src/test/java/org/apache/cayenne/unit/di/runtime/CayenneRuntimeProviderContextsSync.java
 
b/cayenne/src/test/java/org/apache/cayenne/unit/di/runtime/CayenneRuntimeProviderContextsSync.java
index cc77fa3e3..4b9f6f73c 100644
--- 
a/cayenne/src/test/java/org/apache/cayenne/unit/di/runtime/CayenneRuntimeProviderContextsSync.java
+++ 
b/cayenne/src/test/java/org/apache/cayenne/unit/di/runtime/CayenneRuntimeProviderContextsSync.java
@@ -28,9 +28,6 @@ import org.apache.cayenne.unit.UnitDbAdapter;
 import java.util.ArrayList;
 import java.util.Collection;
 
-/**
- * @since 4.1
- */
 public class CayenneRuntimeProviderContextsSync extends CayenneRuntimeProvider 
{
 
     public CayenneRuntimeProviderContextsSync(@Inject 
RuntimeCaseDataSourceFactory dataSourceFactory,
diff --git 
a/cayenne/src/test/java/org/apache/cayenne/unit/di/runtime/RuntimeCaseExtraModules.java
 
b/cayenne/src/test/java/org/apache/cayenne/unit/di/runtime/RuntimeCaseExtraModules.java
index 1bb96429d..fd854bdb9 100644
--- 
a/cayenne/src/test/java/org/apache/cayenne/unit/di/runtime/RuntimeCaseExtraModules.java
+++ 
b/cayenne/src/test/java/org/apache/cayenne/unit/di/runtime/RuntimeCaseExtraModules.java
@@ -23,9 +23,6 @@ import org.apache.cayenne.di.Module;
 import java.util.ArrayList;
 import java.util.Collection;
 
-/**
- * @since 5.0
- */
 public class RuntimeCaseExtraModules {
     protected Class<?>[] extraModules;
 
diff --git a/cayenne/src/test/java/org/apache/cayenne/util/ArrayUtilTest.java 
b/cayenne/src/test/java/org/apache/cayenne/util/ArrayUtilTest.java
index 1a53ac518..93911d9bc 100644
--- a/cayenne/src/test/java/org/apache/cayenne/util/ArrayUtilTest.java
+++ b/cayenne/src/test/java/org/apache/cayenne/util/ArrayUtilTest.java
@@ -23,9 +23,6 @@ import org.junit.jupiter.api.Test;
 
 import static org.junit.jupiter.api.Assertions.*;
 
-/**
- * @since 4.1
- */
 public class ArrayUtilTest {
 
     @Test
diff --git 
a/cayenne/src/test/java/org/apache/cayenne/util/SingleEntryMapTest.java 
b/cayenne/src/test/java/org/apache/cayenne/util/SingleEntryMapTest.java
index 677f4c91c..ef666f5f6 100644
--- a/cayenne/src/test/java/org/apache/cayenne/util/SingleEntryMapTest.java
+++ b/cayenne/src/test/java/org/apache/cayenne/util/SingleEntryMapTest.java
@@ -32,9 +32,6 @@ import static java.util.Collections.emptyMap;
 import static java.util.Collections.singletonMap;
 import static org.junit.jupiter.api.Assertions.*;
 
-/**
- * @since 4.2
- */
 public class SingleEntryMapTest {
 
     private SingleEntryMap<String, Integer> map;
diff --git 
a/cayenne/src/test/java/org/apache/cayenne/util/WeakValueMapTest.java 
b/cayenne/src/test/java/org/apache/cayenne/util/WeakValueMapTest.java
index 97409b26a..0efbad737 100644
--- a/cayenne/src/test/java/org/apache/cayenne/util/WeakValueMapTest.java
+++ b/cayenne/src/test/java/org/apache/cayenne/util/WeakValueMapTest.java
@@ -32,8 +32,6 @@ import static org.junit.jupiter.api.Assertions.*;
 /**
  * As WeakValueMap and SoftValueMap share almost all code from their super 
class
  * only one test is present for both of them.
- *
- * @since 4.1
  */
 public class WeakValueMapTest {
 
diff --git 
a/cayenne/src/test/java/org/apache/cayenne/value/json/JsonReaderTest.java 
b/cayenne/src/test/java/org/apache/cayenne/value/json/JsonReaderTest.java
index d4690c9e5..715ca05ff 100644
--- a/cayenne/src/test/java/org/apache/cayenne/value/json/JsonReaderTest.java
+++ b/cayenne/src/test/java/org/apache/cayenne/value/json/JsonReaderTest.java
@@ -28,9 +28,6 @@ import org.junit.jupiter.api.Test;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
-/**
- * @since 4.2
- */
 public class JsonReaderTest {
 
     @Test
diff --git 
a/cayenne/src/test/java/org/apache/cayenne/value/json/JsonTokenizerTest.java 
b/cayenne/src/test/java/org/apache/cayenne/value/json/JsonTokenizerTest.java
index 668e535f2..3b5f87048 100644
--- a/cayenne/src/test/java/org/apache/cayenne/value/json/JsonTokenizerTest.java
+++ b/cayenne/src/test/java/org/apache/cayenne/value/json/JsonTokenizerTest.java
@@ -24,9 +24,6 @@ import org.junit.jupiter.api.Test;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertThrows;
 
-/**
- * @since 4.2
- */
 public class JsonTokenizerTest {
 
     @Test
@@ -384,7 +381,6 @@ public class JsonTokenizerTest {
         assertEquals(JsonTokenizer.TokenType.NONE, token.type);
     }
 
-
     private static final String JSON = "[\n" +
             "  {\n" +
             "    \"_id\": \"5fc4d1ffde690418e483588a\",\n" +
diff --git 
a/cayenne/src/test/java/org/apache/cayenne/value/json/JsonUtilsTest.java 
b/cayenne/src/test/java/org/apache/cayenne/value/json/JsonUtilsTest.java
index 23b45a3d6..9c61c29c3 100644
--- a/cayenne/src/test/java/org/apache/cayenne/value/json/JsonUtilsTest.java
+++ b/cayenne/src/test/java/org/apache/cayenne/value/json/JsonUtilsTest.java
@@ -28,9 +28,6 @@ import java.util.stream.Stream;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertThrows;
 
-/**
- * @since 4.2
- */
 public class JsonUtilsTest {
 
     @Nested

Reply via email to