Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--features/org.eclipse.emf.cdo.sdk-feature/feature.xml2
-rw-r--r--features/org.eclipse.emf.cdo.sdk-feature/pom.xml2
-rw-r--r--features/org.eclipse.emf.cdo.server.mongodb-feature/feature.xml2
-rw-r--r--features/org.eclipse.emf.cdo.server.mongodb-feature/pom.xml2
-rw-r--r--plugins/org.eclipse.emf.cdo.compare/META-INF/MANIFEST.MF14
-rw-r--r--plugins/org.eclipse.emf.cdo.compare/pom.xml2
-rw-r--r--plugins/org.eclipse.emf.cdo.compare/src/org/eclipse/emf/cdo/compare/CDOComparisonScope.java5
-rw-r--r--plugins/org.eclipse.emf.cdo.server.mongodb/META-INF/MANIFEST.MF23
-rw-r--r--plugins/org.eclipse.emf.cdo.server.mongodb/pom.xml2
-rw-r--r--plugins/org.eclipse.emf.cdo.server.mongodb/src/org/eclipse/emf/cdo/server/internal/mongodb/Coll.java4
-rw-r--r--plugins/org.eclipse.emf.cdo.server.mongodb/src/org/eclipse/emf/cdo/server/internal/mongodb/Commits.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.mongodb/META-INF/MANIFEST.MF21
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.mongodb/pom.xml2
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/META-INF/MANIFEST.MF26
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/pom.xml2
-rw-r--r--plugins/org.eclipse.emf.cdo.ui.compare/META-INF/MANIFEST.MF16
-rw-r--r--plugins/org.eclipse.emf.cdo.ui.compare/pom.xml2
-rw-r--r--plugins/org.eclipse.net4j.http/META-INF/MANIFEST.MF12
-rw-r--r--plugins/org.eclipse.net4j.http/pom.xml2
-rw-r--r--releng/org.eclipse.emf.cdo.releng.parent/Tycho Build.launch3
-rw-r--r--releng/org.eclipse.emf.cdo.releng.parent/Tycho Clean.launch1
-rw-r--r--releng/org.eclipse.emf.cdo.releng/CDO.setup31
-rw-r--r--releng/org.eclipse.emf.cdo.releng/component.ext10
-rw-r--r--releng/org.eclipse.emf.cdo.releng/org.eclipse.emf.cdo.releng.target34
24 files changed, 107 insertions, 115 deletions
diff --git a/features/org.eclipse.emf.cdo.sdk-feature/feature.xml b/features/org.eclipse.emf.cdo.sdk-feature/feature.xml
index 4f61d467b5..2fc749de34 100644
--- a/features/org.eclipse.emf.cdo.sdk-feature/feature.xml
+++ b/features/org.eclipse.emf.cdo.sdk-feature/feature.xml
@@ -12,7 +12,7 @@
<feature
id="org.eclipse.emf.cdo.sdk"
label="%featureName"
- version="4.6.100.qualifier"
+ version="5.0.0.qualifier"
provider-name="%providerName"
image="eclipse_update_120.jpg"
license-feature="org.eclipse.emf.cdo.license"
diff --git a/features/org.eclipse.emf.cdo.sdk-feature/pom.xml b/features/org.eclipse.emf.cdo.sdk-feature/pom.xml
index baeb7773f9..35a22d19e2 100644
--- a/features/org.eclipse.emf.cdo.sdk-feature/pom.xml
+++ b/features/org.eclipse.emf.cdo.sdk-feature/pom.xml
@@ -25,7 +25,7 @@
<groupId>org.eclipse.emf.cdo.features</groupId>
<artifactId>org.eclipse.emf.cdo.sdk</artifactId>
- <version>4.6.100-SNAPSHOT</version>
+ <version>5.0.0-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>
</project>
diff --git a/features/org.eclipse.emf.cdo.server.mongodb-feature/feature.xml b/features/org.eclipse.emf.cdo.server.mongodb-feature/feature.xml
index 365185d63f..9994600134 100644
--- a/features/org.eclipse.emf.cdo.server.mongodb-feature/feature.xml
+++ b/features/org.eclipse.emf.cdo.server.mongodb-feature/feature.xml
@@ -12,7 +12,7 @@
<feature
id="org.eclipse.emf.cdo.server.mongodb"
label="%featureName"
- version="4.2.500.qualifier"
+ version="5.0.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.server.mongodb-feature/pom.xml b/features/org.eclipse.emf.cdo.server.mongodb-feature/pom.xml
index 296eed1312..ac56c5e5ab 100644
--- a/features/org.eclipse.emf.cdo.server.mongodb-feature/pom.xml
+++ b/features/org.eclipse.emf.cdo.server.mongodb-feature/pom.xml
@@ -25,7 +25,7 @@
<groupId>org.eclipse.emf.cdo.features</groupId>
<artifactId>org.eclipse.emf.cdo.server.mongodb</artifactId>
- <version>4.2.500-SNAPSHOT</version>
+ <version>5.0.0-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>
</project>
diff --git a/plugins/org.eclipse.emf.cdo.compare/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo.compare/META-INF/MANIFEST.MF
index ba0e2bcff7..928c0eeb1e 100644
--- a/plugins/org.eclipse.emf.cdo.compare/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.cdo.compare/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.emf.cdo.compare; singleton:=true
-Bundle-Version: 4.3.200.qualifier
+Bundle-Version: 4.3.300.qualifier
Bundle-ClassPath: .
Bundle-Vendor: %providerName
Bundle-Localization: plugin
@@ -10,10 +10,10 @@ Bundle-Activator: org.eclipse.emf.cdo.internal.compare.bundle.OM$Activator
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Require-Bundle: org.eclipse.emf.cdo;bundle-version="[4.0.0,5.0.0)";visibility:=reexport,
org.eclipse.emf.compare;bundle-version="[3.0.0,4.0.0)";visibility:=reexport
-Export-Package: org.eclipse.emf.cdo.compare;version="4.3.200",
- org.eclipse.emf.cdo.internal.compare.bundle;version="4.3.200";x-friends:="org.eclipse.emf.cdo.tests"
+Export-Package: org.eclipse.emf.cdo.compare;version="4.3.300",
+ org.eclipse.emf.cdo.internal.compare.bundle;version="4.3.300";x-friends:="org.eclipse.emf.cdo.tests"
Bundle-ActivationPolicy: lazy
-Import-Package: com.google.common.base;version="[11.0.0,16.0.0)",
- com.google.common.collect;version="[11.0.0,16.0.0)",
- com.google.common.cache;version="[11.0.0,16.0.0)",
- com.google.common.util.concurrent;version="[11.0.0,16.0.0)"
+Import-Package: com.google.common.base;version="[15.0.0,22.0.0)",
+ com.google.common.collect;version="[15.0.0,22.0.0)",
+ com.google.common.cache;version="[15.0.0,22.0.0)",
+ com.google.common.util.concurrent;version="[15.0.0,22.0.0)"
diff --git a/plugins/org.eclipse.emf.cdo.compare/pom.xml b/plugins/org.eclipse.emf.cdo.compare/pom.xml
index 984186d411..95f1c9c1a4 100644
--- a/plugins/org.eclipse.emf.cdo.compare/pom.xml
+++ b/plugins/org.eclipse.emf.cdo.compare/pom.xml
@@ -25,7 +25,7 @@
<groupId>org.eclipse.emf.cdo</groupId>
<artifactId>org.eclipse.emf.cdo.compare</artifactId>
- <version>4.3.200-SNAPSHOT</version>
+ <version>4.3.300-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/plugins/org.eclipse.emf.cdo.compare/src/org/eclipse/emf/cdo/compare/CDOComparisonScope.java b/plugins/org.eclipse.emf.cdo.compare/src/org/eclipse/emf/cdo/compare/CDOComparisonScope.java
index e414d448f8..ad818766a3 100644
--- a/plugins/org.eclipse.emf.cdo.compare/src/org/eclipse/emf/cdo/compare/CDOComparisonScope.java
+++ b/plugins/org.eclipse.emf.cdo.compare/src/org/eclipse/emf/cdo/compare/CDOComparisonScope.java
@@ -45,6 +45,7 @@ import org.eclipse.emf.spi.cdo.InternalCDOView;
import com.google.common.base.Predicate;
import com.google.common.collect.Iterators;
+import java.util.Collections;
import java.util.HashSet;
import java.util.Iterator;
import java.util.List;
@@ -68,12 +69,12 @@ public abstract class CDOComparisonScope extends AbstractComparisonScope
public Iterator<? extends Resource> getCoveredResources(ResourceSet resourceSet)
{
- return Iterators.emptyIterator();
+ return Collections.<Resource> emptyList().iterator();
}
public Iterator<? extends EObject> getCoveredEObjects(Resource resource)
{
- return Iterators.emptyIterator();
+ return Collections.<EObject> emptyList().iterator();
}
public final boolean isResolveProxies()
diff --git a/plugins/org.eclipse.emf.cdo.server.mongodb/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo.server.mongodb/META-INF/MANIFEST.MF
index bc968bbc34..903eea8f3a 100644
--- a/plugins/org.eclipse.emf.cdo.server.mongodb/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.cdo.server.mongodb/META-INF/MANIFEST.MF
@@ -1,7 +1,7 @@
Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-SymbolicName: org.eclipse.emf.cdo.server.mongodb;singleton:=true
-Bundle-Version: 4.0.500.qualifier
+Bundle-Version: 4.0.600.qualifier
Bundle-Name: %pluginName
Bundle-Vendor: %providerName
Bundle-Localization: plugin
@@ -11,14 +11,13 @@ Bundle-RequiredExecutionEnvironment: J2SE-1.5
Bundle-ClassPath: .
Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)",
org.eclipse.emf.cdo.server;bundle-version="[4.0.0,5.0.0)";visibility:=reexport
-Export-Package: org.eclipse.emf.cdo.server.internal.mongodb;version="4.0.500";x-friends:="org.eclipse.emf.cdo.tests,org.eclipse.emf.cdo.tests.mongodb",
- org.eclipse.emf.cdo.server.internal.mongodb.bundle;version="4.0.500";x-internal:=true,
- org.eclipse.emf.cdo.server.mongodb;version="4.0.500"
-Import-Package: com.mongodb;version="[2.0.0,3.0.0)",
- com.mongodb.gridfs;version="[2.0.0,3.0.0)",
- com.mongodb.io;version="[2.0.0,3.0.0)",
- com.mongodb.util;version="[2.0.0,3.0.0)",
- org.bson;version="[2.0.0,3.0.0)",
- org.bson.io;version="[2.0.0,3.0.0)",
- org.bson.types;version="[2.0.0,3.0.0)",
- org.bson.util;version="[2.0.0,3.0.0)"
+Export-Package: org.eclipse.emf.cdo.server.internal.mongodb;version="4.0.600";x-friends:="org.eclipse.emf.cdo.tests,org.eclipse.emf.cdo.tests.mongodb",
+ org.eclipse.emf.cdo.server.internal.mongodb.bundle;version="4.0.600";x-internal:=true,
+ org.eclipse.emf.cdo.server.mongodb;version="4.0.600"
+Import-Package: com.mongodb;version="[3.0.0,4.0.0)",
+ com.mongodb.gridfs;version="[3.0.0,4.0.0)",
+ com.mongodb.util;version="[3.0.0,4.0.0)",
+ org.bson;version="[3.0.0,4.0.0)",
+ org.bson.io;version="[3.0.0,4.0.0)",
+ org.bson.types;version="[3.0.0,4.0.0)",
+ org.bson.util;version="[3.0.0,4.0.0)"
diff --git a/plugins/org.eclipse.emf.cdo.server.mongodb/pom.xml b/plugins/org.eclipse.emf.cdo.server.mongodb/pom.xml
index e979913061..e07beaeb3a 100644
--- a/plugins/org.eclipse.emf.cdo.server.mongodb/pom.xml
+++ b/plugins/org.eclipse.emf.cdo.server.mongodb/pom.xml
@@ -25,7 +25,7 @@
<groupId>org.eclipse.emf.cdo</groupId>
<artifactId>org.eclipse.emf.cdo.server.mongodb</artifactId>
- <version>4.0.500-SNAPSHOT</version>
+ <version>4.0.600-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/plugins/org.eclipse.emf.cdo.server.mongodb/src/org/eclipse/emf/cdo/server/internal/mongodb/Coll.java b/plugins/org.eclipse.emf.cdo.server.mongodb/src/org/eclipse/emf/cdo/server/internal/mongodb/Coll.java
index 2052d3728f..d8b9faec32 100644
--- a/plugins/org.eclipse.emf.cdo.server.mongodb/src/org/eclipse/emf/cdo/server/internal/mongodb/Coll.java
+++ b/plugins/org.eclipse.emf.cdo.server.mongodb/src/org/eclipse/emf/cdo/server/internal/mongodb/Coll.java
@@ -45,7 +45,7 @@ public class Coll
DBObject index = new BasicDBObject();
index.put(element + "." + field, asc ? 1 : -1);
- collection.ensureIndex(index);
+ collection.createIndex(index);
}
public void ensureIndex(String element, String... fields)
@@ -57,7 +57,7 @@ public class Coll
}
- collection.ensureIndex(index);
+ collection.createIndex(index);
}
/**
diff --git a/plugins/org.eclipse.emf.cdo.server.mongodb/src/org/eclipse/emf/cdo/server/internal/mongodb/Commits.java b/plugins/org.eclipse.emf.cdo.server.mongodb/src/org/eclipse/emf/cdo/server/internal/mongodb/Commits.java
index 9cd186e292..625f92412e 100644
--- a/plugins/org.eclipse.emf.cdo.server.mongodb/src/org/eclipse/emf/cdo/server/internal/mongodb/Commits.java
+++ b/plugins/org.eclipse.emf.cdo.server.mongodb/src/org/eclipse/emf/cdo/server/internal/mongodb/Commits.java
@@ -138,7 +138,7 @@ public class Commits extends Coll
index.put(COMMITS_BRANCH, 1);
index.put(REVISIONS + "." + REVISIONS_VERSION, 1);
- collection.ensureIndex(index);
+ collection.createIndex(index);
}
else
{
diff --git a/plugins/org.eclipse.emf.cdo.tests.mongodb/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo.tests.mongodb/META-INF/MANIFEST.MF
index f3ac1bdd24..1538d06313 100644
--- a/plugins/org.eclipse.emf.cdo.tests.mongodb/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.cdo.tests.mongodb/META-INF/MANIFEST.MF
@@ -1,7 +1,7 @@
Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-SymbolicName: org.eclipse.emf.cdo.tests.mongodb;singleton:=true
-Bundle-Version: 4.0.500.qualifier
+Bundle-Version: 4.0.600.qualifier
Bundle-Name: %pluginName
Bundle-Vendor: %providerName
Bundle-Localization: plugin
@@ -12,13 +12,12 @@ Bundle-ClassPath: .
Require-Bundle: org.eclipse.emf.cdo.tests;bundle-version="[4.0.0,5.0.0)";visibility:=reexport,
org.eclipse.emf.cdo.server.mongodb;bundle-version="[4.0.0,5.0.0)";visibility:=reexport
Eclipse-BuddyPolicy: dependent
-Import-Package: com.mongodb;version="[2.0.0,3.0.0)",
- com.mongodb.gridfs;version="[2.0.0,3.0.0)",
- com.mongodb.io;version="[2.0.0,3.0.0)",
- com.mongodb.util;version="[2.0.0,3.0.0)",
- org.bson;version="[2.0.0,3.0.0)",
- org.bson.io;version="[2.0.0,3.0.0)",
- org.bson.types;version="[2.0.0,3.0.0)",
- org.bson.util;version="[2.0.0,3.0.0)"
-Export-Package: org.eclipse.emf.cdo.tests.mongodb;version="4.0.500";x-internal:=true,
- org.eclipse.emf.cdo.tests.mongodb.bundle;version="4.0.500";x-internal:=true
+Import-Package: com.mongodb;version="[3.0.0,4.0.0)",
+ com.mongodb.gridfs;version="[3.0.0,4.0.0)",
+ com.mongodb.util;version="[3.0.0,4.0.0)",
+ org.bson;version="[3.0.0,4.0.0)",
+ org.bson.io;version="[3.0.0,4.0.0)",
+ org.bson.types;version="[3.0.0,4.0.0)",
+ org.bson.util;version="[3.0.0,4.0.0)"
+Export-Package: org.eclipse.emf.cdo.tests.mongodb;version="4.0.600";x-internal:=true,
+ org.eclipse.emf.cdo.tests.mongodb.bundle;version="4.0.600";x-internal:=true
diff --git a/plugins/org.eclipse.emf.cdo.tests.mongodb/pom.xml b/plugins/org.eclipse.emf.cdo.tests.mongodb/pom.xml
index ee74815960..aec49c6603 100644
--- a/plugins/org.eclipse.emf.cdo.tests.mongodb/pom.xml
+++ b/plugins/org.eclipse.emf.cdo.tests.mongodb/pom.xml
@@ -25,7 +25,7 @@
<groupId>org.eclipse.emf.cdo</groupId>
<artifactId>org.eclipse.emf.cdo.tests.mongodb</artifactId>
- <version>4.0.500-SNAPSHOT</version>
+ <version>4.0.600-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/plugins/org.eclipse.emf.cdo.tests/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo.tests/META-INF/MANIFEST.MF
index 2cfe30a034..52ce99ac08 100644
--- a/plugins/org.eclipse.emf.cdo.tests/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.cdo.tests/META-INF/MANIFEST.MF
@@ -1,7 +1,7 @@
Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-SymbolicName: org.eclipse.emf.cdo.tests;singleton:=true
-Bundle-Version: 4.0.600.qualifier
+Bundle-Version: 4.0.700.qualifier
Bundle-Name: %pluginName
Bundle-Vendor: %providerName
Bundle-Localization: plugin
@@ -37,7 +37,7 @@ Require-Bundle: org.eclipse.net4j.tests;bundle-version="[4.0.0,5.0.0)";visibilit
org.eclipse.gmf.runtime.notation;bundle-version="[1.5.0,2.0.0)";visibility:=reexport,
org.eclipse.ocl.ecore;bundle-version="[3.0.0,4.0.0)",
org.apache.log4j;bundle-version="[1.2.0,2.0.0)",
- com.google.guava;bundle-version="[10.0.0,20.0.0)",
+ com.google.guava;bundle-version="[15.0.0,22.0.0)",
org.eclipse.emf.cdo.server.db;bundle-version="[4.0.0,5.0.0)"
Export-Package: base;version="4.0.200",
base.impl;version="4.0.200",
@@ -48,17 +48,17 @@ Export-Package: base;version="4.0.200",
interface_;version="4.0.200",
interface_.impl;version="4.0.200",
interface_.util;version="4.0.200",
- org.eclipse.emf.cdo.tests;version="4.0.600",
- org.eclipse.emf.cdo.tests.bugzilla;version="4.0.600",
- org.eclipse.emf.cdo.tests.bundle;version="4.0.600";x-internal:=true,
- org.eclipse.emf.cdo.tests.config;version="4.0.600",
- org.eclipse.emf.cdo.tests.config.impl;version="4.0.600",
- org.eclipse.emf.cdo.tests.extra;version="4.0.600",
- org.eclipse.emf.cdo.tests.offline;version="4.0.600",
- org.eclipse.emf.cdo.tests.performance;version="4.0.600",
- org.eclipse.emf.cdo.tests.performance.framework;version="4.0.600",
- org.eclipse.emf.cdo.tests.revisioncache;version="4.0.600",
- org.eclipse.emf.cdo.tests.util;version="4.0.600",
+ org.eclipse.emf.cdo.tests;version="4.0.700",
+ org.eclipse.emf.cdo.tests.bugzilla;version="4.0.700",
+ org.eclipse.emf.cdo.tests.bundle;version="4.0.700";x-internal:=true,
+ org.eclipse.emf.cdo.tests.config;version="4.0.700",
+ org.eclipse.emf.cdo.tests.config.impl;version="4.0.700",
+ org.eclipse.emf.cdo.tests.extra;version="4.0.700",
+ org.eclipse.emf.cdo.tests.offline;version="4.0.700",
+ org.eclipse.emf.cdo.tests.performance;version="4.0.700",
+ org.eclipse.emf.cdo.tests.performance.framework;version="4.0.700",
+ org.eclipse.emf.cdo.tests.revisioncache;version="4.0.700",
+ org.eclipse.emf.cdo.tests.util;version="4.0.700",
reference;version="4.0.200",
reference.impl;version="4.0.200";
x-friends:="org.eclipse.emf.cdo.dawn.tests,
diff --git a/plugins/org.eclipse.emf.cdo.tests/pom.xml b/plugins/org.eclipse.emf.cdo.tests/pom.xml
index 83ce1ebc58..64332e6185 100644
--- a/plugins/org.eclipse.emf.cdo.tests/pom.xml
+++ b/plugins/org.eclipse.emf.cdo.tests/pom.xml
@@ -25,7 +25,7 @@
<groupId>org.eclipse.emf.cdo</groupId>
<artifactId>org.eclipse.emf.cdo.tests</artifactId>
- <version>4.0.600-SNAPSHOT</version>
+ <version>4.0.700-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/plugins/org.eclipse.emf.cdo.ui.compare/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo.ui.compare/META-INF/MANIFEST.MF
index 293fe26901..1585793c67 100644
--- a/plugins/org.eclipse.emf.cdo.ui.compare/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.cdo.ui.compare/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.emf.cdo.ui.compare;singleton:=true
-Bundle-Version: 4.4.100.qualifier
+Bundle-Version: 4.4.200.qualifier
Bundle-Activator: org.eclipse.emf.cdo.ui.internal.compare.bundle.OM$Activator
Bundle-Vendor: %providerName
Bundle-ClassPath: .
@@ -16,10 +16,10 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)",
org.eclipse.emf.cdo.compare;bundle-version="[4.2.0,5.0.0)";visibility:=reexport,
org.eclipse.emf.compare.ide.ui;bundle-version="[3.0.0,5.0.0)",
org.eclipse.emf.compare.edit;bundle-version="[3.0.0,5.0.0)"
-Import-Package: com.google.common.base;version="[11.0.0,16.0.0)",
- com.google.common.collect;version="[11.0.0,16.0.0)",
- com.google.common.cache;version="[11.0.0,16.0.0)",
- com.google.common.util.concurrent;version="[11.0.0,16.0.0)"
-Export-Package: org.eclipse.emf.cdo.ui.compare;version="4.4.100",
- org.eclipse.emf.cdo.ui.internal.compare;version="4.4.100";x-friends:="org.eclipse.emf.cdo.explorer.ui",
- org.eclipse.emf.cdo.ui.internal.compare.bundle;version="4.4.100";x-internal:=true
+Import-Package: com.google.common.base;version="[15.0.0,22.0.0)",
+ com.google.common.collect;version="[15.0.0,22.0.0)",
+ com.google.common.cache;version="[15.0.0,22.0.0)",
+ com.google.common.util.concurrent;version="[15.0.0,22.0.0)"
+Export-Package: org.eclipse.emf.cdo.ui.compare;version="4.4.200",
+ org.eclipse.emf.cdo.ui.internal.compare;version="4.4.200";x-friends:="org.eclipse.emf.cdo.explorer.ui",
+ org.eclipse.emf.cdo.ui.internal.compare.bundle;version="4.4.200";x-internal:=true
diff --git a/plugins/org.eclipse.emf.cdo.ui.compare/pom.xml b/plugins/org.eclipse.emf.cdo.ui.compare/pom.xml
index 5f80e2aa61..df9dd1736e 100644
--- a/plugins/org.eclipse.emf.cdo.ui.compare/pom.xml
+++ b/plugins/org.eclipse.emf.cdo.ui.compare/pom.xml
@@ -25,7 +25,7 @@
<groupId>org.eclipse.emf.cdo</groupId>
<artifactId>org.eclipse.emf.cdo.ui.compare</artifactId>
- <version>4.4.100-SNAPSHOT</version>
+ <version>4.4.200-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/plugins/org.eclipse.net4j.http/META-INF/MANIFEST.MF b/plugins/org.eclipse.net4j.http/META-INF/MANIFEST.MF
index 220eccfbba..4b3aab0487 100644
--- a/plugins/org.eclipse.net4j.http/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.net4j.http/META-INF/MANIFEST.MF
@@ -1,7 +1,7 @@
Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-SymbolicName: org.eclipse.net4j.http;singleton:=true
-Bundle-Version: 4.0.500.qualifier
+Bundle-Version: 4.0.600.qualifier
Bundle-Name: %pluginName
Bundle-Vendor: %providerName
Bundle-Localization: plugin
@@ -12,9 +12,9 @@ Bundle-ClassPath: .
Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)";resolution:=optional,
org.eclipse.net4j.http.common;bundle-version="[4.0.0,5.0.0)";visibility:=reexport
Import-Package: org.apache.commons.codec;version="[1.3.0,2.0.0)",
- org.apache.commons.httpclient;version="[3.0.0,4.0.0)",
- org.apache.commons.httpclient.methods;version="[3.0.0,4.0.0)",
+ org.apache.commons.httpclient;version="[3.0.1,4.0.0)",
+ org.apache.commons.httpclient.methods;version="[3.0.1,4.0.0)",
org.apache.commons.logging;version="[1.1.0,2.0.0)"
-Export-Package: org.eclipse.net4j.http;version="4.0.500",
- org.eclipse.net4j.internal.http;version="4.0.500";x-friends:="org.eclipse.net4j.http.tests",
- org.eclipse.net4j.internal.http.bundle;version="4.0.500";x-internal:=true
+Export-Package: org.eclipse.net4j.http;version="4.0.600",
+ org.eclipse.net4j.internal.http;version="4.0.600";x-friends:="org.eclipse.net4j.http.tests",
+ org.eclipse.net4j.internal.http.bundle;version="4.0.600";x-internal:=true
diff --git a/plugins/org.eclipse.net4j.http/pom.xml b/plugins/org.eclipse.net4j.http/pom.xml
index d65ca324ea..1ee4ea3cef 100644
--- a/plugins/org.eclipse.net4j.http/pom.xml
+++ b/plugins/org.eclipse.net4j.http/pom.xml
@@ -25,7 +25,7 @@
<groupId>org.eclipse.emf.cdo</groupId>
<artifactId>org.eclipse.net4j.http</artifactId>
- <version>4.0.500-SNAPSHOT</version>
+ <version>4.0.600-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/releng/org.eclipse.emf.cdo.releng.parent/Tycho Build.launch b/releng/org.eclipse.emf.cdo.releng.parent/Tycho Build.launch
index 86da94f2e6..0aeb9461b2 100644
--- a/releng/org.eclipse.emf.cdo.releng.parent/Tycho Build.launch
+++ b/releng/org.eclipse.emf.cdo.releng.parent/Tycho Build.launch
@@ -3,7 +3,8 @@
<listAttribute key="org.eclipse.debug.ui.favoriteGroups">
<listEntry value="org.eclipse.ui.externaltools.launchGroup"/>
</listAttribute>
+<stringAttribute key="org.eclipse.ui.externaltools.ATTR_LAUNCH_CONFIGURATION_BUILD_SCOPE" value="${none}"/>
<stringAttribute key="org.eclipse.ui.externaltools.ATTR_LOCATION" value="${maven.root}\bin\mvn.bat"/>
-<stringAttribute key="org.eclipse.ui.externaltools.ATTR_TOOL_ARGUMENTS" value="-DGENERATE_SOURCE=true&#13;&#10;-DsourceFeatureLabelSuffix=&quot; Source&quot;&#13;&#10;-DskipTests=true&#13;&#10;-DDtycho.debug.resolver=true&#13;&#10;-DX&#13;&#10;--fail-at-end&#13;&#10;clean&#13;&#10;verify"/>
+<stringAttribute key="org.eclipse.ui.externaltools.ATTR_TOOL_ARGUMENTS" value="-DGENERATE_SOURCE=true&#13;&#10;-DsourceFeatureLabelSuffix=&quot; Source&quot;&#13;&#10;-DskipTests=true&#13;&#10;-Dtycho.debug.resolver=true&#13;&#10;-DX&#13;&#10;--fail-at-end&#13;&#10;clean&#13;&#10;verify"/>
<stringAttribute key="org.eclipse.ui.externaltools.ATTR_WORKING_DIRECTORY" value="${git.clone.cdo}"/>
</launchConfiguration>
diff --git a/releng/org.eclipse.emf.cdo.releng.parent/Tycho Clean.launch b/releng/org.eclipse.emf.cdo.releng.parent/Tycho Clean.launch
index 20a4c4fc1f..59828572ed 100644
--- a/releng/org.eclipse.emf.cdo.releng.parent/Tycho Clean.launch
+++ b/releng/org.eclipse.emf.cdo.releng.parent/Tycho Clean.launch
@@ -3,6 +3,7 @@
<listAttribute key="org.eclipse.debug.ui.favoriteGroups">
<listEntry value="org.eclipse.ui.externaltools.launchGroup"/>
</listAttribute>
+<stringAttribute key="org.eclipse.ui.externaltools.ATTR_LAUNCH_CONFIGURATION_BUILD_SCOPE" value="${none}"/>
<stringAttribute key="org.eclipse.ui.externaltools.ATTR_LOCATION" value="${maven.root}\bin\mvn.bat"/>
<stringAttribute key="org.eclipse.ui.externaltools.ATTR_TOOL_ARGUMENTS" value="clean&#13;&#10;-Dtycho.mode=maven"/>
<stringAttribute key="org.eclipse.ui.externaltools.ATTR_WORKING_DIRECTORY" value="${git.clone.cdo}"/>
diff --git a/releng/org.eclipse.emf.cdo.releng/CDO.setup b/releng/org.eclipse.emf.cdo.releng/CDO.setup
index df1a8e972c..c78ee6c661 100644
--- a/releng/org.eclipse.emf.cdo.releng/CDO.setup
+++ b/releng/org.eclipse.emf.cdo.releng/CDO.setup
@@ -58,6 +58,13 @@
url="http://download.eclipse.org/oomph/updates"/>
</setupTask>
<setupTask
+ xsi:type="setup.p2:P2Task"
+ disabled="true"
+ label="Oomph Local">
+ <repository
+ url="file:/develop/oomph/git/org.eclipse.oomph/sites/org.eclipse.oomph.site/target/repository"/>
+ </setupTask>
+ <setupTask
xsi:type="setup:EclipseIniTask"
option="-Xmx"
value="4g"
@@ -164,14 +171,14 @@
</detail>
</annotation>
<annotation
- source="http:/www.eclipse.org/oomph/targlets/TargetDefinitionGenerator-DISABLED">
+ source="http:/www.eclipse.org/oomph/targlets/TargetDefinitionGenerator">
<detail
key="location">
- <value>${cdo.git.clone.location/plugins/org.eclipse.emf.cdo.releng/org.eclipse.emf.cdo.releng.target}</value>
+ <value>${cdo.git.clone.location/releng/org.eclipse.emf.cdo.releng/org.eclipse.emf.cdo.releng.target}</value>
</detail>
<detail
key="extraUnits">
- <value>org.eclipse.equinox.executable.feature.group, com.google.guava</value>
+ <value>org.eclipse.orbit.mongodb, org.h2, org.slf4j.api, org.apache.commons.lang, org.apache.log4j, org.dom4j</value>
</detail>
<detail
key="generateImplicitUnits">
@@ -450,7 +457,7 @@
</operand>
<operand
xsi:type="workingsets:ExclusionPredicate"
- excludedWorkingSet="//@setupTasks.15/@workingSets.1 //@setupTasks.15/@workingSets.2 //@setupTasks.15/@workingSets.3 //@setupTasks.15/@workingSets.7 //@setupTasks.15/@workingSets.8"/>
+ excludedWorkingSet="//@setupTasks.16/@workingSets.1 //@setupTasks.16/@workingSets.2 //@setupTasks.16/@workingSets.3 //@setupTasks.16/@workingSets.7 //@setupTasks.16/@workingSets.8"/>
</predicate>
</workingSet>
<workingSet
@@ -463,7 +470,7 @@
pattern="org\.eclipse\.emf\.cdo\.tests.*"/>
<operand
xsi:type="workingsets:ExclusionPredicate"
- excludedWorkingSet="//@setupTasks.15/@workingSets.7"/>
+ excludedWorkingSet="//@setupTasks.16/@workingSets.7"/>
</predicate>
</workingSet>
<workingSet
@@ -482,7 +489,7 @@
</operand>
<operand
xsi:type="workingsets:ExclusionPredicate"
- excludedWorkingSet="//@setupTasks.15/@workingSets.7"/>
+ excludedWorkingSet="//@setupTasks.16/@workingSets.7"/>
</predicate>
</workingSet>
<workingSet
@@ -495,7 +502,7 @@
pattern="org\.eclipse\.emf\.cdo\.dawn.*"/>
<operand
xsi:type="workingsets:ExclusionPredicate"
- excludedWorkingSet="//@setupTasks.15/@workingSets.7"/>
+ excludedWorkingSet="//@setupTasks.16/@workingSets.7"/>
</predicate>
</workingSet>
<workingSet
@@ -508,7 +515,7 @@
pattern="org\.eclipse\.net4j.*"/>
<operand
xsi:type="workingsets:ExclusionPredicate"
- excludedWorkingSet="//@setupTasks.15/@workingSets.5 //@setupTasks.15/@workingSets.6 //@setupTasks.15/@workingSets.7"/>
+ excludedWorkingSet="//@setupTasks.16/@workingSets.5 //@setupTasks.16/@workingSets.6 //@setupTasks.16/@workingSets.7"/>
</predicate>
</workingSet>
<workingSet
@@ -521,7 +528,7 @@
pattern="org\.eclipse\.net4j\.db.*"/>
<operand
xsi:type="workingsets:ExclusionPredicate"
- excludedWorkingSet="//@setupTasks.15/@workingSets.7"/>
+ excludedWorkingSet="//@setupTasks.16/@workingSets.7"/>
</predicate>
</workingSet>
<workingSet
@@ -543,7 +550,7 @@
</operand>
<operand
xsi:type="workingsets:ExclusionPredicate"
- excludedWorkingSet="//@setupTasks.15/@workingSets.7"/>
+ excludedWorkingSet="//@setupTasks.16/@workingSets.7"/>
</predicate>
</workingSet>
<workingSet
@@ -569,7 +576,7 @@
pattern="org\.eclipse\.emf\.cdo\.releng.*"/>
<operand
xsi:type="workingsets:ExclusionPredicate"
- excludedWorkingSet="//@setupTasks.15/@workingSets.7"/>
+ excludedWorkingSet="//@setupTasks.16/@workingSets.7"/>
</predicate>
</workingSet>
</setupTask>
@@ -682,7 +689,7 @@
<setupTask
xsi:type="setup:EclipseIniTask"
option="-Doomph.redirection.cdosetup"
- value="=http://git.eclipse.org/c/cdo/cdo.git/plain/plugins/org.eclipse.emf.cdo.releng/CDO.setup->${cdo.git.clone.location|uri}/plugins/org.eclipse.emf.cdo.releng/CDO.setup"
+ value="=http://git.eclipse.org/c/cdo/cdo.git/plain/plugins/org.eclipse.emf.cdo.releng/CDO.setup->${cdo.git.clone.location|uri}/releng/org.eclipse.emf.cdo.releng/CDO.setup"
vm="true"/>
<setupTask
xsi:type="setup:VariableTask"
diff --git a/releng/org.eclipse.emf.cdo.releng/component.ext b/releng/org.eclipse.emf.cdo.releng/component.ext
index 76b022aedb..e8e16ad90a 100644
--- a/releng/org.eclipse.emf.cdo.releng/component.ext
+++ b/releng/org.eclipse.emf.cdo.releng/component.ext
@@ -7,16 +7,6 @@
xsi:schemaLocation="http://www.eclipse.org/CDO/releng/setup/1.0 ../../plugin/org.eclipse.oomph.base/model/legacy/setup.ecore"
setup:toolVersion="8">
<dependencies
- id="org.eclipse.emf.cdo.all.feature.group"/>
- <dependencies
- id="org.eclipse.emf.cdo.examples.client"/>
- <dependencies
- id="org.eclipse.emf.cdo.examples.client.offline"/>
- <dependencies
- id="org.eclipse.emf.cdo.examples.master"/>
- <dependencies
- id="org.eclipse.emf.cdo.examples.clone"/>
- <dependencies
id="org.eclipse.platform.feature.group"/>
<dependencies
id="org.eclipse.jdt.feature.group"/>
diff --git a/releng/org.eclipse.emf.cdo.releng/org.eclipse.emf.cdo.releng.target b/releng/org.eclipse.emf.cdo.releng/org.eclipse.emf.cdo.releng.target
index fbf8de257b..566357e0f8 100644
--- a/releng/org.eclipse.emf.cdo.releng/org.eclipse.emf.cdo.releng.target
+++ b/releng/org.eclipse.emf.cdo.releng/org.eclipse.emf.cdo.releng.target
@@ -1,21 +1,21 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<?pde version="3.8"?>
-<target name="Generated from CDO" sequenceNumber="12">
+<target name="Generated from CDO" sequenceNumber="15">
<locations>
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
- <unit id="com.db4o.feature.group" version="0.0.0"/>
- <unit id="com.mysql.jdbc.feature.group" version="0.0.0"/>
- <unit id="javax.persistence.feature.group" version="0.0.0"/>
+ <unit id="com.db4o" version="0.0.0"/>
+ <unit id="com.mysql.jdbc" version="0.0.0"/>
<unit id="oracle.database.driver" version="0.0.0"/>
<unit id="org.apache.commons.httpclient" version="0.0.0"/>
+ <unit id="org.apache.commons.lang" version="0.0.0"/>
<unit id="org.apache.derby" version="0.0.0"/>
- <unit id="org.dom4j.feature.group" version="0.0.0"/>
- <unit id="org.eclipse.emf.compare.ide.ui.feature.group" version="0.0.0"/>
+ <unit id="org.apache.log4j" version="0.0.0"/>
+ <unit id="org.dom4j" version="0.0.0"/>
+ <unit id="org.eclipse.emf" version="0.0.0"/>
+ <unit id="org.eclipse.emf.compare.ide.ui" version="0.0.0"/>
<unit id="org.eclipse.emf.ecp.emfforms.runtime.feature.feature.group" version="0.0.0"/>
- <unit id="org.eclipse.emf.feature.group" version="0.0.0"/>
- <unit id="org.eclipse.emf.teneo.hibernate.feature.group" version="0.0.0"/>
- <unit id="org.eclipse.emf.transaction.feature.group" version="0.0.0"/>
- <unit id="org.eclipse.emf.workspace.feature.group" version="0.0.0"/>
+ <unit id="org.eclipse.emf.importer" version="0.0.0"/>
+ <unit id="org.eclipse.emf.teneo.hibernate" version="0.0.0"/>
<unit id="org.eclipse.equinox.executable.feature.group" version="0.0.0"/>
<unit id="org.eclipse.gmf.runtime.diagram.ui.actions" version="0.0.0"/>
<unit id="org.eclipse.gmf.runtime.diagram.ui.resources.editor.ide" version="0.0.0"/>
@@ -24,21 +24,15 @@
<unit id="org.eclipse.graphiti.ui" version="0.0.0"/>
<unit id="org.eclipse.nebula.widgets.gallery" version="0.0.0"/>
<unit id="org.eclipse.nebula.widgets.pshelf" version="0.0.0"/>
- <unit id="org.eclipse.ocl.feature.group" version="0.0.0"/>
+ <unit id="org.eclipse.ocl.ecore" version="0.0.0"/>
+ <unit id="org.eclipse.orbit.mongodb" version="0.0.0"/>
<unit id="org.eclipse.pde.feature.group" version="0.0.0"/>
<unit id="org.eclipse.platform.feature.group" version="0.0.0"/>
<unit id="org.eclipse.uml2.uml" version="0.0.0"/>
- <unit id="org.hibernate.feature.group" version="0.0.0"/>
- <unit id="org.hsqldb.feature.group" version="0.0.0"/>
- <unit id="org.postgresql.feature.group" version="0.0.0"/>
-
- <unit id="com.google.guava" version="15.0.0.v201403281430"/>
- <unit id="org.eclipse.orbit.mongodb" version="2.10.1.v20130422-1135"/>
<unit id="org.h2" version="0.0.0"/>
+ <unit id="org.hsqldb" version="0.0.0"/>
+ <unit id="org.postgresql" version="0.0.0"/>
<unit id="org.slf4j.api" version="0.0.0"/>
- <unit id="org.apache.commons.lang" version="0.0.0"/>
- <unit id="org.apache.log4j" version="0.0.0"/>
-
<repository location="http://download.eclipse.org/releases/photon"/>
<repository location="http://download.eclipse.org/tools/orbit/downloads/latest-S"/>
<repository location="http://download.eclipse.org/modeling/emf/teneo/updates/2.1.0/interim"/>

Back to the top