[Releng] Bump org.eclipse.emf.cdo version to 4.8.0

10 files changed, 41 insertions, 41 deletions

diff --git a/plugins/org.eclipse.emf.cdo/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo/META-INF/MANIFEST.MF
index 601c9c9534..afc8b4e155 100644
--- a/plugins/org.eclipse.emf.cdo/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.cdo/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.emf.cdo; singleton:=true
-Bundle-Version: 4.7.0.qualifier
+Bundle-Version: 4.8.0.qualifier
 Bundle-ClassPath: .
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
@@ -10,28 +10,28 @@ Bundle-Activator: org.eclipse.emf.internal.cdo.bundle.Activator$Implementation
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Require-Bundle: org.eclipse.core.expressions;bundle-version="[3.4.0,4.0.0)";resolution:=optional,
  org.eclipse.emf.cdo.common;bundle-version="[4.0.0,5.0.0)";visibility:=reexport
-Export-Package: org.eclipse.emf.cdo;version="4.7.0",
- org.eclipse.emf.cdo.eresource;version="4.7.0",
- org.eclipse.emf.cdo.eresource.impl;version="4.7.0",
- org.eclipse.emf.cdo.eresource.util;version="4.7.0",
- org.eclipse.emf.cdo.eresource.validation;version="4.7.0",
- org.eclipse.emf.cdo.etypes;version="4.7.0",
- org.eclipse.emf.cdo.etypes.impl;version="4.7.0",
- org.eclipse.emf.cdo.etypes.util;version="4.7.0",
- org.eclipse.emf.cdo.session;version="4.7.0",
- org.eclipse.emf.cdo.session.remote;version="4.7.0",
- org.eclipse.emf.cdo.transaction;version="4.7.0",
- org.eclipse.emf.cdo.util;version="4.7.0",
- org.eclipse.emf.cdo.view;version="4.7.0",
- org.eclipse.emf.internal.cdo;version="4.7.0",
- org.eclipse.emf.internal.cdo.analyzer;version="4.7.0";
+Export-Package: org.eclipse.emf.cdo;version="4.8.0",
+ org.eclipse.emf.cdo.eresource;version="4.8.0",
+ org.eclipse.emf.cdo.eresource.impl;version="4.8.0",
+ org.eclipse.emf.cdo.eresource.util;version="4.8.0",
+ org.eclipse.emf.cdo.eresource.validation;version="4.8.0",
+ org.eclipse.emf.cdo.etypes;version="4.8.0",
+ org.eclipse.emf.cdo.etypes.impl;version="4.8.0",
+ org.eclipse.emf.cdo.etypes.util;version="4.8.0",
+ org.eclipse.emf.cdo.session;version="4.8.0",
+ org.eclipse.emf.cdo.session.remote;version="4.8.0",
+ org.eclipse.emf.cdo.transaction;version="4.8.0",
+ org.eclipse.emf.cdo.util;version="4.8.0",
+ org.eclipse.emf.cdo.view;version="4.8.0",
+ org.eclipse.emf.internal.cdo;version="4.8.0",
+ org.eclipse.emf.internal.cdo.analyzer;version="4.8.0";
   x-friends:="org.eclipse.emf.cdo.net4j,
    org.eclipse.emf.cdo.server,
    org.eclipse.emf.cdo.tests,
    org.eclipse.emf.cdo.ui",
- org.eclipse.emf.internal.cdo.bundle;version="4.7.0";x-friends:="org.eclipse.emf.cdo.ui",
- org.eclipse.emf.internal.cdo.messages;version="4.7.0";x-internal:=true,
- org.eclipse.emf.internal.cdo.object;version="4.7.0";
+ org.eclipse.emf.internal.cdo.bundle;version="4.8.0";x-friends:="org.eclipse.emf.cdo.ui",
+ org.eclipse.emf.internal.cdo.messages;version="4.8.0";x-internal:=true,
+ org.eclipse.emf.internal.cdo.object;version="4.8.0";
   x-friends:="org.eclipse.emf.cdo.net4j,
    org.eclipse.emf.cdo.server,
    org.eclipse.emf.cdo.tests,
@@ -40,13 +40,13 @@ Export-Package: org.eclipse.emf.cdo;version="4.7.0",
    org.eclipse.emf.cdo.explorer,
    org.eclipse.emf.cdo.explorer.ui,
    org.eclipse.emf.cdo.edit",
- org.eclipse.emf.internal.cdo.query;version="4.7.0";
+ org.eclipse.emf.internal.cdo.query;version="4.8.0";
   x-friends:="org.eclipse.emf.cdo.net4j,
    org.eclipse.emf.cdo.server,
    org.eclipse.emf.cdo.tests,
    org.eclipse.emf.cdo.ui,
    org.eclipse.emf.cdo.tests.objectivity",
- org.eclipse.emf.internal.cdo.session;version="4.7.0";
+ org.eclipse.emf.internal.cdo.session;version="4.8.0";
   x-friends:="org.eclipse.emf.cdo.net4j,
    org.eclipse.emf.cdo.server,
    org.eclipse.emf.cdo.tests,
@@ -56,23 +56,23 @@ Export-Package: org.eclipse.emf.cdo;version="4.7.0",
    org.eclipse.emf.cdo.security.ui,
    org.eclipse.emf.cdo.explorer,
    org.eclipse.emf.cdo.explorer.ui",
- org.eclipse.emf.internal.cdo.session.remote;version="4.7.0";
+ org.eclipse.emf.internal.cdo.session.remote;version="4.8.0";
   x-friends:="org.eclipse.emf.cdo.net4j,
    org.eclipse.emf.cdo.server,
    org.eclipse.emf.cdo.tests,
    org.eclipse.emf.cdo.ui",
- org.eclipse.emf.internal.cdo.transaction;version="4.7.0";
+ org.eclipse.emf.internal.cdo.transaction;version="4.8.0";
   x-friends:="org.eclipse.emf.cdo.net4j,
    org.eclipse.emf.cdo.server,
    org.eclipse.emf.cdo.tests,
    org.eclipse.emf.cdo.ui,
    org.eclipse.emf.cdo.explorer.ui",
- org.eclipse.emf.internal.cdo.util;version="4.7.0";
+ org.eclipse.emf.internal.cdo.util;version="4.8.0";
   x-friends:="org.eclipse.emf.cdo.net4j,
    org.eclipse.emf.cdo.server,
    org.eclipse.emf.cdo.tests,
    org.eclipse.emf.cdo.ui",
- org.eclipse.emf.internal.cdo.view;version="4.7.0";
+ org.eclipse.emf.internal.cdo.view;version="4.8.0";
   x-friends:="org.eclipse.emf.cdo.net4j,
    org.eclipse.emf.cdo.server,
    org.eclipse.emf.cdo.tests,
@@ -80,6 +80,6 @@ Export-Package: org.eclipse.emf.cdo;version="4.7.0",
    org.eclipse.emf.cdo.ui.ide,
    org.eclipse.emf.cdo.explorer,
    org.eclipse.emf.cdo.explorer.ui",
- org.eclipse.emf.spi.cdo;version="4.7.0"
+ org.eclipse.emf.spi.cdo;version="4.8.0"
 Bundle-ActivationPolicy: lazy
 Automatic-Module-Name: org.eclipse.emf.cdo
diff --git a/plugins/org.eclipse.emf.cdo/pom.xml b/plugins/org.eclipse.emf.cdo/pom.xml
index f883a640b7..70f00d70d9 100644
--- a/plugins/org.eclipse.emf.cdo/pom.xml
+++ b/plugins/org.eclipse.emf.cdo/pom.xml
@@ -25,7 +25,7 @@
 
   <groupId>org.eclipse.emf.cdo</groupId>
   <artifactId>org.eclipse.emf.cdo</artifactId>
-  <version>4.7.0-SNAPSHOT</version>
+  <version>4.8.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 
 </project>
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/CDOLock.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/CDOLock.java
index 483d75157a..37ccb14675 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/CDOLock.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/CDOLock.java
@@ -36,7 +36,7 @@ public interface CDOLock extends Lock
   public static final int NO_WAIT = IRWLockManager.NO_WAIT;
 
   /**
-   * @since 4.7
+   * @since 4.8
    */
   public CDOObject getObject();
 
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/eresource/CDOResourceNode.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/eresource/CDOResourceNode.java
index b1ce8ba26f..8210f80ee9 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/eresource/CDOResourceNode.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/eresource/CDOResourceNode.java
@@ -144,7 +144,7 @@ public interface CDOResourceNode extends CDOObject
 
   /**
    * @ADDED
-   * @since 4.7
+   * @since 4.8
    */
   public void setExtension(String extension);
 
@@ -158,13 +158,13 @@ public interface CDOResourceNode extends CDOObject
 
   /**
    * @ADDED
-   * @since 4.7
+   * @since 4.8
    */
   public String getBasename();
 
   /**
    * @ADDED
-   * @since 4.7
+   * @since 4.8
    */
   public void setBasename(String basename);
 
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/transaction/CDOAutoCommitter.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/transaction/CDOAutoCommitter.java
index fbb4d49cb4..9b4e062e2c 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/transaction/CDOAutoCommitter.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/transaction/CDOAutoCommitter.java
@@ -18,7 +18,7 @@ import org.eclipse.emf.common.notify.Notification;
 
 /**
  * @author Eike Stepper
- * @since 4.7
+ * @since 4.8
  */
 public class CDOAutoCommitter extends CDOPostEventTransactionHandler.Default
 {
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/transaction/CDOTransaction.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/transaction/CDOTransaction.java
index 84db68facd..16aabc6343 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/transaction/CDOTransaction.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/transaction/CDOTransaction.java
@@ -262,23 +262,23 @@ public interface CDOTransaction extends CDOView, CDOCommonTransaction, CDOUserTr
   public CDOQuery createQuery(String language, String queryString, Object context, boolean considerDirtyState);
 
   /**
-   * @since 4.7
+   * @since 4.8
    */
   public <T> CommitResult<T> commit(Callable<T> callable, Predicate<Long> retry, IProgressMonitor monitor)
       throws ConcurrentAccessException, CommitException, Exception;
 
   /**
-   * @since 4.7
+   * @since 4.8
    */
   public <T> CommitResult<T> commit(Callable<T> callable, int attempts, IProgressMonitor monitor) throws ConcurrentAccessException, CommitException, Exception;
 
   /**
-  * @since 4.7
+  * @since 4.8
   */
   public CDOCommitInfo commit(Runnable runnable, Predicate<Long> retry, IProgressMonitor monitor) throws ConcurrentAccessException, CommitException;
 
   /**
-   * @since 4.7
+   * @since 4.8
    */
   public CDOCommitInfo commit(Runnable runnable, int attempts, IProgressMonitor monitor) throws ConcurrentAccessException, CommitException;
 
@@ -558,7 +558,7 @@ public interface CDOTransaction extends CDOView, CDOCommonTransaction, CDOUserTr
 
   /**
    * @author Eike Stepper
-   * @since 4.7
+   * @since 4.8
    */
   public static final class CommitResult<T>
   {
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/view/CDOView.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/view/CDOView.java
index 09fb92543f..91da495e0d 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/view/CDOView.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/view/CDOView.java
@@ -222,7 +222,7 @@ public interface CDOView extends CDOCommonView, CDOUpdatable, CDOCommitHistory.P
   public boolean setTimeStamp(long timeStamp, IProgressMonitor monitor);
 
   /**
-   * @since 4.7
+   * @since 4.8
    */
   public boolean isInvalidating();
 
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOObjectImpl.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOObjectImpl.java
index 760ebd7239..667444bf81 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOObjectImpl.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOObjectImpl.java
@@ -1489,7 +1489,7 @@ public class CDOObjectImpl extends MinimalEStoreEObjectImpl implements InternalC
   /**
    * Implements an internal EStore for TRANSIENT objects, where there is no view or {@link CDOStore}.
    * <p>
-   * Feature values are actually stored in {@link CDOObjectImpl#cdoSettings}.
+   * Feature values are actually stored in {@link CDOObjectImpl#eSettings}.
    *
    * @author Simon McDuff
    * @since 2.0
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/view/AbstractCDOView.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/view/AbstractCDOView.java
index 7aeb0e396b..a56ce152c2 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/view/AbstractCDOView.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/view/AbstractCDOView.java
@@ -2161,9 +2161,9 @@ public abstract class AbstractCDOView extends CDOCommitHistoryProviderImpl<CDOOb
             InternalCDOObject object = (InternalCDOObject)idOrObject;
             if (object.cdoView() != null && FSMUtil.isNew(object))
             {
-              String uri = EcoreUtil.getURI(object.cdoInternalInstance()).toString();
               if (object.cdoID().isTemporary())
               {
+                String uri = EcoreUtil.getURI(object.cdoInternalInstance()).toString();
                 return CDOIDUtil.createTempObjectExternal(uri);
               }
             }
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/spi/cdo/InternalCDOObject.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/spi/cdo/InternalCDOObject.java
index 2a8ed2a298..1fe730c5de 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/spi/cdo/InternalCDOObject.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/spi/cdo/InternalCDOObject.java
@@ -48,7 +48,7 @@ public interface InternalCDOObject extends CDOObject, InternalEObject, InternalC
   public InternalCDORevision cdoRevision(boolean loadOnDemand);
 
   /**
-   * @since 4.7
+   * @since 4.8
    */
   public void cdoInternalPreAttach();