cayenne-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From aadamc...@apache.org
Subject git commit: CAY-1965 Change version from 3.2 to 4.0
Date Sun, 02 Nov 2014 09:30:16 GMT
Repository: cayenne
Updated Branches:
  refs/heads/master eb1f28ca0 -> 0bb7946d9


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/0bb7946d
Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/0bb7946d
Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/0bb7946d

Branch: refs/heads/master
Commit: 0bb7946d903c7643de93fd8d98b9ddcef1b661cf
Parents: eb1f28c
Author: aadamchik <aadamchik@apache.org>
Authored: Sun Nov 2 12:08:54 2014 +0300
Committer: aadamchik <aadamchik@apache.org>
Committed: Sun Nov 2 12:30:07 2014 +0300

----------------------------------------------------------------------
 .../src/main/java/org/apache/cayenne/access/DataContext.java  | 2 +-
 .../src/main/java/org/apache/cayenne/access/DataDomain.java   | 2 +-
 .../src/main/java/org/apache/cayenne/reflect/Property.java    | 3 +--
 .../src/main/java/org/apache/cayenne/tools/DataPortTask.java  | 2 +-
 docs/doc/src/main/resources/RELEASE-NOTES.txt                 | 2 +-
 docs/doc/src/main/resources/UPGRADE.txt                       | 7 +++++--
 .../cayenne-guide/src/docbkx/including-cayenne-in-project.xml | 2 +-
 docs/docbook/cayenne-guide/src/docbkx/setup.xml               | 2 +-
 docs/docbook/pom.xml                                          | 2 +-
 9 files changed, 13 insertions(+), 11 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cayenne/blob/0bb7946d/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 b4a82de..bda8892 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
@@ -876,7 +876,7 @@ public class DataContext extends BaseContext {
     // interface
     @SuppressWarnings({ "rawtypes" })
     public ResultIterator performIteratedQuery(Query query) {
-        // TODO: use 3.2 TransactionManager
+        // TODO: use 4.0 TransactionManager
         if (BaseTransaction.getThreadTransaction() != null) {
             return internalPerformIteratedQuery(query);
         } else {

http://git-wip-us.apache.org/repos/asf/cayenne/blob/0bb7946d/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 63851bb..b77fee0 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
@@ -688,7 +688,7 @@ public class DataDomain implements QueryEngine, DataChannel {
     }
 
     /**
-     * Adds a new filter, immediately calling its 'init' method. Since 3.2 this
+     * Adds a new filter, immediately calling its 'init' method. Since 4.0 this
      * method also registers passed filter as an event listener, if any of its
      * methods have event annotations.
      * 

http://git-wip-us.apache.org/repos/asf/cayenne/blob/0bb7946d/cayenne-server/src/main/java/org/apache/cayenne/reflect/Property.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/main/java/org/apache/cayenne/reflect/Property.java b/cayenne-server/src/main/java/org/apache/cayenne/reflect/Property.java
index 3088b57..173f1a0 100644
--- a/cayenne-server/src/main/java/org/apache/cayenne/reflect/Property.java
+++ b/cayenne-server/src/main/java/org/apache/cayenne/reflect/Property.java
@@ -24,8 +24,7 @@ package org.apache.cayenne.reflect;
  * maintenance tasks.
  * 
  * @since 1.2
- * 
- * @deprecated renamed to PropertyDescriptor in 3.2
+ * @deprecated since 4.0 renamed to PropertyDescriptor.
  * 
  */
 public interface Property {

http://git-wip-us.apache.org/repos/asf/cayenne/blob/0bb7946d/cayenne-tools/src/main/java/org/apache/cayenne/tools/DataPortTask.java
----------------------------------------------------------------------
diff --git a/cayenne-tools/src/main/java/org/apache/cayenne/tools/DataPortTask.java b/cayenne-tools/src/main/java/org/apache/cayenne/tools/DataPortTask.java
index d14c4f5..45ef975 100644
--- a/cayenne-tools/src/main/java/org/apache/cayenne/tools/DataPortTask.java
+++ b/cayenne-tools/src/main/java/org/apache/cayenne/tools/DataPortTask.java
@@ -64,7 +64,7 @@ public class DataPortTask extends CayenneTask {
     @Override
     public void execute() throws BuildException {
 
-        log("*** 'cdataport' task is deprecated and will be removed after 3.2",
+        log("*** 'cdataport' task is deprecated and will be removed after 4.0",
                 Project.MSG_WARN);
 
         validateParameters();

http://git-wip-us.apache.org/repos/asf/cayenne/blob/0bb7946d/docs/doc/src/main/resources/RELEASE-NOTES.txt
----------------------------------------------------------------------
diff --git a/docs/doc/src/main/resources/RELEASE-NOTES.txt b/docs/doc/src/main/resources/RELEASE-NOTES.txt
index 7e5af91..86a1175 100644
--- a/docs/doc/src/main/resources/RELEASE-NOTES.txt
+++ b/docs/doc/src/main/resources/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: 3.2M2
+Release: 4.0.M2
 Date: 
 ----------------------------------
 Changes/New Features:

http://git-wip-us.apache.org/repos/asf/cayenne/blob/0bb7946d/docs/doc/src/main/resources/UPGRADE.txt
----------------------------------------------------------------------
diff --git a/docs/doc/src/main/resources/UPGRADE.txt b/docs/doc/src/main/resources/UPGRADE.txt
index a302af1..94f8f72 100644
--- a/docs/doc/src/main/resources/UPGRADE.txt
+++ b/docs/doc/src/main/resources/UPGRADE.txt
@@ -4,10 +4,13 @@ Apache Cayenne Upgrade Information
 IMPORTANT: be sure to read all notes for the intermediate releases between your
            current release and the release you are upgrading to.
 -------------------------------------------------------------------------------
-UPGRADING TO 3.2M2
+UPGRADING TO 4.0.M2
+
+* Note that 3.2 line of development was renamed to 4.0. So 4.0.M2 is a straight descendant
of
+  3.2M1.
 
 * Minimal required JDK version is now 1.6 (both for modeler and runtime). This is a pretty
conservative 
-  requirement, considering that even Java 1.6 has been EOL'd by Oracle on Feb 2013.
+  requirement, considering that Java 1.6 has been EOL'd by Oracle on Feb 2013.
 
 * Managing listeners in the Modeler is counterproductive and confusing,
   so support for them was removed from the Modeler per CAY-1842. If you have

http://git-wip-us.apache.org/repos/asf/cayenne/blob/0bb7946d/docs/docbook/cayenne-guide/src/docbkx/including-cayenne-in-project.xml
----------------------------------------------------------------------
diff --git a/docs/docbook/cayenne-guide/src/docbkx/including-cayenne-in-project.xml b/docs/docbook/cayenne-guide/src/docbkx/including-cayenne-in-project.xml
index cdcabde..561a44f 100644
--- a/docs/docbook/cayenne-guide/src/docbkx/including-cayenne-in-project.xml
+++ b/docs/docbook/cayenne-guide/src/docbkx/including-cayenne-in-project.xml
@@ -583,7 +583,7 @@
 			<title>cdataport</title>
 			<para>
 				<note>
-					<para>'cdataport' is deprecated in 3.2 and will be removed in the future versions.</para>
+					<para>'cdataport' is deprecated in 4.0 and will be removed in the future versions.</para>
 				</note>
 			</para>
 		</section>

http://git-wip-us.apache.org/repos/asf/cayenne/blob/0bb7946d/docs/docbook/cayenne-guide/src/docbkx/setup.xml
----------------------------------------------------------------------
diff --git a/docs/docbook/cayenne-guide/src/docbkx/setup.xml b/docs/docbook/cayenne-guide/src/docbkx/setup.xml
index c96344c..5a0ccdc 100644
--- a/docs/docbook/cayenne-guide/src/docbkx/setup.xml
+++ b/docs/docbook/cayenne-guide/src/docbkx/setup.xml
@@ -38,7 +38,7 @@
                                     <th>Status</th>
                                 </tr>
                                 <tr>
-                                    <td>3.2</td>
+                                    <td>4.0</td>
                                     <td>Java 1.6 or newer</td>
                                     <td>Alpha (in development)</td>
                                 </tr>

http://git-wip-us.apache.org/repos/asf/cayenne/blob/0bb7946d/docs/docbook/pom.xml
----------------------------------------------------------------------
diff --git a/docs/docbook/pom.xml b/docs/docbook/pom.xml
index 4306100..6c3c974 100644
--- a/docs/docbook/pom.xml
+++ b/docs/docbook/pom.xml
@@ -41,7 +41,7 @@
         <project.stylesheetdir>${project.parent.basedir}/docbook-stylesheets/target/classes</project.stylesheetdir>
 
         <!-- This property allows to only expose major version in the docs metadata to
avoid confusing SEO -->
-        <cayenne.version.major>3.2</cayenne.version.major>
+        <cayenne.version.major>4.0</cayenne.version.major>
     </properties>
 
 	<artifactId>cayenne-docbook</artifactId>


Mime
View raw message