[Releng] Update TP (and switch elver.org to springsite.com)

17 files changed, 72 insertions, 100 deletions

diff --git a/features/org.eclipse.emf.cdo.dawn-feature/feature.xml b/features/org.eclipse.emf.cdo.dawn-feature/feature.xml
index 465e8f92de..913a07cea7 100644
--- a/features/org.eclipse.emf.cdo.dawn-feature/feature.xml
+++ b/features/org.eclipse.emf.cdo.dawn-feature/feature.xml
@@ -12,7 +12,7 @@
 <feature
       id="org.eclipse.emf.cdo.dawn"
       label="%featureName"
-      version="2.3.1.qualifier"
+      version="2.4.0.qualifier"
       provider-name="%providerName"
       license-feature="org.eclipse.emf.cdo.license"
       license-feature-version="0.0.0">
diff --git a/features/org.eclipse.emf.cdo.dawn-feature/pom.xml b/features/org.eclipse.emf.cdo.dawn-feature/pom.xml
index 697bedbdda..f8979e15f3 100644
--- a/features/org.eclipse.emf.cdo.dawn-feature/pom.xml
+++ b/features/org.eclipse.emf.cdo.dawn-feature/pom.xml
@@ -25,7 +25,7 @@
 
   <groupId>org.eclipse.emf.cdo.features</groupId>
   <artifactId>org.eclipse.emf.cdo.dawn</artifactId>
-  <version>2.3.1-SNAPSHOT</version>
+  <version>2.4.0-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
 
 </project>
diff --git a/features/org.eclipse.emf.cdo.server.mongodb-feature/feature.properties b/features/org.eclipse.emf.cdo.server.mongodb-feature/feature.properties
index 6362e47f59..0d7539fa12 100644
--- a/features/org.eclipse.emf.cdo.server.mongodb-feature/feature.properties
+++ b/features/org.eclipse.emf.cdo.server.mongodb-feature/feature.properties
@@ -5,4 +5,4 @@
 # http://www.eclipse.org/legal/epl-v10.html
 
 featureName = CDO Model Repository Server MongoDB
-description = Contains the MongoDBStore plugins. Ensure that a MongoDB Java driver is already installed! Visit http://www.elver.org/eclipse/2.1.0/update for a p2 repository that contains a MongoDB Java driver.
+description = Contains the MongoDBStore plugins. Ensure that a MongoDB Java driver is already installed! Visit http://www.springsite.com/eclipse/2.1.0/update for a p2 repository that contains a MongoDB Java driver.
diff --git a/features/org.eclipse.net4j.db-feature/feature.properties b/features/org.eclipse.net4j.db-feature/feature.properties
index 97f59f4c55..8269e8c026 100644
--- a/features/org.eclipse.net4j.db-feature/feature.properties
+++ b/features/org.eclipse.net4j.db-feature/feature.properties
@@ -7,4 +7,4 @@
 featureName = Net4j DB Framework
 description = Contains the database core framework, the H2 database adapter plugin, and optionally/greedily the H2 database driver.\
  Separate database adapter features are available for Derby, Mysql, HSQLDB, Oracle, DB2, and PostgreSQL.\
- Additional database drivers are available via http://www.elver.org/eclipse/2.1.0/update (read the license informations).
+ Additional database drivers are available via http://www.springsite.com/eclipse/2.1.0/update (read the license informations).
diff --git a/features/org.eclipse.net4j.db.hsqldb-feature/feature.properties b/features/org.eclipse.net4j.db.hsqldb-feature/feature.properties
index b43159658f..44d8a6b5c1 100644
--- a/features/org.eclipse.net4j.db.hsqldb-feature/feature.properties
+++ b/features/org.eclipse.net4j.db.hsqldb-feature/feature.properties
@@ -5,4 +5,4 @@
 # http://www.eclipse.org/legal/epl-v10.html
 
 featureName = Net4j DB Framework HSQLDB Adapter
-description = Contains the HSQLDB Adapter matching the Net4j DB Framework BUT NOT the database driver bundle for HSQLDB. This needs to be installed separately, for example from http://www.elver.org/eclipse/2.1.0/update
+description = Contains the HSQLDB Adapter matching the Net4j DB Framework BUT NOT the database driver bundle for HSQLDB. This needs to be installed separately, for example from http://www.springsite.com/eclipse/2.1.0/update
diff --git a/features/org.eclipse.net4j.db.mysql-feature/feature.properties b/features/org.eclipse.net4j.db.mysql-feature/feature.properties
index 1e6fb47de3..a39f634c36 100644
--- a/features/org.eclipse.net4j.db.mysql-feature/feature.properties
+++ b/features/org.eclipse.net4j.db.mysql-feature/feature.properties
@@ -5,4 +5,4 @@
 # http://www.eclipse.org/legal/epl-v10.html
 
 featureName = Net4j DB Framework MYSQL Adapter
-description = Contains the MYSQL Adapter matching the Net4j DB Framework BUT NOT the database driver bundle for MYSQL. This needs to be installed separately, for example from http://www.elver.org/eclipse/2.1.0/update
+description = Contains the MYSQL Adapter matching the Net4j DB Framework BUT NOT the database driver bundle for MYSQL. This needs to be installed separately, for example from http://www.springsite.com/eclipse/2.1.0/update
diff --git a/features/org.eclipse.net4j.db.postgresql-feature/feature.properties b/features/org.eclipse.net4j.db.postgresql-feature/feature.properties
index f6d3b9e3e0..d31286cb0e 100644
--- a/features/org.eclipse.net4j.db.postgresql-feature/feature.properties
+++ b/features/org.eclipse.net4j.db.postgresql-feature/feature.properties
@@ -5,4 +5,4 @@
 # http://www.eclipse.org/legal/epl-v10.html
 
 featureName = Net4j DB Framework PostgreSQL Adapter
-description = Contains the PostgreSQL Adapter matching the Net4j DB Framework BUT NOT the database driver bundle for PostgreSQL. This needs to be installed separately, for example from http://www.elver.org/eclipse/2.1.0/update
+description = Contains the PostgreSQL Adapter matching the Net4j DB Framework BUT NOT the database driver bundle for PostgreSQL. This needs to be installed separately, for example from http://www.springsite.com/eclipse/2.1.0/update
diff --git a/plugins/org.eclipse.emf.cdo.compare/src/org/eclipse/emf/cdo/compare/CDOCompare.java b/plugins/org.eclipse.emf.cdo.compare/src/org/eclipse/emf/cdo/compare/CDOCompare.java
index 153615c6ef..6ffb3ebc21 100644
--- a/plugins/org.eclipse.emf.cdo.compare/src/org/eclipse/emf/cdo/compare/CDOCompare.java
+++ b/plugins/org.eclipse.emf.cdo.compare/src/org/eclipse/emf/cdo/compare/CDOCompare.java
@@ -48,13 +48,10 @@ import org.eclipse.emf.compare.match.impl.MatchEngineFactoryRegistryImpl;
 import org.eclipse.emf.compare.postprocessor.IPostProcessor;
 import org.eclipse.emf.compare.req.IReqEngine;
 import org.eclipse.emf.compare.scope.IComparisonScope;
-import org.eclipse.emf.compare.utils.ReferenceUtil;
 import org.eclipse.emf.ecore.EAttribute;
 import org.eclipse.emf.ecore.EFactory;
 import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EReference;
 import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.EcorePackage;
 import org.eclipse.emf.ecore.resource.Resource;
 import org.eclipse.emf.ecore.util.InternalEList;
 
@@ -563,54 +560,6 @@ public class CDOCompare
      * TODO Remove this copied method when EMFCompare bug 570625 is resolved and released.
      */
     @Override
-    @SuppressWarnings("deprecation")
-    protected boolean isIgnoredReference(Match match, EReference reference)
-    {
-      final boolean toIgnore;
-      if (reference != null)
-      {
-        // ignore the derived, container or transient
-        if (!reference.isDerived() && !reference.isContainer() && !isTransient(reference))
-        {
-          /*
-           * EGenericTypes are usually "mutually derived" references that are handled through specific means in ecore
-           * (eGenericSuperTypes and eSuperTypes, EGenericType and eType...). As these aren't even shown to the user, we
-           * wish to avoid detection of changes on them.
-           */
-          // Otherwise if this reference is not set on any side, no use checking it
-          boolean isGenericTypeWithoutArguments = false;
-          boolean isGenericType = reference.getEType() == EcorePackage.eINSTANCE.getEGenericType();
-          if (isGenericType)
-          {
-            isGenericTypeWithoutArguments = //
-                org.eclipse.emf.compare.utils.EMFComparePredicates.IS_EGENERIC_TYPE_WITHOUT_PARAMETERS.apply(match.getLeft()) && //
-                    org.eclipse.emf.compare.utils.EMFComparePredicates.IS_EGENERIC_TYPE_WITHOUT_PARAMETERS.apply(match.getRight()) && //
-                    org.eclipse.emf.compare.utils.EMFComparePredicates.IS_EGENERIC_TYPE_WITHOUT_PARAMETERS.apply(match.getOrigin());
-          }
-
-          toIgnore = isGenericTypeWithoutArguments || !referenceIsSet(reference, match);
-        }
-        else if (ReferenceUtil.isFeatureMapDerivedFeature(reference))
-        {
-          toIgnore = false;
-        }
-        else
-        {
-          toIgnore = true;
-        }
-      }
-      else
-      {
-        toIgnore = true;
-      }
-
-      return toIgnore;
-    }
-
-    /**
-     * TODO Remove this copied method when EMFCompare bug 570625 is resolved and released.
-     */
-    @Override
     protected boolean isIgnoredAttribute(EAttribute attribute)
     {
       return attribute == null || attribute.isDerived() || isTransient(attribute);
@@ -619,6 +568,7 @@ public class CDOCompare
     /**
      * @since 4.5
      */
+    @Override
     protected boolean isTransient(EStructuralFeature feature)
     {
       return !EMFUtil.isPersistent(feature);
diff --git a/plugins/org.eclipse.emf.cdo.dawn/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo.dawn/META-INF/MANIFEST.MF
index bb38a12e79..c3097322da 100644
--- a/plugins/org.eclipse.emf.cdo.dawn/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.cdo.dawn/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.emf.cdo.dawn;singleton:=true
-Bundle-Version: 2.2.1.qualifier
+Bundle-Version: 2.3.0.qualifier
 Bundle-Activator: org.eclipse.emf.cdo.dawn.DawnRuntimePlugin
 Bundle-Localization: plugin
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)",
@@ -14,20 +14,20 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)",
  org.eclipse.emf.transaction;bundle-version="[1.4.0,2.0.0)"
 Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: JavaSE-11
-Export-Package: org.eclipse.emf.cdo.dawn;version="2.2.1",
- org.eclipse.emf.cdo.dawn.actions;version="2.2.1";x-internal:=true,
- org.eclipse.emf.cdo.dawn.appearance;version="2.2.1",
- org.eclipse.emf.cdo.dawn.commands;version="2.2.1",
- org.eclipse.emf.cdo.dawn.conflicts;version="2.2.1",
- org.eclipse.emf.cdo.dawn.editors;version="2.2.1",
- org.eclipse.emf.cdo.dawn.editors.impl;version="2.2.1",
- org.eclipse.emf.cdo.dawn.helper;version="2.2.1",
- org.eclipse.emf.cdo.dawn.notifications;version="2.2.1",
- org.eclipse.emf.cdo.dawn.preferences;version="2.2.1",
- org.eclipse.emf.cdo.dawn.resources;version="2.2.1",
- org.eclipse.emf.cdo.dawn.resources.impl;version="2.2.1",
- org.eclipse.emf.cdo.dawn.spi;version="2.2.1",
- org.eclipse.emf.cdo.dawn.transaction;version="2.2.1",
- org.eclipse.emf.cdo.internal.dawn.bundle;version="2.2.1"
+Export-Package: org.eclipse.emf.cdo.dawn;version="2.3.0",
+ org.eclipse.emf.cdo.dawn.actions;version="2.3.0";x-internal:=true,
+ org.eclipse.emf.cdo.dawn.appearance;version="2.3.0",
+ org.eclipse.emf.cdo.dawn.commands;version="2.3.0",
+ org.eclipse.emf.cdo.dawn.conflicts;version="2.3.0",
+ org.eclipse.emf.cdo.dawn.editors;version="2.3.0",
+ org.eclipse.emf.cdo.dawn.editors.impl;version="2.3.0",
+ org.eclipse.emf.cdo.dawn.helper;version="2.3.0",
+ org.eclipse.emf.cdo.dawn.notifications;version="2.3.0",
+ org.eclipse.emf.cdo.dawn.preferences;version="2.3.0",
+ org.eclipse.emf.cdo.dawn.resources;version="2.3.0",
+ org.eclipse.emf.cdo.dawn.resources.impl;version="2.3.0",
+ org.eclipse.emf.cdo.dawn.spi;version="2.3.0",
+ org.eclipse.emf.cdo.dawn.transaction;version="2.3.0",
+ org.eclipse.emf.cdo.internal.dawn.bundle;version="2.3.0"
 Bundle-Vendor: %providerName
 Automatic-Module-Name: org.eclipse.emf.cdo.dawn
diff --git a/plugins/org.eclipse.emf.cdo.dawn/pom.xml b/plugins/org.eclipse.emf.cdo.dawn/pom.xml
index c89a75e302..fbd88a02e1 100644
--- a/plugins/org.eclipse.emf.cdo.dawn/pom.xml
+++ b/plugins/org.eclipse.emf.cdo.dawn/pom.xml
@@ -25,7 +25,7 @@
 
   <groupId>org.eclipse.emf.cdo</groupId>
   <artifactId>org.eclipse.emf.cdo.dawn</artifactId>
-  <version>2.2.1-SNAPSHOT</version>
+  <version>2.3.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 
 </project>
diff --git a/plugins/org.eclipse.emf.cdo.server.product/CDOServer.setup b/plugins/org.eclipse.emf.cdo.server.product/CDOServer.setup
index 150e69da1b..fb74322878 100644
--- a/plugins/org.eclipse.emf.cdo.server.product/CDOServer.setup
+++ b/plugins/org.eclipse.emf.cdo.server.product/CDOServer.setup
@@ -119,5 +119,27 @@
           url="https://download.eclipse.org/modeling/emf/cdo/updates/releases/latest"/>
     </setupTask>
   </version>
+  <version name="integration.stable"
+      label="Stable Integration"
+      requiredJavaVersion="11">
+    <setupTask
+        xsi:type="setup.p2:P2Task">
+      <repository
+          url="https://download.eclipse.org/releases/latest"/>
+      <repository
+          url="https://download.eclipse.org/modeling/emf/cdo/updates/integration/stable/latest"/>
+    </setupTask>
+  </version>
+  <version name="integration.weekly"
+      label="Weekly Integration"
+      requiredJavaVersion="11">
+    <setupTask
+        xsi:type="setup.p2:P2Task">
+      <repository
+          url="https://download.eclipse.org/releases/latest"/>
+      <repository
+          url="https://download.eclipse.org/modeling/emf/cdo/updates/integration/weekly/latest"/>
+    </setupTask>
+  </version>
   <description>A headless CDO Model Repository server.</description>
 </setup:Product>
diff --git a/plugins/org.eclipse.net4j.db.doc/javadoc/overview-summary.html b/plugins/org.eclipse.net4j.db.doc/javadoc/overview-summary.html
index 4b985dfebc..ad52c2b08b 100644
--- a/plugins/org.eclipse.net4j.db.doc/javadoc/overview-summary.html
+++ b/plugins/org.eclipse.net4j.db.doc/javadoc/overview-summary.html
@@ -235,7 +235,7 @@ The Net4j DB Framework contains the database core framework and database adapter
 </p>
 
 <p>
-Additional database drivers are available via <a href="http://www.elver.org/eclipse/2.1.0/update">Elver.org</a> (read the license informations).
+Additional database drivers are available via <a href="http://www.springsite.com/eclipse/2.1.0/update">springsite.com</a> (read the license informations).
 </p></div>
 </div>
 <!-- ======= START OF BOTTOM NAVBAR ====== -->
diff --git a/plugins/org.eclipse.net4j.db.doc/overview.html b/plugins/org.eclipse.net4j.db.doc/overview.html
index 6779a9c78c..25bf78f808 100644
--- a/plugins/org.eclipse.net4j.db.doc/overview.html
+++ b/plugins/org.eclipse.net4j.db.doc/overview.html
@@ -21,7 +21,7 @@ The Net4j DB Framework contains the database core framework and database adapter
 </p>
 
 <p>
-Additional database drivers are available via <a href="http://www.elver.org/eclipse/2.1.0/update">Elver.org</a> (read the license informations).
+Additional database drivers are available via <a href="http://www.springsite.com/eclipse/2.1.0/update">springsite.com</a> (read the license informations).
 </p>
 
 </body>
diff --git a/releng/org.eclipse.emf.cdo.releng.parent/tp/org.eclipse.emf.cdo.releng.tp.target b/releng/org.eclipse.emf.cdo.releng.parent/tp/org.eclipse.emf.cdo.releng.tp.target
index e70114735b..73e448c044 100644
--- a/releng/org.eclipse.emf.cdo.releng.parent/tp/org.eclipse.emf.cdo.releng.tp.target
+++ b/releng/org.eclipse.emf.cdo.releng.parent/tp/org.eclipse.emf.cdo.releng.tp.target
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <?pde version="3.8"?>
-<target name="Generated from CDO" sequenceNumber="51">
+<target name="Generated from CDO" sequenceNumber="52">
   <locations>
     <location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
       <unit id="com.google.guava" version="0.0.0"/>
@@ -50,7 +50,7 @@
       <repository location="http://download.eclipse.org/modeling/emf/teneo/updates/2.1.0/interim"/>
       <repository location="http://download.eclipse.org/jetty/updates/jetty-bundles-9.x/development"/>
       <repository location="http://download.oracle.com/otn_software/oepe/12.2.1.3/mars/repository"/>
-      <repository location="http://www.elver.org/eclipse/2.1.0/update"/>
+      <repository location="http://www.springsite.com/eclipse/2.1.0/update"/>
       <repository location="http://download.eclipse.org/tools/ajdt/48/dev/update"/>
       <repository location="http://download.eclipse.org/eclipse/updates/4.19-I-builds"/>
     </location>
diff --git a/releng/org.eclipse.emf.cdo.releng/CDO.setup b/releng/org.eclipse.emf.cdo.releng/CDO.setup
index 6dd48b499d..7c0bdd93b5 100644
--- a/releng/org.eclipse.emf.cdo.releng/CDO.setup
+++ b/releng/org.eclipse.emf.cdo.releng/CDO.setup
@@ -263,7 +263,7 @@
         <repository
             url="http://download.oracle.com/otn_software/oepe/12.2.1.3/mars/repository"/>
         <repository
-            url="http://www.elver.org/eclipse/2.1.0/update"/>
+            url="http://www.springsite.com/eclipse/2.1.0/update"/>
         <repository
             url="${aspectj.repository}"/>
       </repositoryList>
@@ -284,7 +284,7 @@
         <repository
             url="http://download.oracle.com/otn_software/oepe/12.2.1.3/mars/repository"/>
         <repository
-            url="http://www.elver.org/eclipse/2.1.0/update"/>
+            url="http://www.springsite.com/eclipse/2.1.0/update"/>
         <repository
             url="${aspectj.repository}"/>
       </repositoryList>
@@ -305,7 +305,7 @@
         <repository
             url="http://download.oracle.com/otn_software/oepe/12.2.1.3/mars/repository"/>
         <repository
-            url="http://www.elver.org/eclipse/2.1.0/update"/>
+            url="http://www.springsite.com/eclipse/2.1.0/update"/>
         <repository
             url="${aspectj.repository}"/>
       </repositoryList>
@@ -326,7 +326,7 @@
         <repository
             url="http://download.oracle.com/otn_software/oepe/12.2.1.3/mars/repository"/>
         <repository
-            url="http://www.elver.org/eclipse/2.1.0/update"/>
+            url="http://www.springsite.com/eclipse/2.1.0/update"/>
         <repository
             url="${aspectj.repository}"/>
       </repositoryList>
@@ -345,7 +345,7 @@
         <repository
             url="http://download.oracle.com/otn_software/oepe/12.2.1.3/mars/repository"/>
         <repository
-            url="http://www.elver.org/eclipse/2.1.0/update"/>
+            url="http://www.springsite.com/eclipse/2.1.0/update"/>
         <repository
             url="${aspectj.repository}"/>
       </repositoryList>
@@ -364,7 +364,7 @@
         <repository
             url="http://download.oracle.com/otn_software/oepe/12.2.1.3/mars/repository"/>
         <repository
-            url="http://www.elver.org/eclipse/2.1.0/update"/>
+            url="http://www.springsite.com/eclipse/2.1.0/update"/>
         <repository
             url="${aspectj.repository}"/>
       </repositoryList>
@@ -383,7 +383,7 @@
         <repository
             url="http://download.oracle.com/otn_software/oepe/12.2.1.3/mars/repository"/>
         <repository
-            url="http://www.elver.org/eclipse/2.1.0/update"/>
+            url="http://www.springsite.com/eclipse/2.1.0/update"/>
         <repository
             url="${aspectj.repository}"/>
       </repositoryList>
@@ -400,7 +400,7 @@
         <repository
             url="http://download.oracle.com/otn_software/oepe/12.2.1.3/mars/repository"/>
         <repository
-            url="http://www.elver.org/eclipse/2.1.0/update"/>
+            url="http://www.springsite.com/eclipse/2.1.0/update"/>
         <repository
             url="${aspectj.repository}"/>
       </repositoryList>
@@ -421,7 +421,7 @@
         <repository
             url="http://download.oracle.com/otn_software/oepe/12.2.1.3/mars/repository"/>
         <repository
-            url="http://www.elver.org/eclipse/2.1.0/update"/>
+            url="http://www.springsite.com/eclipse/2.1.0/update"/>
       </repositoryList>
       <repositoryList
           name="Neon">
@@ -442,7 +442,7 @@
         <repository
             url="http://download.oracle.com/otn_software/oepe/12.2.1.3/mars/repository"/>
         <repository
-            url="http://www.elver.org/eclipse/2.1.0/update"/>
+            url="http://www.springsite.com/eclipse/2.1.0/update"/>
       </repositoryList>
     </targlet>
   </setupTask>
@@ -480,7 +480,7 @@
         <repository
             url="http://download.oracle.com/otn_software/oepe/12.2.1.3/mars/repository"/>
         <repository
-            url="http://www.elver.org/eclipse/2.1.0/update"/>
+            url="http://www.springsite.com/eclipse/2.1.0/update"/>
       </repositoryList>
       <repositoryList
           name="4.11">
@@ -497,7 +497,7 @@
         <repository
             url="http://download.oracle.com/otn_software/oepe/12.2.1.3/mars/repository"/>
         <repository
-            url="http://www.elver.org/eclipse/2.1.0/update"/>
+            url="http://www.springsite.com/eclipse/2.1.0/update"/>
       </repositoryList>
       <repositoryList
           name="4.10">
@@ -514,7 +514,7 @@
         <repository
             url="http://download.oracle.com/otn_software/oepe/12.2.1.3/mars/repository"/>
         <repository
-            url="http://www.elver.org/eclipse/2.1.0/update"/>
+            url="http://www.springsite.com/eclipse/2.1.0/update"/>
       </repositoryList>
       <repositoryList
           name="4.9">
@@ -529,7 +529,7 @@
         <repository
             url="http://download.oracle.com/otn_software/oepe/12.2.1.3/mars/repository"/>
         <repository
-            url="http://www.elver.org/eclipse/2.1.0/update"/>
+            url="http://www.springsite.com/eclipse/2.1.0/update"/>
       </repositoryList>
       <repositoryList
           name="4.8">
@@ -544,7 +544,7 @@
         <repository
             url="http://download.oracle.com/otn_software/oepe/12.2.1.3/mars/repository"/>
         <repository
-            url="http://www.elver.org/eclipse/2.1.0/update"/>
+            url="http://www.springsite.com/eclipse/2.1.0/update"/>
       </repositoryList>
       <repositoryList
           name="4.7">
@@ -565,7 +565,7 @@
         <repository
             url="http://download.oracle.com/otn_software/oepe/12.2.1.3/mars/repository"/>
         <repository
-            url="http://www.elver.org/eclipse/2.1.0/update"/>
+            url="http://www.springsite.com/eclipse/2.1.0/update"/>
       </repositoryList>
       <repositoryList
           name="4.6">
@@ -586,7 +586,7 @@
         <repository
             url="http://download.oracle.com/otn_software/oepe/12.2.1.3/mars/repository"/>
         <repository
-            url="http://www.elver.org/eclipse/2.1.0/update"/>
+            url="http://www.springsite.com/eclipse/2.1.0/update"/>
       </repositoryList>
       <repositoryList
           name="4.5">
@@ -607,7 +607,7 @@
         <repository
             url="http://download.oracle.com/otn_software/oepe/12.2.1.3/mars/repository"/>
         <repository
-            url="http://www.elver.org/eclipse/2.1.0/update"/>
+            url="http://www.springsite.com/eclipse/2.1.0/update"/>
       </repositoryList>
     </targlet>
   </setupTask>
diff --git a/releng/org.eclipse.emf.cdo.releng/CDOBaseline.setup b/releng/org.eclipse.emf.cdo.releng/CDOBaseline.setup
index 25280d72cb..1893d1bead 100644
--- a/releng/org.eclipse.emf.cdo.releng/CDOBaseline.setup
+++ b/releng/org.eclipse.emf.cdo.releng/CDOBaseline.setup
@@ -362,7 +362,7 @@
       <repository
           url="http://download.oracle.com/otn_software/oepe/12.2.1.3/mars/repository"/>
       <repository
-          url="http://www.elver.org/eclipse/2.1.0/update"/>
+          url="http://www.springsite.com/eclipse/2.1.0/update"/>
     </setupTask>
     <description>CDO Baseline for Neon.</description>
   </version>
diff --git a/releng/org.eclipse.emf.cdo.releng/CDOPreNeon.setup b/releng/org.eclipse.emf.cdo.releng/CDOPreNeon.setup
index ef1951c3f9..9fda0856c3 100644
--- a/releng/org.eclipse.emf.cdo.releng/CDOPreNeon.setup
+++ b/releng/org.eclipse.emf.cdo.releng/CDOPreNeon.setup
@@ -154,7 +154,7 @@
         <repository
             url="http://download.oracle.com/otn_software/oepe/12.2.1/mars/repository"/>
         <repository
-            url="http://www.elver.org/eclipse/2.1.0/update"/>
+            url="http://www.springsite.com/eclipse/2.1.0/update"/>
       </repositoryList>
       <repositoryList
           name="Luna">
@@ -201,7 +201,7 @@
         <repository
             url="http://download.eclipse.org/mmt/qvto/updates/releases/3.4.0"/>
         <repository
-            url="http://www.elver.org/eclipse/2.0.0/update"/>
+            url="http://www.springsite.com/eclipse/2.0.0/update"/>
         <repository
             url="http://download.oracle.com/otn_software/oepe/kepler"/>
       </repositoryList>