cayenne-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From aadamc...@apache.org
Subject [3/3] git commit: CAY-1965 Change version from 3.2 to 4.0
Date Sun, 02 Nov 2014 09:36:35 GMT
CAY-1965 Change version from 3.2 to 4.0


Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo
Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/777b1d65
Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/777b1d65
Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/777b1d65

Branch: refs/heads/master
Commit: 777b1d6501e6a1e54d1afd59be50eb188a05c216
Parents: 0bb7946
Author: aadamchik <aadamchik@apache.org>
Authored: Sun Nov 2 12:08:54 2014 +0300
Committer: aadamchik <aadamchik@apache.org>
Committed: Sun Nov 2 12:32:46 2014 +0300

----------------------------------------------------------------------
 .../cayenne/crypto/CayenneCryptoException.java  |  2 +-
 .../apache/cayenne/crypto/CryptoConstants.java  |  2 +-
 .../cayenne/crypto/CryptoModuleBuilder.java     |  2 +-
 .../CryptoBatchTranslatorFactoryDecorator.java  |  2 +-
 .../cayenne/crypto/cipher/CipherFactory.java    |  2 +-
 .../crypto/cipher/DefaultCipherFactory.java     |  2 +-
 .../cayenne/crypto/key/JceksKeySource.java      |  2 +-
 .../apache/cayenne/crypto/map/ColumnMapper.java |  2 +-
 .../cayenne/crypto/map/PatternColumnMapper.java |  2 +-
 .../crypto/transformer/BindingsTransformer.java |  2 +-
 .../transformer/DefaultBindingsTransformer.java |  2 +-
 .../transformer/DefaultMapTransformer.java      |  2 +-
 .../transformer/DefaultTransformerFactory.java  |  2 +-
 .../crypto/transformer/MapTransformer.java      |  2 +-
 .../crypto/transformer/TransformerFactory.java  |  2 +-
 .../transformer/bytes/BytesDecryptor.java       |  2 +-
 .../transformer/bytes/BytesEncryptor.java       |  2 +-
 .../bytes/BytesTransformerFactory.java          |  2 +-
 .../bytes/CbcBytesTransformerFactory.java       |  2 +-
 .../crypto/transformer/bytes/CbcDecryptor.java  |  2 +-
 .../crypto/transformer/bytes/CbcEncryptor.java  |  2 +-
 .../bytes/DefaultBytesTransformerFactory.java   |  2 +-
 .../crypto/transformer/bytes/GzipDecryptor.java |  2 +-
 .../crypto/transformer/bytes/GzipEncryptor.java |  2 +-
 .../crypto/transformer/bytes/Header.java        |  2 +-
 .../transformer/bytes/HeaderDecryptor.java      |  2 +-
 .../value/Base64StringConverter.java            |  2 +-
 .../transformer/value/BytesConverter.java       |  2 +-
 .../value/BytesToBytesConverter.java            |  2 +-
 .../value/DefaultValueDecryptor.java            |  2 +-
 .../value/DefaultValueEncryptor.java            |  2 +-
 .../value/DefaultValueTransformerFactory.java   |  2 +-
 .../transformer/value/Utf8StringConverter.java  |  2 +-
 .../transformer/value/ValueDecryptor.java       |  2 +-
 .../transformer/value/ValueEncryptor.java       |  2 +-
 .../value/ValueTransformerFactory.java          |  2 +-
 .../apache/cayenne/di/AdhocObjectFactory.java   |  2 +-
 .../main/java/org/apache/cayenne/di/Binder.java |  4 +--
 .../apache/cayenne/di/ClassLoaderManager.java   |  2 +-
 .../apache/cayenne/di/DIRuntimeException.java   |  2 +-
 .../org/apache/cayenne/di/DecoratorBuilder.java |  2 +-
 .../ConstructorInjectingDecoratorProvider.java  |  2 +-
 .../cayenne/di/spi/DecoratorProvider.java       |  2 +-
 .../di/spi/DefaultAdhocObjectFactory.java       |  2 +-
 .../di/spi/DefaultClassLoaderManager.java       |  2 +-
 .../cayenne/di/spi/DefaultDecoratorBuilder.java |  2 +-
 .../di/spi/FieldInjectingDecoratorProvider.java |  2 +-
 .../cayenne/di/spi/FieldInjectingProvider.java  |  2 +-
 .../lifecycle/audit/AuditableFilter.java        |  2 +-
 .../apache/cayenne/lifecycle/id/IdCoder.java    |  2 +-
 .../java/org/apache/cayenne/BaseContext.java    |  6 ++--
 .../java/org/apache/cayenne/CayenneContext.java |  2 +-
 .../cayenne/CollectionResultIterator.java       |  2 +-
 .../java/org/apache/cayenne/ObjectContext.java  |  8 ++---
 .../apache/cayenne/ResultIteratorCallback.java  |  2 +-
 .../org/apache/cayenne/access/DataContext.java  |  6 ++--
 .../org/apache/cayenne/access/DataDomain.java   | 12 +++----
 .../access/DataDomainLegacyQueryAction.java     |  2 +-
 .../cayenne/access/DataDomainQueryAction.java   |  2 +-
 .../org/apache/cayenne/access/DataNode.java     | 14 ++++----
 .../org/apache/cayenne/access/DataPort.java     |  2 +-
 .../apache/cayenne/access/DataPortDelegate.java |  2 +-
 .../java/org/apache/cayenne/access/DbArcId.java |  2 +-
 .../org/apache/cayenne/access/DbLoader.java     | 14 ++++----
 .../cayenne/access/DbLoaderConfiguration.java   |  2 +-
 .../cayenne/access/DefaultDbLoaderDelegate.java |  2 +-
 .../cayenne/access/OperationObserver.java       |  2 +-
 .../cayenne/access/PrefetchObjectResolver.java  |  2 +-
 .../org/apache/cayenne/access/Transaction.java  |  4 +--
 .../cayenne/access/jdbc/BaseSQLAction.java      |  2 +-
 .../apache/cayenne/access/jdbc/BatchAction.java |  4 +--
 .../cayenne/access/jdbc/ColumnDescriptor.java   |  4 +--
 .../jdbc/ConnectionAwareResultIterator.java     |  2 +-
 .../access/jdbc/DistinctResultIterator.java     |  2 +-
 .../cayenne/access/jdbc/JDBCResultIterator.java |  8 ++---
 .../access/jdbc/LimitResultIterator.java        |  2 +-
 .../cayenne/access/jdbc/ProcedureAction.java    |  2 +-
 .../cayenne/access/jdbc/SQLTemplateAction.java  |  2 +-
 .../cayenne/access/jdbc/SelectAction.java       |  2 +-
 .../jdbc/reader/DefaultRowReaderFactory.java    |  2 +-
 .../access/jdbc/reader/RowReaderFactory.java    |  2 +-
 .../translator/batch/BatchParameterBinding.java |  2 +-
 .../translator/batch/BatchTranslator.java       |  2 +-
 .../batch/BatchTranslatorFactory.java           |  2 +-
 .../batch/DefaultBatchTranslator.java           |  2 +-
 .../batch/DefaultBatchTranslatorFactory.java    |  2 +-
 .../batch/SoftDeleteTranslatorFactory.java      |  2 +-
 .../translator/select/QualifierTranslator.java  |  4 +--
 .../translator/select/QueryAssembler.java       |  2 +-
 .../translator/select/SelectTranslator.java     |  2 +-
 .../access/util/DefaultOperationObserver.java   |  2 +-
 .../apache/cayenne/cache/EhCacheQueryCache.java |  4 +--
 .../cayenne/configuration/CayenneRuntime.java   |  8 ++---
 .../apache/cayenne/configuration/Constants.java |  2 +-
 .../configuration/DefaultRuntimeProperties.java |  2 +-
 .../cayenne/configuration/ModuleCollection.java |  2 +-
 .../configuration/RuntimeProperties.java        |  2 +-
 .../osgi/OsgiClassLoaderManager.java            |  2 +-
 .../osgi/OsgiDataDomainProvider.java            |  2 +-
 .../cayenne/configuration/osgi/OsgiModule.java  |  2 +-
 .../configuration/osgi/OsgiModuleBuilder.java   |  2 +-
 .../server/DataDomainProvider.java              |  4 +--
 .../configuration/server/DataNodeFactory.java   |  2 +-
 .../server/DefaultDataNodeFactory.java          |  2 +-
 .../server/FixedDataSourceFactory.java          |  2 +-
 .../server/FixedJNDIDataSourceFactory.java      |  2 +-
 .../configuration/server/ServerRuntime.java     |  4 +--
 .../server/ServerRuntimeBuilder.java            |  2 +-
 .../server/SyntheticNodeDataDomainProvider.java |  2 +-
 .../configuration/web/CayenneFilter.java        |  2 +-
 .../web/StatelessContextRequestHandler.java     |  2 +-
 .../org/apache/cayenne/conn/DataSourceInfo.java |  2 +-
 .../apache/cayenne/conn/DriverDataSource.java   |  2 +-
 .../org/apache/cayenne/conn/PoolManager.java    |  8 ++---
 .../org/apache/cayenne/dba/AutoAdapter.java     |  8 ++---
 .../java/org/apache/cayenne/dba/DbAdapter.java  |  8 ++---
 .../cayenne/dba/DefaultQuotingStrategy.java     |  4 +--
 .../apache/cayenne/dba/JdbcActionBuilder.java   |  2 +-
 .../org/apache/cayenne/dba/JdbcAdapter.java     | 16 ++++-----
 .../org/apache/cayenne/dba/QuotingStrategy.java | 16 ++++-----
 .../frontbase/FrontBaseSelectTranslator.java    |  2 +-
 .../apache/cayenne/dba/h2/H2PkGenerator.java    |  2 +-
 .../dba/hsqldb/HSQLSelectTranslator.java        |  2 +-
 .../cayenne/dba/ingres/IngresActionBuilder.java |  2 +-
 .../dba/ingres/IngresSelectTranslator.java      |  2 +-
 .../dba/mysql/MySQLSelectTranslator.java        |  2 +-
 .../dba/openbase/OpenBaseSelectTranslator.java  |  2 +-
 .../dba/oracle/Oracle8SelectTranslator.java     |  2 +-
 .../cayenne/dba/oracle/OracleBatchAction.java   |  2 +-
 .../dba/oracle/OracleSelectTranslator.java      |  2 +-
 .../dba/postgres/PostgresSelectTranslator.java  |  2 +-
 .../dba/sqlserver/SQLServerActionBuilder.java   |  2 +-
 .../dba/sqlserver/SQLServerProcedureAction.java |  2 +-
 .../sqlserver/SQLServerSelectTranslator.java    |  2 +-
 .../java/org/apache/cayenne/exp/Expression.java | 34 ++++++++++----------
 .../apache/cayenne/exp/ExpressionFactory.java   | 12 +++----
 .../java/org/apache/cayenne/exp/Property.java   |  2 +-
 .../cayenne/exp/parser/ASTBitwiseLeftShift.java |  2 +-
 .../exp/parser/ASTBitwiseRightShift.java        |  2 +-
 .../apache/cayenne/exp/parser/ASTDbPath.java    |  4 +--
 .../org/apache/cayenne/exp/parser/ASTFalse.java |  4 +--
 .../org/apache/cayenne/exp/parser/ASTList.java  |  2 +-
 .../cayenne/exp/parser/ASTNamedParameter.java   |  2 +-
 .../apache/cayenne/exp/parser/ASTNegate.java    |  4 +--
 .../org/apache/cayenne/exp/parser/ASTNot.java   |  4 +--
 .../apache/cayenne/exp/parser/ASTObjPath.java   |  4 +--
 .../apache/cayenne/exp/parser/ASTScalar.java    |  4 +--
 .../org/apache/cayenne/exp/parser/ASTTrue.java  |  4 +--
 .../apache/cayenne/exp/parser/Evaluator.java    |  2 +-
 .../apache/cayenne/exp/parser/SimpleNode.java   | 10 +++---
 .../org/apache/cayenne/log/JdbcEventLogger.java |  6 ++--
 .../java/org/apache/cayenne/map/DataMap.java    | 20 ++++++------
 .../org/apache/cayenne/map/DbRelationship.java  |  2 +-
 .../java/org/apache/cayenne/map/Embeddable.java |  2 +-
 .../org/apache/cayenne/map/EntityListener.java  |  2 +-
 .../cayenne/map/EntityListenerFactory.java      |  2 +-
 .../org/apache/cayenne/map/EntityResolver.java  | 32 +++++++++---------
 .../org/apache/cayenne/map/MappingCache.java    |  2 +-
 .../apache/cayenne/map/MappingNamespace.java    | 10 +++---
 .../java/org/apache/cayenne/map/ObjEntity.java  | 22 ++++++-------
 .../map/naming/DefaultUniqueNameGenerator.java  |  2 +-
 .../apache/cayenne/map/naming/NameChecker.java  |  2 +-
 .../apache/cayenne/map/naming/NameCheckers.java |  2 +-
 .../cayenne/map/naming/ObjectNameGenerator.java |  2 +-
 .../cayenne/map/naming/UniqueNameGenerator.java |  2 +-
 .../org/apache/cayenne/query/BatchQuery.java    |  8 ++---
 .../org/apache/cayenne/query/BatchQueryRow.java |  2 +-
 .../org/apache/cayenne/query/EJBQLQuery.java    |  4 +--
 .../apache/cayenne/query/ProcedureQuery.java    |  4 +--
 .../org/apache/cayenne/query/QueryRouter.java   |  2 +-
 .../org/apache/cayenne/query/SQLSelect.java     |  4 +--
 .../org/apache/cayenne/query/SQLTemplate.java   | 10 +++---
 .../org/apache/cayenne/query/SelectById.java    |  4 +--
 .../org/apache/cayenne/query/SelectQuery.java   | 22 ++++++-------
 .../org/apache/cayenne/reflect/ArcProperty.java |  2 +-
 .../cayenne/reflect/ConverterFactory.java       |  2 +-
 .../reflect/LifecycleCallbackRegistry.java      |  4 +--
 .../cayenne/reflect/PropertyDescriptor.java     |  2 +-
 .../apache/cayenne/remote/RemoteSession.java    |  6 ++--
 .../resource/ClassLoaderResourceLocator.java    |  2 +-
 .../org/apache/cayenne/tx/BaseTransaction.java  |  2 +-
 .../apache/cayenne/tx/CayenneTransaction.java   |  2 +-
 .../cayenne/tx/DefaultTransactionFactory.java   |  2 +-
 .../cayenne/tx/DefaultTransactionManager.java   |  2 +-
 .../apache/cayenne/tx/ExternalTransaction.java  |  2 +-
 .../java/org/apache/cayenne/tx/Transaction.java |  2 +-
 .../apache/cayenne/tx/TransactionFactory.java   |  2 +-
 .../apache/cayenne/tx/TransactionManager.java   |  2 +-
 .../cayenne/tx/TransactionalOperation.java      |  2 +-
 .../apache/cayenne/util/EntityMergeSupport.java |  8 ++---
 .../main/java/org/apache/cayenne/util/Util.java |  2 +-
 .../exp/Expression_ParamsLegacyTest.java        |  2 +-
 .../apache/cayenne/merge/TokensReversTest.java  |  2 +-
 .../cayenne/merge/TokensToModelExecution.java   |  2 +-
 .../apache/cayenne/merge/builders/Builder.java  |  2 +-
 .../cayenne/merge/builders/DataMapBuilder.java  |  2 +-
 .../merge/builders/DbAttributeBuilder.java      |  2 +-
 .../cayenne/merge/builders/DbEntityBuilder.java |  2 +-
 .../merge/builders/DbRelationshipBuilder.java   |  2 +-
 .../cayenne/merge/builders/DefaultBuilder.java  |  2 +-
 .../merge/builders/ObjAttributeBuilder.java     |  2 +-
 .../merge/builders/ObjEntityBuilder.java        |  2 +-
 .../cayenne/merge/builders/ObjectMother.java    |  2 +-
 .../map/naming/DefaultNameGenerator.java        |  2 +-
 .../cayenne/tools/AntDataPortDelegate.java      |  2 +-
 .../org/apache/cayenne/tools/DataPortTask.java  |  2 +-
 .../apache/cayenne/tools/DbImporterTask.java    | 22 ++++++-------
 .../configuration/DriverDataSourceFactory.java  |  2 +-
 .../tools/configuration/ToolsModule.java        |  2 +-
 .../cayenne/tools/dbimport/DbImportAction.java  |  2 +-
 .../tools/dbimport/DbImportConfiguration.java   |  2 +-
 .../dbimport/DbImportDbLoaderDelegate.java      |  2 +-
 .../cayenne/tools/dbimport/DbImportModule.java  |  2 +-
 .../cayenne/modeler/ProjectController.java      |  4 +--
 .../apache/cayenne/wocompat/EOModelHelper.java  |  2 +-
 .../cayenne/wocompat/EOModelProcessor.java      |  8 ++---
 .../apache/cayenne/tools/DbImporterMojo.java    | 12 +++----
 217 files changed, 397 insertions(+), 397 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cayenne/blob/777b1d65/cayenne-crypto/src/main/java/org/apache/cayenne/crypto/CayenneCryptoException.java
----------------------------------------------------------------------
diff --git a/cayenne-crypto/src/main/java/org/apache/cayenne/crypto/CayenneCryptoException.java b/cayenne-crypto/src/main/java/org/apache/cayenne/crypto/CayenneCryptoException.java
index 4a49934..10a8263 100644
--- a/cayenne-crypto/src/main/java/org/apache/cayenne/crypto/CayenneCryptoException.java
+++ b/cayenne-crypto/src/main/java/org/apache/cayenne/crypto/CayenneCryptoException.java
@@ -21,7 +21,7 @@ package org.apache.cayenne.crypto;
 import org.apache.cayenne.CayenneRuntimeException;
 
 /**
- * @since 3.2
+ * @since 4.0
  */
 public class CayenneCryptoException extends CayenneRuntimeException {
 

http://git-wip-us.apache.org/repos/asf/cayenne/blob/777b1d65/cayenne-crypto/src/main/java/org/apache/cayenne/crypto/CryptoConstants.java
----------------------------------------------------------------------
diff --git a/cayenne-crypto/src/main/java/org/apache/cayenne/crypto/CryptoConstants.java b/cayenne-crypto/src/main/java/org/apache/cayenne/crypto/CryptoConstants.java
index 9a35cc2..f24934e 100644
--- a/cayenne-crypto/src/main/java/org/apache/cayenne/crypto/CryptoConstants.java
+++ b/cayenne-crypto/src/main/java/org/apache/cayenne/crypto/CryptoConstants.java
@@ -21,7 +21,7 @@ package org.apache.cayenne.crypto;
 import org.apache.cayenne.crypto.key.KeySource;
 
 /**
- * @since 3.2
+ * @since 4.0
  */
 public interface CryptoConstants {
 

http://git-wip-us.apache.org/repos/asf/cayenne/blob/777b1d65/cayenne-crypto/src/main/java/org/apache/cayenne/crypto/CryptoModuleBuilder.java
----------------------------------------------------------------------
diff --git a/cayenne-crypto/src/main/java/org/apache/cayenne/crypto/CryptoModuleBuilder.java b/cayenne-crypto/src/main/java/org/apache/cayenne/crypto/CryptoModuleBuilder.java
index 251be8f..5839afe 100644
--- a/cayenne-crypto/src/main/java/org/apache/cayenne/crypto/CryptoModuleBuilder.java
+++ b/cayenne-crypto/src/main/java/org/apache/cayenne/crypto/CryptoModuleBuilder.java
@@ -48,7 +48,7 @@ import org.apache.cayenne.di.Module;
  * to specify custom ciphers, as well as a strategy for discovering which
  * columns are encrypted.
  * 
- * @since 3.2
+ * @since 4.0
  */
 public class CryptoModuleBuilder {
 

http://git-wip-us.apache.org/repos/asf/cayenne/blob/777b1d65/cayenne-crypto/src/main/java/org/apache/cayenne/crypto/batch/CryptoBatchTranslatorFactoryDecorator.java
----------------------------------------------------------------------
diff --git a/cayenne-crypto/src/main/java/org/apache/cayenne/crypto/batch/CryptoBatchTranslatorFactoryDecorator.java b/cayenne-crypto/src/main/java/org/apache/cayenne/crypto/batch/CryptoBatchTranslatorFactoryDecorator.java
index 5d6fda1..cbb19f2 100644
--- a/cayenne-crypto/src/main/java/org/apache/cayenne/crypto/batch/CryptoBatchTranslatorFactoryDecorator.java
+++ b/cayenne-crypto/src/main/java/org/apache/cayenne/crypto/batch/CryptoBatchTranslatorFactoryDecorator.java
@@ -29,7 +29,7 @@ import org.apache.cayenne.query.BatchQuery;
 import org.apache.cayenne.query.BatchQueryRow;
 
 /**
- * @since 3.2
+ * @since 4.0
  */
 public class CryptoBatchTranslatorFactoryDecorator implements BatchTranslatorFactory {
 

http://git-wip-us.apache.org/repos/asf/cayenne/blob/777b1d65/cayenne-crypto/src/main/java/org/apache/cayenne/crypto/cipher/CipherFactory.java
----------------------------------------------------------------------
diff --git a/cayenne-crypto/src/main/java/org/apache/cayenne/crypto/cipher/CipherFactory.java b/cayenne-crypto/src/main/java/org/apache/cayenne/crypto/cipher/CipherFactory.java
index 992bae6..84711c6 100644
--- a/cayenne-crypto/src/main/java/org/apache/cayenne/crypto/cipher/CipherFactory.java
+++ b/cayenne-crypto/src/main/java/org/apache/cayenne/crypto/cipher/CipherFactory.java
@@ -21,7 +21,7 @@ package org.apache.cayenne.crypto.cipher;
 import javax.crypto.Cipher;
 
 /**
- * @since 3.2
+ * @since 4.0
  */
 public interface CipherFactory {
 

http://git-wip-us.apache.org/repos/asf/cayenne/blob/777b1d65/cayenne-crypto/src/main/java/org/apache/cayenne/crypto/cipher/DefaultCipherFactory.java
----------------------------------------------------------------------
diff --git a/cayenne-crypto/src/main/java/org/apache/cayenne/crypto/cipher/DefaultCipherFactory.java b/cayenne-crypto/src/main/java/org/apache/cayenne/crypto/cipher/DefaultCipherFactory.java
index 127f130..c5aae90 100644
--- a/cayenne-crypto/src/main/java/org/apache/cayenne/crypto/cipher/DefaultCipherFactory.java
+++ b/cayenne-crypto/src/main/java/org/apache/cayenne/crypto/cipher/DefaultCipherFactory.java
@@ -32,7 +32,7 @@ import org.apache.cayenne.di.Inject;
  * Creates and returns a new {@link Cipher} configured using properties from
  * {@link CryptoConstants#PROPERTIES_MAP}.
  * 
- * @since 3.2
+ * @since 4.0
  */
 public class DefaultCipherFactory implements CipherFactory {
 

http://git-wip-us.apache.org/repos/asf/cayenne/blob/777b1d65/cayenne-crypto/src/main/java/org/apache/cayenne/crypto/key/JceksKeySource.java
----------------------------------------------------------------------
diff --git a/cayenne-crypto/src/main/java/org/apache/cayenne/crypto/key/JceksKeySource.java b/cayenne-crypto/src/main/java/org/apache/cayenne/crypto/key/JceksKeySource.java
index 0e08e8a..5a4c10e 100644
--- a/cayenne-crypto/src/main/java/org/apache/cayenne/crypto/key/JceksKeySource.java
+++ b/cayenne-crypto/src/main/java/org/apache/cayenne/crypto/key/JceksKeySource.java
@@ -39,7 +39,7 @@ import org.apache.cayenne.di.Inject;
  * {@link CryptoConstants#KEYSTORE_URL} to locate the keystore and
  * {@link CryptoConstants#KEY_PASSWORD} to read the secret key.
  * 
- * @since 3.2
+ * @since 4.0
  */
 public class JceksKeySource implements KeySource {
 

http://git-wip-us.apache.org/repos/asf/cayenne/blob/777b1d65/cayenne-crypto/src/main/java/org/apache/cayenne/crypto/map/ColumnMapper.java
----------------------------------------------------------------------
diff --git a/cayenne-crypto/src/main/java/org/apache/cayenne/crypto/map/ColumnMapper.java b/cayenne-crypto/src/main/java/org/apache/cayenne/crypto/map/ColumnMapper.java
index a673666..df2b51c 100644
--- a/cayenne-crypto/src/main/java/org/apache/cayenne/crypto/map/ColumnMapper.java
+++ b/cayenne-crypto/src/main/java/org/apache/cayenne/crypto/map/ColumnMapper.java
@@ -21,7 +21,7 @@ package org.apache.cayenne.crypto.map;
 import org.apache.cayenne.map.DbAttribute;
 
 /**
- * @since 3.2
+ * @since 4.0
  */
 public interface ColumnMapper {
 

http://git-wip-us.apache.org/repos/asf/cayenne/blob/777b1d65/cayenne-crypto/src/main/java/org/apache/cayenne/crypto/map/PatternColumnMapper.java
----------------------------------------------------------------------
diff --git a/cayenne-crypto/src/main/java/org/apache/cayenne/crypto/map/PatternColumnMapper.java b/cayenne-crypto/src/main/java/org/apache/cayenne/crypto/map/PatternColumnMapper.java
index 6e2395b..18dcb39 100644
--- a/cayenne-crypto/src/main/java/org/apache/cayenne/crypto/map/PatternColumnMapper.java
+++ b/cayenne-crypto/src/main/java/org/apache/cayenne/crypto/map/PatternColumnMapper.java
@@ -27,7 +27,7 @@ import org.apache.cayenne.map.DbAttribute;
  * matching its name against a preset pattern. Only column name is inspected.
  * Table name is ignored.
  * 
- * @since 3.2
+ * @since 4.0
  */
 public class PatternColumnMapper implements ColumnMapper {
 

http://git-wip-us.apache.org/repos/asf/cayenne/blob/777b1d65/cayenne-crypto/src/main/java/org/apache/cayenne/crypto/transformer/BindingsTransformer.java
----------------------------------------------------------------------
diff --git a/cayenne-crypto/src/main/java/org/apache/cayenne/crypto/transformer/BindingsTransformer.java b/cayenne-crypto/src/main/java/org/apache/cayenne/crypto/transformer/BindingsTransformer.java
index 4e85b3c..2d782ee 100644
--- a/cayenne-crypto/src/main/java/org/apache/cayenne/crypto/transformer/BindingsTransformer.java
+++ b/cayenne-crypto/src/main/java/org/apache/cayenne/crypto/transformer/BindingsTransformer.java
@@ -21,7 +21,7 @@ package org.apache.cayenne.crypto.transformer;
 import org.apache.cayenne.access.translator.batch.BatchParameterBinding;
 
 /**
- * @since 3.2
+ * @since 4.0
  */
 public interface BindingsTransformer {
 

http://git-wip-us.apache.org/repos/asf/cayenne/blob/777b1d65/cayenne-crypto/src/main/java/org/apache/cayenne/crypto/transformer/DefaultBindingsTransformer.java
----------------------------------------------------------------------
diff --git a/cayenne-crypto/src/main/java/org/apache/cayenne/crypto/transformer/DefaultBindingsTransformer.java b/cayenne-crypto/src/main/java/org/apache/cayenne/crypto/transformer/DefaultBindingsTransformer.java
index c54f551..0ef8caf 100644
--- a/cayenne-crypto/src/main/java/org/apache/cayenne/crypto/transformer/DefaultBindingsTransformer.java
+++ b/cayenne-crypto/src/main/java/org/apache/cayenne/crypto/transformer/DefaultBindingsTransformer.java
@@ -23,7 +23,7 @@ import org.apache.cayenne.crypto.transformer.bytes.BytesEncryptor;
 import org.apache.cayenne.crypto.transformer.value.ValueEncryptor;
 
 /**
- * @since 3.2
+ * @since 4.0
  */
 public class DefaultBindingsTransformer implements BindingsTransformer {
 

http://git-wip-us.apache.org/repos/asf/cayenne/blob/777b1d65/cayenne-crypto/src/main/java/org/apache/cayenne/crypto/transformer/DefaultMapTransformer.java
----------------------------------------------------------------------
diff --git a/cayenne-crypto/src/main/java/org/apache/cayenne/crypto/transformer/DefaultMapTransformer.java b/cayenne-crypto/src/main/java/org/apache/cayenne/crypto/transformer/DefaultMapTransformer.java
index b4c0cac..b62377a 100644
--- a/cayenne-crypto/src/main/java/org/apache/cayenne/crypto/transformer/DefaultMapTransformer.java
+++ b/cayenne-crypto/src/main/java/org/apache/cayenne/crypto/transformer/DefaultMapTransformer.java
@@ -24,7 +24,7 @@ import org.apache.cayenne.crypto.transformer.bytes.BytesDecryptor;
 import org.apache.cayenne.crypto.transformer.value.ValueDecryptor;
 
 /**
- * @since 3.2
+ * @since 4.0
  */
 public class DefaultMapTransformer implements MapTransformer {
 

http://git-wip-us.apache.org/repos/asf/cayenne/blob/777b1d65/cayenne-crypto/src/main/java/org/apache/cayenne/crypto/transformer/DefaultTransformerFactory.java
----------------------------------------------------------------------
diff --git a/cayenne-crypto/src/main/java/org/apache/cayenne/crypto/transformer/DefaultTransformerFactory.java b/cayenne-crypto/src/main/java/org/apache/cayenne/crypto/transformer/DefaultTransformerFactory.java
index 7b37104..3b3e73a 100644
--- a/cayenne-crypto/src/main/java/org/apache/cayenne/crypto/transformer/DefaultTransformerFactory.java
+++ b/cayenne-crypto/src/main/java/org/apache/cayenne/crypto/transformer/DefaultTransformerFactory.java
@@ -33,7 +33,7 @@ import org.apache.cayenne.di.Inject;
 import org.apache.cayenne.map.DbAttribute;
 
 /**
- * @since 3.2
+ * @since 4.0
  */
 public class DefaultTransformerFactory implements TransformerFactory {
 

http://git-wip-us.apache.org/repos/asf/cayenne/blob/777b1d65/cayenne-crypto/src/main/java/org/apache/cayenne/crypto/transformer/MapTransformer.java
----------------------------------------------------------------------
diff --git a/cayenne-crypto/src/main/java/org/apache/cayenne/crypto/transformer/MapTransformer.java b/cayenne-crypto/src/main/java/org/apache/cayenne/crypto/transformer/MapTransformer.java
index 6d62d85..1befbc3 100644
--- a/cayenne-crypto/src/main/java/org/apache/cayenne/crypto/transformer/MapTransformer.java
+++ b/cayenne-crypto/src/main/java/org/apache/cayenne/crypto/transformer/MapTransformer.java
@@ -21,7 +21,7 @@ package org.apache.cayenne.crypto.transformer;
 import java.util.Map;
 
 /**
- * @since 3.2
+ * @since 4.0
  */
 public interface MapTransformer {
 

http://git-wip-us.apache.org/repos/asf/cayenne/blob/777b1d65/cayenne-crypto/src/main/java/org/apache/cayenne/crypto/transformer/TransformerFactory.java
----------------------------------------------------------------------
diff --git a/cayenne-crypto/src/main/java/org/apache/cayenne/crypto/transformer/TransformerFactory.java b/cayenne-crypto/src/main/java/org/apache/cayenne/crypto/transformer/TransformerFactory.java
index cdf01ee..0d6ed2b 100644
--- a/cayenne-crypto/src/main/java/org/apache/cayenne/crypto/transformer/TransformerFactory.java
+++ b/cayenne-crypto/src/main/java/org/apache/cayenne/crypto/transformer/TransformerFactory.java
@@ -25,7 +25,7 @@ import org.apache.cayenne.access.translator.batch.BatchParameterBinding;
  * A factory that creates encryption transformers used for processing batch
  * bindings and decryption transformers - for result rows.
  * 
- * @since 3.2
+ * @since 4.0
  */
 public interface TransformerFactory {
 

http://git-wip-us.apache.org/repos/asf/cayenne/blob/777b1d65/cayenne-crypto/src/main/java/org/apache/cayenne/crypto/transformer/bytes/BytesDecryptor.java
----------------------------------------------------------------------
diff --git a/cayenne-crypto/src/main/java/org/apache/cayenne/crypto/transformer/bytes/BytesDecryptor.java b/cayenne-crypto/src/main/java/org/apache/cayenne/crypto/transformer/bytes/BytesDecryptor.java
index 74ccefc..4ff0b51 100644
--- a/cayenne-crypto/src/main/java/org/apache/cayenne/crypto/transformer/bytes/BytesDecryptor.java
+++ b/cayenne-crypto/src/main/java/org/apache/cayenne/crypto/transformer/bytes/BytesDecryptor.java
@@ -21,7 +21,7 @@ package org.apache.cayenne.crypto.transformer.bytes;
 import java.security.Key;
 
 /**
- * @since 3.2
+ * @since 4.0
  */
 public interface BytesDecryptor {
 

http://git-wip-us.apache.org/repos/asf/cayenne/blob/777b1d65/cayenne-crypto/src/main/java/org/apache/cayenne/crypto/transformer/bytes/BytesEncryptor.java
----------------------------------------------------------------------
diff --git a/cayenne-crypto/src/main/java/org/apache/cayenne/crypto/transformer/bytes/BytesEncryptor.java b/cayenne-crypto/src/main/java/org/apache/cayenne/crypto/transformer/bytes/BytesEncryptor.java
index 7f444a2..4bd39c0 100644
--- a/cayenne-crypto/src/main/java/org/apache/cayenne/crypto/transformer/bytes/BytesEncryptor.java
+++ b/cayenne-crypto/src/main/java/org/apache/cayenne/crypto/transformer/bytes/BytesEncryptor.java
@@ -19,7 +19,7 @@
 package org.apache.cayenne.crypto.transformer.bytes;
 
 /**
- * @since 3.2
+ * @since 4.0
  */
 public interface BytesEncryptor {
 

http://git-wip-us.apache.org/repos/asf/cayenne/blob/777b1d65/cayenne-crypto/src/main/java/org/apache/cayenne/crypto/transformer/bytes/BytesTransformerFactory.java
----------------------------------------------------------------------
diff --git a/cayenne-crypto/src/main/java/org/apache/cayenne/crypto/transformer/bytes/BytesTransformerFactory.java b/cayenne-crypto/src/main/java/org/apache/cayenne/crypto/transformer/bytes/BytesTransformerFactory.java
index 77687bc..fc1ac72 100644
--- a/cayenne-crypto/src/main/java/org/apache/cayenne/crypto/transformer/bytes/BytesTransformerFactory.java
+++ b/cayenne-crypto/src/main/java/org/apache/cayenne/crypto/transformer/bytes/BytesTransformerFactory.java
@@ -22,7 +22,7 @@ package org.apache.cayenne.crypto.transformer.bytes;
  * A class that encapsulates Cayenne cryptography protocol, which is usually
  * dependent on the encryption mode.
  * 
- * @since 3.2
+ * @since 4.0
  */
 public interface BytesTransformerFactory {
 

http://git-wip-us.apache.org/repos/asf/cayenne/blob/777b1d65/cayenne-crypto/src/main/java/org/apache/cayenne/crypto/transformer/bytes/CbcBytesTransformerFactory.java
----------------------------------------------------------------------
diff --git a/cayenne-crypto/src/main/java/org/apache/cayenne/crypto/transformer/bytes/CbcBytesTransformerFactory.java b/cayenne-crypto/src/main/java/org/apache/cayenne/crypto/transformer/bytes/CbcBytesTransformerFactory.java
index c8fc2f3..bc38a51 100644
--- a/cayenne-crypto/src/main/java/org/apache/cayenne/crypto/transformer/bytes/CbcBytesTransformerFactory.java
+++ b/cayenne-crypto/src/main/java/org/apache/cayenne/crypto/transformer/bytes/CbcBytesTransformerFactory.java
@@ -29,7 +29,7 @@ import org.apache.cayenne.crypto.cipher.CipherFactory;
 import org.apache.cayenne.crypto.key.KeySource;
 
 /**
- * @since 3.2
+ * @since 4.0
  */
 class CbcBytesTransformerFactory implements BytesTransformerFactory {
 

http://git-wip-us.apache.org/repos/asf/cayenne/blob/777b1d65/cayenne-crypto/src/main/java/org/apache/cayenne/crypto/transformer/bytes/CbcDecryptor.java
----------------------------------------------------------------------
diff --git a/cayenne-crypto/src/main/java/org/apache/cayenne/crypto/transformer/bytes/CbcDecryptor.java b/cayenne-crypto/src/main/java/org/apache/cayenne/crypto/transformer/bytes/CbcDecryptor.java
index da7f126..6605724 100644
--- a/cayenne-crypto/src/main/java/org/apache/cayenne/crypto/transformer/bytes/CbcDecryptor.java
+++ b/cayenne-crypto/src/main/java/org/apache/cayenne/crypto/transformer/bytes/CbcDecryptor.java
@@ -35,7 +35,7 @@ import org.apache.cayenne.crypto.CayenneCryptoException;
  * by the complimentary {@link CbcEncryptor}. The object is stateful and is not
  * thread-safe.
  * 
- * @since 3.2
+ * @since 4.0
  */
 class CbcDecryptor implements BytesDecryptor {
 

http://git-wip-us.apache.org/repos/asf/cayenne/blob/777b1d65/cayenne-crypto/src/main/java/org/apache/cayenne/crypto/transformer/bytes/CbcEncryptor.java
----------------------------------------------------------------------
diff --git a/cayenne-crypto/src/main/java/org/apache/cayenne/crypto/transformer/bytes/CbcEncryptor.java b/cayenne-crypto/src/main/java/org/apache/cayenne/crypto/transformer/bytes/CbcEncryptor.java
index 0665963..bebe84b 100644
--- a/cayenne-crypto/src/main/java/org/apache/cayenne/crypto/transformer/bytes/CbcEncryptor.java
+++ b/cayenne-crypto/src/main/java/org/apache/cayenne/crypto/transformer/bytes/CbcEncryptor.java
@@ -37,7 +37,7 @@ import org.apache.cayenne.crypto.CayenneCryptoException;
  * It will be needed for decryption. The object is stateful and is not
  * thread-safe.
  * 
- * @since 3.2
+ * @since 4.0
  */
 class CbcEncryptor implements BytesEncryptor {
 

http://git-wip-us.apache.org/repos/asf/cayenne/blob/777b1d65/cayenne-crypto/src/main/java/org/apache/cayenne/crypto/transformer/bytes/DefaultBytesTransformerFactory.java
----------------------------------------------------------------------
diff --git a/cayenne-crypto/src/main/java/org/apache/cayenne/crypto/transformer/bytes/DefaultBytesTransformerFactory.java b/cayenne-crypto/src/main/java/org/apache/cayenne/crypto/transformer/bytes/DefaultBytesTransformerFactory.java
index 08692d6..7a26a2a 100644
--- a/cayenne-crypto/src/main/java/org/apache/cayenne/crypto/transformer/bytes/DefaultBytesTransformerFactory.java
+++ b/cayenne-crypto/src/main/java/org/apache/cayenne/crypto/transformer/bytes/DefaultBytesTransformerFactory.java
@@ -30,7 +30,7 @@ import org.apache.cayenne.di.Inject;
  * A {@link BytesTransformerFactory} that creates transformers depending on the
  * encryption mode specified via properties.
  * 
- * @since 3.2
+ * @since 4.0
  */
 public class DefaultBytesTransformerFactory implements BytesTransformerFactory {
 

http://git-wip-us.apache.org/repos/asf/cayenne/blob/777b1d65/cayenne-crypto/src/main/java/org/apache/cayenne/crypto/transformer/bytes/GzipDecryptor.java
----------------------------------------------------------------------
diff --git a/cayenne-crypto/src/main/java/org/apache/cayenne/crypto/transformer/bytes/GzipDecryptor.java b/cayenne-crypto/src/main/java/org/apache/cayenne/crypto/transformer/bytes/GzipDecryptor.java
index 5eb6825..7f3b8cb 100644
--- a/cayenne-crypto/src/main/java/org/apache/cayenne/crypto/transformer/bytes/GzipDecryptor.java
+++ b/cayenne-crypto/src/main/java/org/apache/cayenne/crypto/transformer/bytes/GzipDecryptor.java
@@ -27,7 +27,7 @@ import java.util.zip.GZIPInputStream;
 import org.apache.cayenne.crypto.CayenneCryptoException;
 
 /**
- * @since 3.2
+ * @since 4.0
  */
 class GzipDecryptor implements BytesDecryptor {
 

http://git-wip-us.apache.org/repos/asf/cayenne/blob/777b1d65/cayenne-crypto/src/main/java/org/apache/cayenne/crypto/transformer/bytes/GzipEncryptor.java
----------------------------------------------------------------------
diff --git a/cayenne-crypto/src/main/java/org/apache/cayenne/crypto/transformer/bytes/GzipEncryptor.java b/cayenne-crypto/src/main/java/org/apache/cayenne/crypto/transformer/bytes/GzipEncryptor.java
index c84cae4..1936c52 100644
--- a/cayenne-crypto/src/main/java/org/apache/cayenne/crypto/transformer/bytes/GzipEncryptor.java
+++ b/cayenne-crypto/src/main/java/org/apache/cayenne/crypto/transformer/bytes/GzipEncryptor.java
@@ -25,7 +25,7 @@ import java.util.zip.GZIPOutputStream;
 import org.apache.cayenne.crypto.CayenneCryptoException;
 
 /**
- * @since 3.2
+ * @since 4.0
  */
 class GzipEncryptor implements BytesEncryptor {
 

http://git-wip-us.apache.org/repos/asf/cayenne/blob/777b1d65/cayenne-crypto/src/main/java/org/apache/cayenne/crypto/transformer/bytes/Header.java
----------------------------------------------------------------------
diff --git a/cayenne-crypto/src/main/java/org/apache/cayenne/crypto/transformer/bytes/Header.java b/cayenne-crypto/src/main/java/org/apache/cayenne/crypto/transformer/bytes/Header.java
index 4f2cc60..a2baa76 100644
--- a/cayenne-crypto/src/main/java/org/apache/cayenne/crypto/transformer/bytes/Header.java
+++ b/cayenne-crypto/src/main/java/org/apache/cayenne/crypto/transformer/bytes/Header.java
@@ -35,7 +35,7 @@ import org.apache.cayenne.crypto.CayenneCryptoException;
  * <li>byte 5..N: UTF8-encoded symbolic name of the encryption key.
  * </ul>
  * 
- * @since 3.2
+ * @since 4.0
  */
 public class Header {
 

http://git-wip-us.apache.org/repos/asf/cayenne/blob/777b1d65/cayenne-crypto/src/main/java/org/apache/cayenne/crypto/transformer/bytes/HeaderDecryptor.java
----------------------------------------------------------------------
diff --git a/cayenne-crypto/src/main/java/org/apache/cayenne/crypto/transformer/bytes/HeaderDecryptor.java b/cayenne-crypto/src/main/java/org/apache/cayenne/crypto/transformer/bytes/HeaderDecryptor.java
index 5481124..072fd82 100644
--- a/cayenne-crypto/src/main/java/org/apache/cayenne/crypto/transformer/bytes/HeaderDecryptor.java
+++ b/cayenne-crypto/src/main/java/org/apache/cayenne/crypto/transformer/bytes/HeaderDecryptor.java
@@ -23,7 +23,7 @@ import java.security.Key;
 import org.apache.cayenne.crypto.key.KeySource;
 
 /**
- * @since 3.2
+ * @since 4.0
  */
 class HeaderDecryptor implements BytesDecryptor {
 

http://git-wip-us.apache.org/repos/asf/cayenne/blob/777b1d65/cayenne-crypto/src/main/java/org/apache/cayenne/crypto/transformer/value/Base64StringConverter.java
----------------------------------------------------------------------
diff --git a/cayenne-crypto/src/main/java/org/apache/cayenne/crypto/transformer/value/Base64StringConverter.java b/cayenne-crypto/src/main/java/org/apache/cayenne/crypto/transformer/value/Base64StringConverter.java
index ca8a571..3d36a3a 100644
--- a/cayenne-crypto/src/main/java/org/apache/cayenne/crypto/transformer/value/Base64StringConverter.java
+++ b/cayenne-crypto/src/main/java/org/apache/cayenne/crypto/transformer/value/Base64StringConverter.java
@@ -21,7 +21,7 @@ package org.apache.cayenne.crypto.transformer.value;
 import javax.xml.bind.DatatypeConverter;
 
 /**
- * @since 3.2
+ * @since 4.0
  */
 class Base64StringConverter implements BytesConverter {
 

http://git-wip-us.apache.org/repos/asf/cayenne/blob/777b1d65/cayenne-crypto/src/main/java/org/apache/cayenne/crypto/transformer/value/BytesConverter.java
----------------------------------------------------------------------
diff --git a/cayenne-crypto/src/main/java/org/apache/cayenne/crypto/transformer/value/BytesConverter.java b/cayenne-crypto/src/main/java/org/apache/cayenne/crypto/transformer/value/BytesConverter.java
index bacab4c..d6b75f6 100644
--- a/cayenne-crypto/src/main/java/org/apache/cayenne/crypto/transformer/value/BytesConverter.java
+++ b/cayenne-crypto/src/main/java/org/apache/cayenne/crypto/transformer/value/BytesConverter.java
@@ -19,7 +19,7 @@
 package org.apache.cayenne.crypto.transformer.value;
 
 /**
- * @since 3.2
+ * @since 4.0
  */
 interface BytesConverter {
 

http://git-wip-us.apache.org/repos/asf/cayenne/blob/777b1d65/cayenne-crypto/src/main/java/org/apache/cayenne/crypto/transformer/value/BytesToBytesConverter.java
----------------------------------------------------------------------
diff --git a/cayenne-crypto/src/main/java/org/apache/cayenne/crypto/transformer/value/BytesToBytesConverter.java b/cayenne-crypto/src/main/java/org/apache/cayenne/crypto/transformer/value/BytesToBytesConverter.java
index f721522..74f919c 100644
--- a/cayenne-crypto/src/main/java/org/apache/cayenne/crypto/transformer/value/BytesToBytesConverter.java
+++ b/cayenne-crypto/src/main/java/org/apache/cayenne/crypto/transformer/value/BytesToBytesConverter.java
@@ -19,7 +19,7 @@
 package org.apache.cayenne.crypto.transformer.value;
 
 /**
- * @since 3.2
+ * @since 4.0
  */
 class BytesToBytesConverter implements BytesConverter {
 

http://git-wip-us.apache.org/repos/asf/cayenne/blob/777b1d65/cayenne-crypto/src/main/java/org/apache/cayenne/crypto/transformer/value/DefaultValueDecryptor.java
----------------------------------------------------------------------
diff --git a/cayenne-crypto/src/main/java/org/apache/cayenne/crypto/transformer/value/DefaultValueDecryptor.java b/cayenne-crypto/src/main/java/org/apache/cayenne/crypto/transformer/value/DefaultValueDecryptor.java
index 5e065f3..09f0849 100644
--- a/cayenne-crypto/src/main/java/org/apache/cayenne/crypto/transformer/value/DefaultValueDecryptor.java
+++ b/cayenne-crypto/src/main/java/org/apache/cayenne/crypto/transformer/value/DefaultValueDecryptor.java
@@ -23,7 +23,7 @@ import java.security.Key;
 import org.apache.cayenne.crypto.transformer.bytes.BytesDecryptor;
 
 /**
- * @since 3.2
+ * @since 4.0
  */
 class DefaultValueDecryptor implements ValueDecryptor {
 

http://git-wip-us.apache.org/repos/asf/cayenne/blob/777b1d65/cayenne-crypto/src/main/java/org/apache/cayenne/crypto/transformer/value/DefaultValueEncryptor.java
----------------------------------------------------------------------
diff --git a/cayenne-crypto/src/main/java/org/apache/cayenne/crypto/transformer/value/DefaultValueEncryptor.java b/cayenne-crypto/src/main/java/org/apache/cayenne/crypto/transformer/value/DefaultValueEncryptor.java
index b1a2818..e451db1 100644
--- a/cayenne-crypto/src/main/java/org/apache/cayenne/crypto/transformer/value/DefaultValueEncryptor.java
+++ b/cayenne-crypto/src/main/java/org/apache/cayenne/crypto/transformer/value/DefaultValueEncryptor.java
@@ -21,7 +21,7 @@ package org.apache.cayenne.crypto.transformer.value;
 import org.apache.cayenne.crypto.transformer.bytes.BytesEncryptor;
 
 /**
- * @since 3.2
+ * @since 4.0
  */
 class DefaultValueEncryptor implements ValueEncryptor {
 

http://git-wip-us.apache.org/repos/asf/cayenne/blob/777b1d65/cayenne-crypto/src/main/java/org/apache/cayenne/crypto/transformer/value/DefaultValueTransformerFactory.java
----------------------------------------------------------------------
diff --git a/cayenne-crypto/src/main/java/org/apache/cayenne/crypto/transformer/value/DefaultValueTransformerFactory.java b/cayenne-crypto/src/main/java/org/apache/cayenne/crypto/transformer/value/DefaultValueTransformerFactory.java
index 8f82532..6fa56d7 100644
--- a/cayenne-crypto/src/main/java/org/apache/cayenne/crypto/transformer/value/DefaultValueTransformerFactory.java
+++ b/cayenne-crypto/src/main/java/org/apache/cayenne/crypto/transformer/value/DefaultValueTransformerFactory.java
@@ -40,7 +40,7 @@ import org.apache.cayenne.map.ObjEntity;
  * A {@link ValueTransformerFactory} that creates encryptors/decryptors that are
  * taking advantage of the JCE (Java Cryptography Extension) ciphers.
  * 
- * @since 3.2
+ * @since 4.0
  */
 public class DefaultValueTransformerFactory implements ValueTransformerFactory {
 

http://git-wip-us.apache.org/repos/asf/cayenne/blob/777b1d65/cayenne-crypto/src/main/java/org/apache/cayenne/crypto/transformer/value/Utf8StringConverter.java
----------------------------------------------------------------------
diff --git a/cayenne-crypto/src/main/java/org/apache/cayenne/crypto/transformer/value/Utf8StringConverter.java b/cayenne-crypto/src/main/java/org/apache/cayenne/crypto/transformer/value/Utf8StringConverter.java
index a754f4f..b9cddb7 100644
--- a/cayenne-crypto/src/main/java/org/apache/cayenne/crypto/transformer/value/Utf8StringConverter.java
+++ b/cayenne-crypto/src/main/java/org/apache/cayenne/crypto/transformer/value/Utf8StringConverter.java
@@ -21,7 +21,7 @@ package org.apache.cayenne.crypto.transformer.value;
 import java.nio.charset.Charset;
 
 /**
- * @since 3.2
+ * @since 4.0
  */
 final class Utf8StringConverter implements BytesConverter {
 

http://git-wip-us.apache.org/repos/asf/cayenne/blob/777b1d65/cayenne-crypto/src/main/java/org/apache/cayenne/crypto/transformer/value/ValueDecryptor.java
----------------------------------------------------------------------
diff --git a/cayenne-crypto/src/main/java/org/apache/cayenne/crypto/transformer/value/ValueDecryptor.java b/cayenne-crypto/src/main/java/org/apache/cayenne/crypto/transformer/value/ValueDecryptor.java
index 4549d64..2912f70 100644
--- a/cayenne-crypto/src/main/java/org/apache/cayenne/crypto/transformer/value/ValueDecryptor.java
+++ b/cayenne-crypto/src/main/java/org/apache/cayenne/crypto/transformer/value/ValueDecryptor.java
@@ -21,7 +21,7 @@ package org.apache.cayenne.crypto.transformer.value;
 import org.apache.cayenne.crypto.transformer.bytes.BytesDecryptor;
 
 /**
- * @since 3.2
+ * @since 4.0
  */
 public interface ValueDecryptor {
 

http://git-wip-us.apache.org/repos/asf/cayenne/blob/777b1d65/cayenne-crypto/src/main/java/org/apache/cayenne/crypto/transformer/value/ValueEncryptor.java
----------------------------------------------------------------------
diff --git a/cayenne-crypto/src/main/java/org/apache/cayenne/crypto/transformer/value/ValueEncryptor.java b/cayenne-crypto/src/main/java/org/apache/cayenne/crypto/transformer/value/ValueEncryptor.java
index e87135d..cae9738 100644
--- a/cayenne-crypto/src/main/java/org/apache/cayenne/crypto/transformer/value/ValueEncryptor.java
+++ b/cayenne-crypto/src/main/java/org/apache/cayenne/crypto/transformer/value/ValueEncryptor.java
@@ -23,7 +23,7 @@ import org.apache.cayenne.crypto.transformer.bytes.BytesEncryptor;
 /**
  * An encryptor or decryptor of a single value.
  * 
- * @since 3.2
+ * @since 4.0
  */
 public interface ValueEncryptor {
 

http://git-wip-us.apache.org/repos/asf/cayenne/blob/777b1d65/cayenne-crypto/src/main/java/org/apache/cayenne/crypto/transformer/value/ValueTransformerFactory.java
----------------------------------------------------------------------
diff --git a/cayenne-crypto/src/main/java/org/apache/cayenne/crypto/transformer/value/ValueTransformerFactory.java b/cayenne-crypto/src/main/java/org/apache/cayenne/crypto/transformer/value/ValueTransformerFactory.java
index 3599316..9e789a3 100644
--- a/cayenne-crypto/src/main/java/org/apache/cayenne/crypto/transformer/value/ValueTransformerFactory.java
+++ b/cayenne-crypto/src/main/java/org/apache/cayenne/crypto/transformer/value/ValueTransformerFactory.java
@@ -24,7 +24,7 @@ import org.apache.cayenne.map.DbAttribute;
  * A factory that creates transformers for encryption/decryption of individual
  * values.
  * 
- * @since 3.2
+ * @since 4.0
  */
 public interface ValueTransformerFactory {
 

http://git-wip-us.apache.org/repos/asf/cayenne/blob/777b1d65/cayenne-di/src/main/java/org/apache/cayenne/di/AdhocObjectFactory.java
----------------------------------------------------------------------
diff --git a/cayenne-di/src/main/java/org/apache/cayenne/di/AdhocObjectFactory.java b/cayenne-di/src/main/java/org/apache/cayenne/di/AdhocObjectFactory.java
index cd10770..7d8e3df 100644
--- a/cayenne-di/src/main/java/org/apache/cayenne/di/AdhocObjectFactory.java
+++ b/cayenne-di/src/main/java/org/apache/cayenne/di/AdhocObjectFactory.java
@@ -36,7 +36,7 @@ public interface AdhocObjectFactory {
      * Returns a Java class loaded using ClassLoader returned from
      * {@link ClassLoaderManager#getClassLoader(String)} for a given class name.
      * 
-     * @since 3.2
+     * @since 4.0
      */
     Class<?> getJavaClass(String className);
 }

http://git-wip-us.apache.org/repos/asf/cayenne/blob/777b1d65/cayenne-di/src/main/java/org/apache/cayenne/di/Binder.java
----------------------------------------------------------------------
diff --git a/cayenne-di/src/main/java/org/apache/cayenne/di/Binder.java b/cayenne-di/src/main/java/org/apache/cayenne/di/Binder.java
index 54b15dc..d002cc1 100644
--- a/cayenne-di/src/main/java/org/apache/cayenne/di/Binder.java
+++ b/cayenne-di/src/main/java/org/apache/cayenne/di/Binder.java
@@ -60,12 +60,12 @@ public interface Binder {
     <T> ListBuilder<T> bindList(String bindingName);
     
     /**
-     * @since 3.2
+     * @since 4.0
      */
     <T> DecoratorBuilder<T> decorate(Class<T> interfaceType);
     
     /**
-     * @since 3.2
+     * @since 4.0
      */
     <T> DecoratorBuilder<T> decorate(Key<T> key);
 }

http://git-wip-us.apache.org/repos/asf/cayenne/blob/777b1d65/cayenne-di/src/main/java/org/apache/cayenne/di/ClassLoaderManager.java
----------------------------------------------------------------------
diff --git a/cayenne-di/src/main/java/org/apache/cayenne/di/ClassLoaderManager.java b/cayenne-di/src/main/java/org/apache/cayenne/di/ClassLoaderManager.java
index 5434388..1f26e86 100644
--- a/cayenne-di/src/main/java/org/apache/cayenne/di/ClassLoaderManager.java
+++ b/cayenne-di/src/main/java/org/apache/cayenne/di/ClassLoaderManager.java
@@ -23,7 +23,7 @@ package org.apache.cayenne.di;
  * between environments. E.g. between JEE with thread/hierarchical classloaders
  * and OSGi with per-bundle classloaders.
  * 
- * @since 3.2
+ * @since 4.0
  */
 public interface ClassLoaderManager {
 

http://git-wip-us.apache.org/repos/asf/cayenne/blob/777b1d65/cayenne-di/src/main/java/org/apache/cayenne/di/DIRuntimeException.java
----------------------------------------------------------------------
diff --git a/cayenne-di/src/main/java/org/apache/cayenne/di/DIRuntimeException.java b/cayenne-di/src/main/java/org/apache/cayenne/di/DIRuntimeException.java
index e828b0f..076b496 100644
--- a/cayenne-di/src/main/java/org/apache/cayenne/di/DIRuntimeException.java
+++ b/cayenne-di/src/main/java/org/apache/cayenne/di/DIRuntimeException.java
@@ -21,7 +21,7 @@ package org.apache.cayenne.di;
 /**
  * A runtime exception thrown on DI misconfiguration.
  * 
- * @since 3.2
+ * @since 4.0
  */
 public class DIRuntimeException extends RuntimeException {
     /**

http://git-wip-us.apache.org/repos/asf/cayenne/blob/777b1d65/cayenne-di/src/main/java/org/apache/cayenne/di/DecoratorBuilder.java
----------------------------------------------------------------------
diff --git a/cayenne-di/src/main/java/org/apache/cayenne/di/DecoratorBuilder.java b/cayenne-di/src/main/java/org/apache/cayenne/di/DecoratorBuilder.java
index 8a26a03..6572149 100644
--- a/cayenne-di/src/main/java/org/apache/cayenne/di/DecoratorBuilder.java
+++ b/cayenne-di/src/main/java/org/apache/cayenne/di/DecoratorBuilder.java
@@ -19,7 +19,7 @@
 package org.apache.cayenne.di;
 
 /**
- * @since 3.2
+ * @since 4.0
  */
 public interface DecoratorBuilder<T> {
 

http://git-wip-us.apache.org/repos/asf/cayenne/blob/777b1d65/cayenne-di/src/main/java/org/apache/cayenne/di/spi/ConstructorInjectingDecoratorProvider.java
----------------------------------------------------------------------
diff --git a/cayenne-di/src/main/java/org/apache/cayenne/di/spi/ConstructorInjectingDecoratorProvider.java b/cayenne-di/src/main/java/org/apache/cayenne/di/spi/ConstructorInjectingDecoratorProvider.java
index 0889454..4ad974f 100644
--- a/cayenne-di/src/main/java/org/apache/cayenne/di/spi/ConstructorInjectingDecoratorProvider.java
+++ b/cayenne-di/src/main/java/org/apache/cayenne/di/spi/ConstructorInjectingDecoratorProvider.java
@@ -24,7 +24,7 @@ import org.apache.cayenne.di.DIRuntimeException;
 import org.apache.cayenne.di.Provider;
 
 /**
- * @since 3.2
+ * @since 4.0
  */
 public class ConstructorInjectingDecoratorProvider<T> implements DecoratorProvider<T> {
 

http://git-wip-us.apache.org/repos/asf/cayenne/blob/777b1d65/cayenne-di/src/main/java/org/apache/cayenne/di/spi/DecoratorProvider.java
----------------------------------------------------------------------
diff --git a/cayenne-di/src/main/java/org/apache/cayenne/di/spi/DecoratorProvider.java b/cayenne-di/src/main/java/org/apache/cayenne/di/spi/DecoratorProvider.java
index 5e17132..8559f34 100644
--- a/cayenne-di/src/main/java/org/apache/cayenne/di/spi/DecoratorProvider.java
+++ b/cayenne-di/src/main/java/org/apache/cayenne/di/spi/DecoratorProvider.java
@@ -22,7 +22,7 @@ import org.apache.cayenne.di.DIRuntimeException;
 import org.apache.cayenne.di.Provider;
 
 /**
- * @since 3.2
+ * @since 4.0
  */
 interface DecoratorProvider<T> {
 

http://git-wip-us.apache.org/repos/asf/cayenne/blob/777b1d65/cayenne-di/src/main/java/org/apache/cayenne/di/spi/DefaultAdhocObjectFactory.java
----------------------------------------------------------------------
diff --git a/cayenne-di/src/main/java/org/apache/cayenne/di/spi/DefaultAdhocObjectFactory.java b/cayenne-di/src/main/java/org/apache/cayenne/di/spi/DefaultAdhocObjectFactory.java
index 83d588e..ab2728d 100644
--- a/cayenne-di/src/main/java/org/apache/cayenne/di/spi/DefaultAdhocObjectFactory.java
+++ b/cayenne-di/src/main/java/org/apache/cayenne/di/spi/DefaultAdhocObjectFactory.java
@@ -38,7 +38,7 @@ public class DefaultAdhocObjectFactory implements AdhocObjectFactory {
     protected ClassLoaderManager classLoaderManager;
 
     /**
-     * @since 3.2
+     * @since 4.0
      */
     public DefaultAdhocObjectFactory(@Inject Injector injector, @Inject ClassLoaderManager classLoaderManager) {
         this.injector = injector;

http://git-wip-us.apache.org/repos/asf/cayenne/blob/777b1d65/cayenne-di/src/main/java/org/apache/cayenne/di/spi/DefaultClassLoaderManager.java
----------------------------------------------------------------------
diff --git a/cayenne-di/src/main/java/org/apache/cayenne/di/spi/DefaultClassLoaderManager.java b/cayenne-di/src/main/java/org/apache/cayenne/di/spi/DefaultClassLoaderManager.java
index 497ad24..483bbb2 100644
--- a/cayenne-di/src/main/java/org/apache/cayenne/di/spi/DefaultClassLoaderManager.java
+++ b/cayenne-di/src/main/java/org/apache/cayenne/di/spi/DefaultClassLoaderManager.java
@@ -23,7 +23,7 @@ import org.apache.cayenne.di.ClassLoaderManager;
 /**
  * A {@link ClassLoaderManager} that
  * 
- * @since 3.2
+ * @since 4.0
  */
 public class DefaultClassLoaderManager implements ClassLoaderManager {
 

http://git-wip-us.apache.org/repos/asf/cayenne/blob/777b1d65/cayenne-di/src/main/java/org/apache/cayenne/di/spi/DefaultDecoratorBuilder.java
----------------------------------------------------------------------
diff --git a/cayenne-di/src/main/java/org/apache/cayenne/di/spi/DefaultDecoratorBuilder.java b/cayenne-di/src/main/java/org/apache/cayenne/di/spi/DefaultDecoratorBuilder.java
index 3ba654d..1c0a0b4 100644
--- a/cayenne-di/src/main/java/org/apache/cayenne/di/spi/DefaultDecoratorBuilder.java
+++ b/cayenne-di/src/main/java/org/apache/cayenne/di/spi/DefaultDecoratorBuilder.java
@@ -23,7 +23,7 @@ import org.apache.cayenne.di.DecoratorBuilder;
 import org.apache.cayenne.di.Key;
 
 /**
- * @since 3.2
+ * @since 4.0
  */
 class DefaultDecoratorBuilder<T> implements DecoratorBuilder<T> {
 

http://git-wip-us.apache.org/repos/asf/cayenne/blob/777b1d65/cayenne-di/src/main/java/org/apache/cayenne/di/spi/FieldInjectingDecoratorProvider.java
----------------------------------------------------------------------
diff --git a/cayenne-di/src/main/java/org/apache/cayenne/di/spi/FieldInjectingDecoratorProvider.java b/cayenne-di/src/main/java/org/apache/cayenne/di/spi/FieldInjectingDecoratorProvider.java
index 0e5015e..e6c072b 100644
--- a/cayenne-di/src/main/java/org/apache/cayenne/di/spi/FieldInjectingDecoratorProvider.java
+++ b/cayenne-di/src/main/java/org/apache/cayenne/di/spi/FieldInjectingDecoratorProvider.java
@@ -24,7 +24,7 @@ import org.apache.cayenne.di.DIRuntimeException;
 import org.apache.cayenne.di.Provider;
 
 /**
- * @since 3.2
+ * @since 4.0
  */
 class FieldInjectingDecoratorProvider<T> implements DecoratorProvider<T> {
 

http://git-wip-us.apache.org/repos/asf/cayenne/blob/777b1d65/cayenne-di/src/main/java/org/apache/cayenne/di/spi/FieldInjectingProvider.java
----------------------------------------------------------------------
diff --git a/cayenne-di/src/main/java/org/apache/cayenne/di/spi/FieldInjectingProvider.java b/cayenne-di/src/main/java/org/apache/cayenne/di/spi/FieldInjectingProvider.java
index 96ff905..edc55be 100644
--- a/cayenne-di/src/main/java/org/apache/cayenne/di/spi/FieldInjectingProvider.java
+++ b/cayenne-di/src/main/java/org/apache/cayenne/di/spi/FieldInjectingProvider.java
@@ -78,7 +78,7 @@ class FieldInjectingProvider<T> implements Provider<T> {
     }
     
     /**
-     * @since 3.2
+     * @since 4.0
      */
     protected Object value(Field field, String bindingName) {
 

http://git-wip-us.apache.org/repos/asf/cayenne/blob/777b1d65/cayenne-lifecycle/src/main/java/org/apache/cayenne/lifecycle/audit/AuditableFilter.java
----------------------------------------------------------------------
diff --git a/cayenne-lifecycle/src/main/java/org/apache/cayenne/lifecycle/audit/AuditableFilter.java b/cayenne-lifecycle/src/main/java/org/apache/cayenne/lifecycle/audit/AuditableFilter.java
index 931d9c4..58b0feb 100644
--- a/cayenne-lifecycle/src/main/java/org/apache/cayenne/lifecycle/audit/AuditableFilter.java
+++ b/cayenne-lifecycle/src/main/java/org/apache/cayenne/lifecycle/audit/AuditableFilter.java
@@ -53,7 +53,7 @@ public class AuditableFilter implements DataChannelFilter {
     protected EntityResolver entityResolver;
 
     /**
-     * @since 3.2
+     * @since 4.0
      */
     public AuditableFilter(AuditableProcessor processor) {
         this.processor = processor;

http://git-wip-us.apache.org/repos/asf/cayenne/blob/777b1d65/cayenne-lifecycle/src/main/java/org/apache/cayenne/lifecycle/id/IdCoder.java
----------------------------------------------------------------------
diff --git a/cayenne-lifecycle/src/main/java/org/apache/cayenne/lifecycle/id/IdCoder.java b/cayenne-lifecycle/src/main/java/org/apache/cayenne/lifecycle/id/IdCoder.java
index d89f31c..63d0e01 100644
--- a/cayenne-lifecycle/src/main/java/org/apache/cayenne/lifecycle/id/IdCoder.java
+++ b/cayenne-lifecycle/src/main/java/org/apache/cayenne/lifecycle/id/IdCoder.java
@@ -53,7 +53,7 @@ public class IdCoder {
     }
 
     /**
-     * @since 3.2
+     * @since 4.0
      */
     public String getStringId(ObjectId id) {
         EntityIdCoder coder = getCoder(id.getEntityName());

http://git-wip-us.apache.org/repos/asf/cayenne/blob/777b1d65/cayenne-server/src/main/java/org/apache/cayenne/BaseContext.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/main/java/org/apache/cayenne/BaseContext.java b/cayenne-server/src/main/java/org/apache/cayenne/BaseContext.java
index fc0ad33..dd61318 100644
--- a/cayenne-server/src/main/java/org/apache/cayenne/BaseContext.java
+++ b/cayenne-server/src/main/java/org/apache/cayenne/BaseContext.java
@@ -299,7 +299,7 @@ public abstract class BaseContext implements ObjectContext {
     public abstract List performQuery(Query query);
 
     /**
-     * @since 3.2
+     * @since 4.0
      */
     @SuppressWarnings("unchecked")
     @Override
@@ -308,7 +308,7 @@ public abstract class BaseContext implements ObjectContext {
     }
 
     /**
-     * @since 3.2
+     * @since 4.0
      */
     @Override
     public <T> T selectOne(Select<T> query) {
@@ -324,7 +324,7 @@ public abstract class BaseContext implements ObjectContext {
     }
 
     /**
-     * @since 3.2
+     * @since 4.0
      */
     @Override
     public <T> void iterate(Select<T> query, ResultIteratorCallback<T> callback) {

http://git-wip-us.apache.org/repos/asf/cayenne/blob/777b1d65/cayenne-server/src/main/java/org/apache/cayenne/CayenneContext.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/main/java/org/apache/cayenne/CayenneContext.java b/cayenne-server/src/main/java/org/apache/cayenne/CayenneContext.java
index 4ae5b34..827a60f 100644
--- a/cayenne-server/src/main/java/org/apache/cayenne/CayenneContext.java
+++ b/cayenne-server/src/main/java/org/apache/cayenne/CayenneContext.java
@@ -380,7 +380,7 @@ public class CayenneContext extends BaseContext {
      * This method simply returns an iterator over a list of selected objects.
      * There's no performance benefit of using it vs. regular "select".
      * 
-     * @since 3.2
+     * @since 4.0
      */
     public <T> ResultIterator<T> iterator(org.apache.cayenne.query.Select<T> query) {
         List<T> objects = select(query);

http://git-wip-us.apache.org/repos/asf/cayenne/blob/777b1d65/cayenne-server/src/main/java/org/apache/cayenne/CollectionResultIterator.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/main/java/org/apache/cayenne/CollectionResultIterator.java b/cayenne-server/src/main/java/org/apache/cayenne/CollectionResultIterator.java
index e77543b..9556b15 100644
--- a/cayenne-server/src/main/java/org/apache/cayenne/CollectionResultIterator.java
+++ b/cayenne-server/src/main/java/org/apache/cayenne/CollectionResultIterator.java
@@ -26,7 +26,7 @@ import java.util.List;
 /**
  * A ResultIterator over a collection of objects.
  * 
- * @since 3.2
+ * @since 4.0
  */
 class CollectionResultIterator<T> implements ResultIterator<T> {
 

http://git-wip-us.apache.org/repos/asf/cayenne/blob/777b1d65/cayenne-server/src/main/java/org/apache/cayenne/ObjectContext.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/main/java/org/apache/cayenne/ObjectContext.java b/cayenne-server/src/main/java/org/apache/cayenne/ObjectContext.java
index 7bdd67f..a925bdd 100644
--- a/cayenne-server/src/main/java/org/apache/cayenne/ObjectContext.java
+++ b/cayenne-server/src/main/java/org/apache/cayenne/ObjectContext.java
@@ -180,7 +180,7 @@ public interface ObjectContext extends DataChannel, Serializable {
      * Executes a selecting query, returning a list of persistent objects or
      * data rows.
      * 
-     * @since 3.2
+     * @since 4.0
      */
     <T> List<T> select(Select<T> query);
 
@@ -189,7 +189,7 @@ public interface ObjectContext extends DataChannel, Serializable {
      * objects, or a single object. If query matches more than one object,
      * {@link CayenneRuntimeException} is thrown.
      * 
-     * @since 3.2
+     * @since 4.0
      */
     <T> T selectOne(Select<T> query);
 
@@ -198,7 +198,7 @@ public interface ObjectContext extends DataChannel, Serializable {
      * callback for processing. The caller does not need to worry about closing
      * the iterator. This method takes care of it.
      * 
-     * @since 3.2
+     * @since 4.0
      */
     <T> void iterate(Select<T> query, ResultIteratorCallback<T> callback);
 
@@ -209,7 +209,7 @@ public interface ObjectContext extends DataChannel, Serializable {
      * iteration in try/finally and close the ResultIterator explicitly. Or use
      * {@link #iterate(Select, ResultIteratorCallback)} as an alternative.
      * 
-     * @since 3.2
+     * @since 4.0
      */
     <T> ResultIterator<T> iterator(Select<T> query);
 

http://git-wip-us.apache.org/repos/asf/cayenne/blob/777b1d65/cayenne-server/src/main/java/org/apache/cayenne/ResultIteratorCallback.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/main/java/org/apache/cayenne/ResultIteratorCallback.java b/cayenne-server/src/main/java/org/apache/cayenne/ResultIteratorCallback.java
index 216489f..d27c609 100644
--- a/cayenne-server/src/main/java/org/apache/cayenne/ResultIteratorCallback.java
+++ b/cayenne-server/src/main/java/org/apache/cayenne/ResultIteratorCallback.java
@@ -22,7 +22,7 @@ package org.apache.cayenne;
  * A callback interface invoked on each row when iterating over
  * {@link ResultIterator}. This simplifies iterator management.
  * 
- * @since 3.2
+ * @since 4.0
  */
 public interface ResultIteratorCallback<T> {
 

http://git-wip-us.apache.org/repos/asf/cayenne/blob/777b1d65/cayenne-server/src/main/java/org/apache/cayenne/access/DataContext.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/main/java/org/apache/cayenne/access/DataContext.java b/cayenne-server/src/main/java/org/apache/cayenne/access/DataContext.java
index bda8892..0fdab21 100644
--- a/cayenne-server/src/main/java/org/apache/cayenne/access/DataContext.java
+++ b/cayenne-server/src/main/java/org/apache/cayenne/access/DataContext.java
@@ -83,7 +83,7 @@ public class DataContext extends BaseContext {
     protected ObjectStore objectStore;
 
     /**
-     * @deprecated since 3.2 used in a method that itself should be deprecated,
+     * @deprecated since 4.0 used in a method that itself should be deprecated,
      *             so this is a temp code
      */
     @Deprecated
@@ -1205,8 +1205,8 @@ public class DataContext extends BaseContext {
     }
 
     /**
-     * @since 3.2
-     * @deprecated since 3.2 avoid using thsi directly. Transaction management
+     * @since 4.0
+     * @deprecated since 4.0 avoid using thsi directly. Transaction management
      *             at this level will be eventually removed
      */
     @Deprecated

http://git-wip-us.apache.org/repos/asf/cayenne/blob/777b1d65/cayenne-server/src/main/java/org/apache/cayenne/access/DataDomain.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/main/java/org/apache/cayenne/access/DataDomain.java b/cayenne-server/src/main/java/org/apache/cayenne/access/DataDomain.java
index b77fee0..e8ba6ff 100644
--- a/cayenne-server/src/main/java/org/apache/cayenne/access/DataDomain.java
+++ b/cayenne-server/src/main/java/org/apache/cayenne/access/DataDomain.java
@@ -69,13 +69,13 @@ public class DataDomain implements QueryEngine, DataChannel {
     public static final boolean VALIDATING_OBJECTS_ON_COMMIT_DEFAULT = true;
 
     /**
-     * @deprecated since 3.2 See {@link Constants#SERVER_EXTERNAL_TX_PROPERTY}.
+     * @deprecated since 4.0 See {@link Constants#SERVER_EXTERNAL_TX_PROPERTY}.
      */
     @Deprecated
     public static final String USING_EXTERNAL_TRANSACTIONS_PROPERTY = "cayenne.DataDomain.usingExternalTransactions";
 
     /**
-     * @deprecated since 3.2 See {@link Constants#SERVER_EXTERNAL_TX_PROPERTY}.
+     * @deprecated since 4.0 See {@link Constants#SERVER_EXTERNAL_TX_PROPERTY}.
      */
     @Deprecated
     public static final boolean USING_EXTERNAL_TRANSACTIONS_DEFAULT = false;
@@ -87,7 +87,7 @@ public class DataDomain implements QueryEngine, DataChannel {
     protected JdbcEventLogger jdbcEventLogger;
 
     /**
-     * @since 3.2
+     * @since 4.0
      */
     @Inject
     protected TransactionManager transactionManager;
@@ -144,7 +144,7 @@ public class DataDomain implements QueryEngine, DataChannel {
      *            Configuration object.
      * @param properties
      *            A Map containing domain configuration properties.
-     * @deprecated since 3.2 unused
+     * @deprecated since 4.0 unused
      */
     @Deprecated
     public DataDomain(String name, Map properties) {
@@ -207,7 +207,7 @@ public class DataDomain implements QueryEngine, DataChannel {
      * Reinitializes domain state with a new set of properties.
      * 
      * @since 1.1
-     * @deprecated since 3.2 properties are processed by the DI provider.
+     * @deprecated since 4.0 properties are processed by the DI provider.
      */
     @Deprecated
     public void initWithProperties(Map<String, String> properties) {
@@ -714,7 +714,7 @@ public class DataDomain implements QueryEngine, DataChannel {
      * is a shortcut for
      * 'getEntityResolver().getCallbackRegistry().addListener(listener)'.
      * 
-     * @since 3.2
+     * @since 4.0
      */
     public void addListener(Object listener) {
         getEntityResolver().getCallbackRegistry().addListener(listener);

http://git-wip-us.apache.org/repos/asf/cayenne/blob/777b1d65/cayenne-server/src/main/java/org/apache/cayenne/access/DataDomainLegacyQueryAction.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/main/java/org/apache/cayenne/access/DataDomainLegacyQueryAction.java b/cayenne-server/src/main/java/org/apache/cayenne/access/DataDomainLegacyQueryAction.java
index a98c30f..3c3c46e 100644
--- a/cayenne-server/src/main/java/org/apache/cayenne/access/DataDomainLegacyQueryAction.java
+++ b/cayenne-server/src/main/java/org/apache/cayenne/access/DataDomainLegacyQueryAction.java
@@ -127,7 +127,7 @@ class DataDomainLegacyQueryAction implements QueryRouter, OperationObserver {
     }
     
     /**
-     * @since 3.2
+     * @since 4.0
      */
     @Override
     public QueryEngine engineForName(String name) {

http://git-wip-us.apache.org/repos/asf/cayenne/blob/777b1d65/cayenne-server/src/main/java/org/apache/cayenne/access/DataDomainQueryAction.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/main/java/org/apache/cayenne/access/DataDomainQueryAction.java b/cayenne-server/src/main/java/org/apache/cayenne/access/DataDomainQueryAction.java
index 3854e89..a0fce92 100644
--- a/cayenne-server/src/main/java/org/apache/cayenne/access/DataDomainQueryAction.java
+++ b/cayenne-server/src/main/java/org/apache/cayenne/access/DataDomainQueryAction.java
@@ -517,7 +517,7 @@ class DataDomainQueryAction implements QueryRouter, OperationObserver {
     }
 
     /**
-     * @since 3.2
+     * @since 4.0
      */
     @Override
     public QueryEngine engineForName(String name) {

http://git-wip-us.apache.org/repos/asf/cayenne/blob/777b1d65/cayenne-server/src/main/java/org/apache/cayenne/access/DataNode.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/main/java/org/apache/cayenne/access/DataNode.java b/cayenne-server/src/main/java/org/apache/cayenne/access/DataNode.java
index 55a8f19..907c81a 100644
--- a/cayenne-server/src/main/java/org/apache/cayenne/access/DataNode.java
+++ b/cayenne-server/src/main/java/org/apache/cayenne/access/DataNode.java
@@ -454,7 +454,7 @@ public class DataNode implements QueryEngine {
     /**
      * Creates a {@link RowReader} using internal {@link RowReaderFactory}.
      * 
-     * @since 3.2
+     * @since 4.0
      */
     public RowReader<?> rowReader(RowDescriptor descriptor, QueryMetadata queryMetadata) {
         return rowReader(descriptor, queryMetadata, Collections.<ObjAttribute, ColumnDescriptor> emptyMap());
@@ -463,7 +463,7 @@ public class DataNode implements QueryEngine {
     /**
      * Creates a {@link RowReader} using internal {@link RowReaderFactory}.
      * 
-     * @since 3.2
+     * @since 4.0
      */
     public RowReader<?> rowReader(RowDescriptor descriptor, QueryMetadata queryMetadata,
             Map<ObjAttribute, ColumnDescriptor> attributeOverrides) {
@@ -471,35 +471,35 @@ public class DataNode implements QueryEngine {
     }
     
     /**
-     * @since 3.2
+     * @since 4.0
      */
     public BatchTranslator batchTranslator(BatchQuery query, String trimFunction) {
         return batchTranslatorFactory.translator(query, getAdapter(), trimFunction);
     }
 
     /**
-     * @since 3.2
+     * @since 4.0
      */
     public RowReaderFactory getRowReaderFactory() {
         return rowReaderFactory;
     }
 
     /**
-     * @since 3.2
+     * @since 4.0
      */
     public void setRowReaderFactory(RowReaderFactory rowReaderFactory) {
         this.rowReaderFactory = rowReaderFactory;
     }
 
     /**
-     * @since 3.2
+     * @since 4.0
      */
     public BatchTranslatorFactory getBatchTranslatorFactory() {
         return batchTranslatorFactory;
     }
 
     /**
-     * @since 3.2
+     * @since 4.0
      */
     public void setBatchTranslatorFactory(BatchTranslatorFactory batchTranslatorFactory) {
         this.batchTranslatorFactory = batchTranslatorFactory;

http://git-wip-us.apache.org/repos/asf/cayenne/blob/777b1d65/cayenne-server/src/main/java/org/apache/cayenne/access/DataPort.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/main/java/org/apache/cayenne/access/DataPort.java b/cayenne-server/src/main/java/org/apache/cayenne/access/DataPort.java
index 5173f7d..3ec8b63 100644
--- a/cayenne-server/src/main/java/org/apache/cayenne/access/DataPort.java
+++ b/cayenne-server/src/main/java/org/apache/cayenne/access/DataPort.java
@@ -54,7 +54,7 @@ import org.apache.cayenne.query.SelectQuery;
  * 
  * @since 1.2: Prior to 1.2 DataPort classes were a part of cayenne-examples
  *        package.
- * @deprecated since 3.2
+ * @deprecated since 4.0
  */
 @Deprecated
 public class DataPort {

http://git-wip-us.apache.org/repos/asf/cayenne/blob/777b1d65/cayenne-server/src/main/java/org/apache/cayenne/access/DataPortDelegate.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/main/java/org/apache/cayenne/access/DataPortDelegate.java b/cayenne-server/src/main/java/org/apache/cayenne/access/DataPortDelegate.java
index 5c57df8..199031b 100644
--- a/cayenne-server/src/main/java/org/apache/cayenne/access/DataPortDelegate.java
+++ b/cayenne-server/src/main/java/org/apache/cayenne/access/DataPortDelegate.java
@@ -30,7 +30,7 @@ import org.apache.cayenne.query.Query;
  * delegate methods during different stages of porting process.
  * 
  * @since 1.2: Prior to 1.2 DataPort classes were a part of cayenne-examples package.
- * @deprecated since 3.2
+ * @deprecated since 4.0
  */
 @Deprecated
 public interface DataPortDelegate {

http://git-wip-us.apache.org/repos/asf/cayenne/blob/777b1d65/cayenne-server/src/main/java/org/apache/cayenne/access/DbArcId.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/main/java/org/apache/cayenne/access/DbArcId.java b/cayenne-server/src/main/java/org/apache/cayenne/access/DbArcId.java
index 510f7ee..4d66101 100644
--- a/cayenne-server/src/main/java/org/apache/cayenne/access/DbArcId.java
+++ b/cayenne-server/src/main/java/org/apache/cayenne/access/DbArcId.java
@@ -29,7 +29,7 @@ import org.apache.cayenne.util.HashCodeBuilder;
  * DbEntities of flattened attributes or relationships. Provides 'equals' and
  * 'hashCode' implementations adequate for use as a map key.
  * 
- * @since 3.2
+ * @since 4.0
  */
 final class DbArcId {
 

http://git-wip-us.apache.org/repos/asf/cayenne/blob/777b1d65/cayenne-server/src/main/java/org/apache/cayenne/access/DbLoader.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/main/java/org/apache/cayenne/access/DbLoader.java b/cayenne-server/src/main/java/org/apache/cayenne/access/DbLoader.java
index 4f8fdee..c8589e0 100644
--- a/cayenne-server/src/main/java/org/apache/cayenne/access/DbLoader.java
+++ b/cayenne-server/src/main/java/org/apache/cayenne/access/DbLoader.java
@@ -538,7 +538,7 @@ public class DbLoader {
     }
 
     /**
-     * @since 3.2
+     * @since 4.0
      */
     protected EntityMergeSupport createEntityMerger(DataMap map) {
         return new EntityMergeSupport(map, nameGenerator, !creatingMeaningfulPK);
@@ -734,7 +734,7 @@ public class DbLoader {
     }
 
     /**
-     * @since 3.2
+     * @since 4.0
      */
     public String[] getDefaultTableTypes() {
         String viewType = adapter.tableTypeForView();
@@ -760,7 +760,7 @@ public class DbLoader {
      * tables and views.
      * 
      * @since 1.0.7
-     * @deprecated since 3.2 use
+     * @deprecated since 4.0 use
      *             {@link #load(DataMap, String, String, String, String...)}
      *             method that supports catalogs.
      */
@@ -781,7 +781,7 @@ public class DbLoader {
      * contains default mapping of the tables and views. Allows to limit types
      * of tables to read.
      * 
-     * @deprecated since 3.2 use
+     * @deprecated since 4.0 use
      *             {@link #load(DataMap, String, String, String, String...)}
      *             method that supports catalogs.
      */
@@ -799,7 +799,7 @@ public class DbLoader {
      * schema, table name and table type patterns and fills the specified
      * DataMap object with DB and object mapping info.
      * 
-     * @since 3.2
+     * @since 4.0
      */
     public void load(DataMap dataMap, String catalogPattern, String schemaPattern, String tablePattern,
             String... tableTypes) throws SQLException {
@@ -829,7 +829,7 @@ public class DbLoader {
      * </p>
      * 
      * @since 1.1
-     * @deprecated since 3.2 use
+     * @deprecated since 4.0 use
      *             {@link #loadProcedures(DataMap, String, String, String)} that
      *             supports "catalog" pattern.
      */
@@ -846,7 +846,7 @@ public class DbLoader {
      * be invoked explicitly by the user. </i>
      * </p>
      * 
-     * @since 3.2
+     * @since 4.0
      */
     public void loadProcedures(DataMap dataMap, String catalogPattern, String schemaPattern, String namePattern)
             throws SQLException {

http://git-wip-us.apache.org/repos/asf/cayenne/blob/777b1d65/cayenne-server/src/main/java/org/apache/cayenne/access/DbLoaderConfiguration.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/main/java/org/apache/cayenne/access/DbLoaderConfiguration.java b/cayenne-server/src/main/java/org/apache/cayenne/access/DbLoaderConfiguration.java
index 9d56964..02dab76 100644
--- a/cayenne-server/src/main/java/org/apache/cayenne/access/DbLoaderConfiguration.java
+++ b/cayenne-server/src/main/java/org/apache/cayenne/access/DbLoaderConfiguration.java
@@ -19,7 +19,7 @@
 package org.apache.cayenne.access;
 
 /**
- * @since 3.2.
+ * @since 4.0.
  */
 public class DbLoaderConfiguration {
 

http://git-wip-us.apache.org/repos/asf/cayenne/blob/777b1d65/cayenne-server/src/main/java/org/apache/cayenne/access/DefaultDbLoaderDelegate.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/main/java/org/apache/cayenne/access/DefaultDbLoaderDelegate.java b/cayenne-server/src/main/java/org/apache/cayenne/access/DefaultDbLoaderDelegate.java
index 08e229e..807635a 100644
--- a/cayenne-server/src/main/java/org/apache/cayenne/access/DefaultDbLoaderDelegate.java
+++ b/cayenne-server/src/main/java/org/apache/cayenne/access/DefaultDbLoaderDelegate.java
@@ -23,7 +23,7 @@ import org.apache.cayenne.map.DbEntity;
 import org.apache.cayenne.map.ObjEntity;
 
 /**
- * @since 3.2.
+ * @since 4.0.
  */
 public class DefaultDbLoaderDelegate implements DbLoaderDelegate {
 

http://git-wip-us.apache.org/repos/asf/cayenne/blob/777b1d65/cayenne-server/src/main/java/org/apache/cayenne/access/OperationObserver.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/main/java/org/apache/cayenne/access/OperationObserver.java b/cayenne-server/src/main/java/org/apache/cayenne/access/OperationObserver.java
index 682af9c..7f292d2 100644
--- a/cayenne-server/src/main/java/org/apache/cayenne/access/OperationObserver.java
+++ b/cayenne-server/src/main/java/org/apache/cayenne/access/OperationObserver.java
@@ -61,7 +61,7 @@ public interface OperationObserver extends OperationHints {
      * Callback method invoked after each batch of generated values is read during an
      * update.
      * 
-     * @since 3.2
+     * @since 4.0
      */
     void nextGeneratedRows(Query query, ResultIterator keys, ObjectId idToUpdate);
 

http://git-wip-us.apache.org/repos/asf/cayenne/blob/777b1d65/cayenne-server/src/main/java/org/apache/cayenne/access/PrefetchObjectResolver.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/main/java/org/apache/cayenne/access/PrefetchObjectResolver.java b/cayenne-server/src/main/java/org/apache/cayenne/access/PrefetchObjectResolver.java
index 4843fcf..e54c017 100644
--- a/cayenne-server/src/main/java/org/apache/cayenne/access/PrefetchObjectResolver.java
+++ b/cayenne-server/src/main/java/org/apache/cayenne/access/PrefetchObjectResolver.java
@@ -26,7 +26,7 @@ import org.apache.cayenne.Persistent;
 import org.apache.cayenne.reflect.ClassDescriptor;
 
 /**
- * @since 3.2
+ * @since 4.0
  */
 class PrefetchObjectResolver extends ObjectResolver {
 

http://git-wip-us.apache.org/repos/asf/cayenne/blob/777b1d65/cayenne-server/src/main/java/org/apache/cayenne/access/Transaction.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/main/java/org/apache/cayenne/access/Transaction.java b/cayenne-server/src/main/java/org/apache/cayenne/access/Transaction.java
index 80c3f55..779ba34 100644
--- a/cayenne-server/src/main/java/org/apache/cayenne/access/Transaction.java
+++ b/cayenne-server/src/main/java/org/apache/cayenne/access/Transaction.java
@@ -22,10 +22,10 @@ import org.apache.cayenne.configuration.server.ServerRuntime;
 import org.apache.cayenne.tx.BaseTransaction;
 
 /**
- * @deprecated since 3.2. For manual transaction management use
+ * @deprecated since 4.0. For manual transaction management use
  *             {@link BaseTransaction} static methods or better -
  *             {@link ServerRuntime#performInTransaction(org.apache.cayenne.tx.TransactionalOperation)}
- *             . Also note that since 3.2 an actual Transaction is an interface
+ *             . Also note that since 4.0 an actual Transaction is an interface
  *             located in a different package:
  *             {@link org.apache.cayenne.tx.Transaction}
  */

http://git-wip-us.apache.org/repos/asf/cayenne/blob/777b1d65/cayenne-server/src/main/java/org/apache/cayenne/access/jdbc/BaseSQLAction.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/main/java/org/apache/cayenne/access/jdbc/BaseSQLAction.java b/cayenne-server/src/main/java/org/apache/cayenne/access/jdbc/BaseSQLAction.java
index 38a1f61..7dcb056 100644
--- a/cayenne-server/src/main/java/org/apache/cayenne/access/jdbc/BaseSQLAction.java
+++ b/cayenne-server/src/main/java/org/apache/cayenne/access/jdbc/BaseSQLAction.java
@@ -40,7 +40,7 @@ public abstract class BaseSQLAction implements SQLAction {
     protected DataNode dataNode;
 
     /**
-     * @since 3.2
+     * @since 4.0
      */
     public BaseSQLAction(DataNode dataNode) {
         this.dataNode = dataNode;

http://git-wip-us.apache.org/repos/asf/cayenne/blob/777b1d65/cayenne-server/src/main/java/org/apache/cayenne/access/jdbc/BatchAction.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/main/java/org/apache/cayenne/access/jdbc/BatchAction.java b/cayenne-server/src/main/java/org/apache/cayenne/access/jdbc/BatchAction.java
index 25bea65..7efe4e3 100644
--- a/cayenne-server/src/main/java/org/apache/cayenne/access/jdbc/BatchAction.java
+++ b/cayenne-server/src/main/java/org/apache/cayenne/access/jdbc/BatchAction.java
@@ -65,7 +65,7 @@ public class BatchAction extends BaseSQLAction {
     }
 
     /**
-     * @since 3.2
+     * @since 4.0
      */
     public BatchAction(BatchQuery query, DataNode dataNode, boolean runningAsBatch) {
         super(dataNode);
@@ -224,7 +224,7 @@ public class BatchAction extends BaseSQLAction {
     /**
      * Implements generated keys extraction supported in JDBC 3.0 specification.
      * 
-     * @since 3.2
+     * @since 4.0
      */
     @SuppressWarnings({ "rawtypes", "unchecked" })
     protected void processGeneratedKeys(Statement statement, OperationObserver observer, BatchQueryRow row)

http://git-wip-us.apache.org/repos/asf/cayenne/blob/777b1d65/cayenne-server/src/main/java/org/apache/cayenne/access/jdbc/ColumnDescriptor.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/main/java/org/apache/cayenne/access/jdbc/ColumnDescriptor.java b/cayenne-server/src/main/java/org/apache/cayenne/access/jdbc/ColumnDescriptor.java
index d93d4d8..3f3f189 100644
--- a/cayenne-server/src/main/java/org/apache/cayenne/access/jdbc/ColumnDescriptor.java
+++ b/cayenne-server/src/main/java/org/apache/cayenne/access/jdbc/ColumnDescriptor.java
@@ -142,7 +142,7 @@ public class ColumnDescriptor {
      * initialized in a context where a DbAttribite is unknown, this method may
      * return null.
      * 
-     * @since 3.2
+     * @since 4.0
      */
     public DbAttribute getAttribute() {
         return attribute;
@@ -213,7 +213,7 @@ public class ColumnDescriptor {
     }
 
     /**
-     * @since 3.2
+     * @since 4.0
      */
     public String getNamePrefix() {
         return namePrefix;

http://git-wip-us.apache.org/repos/asf/cayenne/blob/777b1d65/cayenne-server/src/main/java/org/apache/cayenne/access/jdbc/ConnectionAwareResultIterator.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/main/java/org/apache/cayenne/access/jdbc/ConnectionAwareResultIterator.java b/cayenne-server/src/main/java/org/apache/cayenne/access/jdbc/ConnectionAwareResultIterator.java
index 58e64bc..b821d8e 100644
--- a/cayenne-server/src/main/java/org/apache/cayenne/access/jdbc/ConnectionAwareResultIterator.java
+++ b/cayenne-server/src/main/java/org/apache/cayenne/access/jdbc/ConnectionAwareResultIterator.java
@@ -32,7 +32,7 @@ import org.apache.cayenne.ResultIterator;
  * Subclasses are used in iterators that are returned to the end users and are
  * not implicitly managed by Cayenne.
  * 
- * @since 3.2
+ * @since 4.0
  */
 public class ConnectionAwareResultIterator<T> implements ResultIterator<T> {
 

http://git-wip-us.apache.org/repos/asf/cayenne/blob/777b1d65/cayenne-server/src/main/java/org/apache/cayenne/access/jdbc/DistinctResultIterator.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/main/java/org/apache/cayenne/access/jdbc/DistinctResultIterator.java b/cayenne-server/src/main/java/org/apache/cayenne/access/jdbc/DistinctResultIterator.java
index d68b979..6e07506 100644
--- a/cayenne-server/src/main/java/org/apache/cayenne/access/jdbc/DistinctResultIterator.java
+++ b/cayenne-server/src/main/java/org/apache/cayenne/access/jdbc/DistinctResultIterator.java
@@ -74,7 +74,7 @@ public class DistinctResultIterator<T> implements ResultIterator<T> {
     }
 
     /**
-     * @since 3.2
+     * @since 4.0
      */
     @Override
     public Iterator<T> iterator() {

http://git-wip-us.apache.org/repos/asf/cayenne/blob/777b1d65/cayenne-server/src/main/java/org/apache/cayenne/access/jdbc/JDBCResultIterator.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/main/java/org/apache/cayenne/access/jdbc/JDBCResultIterator.java b/cayenne-server/src/main/java/org/apache/cayenne/access/jdbc/JDBCResultIterator.java
index 7801b43..a5c494f 100644
--- a/cayenne-server/src/main/java/org/apache/cayenne/access/jdbc/JDBCResultIterator.java
+++ b/cayenne-server/src/main/java/org/apache/cayenne/access/jdbc/JDBCResultIterator.java
@@ -50,7 +50,7 @@ public class JDBCResultIterator<T> implements ResultIterator<T> {
     /**
      * Creates new JDBCResultIterator that reads from provided ResultSet.
      * 
-     * @since 3.2
+     * @since 4.0
      */
     public JDBCResultIterator(Statement statement, ResultSet resultSet, RowReader<T> rowReader) {
 
@@ -62,7 +62,7 @@ public class JDBCResultIterator<T> implements ResultIterator<T> {
     }
 
     /**
-     * @since 3.2
+     * @since 4.0
      */
     @Override
     public Iterator<T> iterator() {
@@ -167,7 +167,7 @@ public class JDBCResultIterator<T> implements ResultIterator<T> {
     }
 
     /**
-     * @deprecated since 3.2 always returns false. Connection closing is outside
+     * @deprecated since 4.0 always returns false. Connection closing is outside
      *             the scope of this iterator. See
      *             {@link ConnectionAwareResultIterator} for a replacement.
      */
@@ -179,7 +179,7 @@ public class JDBCResultIterator<T> implements ResultIterator<T> {
     /**
      * Sets the <code>closingConnection</code> property.
      * 
-     * @deprecated since 3.2 does nothing. Connection closing is outside the
+     * @deprecated since 4.0 does nothing. Connection closing is outside the
      *             scope of this iterator. See
      *             {@link ConnectionAwareResultIterator} for a replacement.
      */

http://git-wip-us.apache.org/repos/asf/cayenne/blob/777b1d65/cayenne-server/src/main/java/org/apache/cayenne/access/jdbc/LimitResultIterator.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/main/java/org/apache/cayenne/access/jdbc/LimitResultIterator.java b/cayenne-server/src/main/java/org/apache/cayenne/access/jdbc/LimitResultIterator.java
index 186ffcb..e0d5503 100644
--- a/cayenne-server/src/main/java/org/apache/cayenne/access/jdbc/LimitResultIterator.java
+++ b/cayenne-server/src/main/java/org/apache/cayenne/access/jdbc/LimitResultIterator.java
@@ -56,7 +56,7 @@ public class LimitResultIterator<T> implements ResultIterator<T> {
     }
 
     /**
-     * @since 3.2
+     * @since 4.0
      */
     @Override
     public Iterator<T> iterator() {

http://git-wip-us.apache.org/repos/asf/cayenne/blob/777b1d65/cayenne-server/src/main/java/org/apache/cayenne/access/jdbc/ProcedureAction.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/main/java/org/apache/cayenne/access/jdbc/ProcedureAction.java b/cayenne-server/src/main/java/org/apache/cayenne/access/jdbc/ProcedureAction.java
index c1ea24d..d1068ea 100644
--- a/cayenne-server/src/main/java/org/apache/cayenne/access/jdbc/ProcedureAction.java
+++ b/cayenne-server/src/main/java/org/apache/cayenne/access/jdbc/ProcedureAction.java
@@ -53,7 +53,7 @@ public class ProcedureAction extends BaseSQLAction {
     protected int processedResultSets;
 
     /**
-     * @since 3.2
+     * @since 4.0
      */
     public ProcedureAction(ProcedureQuery query, DataNode dataNode) {
         super(dataNode);

http://git-wip-us.apache.org/repos/asf/cayenne/blob/777b1d65/cayenne-server/src/main/java/org/apache/cayenne/access/jdbc/SQLTemplateAction.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/main/java/org/apache/cayenne/access/jdbc/SQLTemplateAction.java b/cayenne-server/src/main/java/org/apache/cayenne/access/jdbc/SQLTemplateAction.java
index a573409..5f7b773 100644
--- a/cayenne-server/src/main/java/org/apache/cayenne/access/jdbc/SQLTemplateAction.java
+++ b/cayenne-server/src/main/java/org/apache/cayenne/access/jdbc/SQLTemplateAction.java
@@ -66,7 +66,7 @@ public class SQLTemplateAction implements SQLAction {
     protected DbAdapter dbAdapter;
 
     /**
-     * @since 3.2
+     * @since 4.0
      */
     public SQLTemplateAction(SQLTemplate query, DataNode dataNode) {
         this.query = query;


Mime
View raw message