Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEike Stepper2020-09-11 07:35:36 +0000
committerEike Stepper2020-09-11 07:35:36 +0000
commit0d1b2629e65c195bddae1f08f5ecdbd82d7a6ad2 (patch)
tree68c3b67c3163df7eb71ae89ec591fd84d0a72086
parent0900452dabdb04533e0543c5fdbc5b10548c8c41 (diff)
downloadcdo-0d1b2629e65c195bddae1f08f5ecdbd82d7a6ad2.tar.gz
cdo-0d1b2629e65c195bddae1f08f5ecdbd82d7a6ad2.tar.xz
cdo-0d1b2629e65c195bddae1f08f5ecdbd82d7a6ad2.zip
[Releng] Prepare 4.12 development
-rw-r--r--features/org.eclipse.emf.cdo.all-feature/feature.xml2
-rw-r--r--features/org.eclipse.emf.cdo.all-feature/pom.xml2
-rw-r--r--features/org.eclipse.emf.cdo.epp-feature/feature.xml2
-rw-r--r--features/org.eclipse.emf.cdo.epp-feature/pom.xml2
-rw-r--r--features/org.eclipse.emf.cdo.migrator-feature/feature.xml2
-rw-r--r--features/org.eclipse.emf.cdo.migrator-feature/pom.xml2
-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--plugins/org.eclipse.emf.cdo.migrator/META-INF/MANIFEST.MF10
-rw-r--r--plugins/org.eclipse.emf.cdo.migrator/pom.xml2
-rw-r--r--releng/org.eclipse.emf.cdo.releng.parent/plugins/pom.xml1
-rw-r--r--releng/org.eclipse.emf.cdo.releng.parent/tp/org.eclipse.emf.cdo.releng.tp.target11
-rw-r--r--releng/org.eclipse.emf.cdo.releng/CDO.setup44
13 files changed, 62 insertions, 22 deletions
diff --git a/features/org.eclipse.emf.cdo.all-feature/feature.xml b/features/org.eclipse.emf.cdo.all-feature/feature.xml
index e1555b452c..248d33aa40 100644
--- a/features/org.eclipse.emf.cdo.all-feature/feature.xml
+++ b/features/org.eclipse.emf.cdo.all-feature/feature.xml
@@ -13,7 +13,7 @@
<feature
id="org.eclipse.emf.cdo.all"
label="%featureName"
- version="4.11.0.qualifier"
+ version="4.11.1.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.all-feature/pom.xml b/features/org.eclipse.emf.cdo.all-feature/pom.xml
index 1e2ac9a0f5..c61bdac715 100644
--- a/features/org.eclipse.emf.cdo.all-feature/pom.xml
+++ b/features/org.eclipse.emf.cdo.all-feature/pom.xml
@@ -25,7 +25,7 @@
<groupId>org.eclipse.emf.cdo.features</groupId>
<artifactId>org.eclipse.emf.cdo.all</artifactId>
- <version>4.11.0-SNAPSHOT</version>
+ <version>4.11.1-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>
</project>
diff --git a/features/org.eclipse.emf.cdo.epp-feature/feature.xml b/features/org.eclipse.emf.cdo.epp-feature/feature.xml
index fd4e897d9b..263f71e6df 100644
--- a/features/org.eclipse.emf.cdo.epp-feature/feature.xml
+++ b/features/org.eclipse.emf.cdo.epp-feature/feature.xml
@@ -12,7 +12,7 @@
<feature
id="org.eclipse.emf.cdo.epp"
label="%featureName"
- version="4.11.0.qualifier"
+ version="4.11.1.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.epp-feature/pom.xml b/features/org.eclipse.emf.cdo.epp-feature/pom.xml
index 09efdf4873..cd17132220 100644
--- a/features/org.eclipse.emf.cdo.epp-feature/pom.xml
+++ b/features/org.eclipse.emf.cdo.epp-feature/pom.xml
@@ -25,7 +25,7 @@
<groupId>org.eclipse.emf.cdo.features</groupId>
<artifactId>org.eclipse.emf.cdo.epp</artifactId>
- <version>4.11.0-SNAPSHOT</version>
+ <version>4.11.1-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>
</project>
diff --git a/features/org.eclipse.emf.cdo.migrator-feature/feature.xml b/features/org.eclipse.emf.cdo.migrator-feature/feature.xml
index 1cea4d7e53..a07aa2e8c5 100644
--- a/features/org.eclipse.emf.cdo.migrator-feature/feature.xml
+++ b/features/org.eclipse.emf.cdo.migrator-feature/feature.xml
@@ -12,7 +12,7 @@
<feature
id="org.eclipse.emf.cdo.migrator"
label="%featureName"
- version="4.4.0.qualifier"
+ version="4.4.1.qualifier"
provider-name="%providerName"
image="eclipse_update_120.jpg"
license-feature="org.eclipse.emf.cdo.license"
diff --git a/features/org.eclipse.emf.cdo.migrator-feature/pom.xml b/features/org.eclipse.emf.cdo.migrator-feature/pom.xml
index fbd6a9a5f9..f135f985b8 100644
--- a/features/org.eclipse.emf.cdo.migrator-feature/pom.xml
+++ b/features/org.eclipse.emf.cdo.migrator-feature/pom.xml
@@ -25,7 +25,7 @@
<groupId>org.eclipse.emf.cdo.features</groupId>
<artifactId>org.eclipse.emf.cdo.migrator</artifactId>
- <version>4.4.0-SNAPSHOT</version>
+ <version>4.4.1-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>
</project>
diff --git a/features/org.eclipse.emf.cdo.sdk-feature/feature.xml b/features/org.eclipse.emf.cdo.sdk-feature/feature.xml
index 5fadbedd22..e3bae4d16a 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="5.4.0.qualifier"
+ version="5.4.1.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 42b0d8bca8..f4a531835d 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>5.4.0-SNAPSHOT</version>
+ <version>5.4.1-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>
</project>
diff --git a/plugins/org.eclipse.emf.cdo.migrator/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo.migrator/META-INF/MANIFEST.MF
index 60a9accab2..5960c0de06 100644
--- a/plugins/org.eclipse.emf.cdo.migrator/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.cdo.migrator/META-INF/MANIFEST.MF
@@ -1,7 +1,7 @@
Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-SymbolicName: org.eclipse.emf.cdo.migrator;singleton:=true
-Bundle-Version: 3.2.0.qualifier
+Bundle-Version: 3.2.1.qualifier
Bundle-Name: %pluginName
Bundle-Vendor: %providerName
Bundle-Localization: plugin
@@ -17,8 +17,8 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)",
org.eclipse.ant.core;bundle-version="[3.5.0,4.0.0)";resolution:=optional,
org.apache.ant;bundle-version="[1.0.0,2.0.0)";resolution:=optional
Export-Package: org.eclipse.emf.cdo.internal.messages;version="3.0.800";x-internal:=true,
- org.eclipse.emf.cdo.internal.migrator;version="3.2.0";x-internal:=true,
- org.eclipse.emf.cdo.internal.migrator.actions;version="3.2.0";x-internal:=true,
- org.eclipse.emf.cdo.internal.migrator.tasks;version="3.2.0";x-internal:=true,
- org.eclipse.emf.cdo.internal.migrator.wizards;version="3.2.0";x-internal:=true
+ org.eclipse.emf.cdo.internal.migrator;version="3.2.1";x-internal:=true,
+ org.eclipse.emf.cdo.internal.migrator.actions;version="3.2.1";x-internal:=true,
+ org.eclipse.emf.cdo.internal.migrator.tasks;version="3.2.1";x-internal:=true,
+ org.eclipse.emf.cdo.internal.migrator.wizards;version="3.2.1";x-internal:=true
Automatic-Module-Name: org.eclipse.emf.cdo.migrator
diff --git a/plugins/org.eclipse.emf.cdo.migrator/pom.xml b/plugins/org.eclipse.emf.cdo.migrator/pom.xml
index dcdc1d6048..de66942832 100644
--- a/plugins/org.eclipse.emf.cdo.migrator/pom.xml
+++ b/plugins/org.eclipse.emf.cdo.migrator/pom.xml
@@ -25,7 +25,7 @@
<groupId>org.eclipse.emf.cdo</groupId>
<artifactId>org.eclipse.emf.cdo.migrator</artifactId>
- <version>3.2.0-SNAPSHOT</version>
+ <version>3.2.1-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/releng/org.eclipse.emf.cdo.releng.parent/plugins/pom.xml b/releng/org.eclipse.emf.cdo.releng.parent/plugins/pom.xml
index a31b1c9d11..ebfbf94889 100644
--- a/releng/org.eclipse.emf.cdo.releng.parent/plugins/pom.xml
+++ b/releng/org.eclipse.emf.cdo.releng.parent/plugins/pom.xml
@@ -94,7 +94,6 @@ Eike Stepper - initial API and implementation
<module>../../../plugins/org.eclipse.emf.cdo.transfer.ui</module>
<module>../../../plugins/org.eclipse.emf.cdo.transfer.workspace</module>
<module>../../../plugins/org.eclipse.emf.cdo.transfer.workspace.ui</module>
- <module>../../../plugins/org.eclipse.emf.cdo.ui</module>
<module>../../../plugins/org.eclipse.emf.cdo.ui.admin</module>
<module>../../../plugins/org.eclipse.emf.cdo.ui.compare</module>
<module>../../../plugins/org.eclipse.emf.cdo.ui.shared</module>
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 53c3aa3427..639d3511a4 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,22 +1,26 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<?pde version="3.8"?>
-<target name="Generated from CDO" sequenceNumber="42">
+<target name="Generated from CDO" sequenceNumber="43">
<locations>
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
<unit id="com.google.guava" version="0.0.0"/>
<unit id="com.mysql.jdbc" version="0.0.0"/>
+ <unit id="jakarta.xml.bind" version="0.0.0"/>
<unit id="javax.activation" version="0.0.0"/>
<unit id="javax.xml" version="0.0.0"/>
- <unit id="javax.xml.bind" 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.apache.log4j" version="0.0.0"/>
<unit id="org.aspectj.weaver" version="0.0.0"/>
+ <unit id="org.eclipse.emf.cdo.ui" 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.ecp.view.label.model" version="0.0.0"/>
+ <unit id="org.eclipse.emf.ecp.view.model.common.di" version="0.0.0"/>
+ <unit id="org.eclipse.emf.ecp.view.template.service" version="0.0.0"/>
<unit id="org.eclipse.emf.sdk.feature.group" version="0.0.0"/>
+ <unit id="org.eclipse.emfforms.view.annotation.model" version="0.0.0"/>
<unit id="org.eclipse.equinox.executable.feature.group" version="0.0.0"/>
<unit id="org.eclipse.equinox.weaving.aspectj" version="0.0.0"/>
<unit id="org.eclipse.equinox.weaving.hook" version="0.0.0"/>
@@ -51,7 +55,6 @@
<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://download.eclipse.org/tools/ajdt/48/dev/update"/>
- <repository location="http://download.eclipse.org/eclipse/updates/4.17-I-builds"/>
</location>
</locations>
</target>
diff --git a/releng/org.eclipse.emf.cdo.releng/CDO.setup b/releng/org.eclipse.emf.cdo.releng/CDO.setup
index 4933d82826..8cb825d56c 100644
--- a/releng/org.eclipse.emf.cdo.releng/CDO.setup
+++ b/releng/org.eclipse.emf.cdo.releng/CDO.setup
@@ -247,6 +247,27 @@
<sourceLocator
rootFolder="${cdo.git.clone.location}"/>
<repositoryList
+ name="2020-12">
+ <repository
+ url="http://download.eclipse.org/releases/2020-09"/>
+ <repository
+ url="http://download.eclipse.org/eclipse/updates/latest"/>
+ <repository
+ url="http://download.eclipse.org/tools/orbit/downloads/latest-I"/>
+ <repository
+ url="http://download.eclipse.org/nebula/snapshot"/>
+ <repository
+ url="http://download.eclipse.org/modeling/emf/teneo/updates/2.1.0/interim"/>
+ <repository
+ url="http://download.eclipse.org/jetty/updates/jetty-bundles-9.x/development"/>
+ <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"/>
+ <repository
+ url="${aspectj.repository}"/>
+ </repositoryList>
+ <repositoryList
name="2020-09">
<repository
url="http://download.eclipse.org/releases/2020-09"/>
@@ -424,6 +445,23 @@
<requirement
name="org.eclipse.equinox.executable.feature.group"/>
<repositoryList
+ name="4.11">
+ <repository
+ url="http://download.eclipse.org/modeling/emf/cdo/drops/R20200902-0430"/>
+ <repository
+ url="http://download.eclipse.org/releases/2020-09/202009161000"/>
+ <repository
+ url="http://download.eclipse.org/nebula/releases/2.4.2"/>
+ <repository
+ url="http://download.eclipse.org/modeling/emf/teneo/updates/2.1.0/interim"/>
+ <repository
+ url="http://download.eclipse.org/jetty/updates/jetty-bundles-9.x/9.4.31.v20200723"/>
+ <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"/>
+ </repositoryList>
+ <repositoryList
name="4.10">
<repository
url="http://download.eclipse.org/modeling/emf/cdo/drops/R20200610-0035"/>
@@ -829,15 +867,15 @@
<setupTask
xsi:type="setup:VariableTask"
name="cdo.target.platform"
- value="2020-09"/>
+ value="2020-12"/>
<setupTask
xsi:type="setup:VariableTask"
name="cdo.bugzilla.version"
- value="4.11"/>
+ value="4.12"/>
<setupTask
xsi:type="setup:VariableTask"
name="cdo.baseline.version"
- value="4.10"/>
+ value="4.11"/>
<setupTask
xsi:type="jdt:JRETask"
version="JavaSE-1.8"

Back to the top