You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cayenne.apache.org by nt...@apache.org on 2022/11/11 11:44:06 UTC
[cayenne] branch master updated: CAY-2773 Switch master to "5.0"
This is an automated email from the ASF dual-hosted git repository.
ntimofeev pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cayenne.git
The following commit(s) were added to refs/heads/master by this push:
new 7e447397f CAY-2773 Switch master to "5.0"
7e447397f is described below
commit 7e447397f3f2c9c9779cf6ad5fec7624e0cc594b
Author: Nikita Timofeev <st...@gmail.com>
AuthorDate: Fri Nov 11 14:43:53 2022 +0300
CAY-2773 Switch master to "5.0"
---
RELEASE-NOTES.txt | 5 +++--
UPGRADE.txt | 2 +-
assembly/pom.xml | 2 +-
build-tools/cayenne-legal/pom.xml | 2 +-
build-tools/cayenne-test-utilities/pom.xml | 2 +-
build-tools/pom.xml | 2 +-
cayenne-ant/pom.xml | 2 +-
.../org/apache/cayenne/tools/CayenneGeneratorTask.java | 4 ++--
cayenne-cache-invalidation/pom.xml | 2 +-
cayenne-cgen/pom.xml | 2 +-
.../java/org/apache/cayenne/gen/CgenConfiguration.java | 4 ++--
cayenne-commitlog/pom.xml | 2 +-
cayenne-crypto/pom.xml | 2 +-
cayenne-dbsync/pom.xml | 2 +-
cayenne-di/pom.xml | 2 +-
cayenne-gradle-plugin/pom.xml | 2 +-
.../src/main/java/org/apache/cayenne/tools/CgenTask.java | 4 ++--
cayenne-jcache/pom.xml | 2 +-
cayenne-lifecycle/pom.xml | 2 +-
cayenne-osgi/pom.xml | 2 +-
cayenne-project-compatibility/pom.xml | 2 +-
cayenne-project/pom.xml | 2 +-
.../project/upgrade/handlers/UpgradeHandler_V11.java | 4 ++--
.../project/upgrade/handlers/UpgradeHandler_V11Test.java | 2 +-
cayenne-server/pom.xml | 2 +-
.../src/main/java/org/apache/cayenne/BaseContext.java | 4 ++--
.../src/main/java/org/apache/cayenne/ObjectContext.java | 4 ++--
.../cayenne/configuration/DataSourceDescriptor.java | 2 +-
.../configuration/server/JNDIDataSourceFactory.java | 2 +-
.../main/java/org/apache/cayenne/dba/h2/H2Adapter.java | 2 +-
.../cayenne/dba/h2/H2EJBQLConditionTranslator.java | 2 +-
.../apache/cayenne/dba/h2/H2EJBQLTranslatorFactory.java | 2 +-
.../org/apache/cayenne/dba/h2/H2TrimmingColumnNode.java | 2 +-
.../src/main/java/org/apache/cayenne/exp/Expression.java | 4 ++--
.../java/org/apache/cayenne/exp/ExpressionFactory.java | 4 ++--
.../apache/cayenne/exp/property/ComparableProperty.java | 16 ++++++++--------
.../main/java/org/apache/cayenne/map/DbAttribute.java | 2 +-
.../main/java/org/apache/cayenne/map/EntityResolver.java | 6 +++---
.../main/java/org/apache/cayenne/query/FluentSelect.java | 2 +-
cayenne-velocity/pom.xml | 2 +-
docs/asciidoc/cayenne-asciidoc-extension/pom.xml | 2 +-
docs/asciidoc/cayenne-guide/pom.xml | 2 +-
.../src/docs/asciidoc/_cayenne-guide/part1/setup.adoc | 2 +-
.../_cayenne-guide/part2/queries/objectselect.adoc | 2 +-
docs/asciidoc/getting-started-db-first/pom.xml | 2 +-
docs/asciidoc/getting-started-guide/pom.xml | 2 +-
docs/asciidoc/pom.xml | 4 ++--
docs/asciidoc/upgrade-guide/pom.xml | 2 +-
docs/doc/pom.xml | 2 +-
docs/pom.xml | 2 +-
maven-plugins/cayenne-maven-plugin/pom.xml | 2 +-
.../org/apache/cayenne/tools/CayenneGeneratorMojo.java | 4 ++--
maven-plugins/cayenne-modeler-maven-plugin/pom.xml | 2 +-
maven-plugins/cayenne-tools-itest/pom.xml | 2 +-
maven-plugins/pom.xml | 2 +-
modeler/cayenne-modeler-generic-ext/pom.xml | 2 +-
modeler/cayenne-modeler-generic/pom.xml | 2 +-
modeler/cayenne-modeler-mac-ext/pom.xml | 2 +-
modeler/cayenne-modeler-mac/pom.xml | 2 +-
modeler/cayenne-modeler-win-ext/pom.xml | 2 +-
modeler/cayenne-modeler-win/pom.xml | 2 +-
modeler/cayenne-modeler/pom.xml | 2 +-
.../dialog/pref/CreateTemplateFromDefaultController.java | 2 +-
.../dialog/pref/CreateTemplateFromDefaultView.java | 2 +-
.../modeler/dialog/templateeditor/FileTemplateSaver.java | 2 +-
.../dialog/templateeditor/FindAndReplaceController.java | 2 +-
.../dialog/templateeditor/FindAndReplaceView.java | 2 +-
.../modeler/dialog/templateeditor/FindController.java | 2 +-
.../cayenne/modeler/dialog/templateeditor/FindView.java | 2 +-
.../templateeditor/PreviewClassGenerationFactory.java | 2 +-
.../dialog/templateeditor/PreviewGenerationAction.java | 2 +-
.../dialog/templateeditor/TemplateEditorController.java | 2 +-
.../dialog/templateeditor/TemplateEditorView.java | 2 +-
.../modeler/dialog/templateeditor/TemplateLoader.java | 2 +-
.../dialog/templateeditor/VelocityTokenMaker.java | 2 +-
.../apache/cayenne/modeler/event/ProjectSavedEvent.java | 2 +-
.../cayenne/modeler/event/ProjectSavedListener.java | 2 +-
modeler/cayenne-wocompat/pom.xml | 2 +-
.../main/java/org/apache/cayenne/wocompat/EOQuery.java | 2 +-
modeler/pom.xml | 2 +-
pom.xml | 2 +-
tutorials/pom.xml | 2 +-
tutorials/tutorial/pom.xml | 2 +-
83 files changed, 104 insertions(+), 103 deletions(-)
diff --git a/RELEASE-NOTES.txt b/RELEASE-NOTES.txt
index eec8f98a6..a1aa5daf0 100644
--- a/RELEASE-NOTES.txt
+++ b/RELEASE-NOTES.txt
@@ -8,7 +8,7 @@ To browse individual bug reports check out project issue tracker:
https://issues.apache.org/jira/browse/CAY
----------------------------------
-Release: 4.3.M1
+Release: 5.0.M1
Date:
----------------------------------
Changes/New Features:
@@ -16,7 +16,7 @@ Changes/New Features:
CAY-2378 Switch usage of SelectQuery to ObjectSelect internally
CAY-2498 Rename packages to prevent crossing package names
CAY-2715 Support ANY and ALL expressions for subqueries
-CAY-2737 Cayenne 4.3: cleanup deprecated code
+CAY-2737 Cayenne 5.0: cleanup deprecated code
CAY-2741 Cleanup TransactionDescriptor and deprecate DefaultTransactionDescriptor
CAY-2742 Switch minimum required Java version to 11
CAY-2747 Update project XML version to 11
@@ -28,6 +28,7 @@ CAY-2757 Modeler: Create custom templates from defaults
CAY-2760 ObjectContext.userProperties need a way to clear properties
CAY-2761 Modeler: Editor for the cgen templates
CAY-2767 Modeler: upgrade deprecated code in custom components
+CAY-2773 Switch master to "5.0"
Bug Fixes:
diff --git a/UPGRADE.txt b/UPGRADE.txt
index b7bf1e789..ab8894acb 100644
--- a/UPGRADE.txt
+++ b/UPGRADE.txt
@@ -5,7 +5,7 @@ IMPORTANT: be sure to read all notes for the intermediate releases between your
current release and the release you are upgrading to.
-------------------------------------------------------------------------------
-UPGRADING TO 4.3.M1
+UPGRADING TO 5.0.M1
* Per CAY-2737 All code deprecated in Cayenne 4.1 and 4.2 was deleted, please review your code before upgrading.
Most notable removals are SelectQuery and these Cayenne modules:
diff --git a/assembly/pom.xml b/assembly/pom.xml
index 6dea36e2d..7ec2664ee 100644
--- a/assembly/pom.xml
+++ b/assembly/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.cayenne</groupId>
<artifactId>cayenne-parent</artifactId>
- <version>4.3.M1-SNAPSHOT</version>
+ <version>5.0.M1-SNAPSHOT</version>
</parent>
<groupId>org.apache.cayenne.assembly</groupId>
diff --git a/build-tools/cayenne-legal/pom.xml b/build-tools/cayenne-legal/pom.xml
index a8ef2d49a..42051c058 100644
--- a/build-tools/cayenne-legal/pom.xml
+++ b/build-tools/cayenne-legal/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.cayenne.build-tools</groupId>
<artifactId>build-tools-parent</artifactId>
- <version>4.3.M1-SNAPSHOT</version>
+ <version>5.0.M1-SNAPSHOT</version>
</parent>
<artifactId>cayenne-legal</artifactId>
diff --git a/build-tools/cayenne-test-utilities/pom.xml b/build-tools/cayenne-test-utilities/pom.xml
index 69d4af1c2..e82cb39bb 100644
--- a/build-tools/cayenne-test-utilities/pom.xml
+++ b/build-tools/cayenne-test-utilities/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.cayenne.build-tools</groupId>
<artifactId>build-tools-parent</artifactId>
- <version>4.3.M1-SNAPSHOT</version>
+ <version>5.0.M1-SNAPSHOT</version>
</parent>
<description>Common Unit Test Utilities</description>
diff --git a/build-tools/pom.xml b/build-tools/pom.xml
index 48e2102bc..38668c43d 100644
--- a/build-tools/pom.xml
+++ b/build-tools/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.cayenne</groupId>
<artifactId>cayenne-parent</artifactId>
- <version>4.3.M1-SNAPSHOT</version>
+ <version>5.0.M1-SNAPSHOT</version>
</parent>
<groupId>org.apache.cayenne.build-tools</groupId>
diff --git a/cayenne-ant/pom.xml b/cayenne-ant/pom.xml
index 6b3778f1b..033ba4b43 100644
--- a/cayenne-ant/pom.xml
+++ b/cayenne-ant/pom.xml
@@ -22,7 +22,7 @@
<parent>
<artifactId>cayenne-parent</artifactId>
<groupId>org.apache.cayenne</groupId>
- <version>4.3.M1-SNAPSHOT</version>
+ <version>5.0.M1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/cayenne-ant/src/main/java/org/apache/cayenne/tools/CayenneGeneratorTask.java b/cayenne-ant/src/main/java/org/apache/cayenne/tools/CayenneGeneratorTask.java
index c8783374a..936c005ff 100644
--- a/cayenne-ant/src/main/java/org/apache/cayenne/tools/CayenneGeneratorTask.java
+++ b/cayenne-ant/src/main/java/org/apache/cayenne/tools/CayenneGeneratorTask.java
@@ -288,7 +288,7 @@ public class CayenneGeneratorTask extends CayenneTask {
/**
* Sets <code>datamaptemplate</code> property.
- * @since 4.3 querytemplate renamed to datamaptemplate
+ * @since 5.0 querytemplate renamed to datamaptemplate
*/
public void setDataMapTemplate(String datamaptemplate) {
this.datamaptemplate = datamaptemplate;
@@ -296,7 +296,7 @@ public class CayenneGeneratorTask extends CayenneTask {
/**
* Sets <code>datamapsupertemplate</code> property.
- * @since 4.3 querysupertemplate renamed to datamapsupertemplate
+ * @since 5.0 querysupertemplate renamed to datamapsupertemplate
*/
public void setDataMapSupertemplate(String datamapsupertemplate) {
this.datamapsupertemplate = datamapsupertemplate;
diff --git a/cayenne-cache-invalidation/pom.xml b/cayenne-cache-invalidation/pom.xml
index 9e100505d..fd3721d27 100644
--- a/cayenne-cache-invalidation/pom.xml
+++ b/cayenne-cache-invalidation/pom.xml
@@ -22,7 +22,7 @@
<parent>
<artifactId>cayenne-parent</artifactId>
<groupId>org.apache.cayenne</groupId>
- <version>4.3.M1-SNAPSHOT</version>
+ <version>5.0.M1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/cayenne-cgen/pom.xml b/cayenne-cgen/pom.xml
index edf15b3e1..d4dc13ddc 100644
--- a/cayenne-cgen/pom.xml
+++ b/cayenne-cgen/pom.xml
@@ -22,7 +22,7 @@
<parent>
<artifactId>cayenne-parent</artifactId>
<groupId>org.apache.cayenne</groupId>
- <version>4.3.M1-SNAPSHOT</version>
+ <version>5.0.M1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/cayenne-cgen/src/main/java/org/apache/cayenne/gen/CgenConfiguration.java b/cayenne-cgen/src/main/java/org/apache/cayenne/gen/CgenConfiguration.java
index 7f86a0c9b..13e804baa 100644
--- a/cayenne-cgen/src/main/java/org/apache/cayenne/gen/CgenConfiguration.java
+++ b/cayenne-cgen/src/main/java/org/apache/cayenne/gen/CgenConfiguration.java
@@ -68,11 +68,11 @@ public class CgenConfiguration implements Serializable, XMLSerializable {
private String embeddableTemplate;
private String embeddableSuperTemplate;
/**
- * @since 4.3 renamed from queryTemplate
+ * @since 5.0 renamed from queryTemplate
*/
private String dataMapTemplate;
/**
- * @since 4.3 renamed from querySuperTemplate
+ * @since 5.0 renamed from querySuperTemplate
*/
private String dataMapSuperTemplate;
private long timestamp;
diff --git a/cayenne-commitlog/pom.xml b/cayenne-commitlog/pom.xml
index 21d032747..56685405b 100644
--- a/cayenne-commitlog/pom.xml
+++ b/cayenne-commitlog/pom.xml
@@ -22,7 +22,7 @@
<parent>
<artifactId>cayenne-parent</artifactId>
<groupId>org.apache.cayenne</groupId>
- <version>4.3.M1-SNAPSHOT</version>
+ <version>5.0.M1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/cayenne-crypto/pom.xml b/cayenne-crypto/pom.xml
index 5e09acf97..990e7b45b 100644
--- a/cayenne-crypto/pom.xml
+++ b/cayenne-crypto/pom.xml
@@ -14,7 +14,7 @@
<parent>
<artifactId>cayenne-parent</artifactId>
<groupId>org.apache.cayenne</groupId>
- <version>4.3.M1-SNAPSHOT</version>
+ <version>5.0.M1-SNAPSHOT</version>
</parent>
<artifactId>cayenne-crypto</artifactId>
<name>cayenne-crypto: Cayenne Cryptography Extensions</name>
diff --git a/cayenne-dbsync/pom.xml b/cayenne-dbsync/pom.xml
index 709881a17..6dd2f7750 100644
--- a/cayenne-dbsync/pom.xml
+++ b/cayenne-dbsync/pom.xml
@@ -22,7 +22,7 @@
<parent>
<artifactId>cayenne-parent</artifactId>
<groupId>org.apache.cayenne</groupId>
- <version>4.3.M1-SNAPSHOT</version>
+ <version>5.0.M1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/cayenne-di/pom.xml b/cayenne-di/pom.xml
index 90adf56e9..8d4577813 100644
--- a/cayenne-di/pom.xml
+++ b/cayenne-di/pom.xml
@@ -14,7 +14,7 @@
<parent>
<groupId>org.apache.cayenne</groupId>
<artifactId>cayenne-parent</artifactId>
- <version>4.3.M1-SNAPSHOT</version>
+ <version>5.0.M1-SNAPSHOT</version>
</parent>
<artifactId>cayenne-di</artifactId>
<packaging>jar</packaging>
diff --git a/cayenne-gradle-plugin/pom.xml b/cayenne-gradle-plugin/pom.xml
index 9051eb72f..f69b419a1 100644
--- a/cayenne-gradle-plugin/pom.xml
+++ b/cayenne-gradle-plugin/pom.xml
@@ -22,7 +22,7 @@
<parent>
<artifactId>cayenne-parent</artifactId>
<groupId>org.apache.cayenne</groupId>
- <version>4.3.M1-SNAPSHOT</version>
+ <version>5.0.M1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/cayenne-gradle-plugin/src/main/java/org/apache/cayenne/tools/CgenTask.java b/cayenne-gradle-plugin/src/main/java/org/apache/cayenne/tools/CgenTask.java
index 58dba0f80..a00256f5a 100644
--- a/cayenne-gradle-plugin/src/main/java/org/apache/cayenne/tools/CgenTask.java
+++ b/cayenne-gradle-plugin/src/main/java/org/apache/cayenne/tools/CgenTask.java
@@ -204,7 +204,7 @@ public class CgenTask extends BaseCayenneTask {
* DataMap class provides utilities for usage of the Cayenne queries stored in the DataMap.
* If omitted, default template is used.
*
- * @since 4.3 renamed from queryTemplate
+ * @since 5.0 renamed from queryTemplate
*/
@Input
@Optional
@@ -216,7 +216,7 @@ public class CgenTask extends BaseCayenneTask {
* If omitted, default template is used.
* Ignored unless <code>makepairs</code> set to <code>true</code>.
*
- * @since 4.3 renamed from querySuperTemplate
+ * @since 5.0 renamed from querySuperTemplate
*/
@Input
@Optional
diff --git a/cayenne-jcache/pom.xml b/cayenne-jcache/pom.xml
index 08704f101..e5d3a7695 100644
--- a/cayenne-jcache/pom.xml
+++ b/cayenne-jcache/pom.xml
@@ -22,7 +22,7 @@
<parent>
<artifactId>cayenne-parent</artifactId>
<groupId>org.apache.cayenne</groupId>
- <version>4.3.M1-SNAPSHOT</version>
+ <version>5.0.M1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/cayenne-lifecycle/pom.xml b/cayenne-lifecycle/pom.xml
index 0f0d8182e..4eb5cd208 100644
--- a/cayenne-lifecycle/pom.xml
+++ b/cayenne-lifecycle/pom.xml
@@ -14,7 +14,7 @@
<parent>
<artifactId>cayenne-parent</artifactId>
<groupId>org.apache.cayenne</groupId>
- <version>4.3.M1-SNAPSHOT</version>
+ <version>5.0.M1-SNAPSHOT</version>
</parent>
<artifactId>cayenne-lifecycle</artifactId>
<name>cayenne-lifecycle: Cayenne Lifecycle Utilities</name>
diff --git a/cayenne-osgi/pom.xml b/cayenne-osgi/pom.xml
index 6b2926f96..106e5346d 100644
--- a/cayenne-osgi/pom.xml
+++ b/cayenne-osgi/pom.xml
@@ -21,7 +21,7 @@
<parent>
<artifactId>cayenne-parent</artifactId>
<groupId>org.apache.cayenne</groupId>
- <version>4.3.M1-SNAPSHOT</version>
+ <version>5.0.M1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/cayenne-project-compatibility/pom.xml b/cayenne-project-compatibility/pom.xml
index 7db5f7f06..bd98f88d4 100644
--- a/cayenne-project-compatibility/pom.xml
+++ b/cayenne-project-compatibility/pom.xml
@@ -22,7 +22,7 @@
<parent>
<artifactId>cayenne-parent</artifactId>
<groupId>org.apache.cayenne</groupId>
- <version>4.3.M1-SNAPSHOT</version>
+ <version>5.0.M1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/cayenne-project/pom.xml b/cayenne-project/pom.xml
index b121310b9..a3fb1c36d 100644
--- a/cayenne-project/pom.xml
+++ b/cayenne-project/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.cayenne</groupId>
<artifactId>cayenne-parent</artifactId>
- <version>4.3.M1-SNAPSHOT</version>
+ <version>5.0.M1-SNAPSHOT</version>
</parent>
<artifactId>cayenne-project</artifactId>
diff --git a/cayenne-project/src/main/java/org/apache/cayenne/project/upgrade/handlers/UpgradeHandler_V11.java b/cayenne-project/src/main/java/org/apache/cayenne/project/upgrade/handlers/UpgradeHandler_V11.java
index 0cd39e24b..4c89a12a4 100644
--- a/cayenne-project/src/main/java/org/apache/cayenne/project/upgrade/handlers/UpgradeHandler_V11.java
+++ b/cayenne-project/src/main/java/org/apache/cayenne/project/upgrade/handlers/UpgradeHandler_V11.java
@@ -29,13 +29,13 @@ import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
/**
- * Upgrade handler for the project version "11" introduced by 4.3.M1 release.
+ * Upgrade handler for the project version "11" introduced by 5.0.M1 release.
* Changes highlight:
* - schemas version update
* - ROP removal
* - cgen schema changes
*
- * @since 4.3
+ * @since 5.0
*/
public class UpgradeHandler_V11 implements UpgradeHandler {
diff --git a/cayenne-project/src/test/java/org/apache/cayenne/project/upgrade/handlers/UpgradeHandler_V11Test.java b/cayenne-project/src/test/java/org/apache/cayenne/project/upgrade/handlers/UpgradeHandler_V11Test.java
index ffc195d87..9ae9f4ce6 100644
--- a/cayenne-project/src/test/java/org/apache/cayenne/project/upgrade/handlers/UpgradeHandler_V11Test.java
+++ b/cayenne-project/src/test/java/org/apache/cayenne/project/upgrade/handlers/UpgradeHandler_V11Test.java
@@ -34,7 +34,7 @@ import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.verifyNoInteractions;
/**
- * @since 4.3
+ * @since 5.0
*/
public class UpgradeHandler_V11Test extends BaseUpgradeHandlerTest{
diff --git a/cayenne-server/pom.xml b/cayenne-server/pom.xml
index a8d740f04..292b8f8b1 100644
--- a/cayenne-server/pom.xml
+++ b/cayenne-server/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.cayenne</groupId>
<artifactId>cayenne-parent</artifactId>
- <version>4.3.M1-SNAPSHOT</version>
+ <version>5.0.M1-SNAPSHOT</version>
</parent>
<artifactId>cayenne-server</artifactId>
<name>cayenne-server: Cayenne Server</name>
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 d31f69917..c97af15fd 100644
--- a/cayenne-server/src/main/java/org/apache/cayenne/BaseContext.java
+++ b/cayenne-server/src/main/java/org/apache/cayenne/BaseContext.java
@@ -618,7 +618,7 @@ public abstract class BaseContext implements ObjectContext {
/**
* {@inheritDoc}
*
- * @since 4.3
+ * @since 5.0
*/
@Override
public void removeUserProperty(String key) {
@@ -628,7 +628,7 @@ public abstract class BaseContext implements ObjectContext {
/**
* {@inheritDoc}
*
- * @since 4.3
+ * @since 5.0
*/
@Override
public void clearUserProperties() {
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 d8e1776ed..4166b06f1 100644
--- a/cayenne-server/src/main/java/org/apache/cayenne/ObjectContext.java
+++ b/cayenne-server/src/main/java/org/apache/cayenne/ObjectContext.java
@@ -308,14 +308,14 @@ public interface ObjectContext extends DataChannel, Serializable {
/**
* Removes a user-defined property.
*
- * @since 4.3
+ * @since 5.0
*/
void removeUserProperty(String key);
/**
* Removes all user-defined properties.
*
- * @since 4.3
+ * @since 5.0
*/
void clearUserProperties();
}
diff --git a/cayenne-server/src/main/java/org/apache/cayenne/configuration/DataSourceDescriptor.java b/cayenne-server/src/main/java/org/apache/cayenne/configuration/DataSourceDescriptor.java
index 9e6ab1973..94f3db244 100644
--- a/cayenne-server/src/main/java/org/apache/cayenne/configuration/DataSourceDescriptor.java
+++ b/cayenne-server/src/main/java/org/apache/cayenne/configuration/DataSourceDescriptor.java
@@ -27,7 +27,7 @@ import org.apache.cayenne.util.XMLSerializable;
/**
* Helper JavaBean class that holds DataSource information for the Cayenne-managed DataSource.
- * @since 4.3
+ * @since 5.0
*/
public class DataSourceDescriptor implements Serializable, XMLSerializable {
diff --git a/cayenne-server/src/main/java/org/apache/cayenne/configuration/server/JNDIDataSourceFactory.java b/cayenne-server/src/main/java/org/apache/cayenne/configuration/server/JNDIDataSourceFactory.java
index fa1f47611..0da730baa 100644
--- a/cayenne-server/src/main/java/org/apache/cayenne/configuration/server/JNDIDataSourceFactory.java
+++ b/cayenne-server/src/main/java/org/apache/cayenne/configuration/server/JNDIDataSourceFactory.java
@@ -32,7 +32,7 @@ import org.slf4j.LoggerFactory;
* Locates DataSource mapped via JNDI.
*
* @since 3.1
- * @deprecated since 4.3, unused by Cayenne
+ * @deprecated since 5.0, unused by Cayenne
*/
@Deprecated
public class JNDIDataSourceFactory implements DataSourceFactory {
diff --git a/cayenne-server/src/main/java/org/apache/cayenne/dba/h2/H2Adapter.java b/cayenne-server/src/main/java/org/apache/cayenne/dba/h2/H2Adapter.java
index 76714ffe1..ea13e66cf 100644
--- a/cayenne-server/src/main/java/org/apache/cayenne/dba/h2/H2Adapter.java
+++ b/cayenne-server/src/main/java/org/apache/cayenne/dba/h2/H2Adapter.java
@@ -82,7 +82,7 @@ public class H2Adapter extends JdbcAdapter {
/**
* @return translator factory for EJBQL queries
- * @since 4.3
+ * @since 5.0
*/
@Override
protected EJBQLTranslatorFactory createEJBQLTranslatorFactory() {
diff --git a/cayenne-server/src/main/java/org/apache/cayenne/dba/h2/H2EJBQLConditionTranslator.java b/cayenne-server/src/main/java/org/apache/cayenne/dba/h2/H2EJBQLConditionTranslator.java
index b8f9d3a44..33cfcacf5 100644
--- a/cayenne-server/src/main/java/org/apache/cayenne/dba/h2/H2EJBQLConditionTranslator.java
+++ b/cayenne-server/src/main/java/org/apache/cayenne/dba/h2/H2EJBQLConditionTranslator.java
@@ -30,7 +30,7 @@ import org.apache.cayenne.ejbql.EJBQLExpression;
import org.apache.cayenne.map.ObjAttribute;
/**
- * @since 4.3
+ * @since 5.0
*/
public class H2EJBQLConditionTranslator extends EJBQLConditionTranslator {
diff --git a/cayenne-server/src/main/java/org/apache/cayenne/dba/h2/H2EJBQLTranslatorFactory.java b/cayenne-server/src/main/java/org/apache/cayenne/dba/h2/H2EJBQLTranslatorFactory.java
index 3706146ec..8497515d8 100644
--- a/cayenne-server/src/main/java/org/apache/cayenne/dba/h2/H2EJBQLTranslatorFactory.java
+++ b/cayenne-server/src/main/java/org/apache/cayenne/dba/h2/H2EJBQLTranslatorFactory.java
@@ -24,7 +24,7 @@ import org.apache.cayenne.access.translator.ejbql.JdbcEJBQLTranslatorFactory;
import org.apache.cayenne.ejbql.EJBQLExpressionVisitor;
/**
- * @since 4.3
+ * @since 5.0
*/
public class H2EJBQLTranslatorFactory extends JdbcEJBQLTranslatorFactory {
diff --git a/cayenne-server/src/main/java/org/apache/cayenne/dba/h2/H2TrimmingColumnNode.java b/cayenne-server/src/main/java/org/apache/cayenne/dba/h2/H2TrimmingColumnNode.java
index 10991c8fc..b7fdf1593 100644
--- a/cayenne-server/src/main/java/org/apache/cayenne/dba/h2/H2TrimmingColumnNode.java
+++ b/cayenne-server/src/main/java/org/apache/cayenne/dba/h2/H2TrimmingColumnNode.java
@@ -25,7 +25,7 @@ import org.apache.cayenne.access.sqlbuilder.sqltree.NodeType;
import org.apache.cayenne.access.sqlbuilder.sqltree.TrimmingColumnNode;
/**
- * @since 4.3
+ * @since 5.0
*/
public class H2TrimmingColumnNode extends TrimmingColumnNode {
public H2TrimmingColumnNode(ColumnNode columnNode) {
diff --git a/cayenne-server/src/main/java/org/apache/cayenne/exp/Expression.java b/cayenne-server/src/main/java/org/apache/cayenne/exp/Expression.java
index 4ab98f258..6a6f5eb64 100644
--- a/cayenne-server/src/main/java/org/apache/cayenne/exp/Expression.java
+++ b/cayenne-server/src/main/java/org/apache/cayenne/exp/Expression.java
@@ -195,12 +195,12 @@ public abstract class Expression implements Serializable, XMLSerializable {
public static final int CUSTOM_OP = 53;
/**
- * @since 4.3
+ * @since 5.0
*/
public static final int ALL = 54;
/**
- * @since 4.3
+ * @since 5.0
*/
public static final int ANY = 55;
diff --git a/cayenne-server/src/main/java/org/apache/cayenne/exp/ExpressionFactory.java b/cayenne-server/src/main/java/org/apache/cayenne/exp/ExpressionFactory.java
index 9fe545561..8f50603f7 100644
--- a/cayenne-server/src/main/java/org/apache/cayenne/exp/ExpressionFactory.java
+++ b/cayenne-server/src/main/java/org/apache/cayenne/exp/ExpressionFactory.java
@@ -1472,14 +1472,14 @@ public class ExpressionFactory {
}
/**
- * @since 4.3
+ * @since 5.0
*/
public static Expression all(ColumnSelect<?> subquery) {
return new ASTAll(new ASTSubquery(subquery));
}
/**
- * @since 4.3
+ * @since 5.0
*/
public static Expression any(ColumnSelect<?> subquery) {
return new ASTAny(new ASTSubquery(subquery));
diff --git a/cayenne-server/src/main/java/org/apache/cayenne/exp/property/ComparableProperty.java b/cayenne-server/src/main/java/org/apache/cayenne/exp/property/ComparableProperty.java
index e1c87c5d3..752f19959 100644
--- a/cayenne-server/src/main/java/org/apache/cayenne/exp/property/ComparableProperty.java
+++ b/cayenne-server/src/main/java/org/apache/cayenne/exp/property/ComparableProperty.java
@@ -128,7 +128,7 @@ public interface ComparableProperty<E> extends Property<E> {
/**
* @param subquery to use, must be a single column query.
* @return {@link Expression} that translates to a "< ALL (subquery)" SQL
- * @since 4.3
+ * @since 5.0
*/
default Expression ltAll(ColumnSelect<E> subquery) {
assertValidateSubqueryForComparison(subquery);
@@ -138,7 +138,7 @@ public interface ComparableProperty<E> extends Property<E> {
/**
* @param subquery to use, must be a single column query.
* @return {@link Expression} that translates to a "<= ALL (subquery)" SQL
- * @since 4.3
+ * @since 5.0
*/
default Expression lteAll(ColumnSelect<E> subquery) {
assertValidateSubqueryForComparison(subquery);
@@ -148,7 +148,7 @@ public interface ComparableProperty<E> extends Property<E> {
/**
* @param subquery to use, must be a single column query.
* @return {@link Expression} that translates to a "> ALL (subquery)" SQL
- * @since 4.3
+ * @since 5.0
*/
default Expression gtAll(ColumnSelect<E> subquery) {
assertValidateSubqueryForComparison(subquery);
@@ -158,7 +158,7 @@ public interface ComparableProperty<E> extends Property<E> {
/**
* @param subquery to use, must be a single column query.
* @return {@link Expression} that translates to a ">= ALL (subquery)" SQL
- * @since 4.3
+ * @since 5.0
*/
default Expression gteAll(ColumnSelect<E> subquery) {
assertValidateSubqueryForComparison(subquery);
@@ -168,7 +168,7 @@ public interface ComparableProperty<E> extends Property<E> {
/**
* @param subquery to use, must be a single column query.
* @return {@link Expression} that translates to a "< ANY (subquery)" SQL
- * @since 4.3
+ * @since 5.0
*/
default Expression ltAny(ColumnSelect<E> subquery) {
assertValidateSubqueryForComparison(subquery);
@@ -178,7 +178,7 @@ public interface ComparableProperty<E> extends Property<E> {
/**
* @param subquery to use, must be a single column query.
* @return {@link Expression} that translates to a "<= ANY (subquery)" SQL
- * @since 4.3
+ * @since 5.0
*/
default Expression lteAny(ColumnSelect<E> subquery) {
assertValidateSubqueryForComparison(subquery);
@@ -188,7 +188,7 @@ public interface ComparableProperty<E> extends Property<E> {
/**
* @param subquery to use, must be a single column query.
* @return {@link Expression} that translates to a "> ANY (subquery)" SQL
- * @since 4.3
+ * @since 5.0
*/
default Expression gtAny(ColumnSelect<E> subquery) {
assertValidateSubqueryForComparison(subquery);
@@ -198,7 +198,7 @@ public interface ComparableProperty<E> extends Property<E> {
/**
* @param subquery to use, must be a single column query.
* @return {@link Expression} that translates to a ">= ANY (subquery)" SQL
- * @since 4.3
+ * @since 5.0
*/
default Expression gteAny(ColumnSelect<E> subquery) {
assertValidateSubqueryForComparison(subquery);
diff --git a/cayenne-server/src/main/java/org/apache/cayenne/map/DbAttribute.java b/cayenne-server/src/main/java/org/apache/cayenne/map/DbAttribute.java
index 37fae8174..bd42e701d 100644
--- a/cayenne-server/src/main/java/org/apache/cayenne/map/DbAttribute.java
+++ b/cayenne-server/src/main/java/org/apache/cayenne/map/DbAttribute.java
@@ -281,7 +281,7 @@ public class DbAttribute extends Attribute<DbEntity, DbAttribute, DbRelationship
/**
* @return java class guessed by the JDBC type of this attribute
- * @since 4.3
+ * @since 5.0
*/
public String getJavaClass() {
return TypesMapping.getJavaBySqlType(this);
diff --git a/cayenne-server/src/main/java/org/apache/cayenne/map/EntityResolver.java b/cayenne-server/src/main/java/org/apache/cayenne/map/EntityResolver.java
index 8c9745105..b3ff97bb9 100644
--- a/cayenne-server/src/main/java/org/apache/cayenne/map/EntityResolver.java
+++ b/cayenne-server/src/main/java/org/apache/cayenne/map/EntityResolver.java
@@ -106,7 +106,7 @@ public class EntityResolver implements MappingNamespace, Serializable {
protected transient EntitySorter entitySorter;
/**
- * @since 4.3
+ * @since 5.0
*/
protected transient AdhocObjectFactory objectFactory;
@@ -563,14 +563,14 @@ public class EntityResolver implements MappingNamespace, Serializable {
}
/**
- * @since 4.3
+ * @since 5.0
*/
public void setObjectFactory(AdhocObjectFactory objectFactory) {
this.objectFactory = objectFactory;
}
/**
- * @since 4.3
+ * @since 5.0
*/
public AdhocObjectFactory getObjectFactory() {
return objectFactory;
diff --git a/cayenne-server/src/main/java/org/apache/cayenne/query/FluentSelect.java b/cayenne-server/src/main/java/org/apache/cayenne/query/FluentSelect.java
index 8d82b3185..5491c2047 100644
--- a/cayenne-server/src/main/java/org/apache/cayenne/query/FluentSelect.java
+++ b/cayenne-server/src/main/java/org/apache/cayenne/query/FluentSelect.java
@@ -559,7 +559,7 @@ public abstract class FluentSelect<T, S extends FluentSelect<T, S>> extends Abst
*
* @return <code>this</code> casted to the type E
* @param <E> type to cast to
- * @since 4.3
+ * @since 5.0
*/
@SuppressWarnings("unchecked")
protected <E> E castSelf() {
diff --git a/cayenne-velocity/pom.xml b/cayenne-velocity/pom.xml
index 84bea6afa..903d0fc85 100644
--- a/cayenne-velocity/pom.xml
+++ b/cayenne-velocity/pom.xml
@@ -22,7 +22,7 @@
<parent>
<artifactId>cayenne-parent</artifactId>
<groupId>org.apache.cayenne</groupId>
- <version>4.3.M1-SNAPSHOT</version>
+ <version>5.0.M1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/docs/asciidoc/cayenne-asciidoc-extension/pom.xml b/docs/asciidoc/cayenne-asciidoc-extension/pom.xml
index 52a3dbdc5..322e2fee1 100644
--- a/docs/asciidoc/cayenne-asciidoc-extension/pom.xml
+++ b/docs/asciidoc/cayenne-asciidoc-extension/pom.xml
@@ -22,7 +22,7 @@
<parent>
<artifactId>cayenne-asciidoc-parent</artifactId>
<groupId>org.apache.cayenne.docs</groupId>
- <version>4.3.M1-SNAPSHOT</version>
+ <version>5.0.M1-SNAPSHOT</version>
</parent>
<artifactId>cayenne-asciidoc-extension</artifactId>
diff --git a/docs/asciidoc/cayenne-guide/pom.xml b/docs/asciidoc/cayenne-guide/pom.xml
index a64d9d9d6..5bf45370c 100644
--- a/docs/asciidoc/cayenne-guide/pom.xml
+++ b/docs/asciidoc/cayenne-guide/pom.xml
@@ -22,7 +22,7 @@
<parent>
<artifactId>cayenne-asciidoc-parent</artifactId>
<groupId>org.apache.cayenne.docs</groupId>
- <version>4.3.M1-SNAPSHOT</version>
+ <version>5.0.M1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/docs/asciidoc/cayenne-guide/src/docs/asciidoc/_cayenne-guide/part1/setup.adoc b/docs/asciidoc/cayenne-guide/src/docs/asciidoc/_cayenne-guide/part1/setup.adoc
index 6555da65b..fbff2689c 100644
--- a/docs/asciidoc/cayenne-guide/src/docs/asciidoc/_cayenne-guide/part1/setup.adoc
+++ b/docs/asciidoc/cayenne-guide/src/docs/asciidoc/_cayenne-guide/part1/setup.adoc
@@ -26,7 +26,7 @@ include::../var.adoc[]
|===
|Cayenne Version |Java Version |Status
-|4.3
+|5.0
|Java 11 or newer
|Development
diff --git a/docs/asciidoc/cayenne-guide/src/docs/asciidoc/_cayenne-guide/part2/queries/objectselect.adoc b/docs/asciidoc/cayenne-guide/src/docs/asciidoc/_cayenne-guide/part2/queries/objectselect.adoc
index 02eb53268..d6a8f6dae 100644
--- a/docs/asciidoc/cayenne-guide/src/docs/asciidoc/_cayenne-guide/part2/queries/objectselect.adoc
+++ b/docs/asciidoc/cayenne-guide/src/docs/asciidoc/_cayenne-guide/part2/queries/objectselect.adoc
@@ -14,7 +14,7 @@
[[select]]
==== ObjectSelect
-NOTE: `ObjectSelect` supersedes older `SelectQuery`. `SelectQuery` is deprecated since 4.2 and removed in 4.3.
+NOTE: `ObjectSelect` supersedes older `SelectQuery`. `SelectQuery` is deprecated since 4.2 and removed in 5.0.
===== Selecting objects
diff --git a/docs/asciidoc/getting-started-db-first/pom.xml b/docs/asciidoc/getting-started-db-first/pom.xml
index 63a6c9fae..d94b2c56a 100644
--- a/docs/asciidoc/getting-started-db-first/pom.xml
+++ b/docs/asciidoc/getting-started-db-first/pom.xml
@@ -22,7 +22,7 @@
<parent>
<artifactId>cayenne-asciidoc-parent</artifactId>
<groupId>org.apache.cayenne.docs</groupId>
- <version>4.3.M1-SNAPSHOT</version>
+ <version>5.0.M1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/docs/asciidoc/getting-started-guide/pom.xml b/docs/asciidoc/getting-started-guide/pom.xml
index 4d2d1cd54..a2b013659 100644
--- a/docs/asciidoc/getting-started-guide/pom.xml
+++ b/docs/asciidoc/getting-started-guide/pom.xml
@@ -22,7 +22,7 @@
<parent>
<artifactId>cayenne-asciidoc-parent</artifactId>
<groupId>org.apache.cayenne.docs</groupId>
- <version>4.3.M1-SNAPSHOT</version>
+ <version>5.0.M1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/docs/asciidoc/pom.xml b/docs/asciidoc/pom.xml
index f4395ff2e..0b888693b 100644
--- a/docs/asciidoc/pom.xml
+++ b/docs/asciidoc/pom.xml
@@ -23,7 +23,7 @@
<parent>
<artifactId>cayenne-docs-parent</artifactId>
<groupId>org.apache.cayenne.docs</groupId>
- <version>4.3.M1-SNAPSHOT</version>
+ <version>5.0.M1-SNAPSHOT</version>
</parent>
<artifactId>cayenne-asciidoc-parent</artifactId>
@@ -45,7 +45,7 @@
<asciidoctor.maven.plugin.version>2.2.2</asciidoctor.maven.plugin.version>
<asciidoctorj.pdf.version>2.1.4</asciidoctorj.pdf.version>
<cayenne.version>${project.version}</cayenne.version>
- <cayenne.major.version>4.3</cayenne.major.version>
+ <cayenne.major.version>5.0</cayenne.major.version>
</properties>
<dependencies>
diff --git a/docs/asciidoc/upgrade-guide/pom.xml b/docs/asciidoc/upgrade-guide/pom.xml
index 08f7aeec4..24b6586ba 100644
--- a/docs/asciidoc/upgrade-guide/pom.xml
+++ b/docs/asciidoc/upgrade-guide/pom.xml
@@ -22,7 +22,7 @@
<parent>
<artifactId>cayenne-asciidoc-parent</artifactId>
<groupId>org.apache.cayenne.docs</groupId>
- <version>4.3.M1-SNAPSHOT</version>
+ <version>5.0.M1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/docs/doc/pom.xml b/docs/doc/pom.xml
index 3bbd05a21..c2c01cec9 100644
--- a/docs/doc/pom.xml
+++ b/docs/doc/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.cayenne.docs</groupId>
<artifactId>cayenne-docs-parent</artifactId>
- <version>4.3.M1-SNAPSHOT</version>
+ <version>5.0.M1-SNAPSHOT</version>
</parent>
<artifactId>cayenne-doc</artifactId>
diff --git a/docs/pom.xml b/docs/pom.xml
index fcdf179ef..d60ad1454 100644
--- a/docs/pom.xml
+++ b/docs/pom.xml
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.cayenne</groupId>
<artifactId>cayenne-parent</artifactId>
- <version>4.3.M1-SNAPSHOT</version>
+ <version>5.0.M1-SNAPSHOT</version>
</parent>
<groupId>org.apache.cayenne.docs</groupId>
diff --git a/maven-plugins/cayenne-maven-plugin/pom.xml b/maven-plugins/cayenne-maven-plugin/pom.xml
index 6a5c4e65c..45ad54dd8 100644
--- a/maven-plugins/cayenne-maven-plugin/pom.xml
+++ b/maven-plugins/cayenne-maven-plugin/pom.xml
@@ -14,7 +14,7 @@
<parent>
<artifactId>cayenne-maven-plugins-parent</artifactId>
<groupId>org.apache.cayenne.plugins</groupId>
- <version>4.3.M1-SNAPSHOT</version>
+ <version>5.0.M1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/maven-plugins/cayenne-maven-plugin/src/main/java/org/apache/cayenne/tools/CayenneGeneratorMojo.java b/maven-plugins/cayenne-maven-plugin/src/main/java/org/apache/cayenne/tools/CayenneGeneratorMojo.java
index c434f10dc..e9fd7013d 100644
--- a/maven-plugins/cayenne-maven-plugin/src/main/java/org/apache/cayenne/tools/CayenneGeneratorMojo.java
+++ b/maven-plugins/cayenne-maven-plugin/src/main/java/org/apache/cayenne/tools/CayenneGeneratorMojo.java
@@ -209,7 +209,7 @@ public class CayenneGeneratorMojo extends AbstractMojo {
* DataMap class provides utilities for usage of the Cayenne queries stored in the DataMap.
* If omitted, default template is used.
*
- * @since 4.3 renamed from queryTemplate
+ * @since 5.0 renamed from queryTemplate
*/
@Parameter
private String dataMapTemplate;
@@ -220,7 +220,7 @@ public class CayenneGeneratorMojo extends AbstractMojo {
* If omitted, default template is used.
* Ignored unless <code>makepairs</code> set to <code>true</code>.
*
- * @since 4.3 renamed from querySuperTemplate
+ * @since 5.0 renamed from querySuperTemplate
*/
@Parameter
private String dataMapSuperTemplate;
diff --git a/maven-plugins/cayenne-modeler-maven-plugin/pom.xml b/maven-plugins/cayenne-modeler-maven-plugin/pom.xml
index 4017ae9f3..f23e17637 100644
--- a/maven-plugins/cayenne-modeler-maven-plugin/pom.xml
+++ b/maven-plugins/cayenne-modeler-maven-plugin/pom.xml
@@ -22,7 +22,7 @@
<parent>
<artifactId>cayenne-maven-plugins-parent</artifactId>
<groupId>org.apache.cayenne.plugins</groupId>
- <version>4.3.M1-SNAPSHOT</version>
+ <version>5.0.M1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/maven-plugins/cayenne-tools-itest/pom.xml b/maven-plugins/cayenne-tools-itest/pom.xml
index f418a26bc..fd8ad75fb 100644
--- a/maven-plugins/cayenne-tools-itest/pom.xml
+++ b/maven-plugins/cayenne-tools-itest/pom.xml
@@ -21,7 +21,7 @@
<parent>
<artifactId>cayenne-maven-plugins-parent</artifactId>
<groupId>org.apache.cayenne.plugins</groupId>
- <version>4.3.M1-SNAPSHOT</version>
+ <version>5.0.M1-SNAPSHOT</version>
</parent>
<description>Integration Tests - Cayenne Tools</description>
diff --git a/maven-plugins/pom.xml b/maven-plugins/pom.xml
index cf47e5c6a..6940cfc97 100644
--- a/maven-plugins/pom.xml
+++ b/maven-plugins/pom.xml
@@ -14,7 +14,7 @@
<parent>
<groupId>org.apache.cayenne</groupId>
<artifactId>cayenne-parent</artifactId>
- <version>4.3.M1-SNAPSHOT</version>
+ <version>5.0.M1-SNAPSHOT</version>
</parent>
<groupId>org.apache.cayenne.plugins</groupId>
<artifactId>cayenne-maven-plugins-parent</artifactId>
diff --git a/modeler/cayenne-modeler-generic-ext/pom.xml b/modeler/cayenne-modeler-generic-ext/pom.xml
index f04ccc601..48e48042d 100644
--- a/modeler/cayenne-modeler-generic-ext/pom.xml
+++ b/modeler/cayenne-modeler-generic-ext/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.cayenne.modeler</groupId>
<artifactId>cayenne-modeler-parent</artifactId>
- <version>4.3.M1-SNAPSHOT</version>
+ <version>5.0.M1-SNAPSHOT</version>
</parent>
<artifactId>cayenne-modeler-generic-ext</artifactId>
diff --git a/modeler/cayenne-modeler-generic/pom.xml b/modeler/cayenne-modeler-generic/pom.xml
index 7a03a83f9..e291cc3e0 100644
--- a/modeler/cayenne-modeler-generic/pom.xml
+++ b/modeler/cayenne-modeler-generic/pom.xml
@@ -16,7 +16,7 @@
<parent>
<groupId>org.apache.cayenne.modeler</groupId>
<artifactId>cayenne-modeler-parent</artifactId>
- <version>4.3.M1-SNAPSHOT</version>
+ <version>5.0.M1-SNAPSHOT</version>
</parent>
<artifactId>cayenne-modeler-generic</artifactId>
diff --git a/modeler/cayenne-modeler-mac-ext/pom.xml b/modeler/cayenne-modeler-mac-ext/pom.xml
index dfde5304c..111bd493a 100644
--- a/modeler/cayenne-modeler-mac-ext/pom.xml
+++ b/modeler/cayenne-modeler-mac-ext/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.cayenne.modeler</groupId>
<artifactId>cayenne-modeler-parent</artifactId>
- <version>4.3.M1-SNAPSHOT</version>
+ <version>5.0.M1-SNAPSHOT</version>
</parent>
<artifactId>cayenne-modeler-mac-ext</artifactId>
diff --git a/modeler/cayenne-modeler-mac/pom.xml b/modeler/cayenne-modeler-mac/pom.xml
index f2beeeb64..cba2177f8 100644
--- a/modeler/cayenne-modeler-mac/pom.xml
+++ b/modeler/cayenne-modeler-mac/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.cayenne.modeler</groupId>
<artifactId>cayenne-modeler-parent</artifactId>
- <version>4.3.M1-SNAPSHOT</version>
+ <version>5.0.M1-SNAPSHOT</version>
</parent>
<artifactId>cayenne-modeler-mac</artifactId>
diff --git a/modeler/cayenne-modeler-win-ext/pom.xml b/modeler/cayenne-modeler-win-ext/pom.xml
index d9275ed8f..0440333cd 100644
--- a/modeler/cayenne-modeler-win-ext/pom.xml
+++ b/modeler/cayenne-modeler-win-ext/pom.xml
@@ -24,7 +24,7 @@
<parent>
<artifactId>cayenne-modeler-parent</artifactId>
<groupId>org.apache.cayenne.modeler</groupId>
- <version>4.3.M1-SNAPSHOT</version>
+ <version>5.0.M1-SNAPSHOT</version>
</parent>
<name>cayenne-modeler-win-ext: Modeler Win Extensions</name>
diff --git a/modeler/cayenne-modeler-win/pom.xml b/modeler/cayenne-modeler-win/pom.xml
index bd61c634f..ab1dcf2a0 100644
--- a/modeler/cayenne-modeler-win/pom.xml
+++ b/modeler/cayenne-modeler-win/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.cayenne.modeler</groupId>
<artifactId>cayenne-modeler-parent</artifactId>
- <version>4.3.M1-SNAPSHOT</version>
+ <version>5.0.M1-SNAPSHOT</version>
</parent>
<artifactId>cayenne-modeler-win</artifactId>
diff --git a/modeler/cayenne-modeler/pom.xml b/modeler/cayenne-modeler/pom.xml
index 0a2bf1707..012a82e5f 100644
--- a/modeler/cayenne-modeler/pom.xml
+++ b/modeler/cayenne-modeler/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.cayenne.modeler</groupId>
<artifactId>cayenne-modeler-parent</artifactId>
- <version>4.3.M1-SNAPSHOT</version>
+ <version>5.0.M1-SNAPSHOT</version>
</parent>
<artifactId>cayenne-modeler</artifactId>
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/pref/CreateTemplateFromDefaultController.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/pref/CreateTemplateFromDefaultController.java
index 228091047..b1f2e70cb 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/pref/CreateTemplateFromDefaultController.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/pref/CreateTemplateFromDefaultController.java
@@ -48,7 +48,7 @@ import java.util.prefs.BackingStoreException;
import java.util.prefs.Preferences;
/**
- * @since 4.3
+ * @since 5.0
*/
public class CreateTemplateFromDefaultController extends CayenneController {
protected CreateTemplateFromDefaultView view;
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/pref/CreateTemplateFromDefaultView.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/pref/CreateTemplateFromDefaultView.java
index b6676c249..74b5836e9 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/pref/CreateTemplateFromDefaultView.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/pref/CreateTemplateFromDefaultView.java
@@ -37,7 +37,7 @@ import java.util.ArrayList;
import java.util.List;
/**
- * @since 4.3
+ * @since 5.0
*/
public class CreateTemplateFromDefaultView extends JDialog {
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/templateeditor/FileTemplateSaver.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/templateeditor/FileTemplateSaver.java
index 9ba141034..089c0ae53 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/templateeditor/FileTemplateSaver.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/templateeditor/FileTemplateSaver.java
@@ -31,7 +31,7 @@ import java.io.IOException;
import java.nio.file.Files;
/**
- * since 4.3
+ * @since 5.0
*/
public class FileTemplateSaver {
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/templateeditor/FindAndReplaceController.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/templateeditor/FindAndReplaceController.java
index 3b88e0306..5254298c1 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/templateeditor/FindAndReplaceController.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/templateeditor/FindAndReplaceController.java
@@ -29,7 +29,7 @@ import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
/**
- * since 4.3
+ * @since 5.0
*/
public class FindAndReplaceController extends FindController implements ActionListener {
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/templateeditor/FindAndReplaceView.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/templateeditor/FindAndReplaceView.java
index 19a9b7eb0..935832e0c 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/templateeditor/FindAndReplaceView.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/templateeditor/FindAndReplaceView.java
@@ -28,7 +28,7 @@ import javax.swing.JTextField;
import java.awt.BorderLayout;
/**
- * since 4.3
+ * @since 5.0
*/
public class FindAndReplaceView extends FindView {
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/templateeditor/FindController.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/templateeditor/FindController.java
index 8515f012e..3bffb5811 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/templateeditor/FindController.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/templateeditor/FindController.java
@@ -31,7 +31,7 @@ import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
/**
- * since 4.3
+ * @since 5.0
*/
public class FindController extends CayenneController implements ActionListener {
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/templateeditor/FindView.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/templateeditor/FindView.java
index 118d1e5a4..2537a598d 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/templateeditor/FindView.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/templateeditor/FindView.java
@@ -30,7 +30,7 @@ import javax.swing.JTextField;
import java.awt.BorderLayout;
/**
- * since 4.3
+ * @since 5.0
*/
public class FindView extends JDialog {
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/templateeditor/PreviewClassGenerationFactory.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/templateeditor/PreviewClassGenerationFactory.java
index e9d4c5631..1305c80da 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/templateeditor/PreviewClassGenerationFactory.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/templateeditor/PreviewClassGenerationFactory.java
@@ -30,7 +30,7 @@ import java.io.StringWriter;
/**
- * @since 4.3
+ * @since 5.0
*/
public class PreviewClassGenerationFactory implements ClassGenerationActionFactory {
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/templateeditor/PreviewGenerationAction.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/templateeditor/PreviewGenerationAction.java
index 26ccdaf28..9d8e64807 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/templateeditor/PreviewGenerationAction.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/templateeditor/PreviewGenerationAction.java
@@ -31,7 +31,7 @@ import java.io.Writer;
import java.util.Properties;
/**
- * @since 4.3
+ * @since 5.0
*/
public class PreviewGenerationAction extends ClassGenerationAction {
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/templateeditor/TemplateEditorController.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/templateeditor/TemplateEditorController.java
index ea6408b3e..8e7ad221f 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/templateeditor/TemplateEditorController.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/templateeditor/TemplateEditorController.java
@@ -47,7 +47,7 @@ import java.util.Map;
import java.util.stream.Collectors;
/**
- * since 4.3
+ * @since 5.0
*/
public class TemplateEditorController extends CayenneController {
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/templateeditor/TemplateEditorView.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/templateeditor/TemplateEditorView.java
index ed52629be..54b59a208 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/templateeditor/TemplateEditorView.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/templateeditor/TemplateEditorView.java
@@ -43,7 +43,7 @@ import java.awt.Dimension;
import java.util.List;
/**
- * since 4.3
+ * @since 5.0
*/
public class TemplateEditorView extends JFrame {
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/templateeditor/TemplateLoader.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/templateeditor/TemplateLoader.java
index 7e5727036..c520beb00 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/templateeditor/TemplateLoader.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/templateeditor/TemplateLoader.java
@@ -30,7 +30,7 @@ import java.nio.file.Paths;
import java.util.List;
/**
- * since 4.3
+ * @since 5.0
*/
public class TemplateLoader {
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/templateeditor/VelocityTokenMaker.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/templateeditor/VelocityTokenMaker.java
index 51b4104d2..db6dadf6e 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/templateeditor/VelocityTokenMaker.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/templateeditor/VelocityTokenMaker.java
@@ -30,7 +30,7 @@ import org.fife.ui.rsyntaxtextarea.TokenImpl;
/**
- * since 4.3
+ * @since 5.0
*/
public class VelocityTokenMaker extends AbstractJFlexCTokenMaker {
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/event/ProjectSavedEvent.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/event/ProjectSavedEvent.java
index 2510d6503..5063819be 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/event/ProjectSavedEvent.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/event/ProjectSavedEvent.java
@@ -24,7 +24,7 @@ import java.util.EventObject;
/**
* Triggered when project is saved completely.
*
- * @since 4.3
+ * @since 5.0
*/
public class ProjectSavedEvent extends EventObject {
/**
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/event/ProjectSavedListener.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/event/ProjectSavedListener.java
index 53c7a942f..bdf49bcc4 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/event/ProjectSavedListener.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/event/ProjectSavedListener.java
@@ -24,7 +24,7 @@ import java.util.EventListener;
/**
* Interface for classes that are interested in ProjectSaved events.
*
- * @since 4.3
+ * @since 5.0
*/
public interface ProjectSavedListener extends EventListener {
void updateNamesAfterSaving(ProjectSavedEvent e);
diff --git a/modeler/cayenne-wocompat/pom.xml b/modeler/cayenne-wocompat/pom.xml
index 15c2b8442..0f0bae2c8 100644
--- a/modeler/cayenne-wocompat/pom.xml
+++ b/modeler/cayenne-wocompat/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.cayenne.modeler</groupId>
<artifactId>cayenne-modeler-parent</artifactId>
- <version>4.3.M1-SNAPSHOT</version>
+ <version>5.0.M1-SNAPSHOT</version>
</parent>
<artifactId>cayenne-wocompat</artifactId>
diff --git a/modeler/cayenne-wocompat/src/main/java/org/apache/cayenne/wocompat/EOQuery.java b/modeler/cayenne-wocompat/src/main/java/org/apache/cayenne/wocompat/EOQuery.java
index 661aadb3e..6aa22950c 100644
--- a/modeler/cayenne-wocompat/src/main/java/org/apache/cayenne/wocompat/EOQuery.java
+++ b/modeler/cayenne-wocompat/src/main/java/org/apache/cayenne/wocompat/EOQuery.java
@@ -45,7 +45,7 @@ import java.util.Map;
* of WebObjects EOFetchSpecification.
*
* @since 1.1
- * @since 4.3 this query extends {@link ObjectSelect}
+ * @since 5.0 this query extends {@link ObjectSelect}
*/
@SuppressWarnings("unchecked")
public class EOQuery<T> extends ObjectSelect<T> {
diff --git a/modeler/pom.xml b/modeler/pom.xml
index e58cf7aea..38fa6b6c6 100644
--- a/modeler/pom.xml
+++ b/modeler/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.cayenne</groupId>
<artifactId>cayenne-parent</artifactId>
- <version>4.3.M1-SNAPSHOT</version>
+ <version>5.0.M1-SNAPSHOT</version>
</parent>
<artifactId>cayenne-modeler-parent</artifactId>
diff --git a/pom.xml b/pom.xml
index 136a48f85..8ad8ff7d2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -24,7 +24,7 @@
<groupId>org.apache.cayenne</groupId>
<name>cayenne-parent: Top-level parent of Cayenne modules</name>
- <version>4.3.M1-SNAPSHOT</version>
+ <version>5.0.M1-SNAPSHOT</version>
<packaging>pom</packaging>
<description>
diff --git a/tutorials/pom.xml b/tutorials/pom.xml
index a471c0795..1ff02830e 100644
--- a/tutorials/pom.xml
+++ b/tutorials/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.cayenne</groupId>
<artifactId>cayenne-parent</artifactId>
- <version>4.3.M1-SNAPSHOT</version>
+ <version>5.0.M1-SNAPSHOT</version>
</parent>
<groupId>org.apache.cayenne.tutorials</groupId>
diff --git a/tutorials/tutorial/pom.xml b/tutorials/tutorial/pom.xml
index 96245ff6d..14341831b 100644
--- a/tutorials/tutorial/pom.xml
+++ b/tutorials/tutorial/pom.xml
@@ -18,7 +18,7 @@
<parent>
<groupId>org.apache.cayenne.tutorials</groupId>
<artifactId>cayenne-tutorials-parent</artifactId>
- <version>4.3.M1-SNAPSHOT</version>
+ <version>5.0.M1-SNAPSHOT</version>
</parent>
<artifactId>tutorial</artifactId>