Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEike Stepper2020-06-15 13:56:44 +0000
committerEike Stepper2020-06-15 13:56:44 +0000
commitb36ff701c9807a167a4e5953337a0352da811465 (patch)
treefef3e17aaf9c89925cb6d539db77d587d3c8141e
parent8927cbd1796e36cf48ead1923a9d4bd98486422d (diff)
downloadcdo-b36ff701c9807a167a4e5953337a0352da811465.tar.gz
cdo-b36ff701c9807a167a4e5953337a0352da811465.tar.xz
cdo-b36ff701c9807a167a4e5953337a0352da811465.zip
[Releng] Prepare 4.11 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/tp/org.eclipse.emf.cdo.releng.tp.target5
-rw-r--r--releng/org.eclipse.emf.cdo.releng/CDO.setup63
12 files changed, 73 insertions, 23 deletions
diff --git a/features/org.eclipse.emf.cdo.all-feature/feature.xml b/features/org.eclipse.emf.cdo.all-feature/feature.xml
index f651112efb..dce0ec21cc 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.10.0.qualifier"
+ version="4.10.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 d65847a4fa..7f12ca67f7 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.10.0-SNAPSHOT</version>
+ <version>4.10.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 c4f45031a5..942cfe9ec5 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.10.0.qualifier"
+ version="4.10.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 880b68273b..c7641bbdb3 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.10.0-SNAPSHOT</version>
+ <version>4.10.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 ad5037c0b5..2ecb1108f0 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.3.1.qualifier"
+ version="4.3.2.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 3382d037aa..c462d6d3cd 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.3.1-SNAPSHOT</version>
+ <version>4.3.2-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 020afe7499..1cfe188dce 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.3.0.qualifier"
+ version="5.3.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 ea5326bc66..40eb2816c1 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.3.0-SNAPSHOT</version>
+ <version>5.3.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 62fb6d0ab5..2f3a883a65 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.1.1.qualifier
+Bundle-Version: 3.1.2.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.1.1";x-internal:=true,
- org.eclipse.emf.cdo.internal.migrator.actions;version="3.1.1";x-internal:=true,
- org.eclipse.emf.cdo.internal.migrator.tasks;version="3.1.1";x-internal:=true,
- org.eclipse.emf.cdo.internal.migrator.wizards;version="3.1.1";x-internal:=true
+ org.eclipse.emf.cdo.internal.migrator;version="3.1.2";x-internal:=true,
+ org.eclipse.emf.cdo.internal.migrator.actions;version="3.1.2";x-internal:=true,
+ org.eclipse.emf.cdo.internal.migrator.tasks;version="3.1.2";x-internal:=true,
+ org.eclipse.emf.cdo.internal.migrator.wizards;version="3.1.2";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 1c4f608cfa..860c9a7c7a 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.1.1-SNAPSHOT</version>
+ <version>3.1.2-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
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 b4051d9f16..d618cef9e9 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="38">
+<target name="Generated from CDO" sequenceNumber="39">
<locations>
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
<unit id="com.google.guava" version="0.0.0"/>
@@ -42,7 +42,7 @@
<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"/>
- <repository location="http://download.eclipse.org/releases/2020-06"/>
+ <repository location="http://download.eclipse.org/releases/2020-06/202006171000"/>
<repository location="http://download.eclipse.org/eclipse/updates/latest"/>
<repository location="http://download.eclipse.org/tools/orbit/downloads/latest-I"/>
<repository location="http://download.eclipse.org/nebula/snapshot"/>
@@ -51,7 +51,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.16-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 324aa7834b..e022e932ff 100644
--- a/releng/org.eclipse.emf.cdo.releng/CDO.setup
+++ b/releng/org.eclipse.emf.cdo.releng/CDO.setup
@@ -80,9 +80,22 @@
<setupTask
xsi:type="setup:ResourceCreationTask"
excludedTriggers="STARTUP MANUAL"
- content="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?>&#xD;&#xA;&lt;section name=&quot;Workbench&quot;>&#xD;&#xA;&#x9;&lt;section name=&quot;org.eclipse.jdt.internal.ui.packageview.PackageExplorerPart&quot;>&#xD;&#xA;&#x9;&#x9;&lt;item value=&quot;true&quot; key=&quot;group_libraries&quot;/>&#xD;&#xA;&#x9;&#x9;&lt;item value=&quot;false&quot; key=&quot;linkWithEditor&quot;/>&#xD;&#xA;&#x9;&#x9;&lt;item value=&quot;2&quot; key=&quot;layout&quot;/>&#xD;&#xA;&#x9;&#x9;&lt;item value=&quot;2&quot; key=&quot;rootMode&quot;/>&#xD;&#xA;&#x9;&#x9;&lt;item value=&quot;&amp;lt;?xml version=&amp;quot;1.0&amp;quot; encoding=&amp;quot;UTF-8&amp;quot;?&amp;gt;&amp;#x0D;&amp;#x0A;&amp;lt;packageExplorer configured=&amp;quot;true&amp;quot; group_libraries=&amp;quot;1&amp;quot; layout=&amp;quot;2&amp;quot; linkWithEditor=&amp;quot;0&amp;quot; rootMode=&amp;quot;2&amp;quot; sortWorkingSets=&amp;quot;false&amp;quot; workingSetName=&amp;quot;&amp;quot;&amp;gt;&amp;#x0D;&amp;#x0A;&amp;lt;localWorkingSetManager&amp;gt;&amp;#x0D;&amp;#x0A;&amp;lt;workingSet editPageId=&amp;quot;org.eclipse.jdt.internal.ui.OthersWorkingSet&amp;quot; factoryID=&amp;quot;org.eclipse.ui.internal.WorkingSetFactory&amp;quot; id=&amp;quot;1382792884467_1&amp;quot; label=&amp;quot;Other Projects&amp;quot; name=&amp;quot;Other Projects&amp;quot;/&amp;gt;&amp;#x0D;&amp;#x0A;&amp;lt;/localWorkingSetManager&amp;gt;&amp;#x0D;&amp;#x0A;&amp;lt;activeWorkingSet workingSetName=&amp;quot;Other Projects&amp;quot;/&amp;gt;&amp;#x0D;&amp;#x0A;&amp;lt;allWorkingSets workingSetName=&amp;quot;Other Projects&amp;quot;/&amp;gt;&amp;#x0D;&amp;#x0A;&amp;lt;/packageExplorer&amp;gt;&quot; key=&quot;memento&quot;/>&#xD;&#xA;&#x9;&lt;/section>&#xD;&#xA;&lt;/section>&#xD;&#xA;"
targetURL="${workspace.location|uri}/.metadata/.plugins/org.eclipse.jdt.ui/dialog_settings.xml"
- encoding="UTF-8"/>
+ encoding="UTF-8">
+ <content>
+ &lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?>
+ &lt;section name=&quot;Workbench&quot;>
+ &lt;section name=&quot;org.eclipse.jdt.internal.ui.packageview.PackageExplorerPart&quot;>
+ &lt;item value=&quot;true&quot; key=&quot;group_libraries&quot;/>
+ &lt;item value=&quot;false&quot; key=&quot;linkWithEditor&quot;/>
+ &lt;item value=&quot;2&quot; key=&quot;layout&quot;/>
+ &lt;item value=&quot;2&quot; key=&quot;rootMode&quot;/>
+ &lt;item value=&quot;&amp;lt;?xml version=&amp;quot;1.0&amp;quot; encoding=&amp;quot;UTF-8&amp;quot;?&amp;gt;&amp;#x0D;&amp;#x0A;&amp;lt;packageExplorer configured=&amp;quot;true&amp;quot; group_libraries=&amp;quot;1&amp;quot; layout=&amp;quot;2&amp;quot; linkWithEditor=&amp;quot;0&amp;quot; rootMode=&amp;quot;2&amp;quot; sortWorkingSets=&amp;quot;false&amp;quot; workingSetName=&amp;quot;&amp;quot;&amp;gt;&amp;#x0D;&amp;#x0A;&amp;lt;localWorkingSetManager&amp;gt;&amp;#x0D;&amp;#x0A;&amp;lt;workingSet editPageId=&amp;quot;org.eclipse.jdt.internal.ui.OthersWorkingSet&amp;quot; factoryID=&amp;quot;org.eclipse.ui.internal.WorkingSetFactory&amp;quot; id=&amp;quot;1382792884467_1&amp;quot; label=&amp;quot;Other Projects&amp;quot; name=&amp;quot;Other Projects&amp;quot;/&amp;gt;&amp;#x0D;&amp;#x0A;&amp;lt;/localWorkingSetManager&amp;gt;&amp;#x0D;&amp;#x0A;&amp;lt;activeWorkingSet workingSetName=&amp;quot;Other Projects&amp;quot;/&amp;gt;&amp;#x0D;&amp;#x0A;&amp;lt;allWorkingSets workingSetName=&amp;quot;Other Projects&amp;quot;/&amp;gt;&amp;#x0D;&amp;#x0A;&amp;lt;/packageExplorer&amp;gt;&quot; key=&quot;memento&quot;/>
+ &lt;/section>
+ &lt;/section>
+
+ </content>
+ </setupTask>
<setupTask
xsi:type="setup:PreferenceTask"
key="/instance/org.eclipse.jdt.launching/org.eclipse.jdt.launching.PREF_STRICTLY_COMPATIBLE_JRE_NOT_AVAILABLE"
@@ -234,6 +247,27 @@
<sourceLocator
rootFolder="${cdo.git.clone.location}"/>
<repositoryList
+ name="2020-09">
+ <repository
+ url="http://download.eclipse.org/releases/2020-06/202006171000"/>
+ <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-06">
<repository
url="http://download.eclipse.org/releases/2020-06"/>
@@ -246,7 +280,7 @@
<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"/>
+ url="http://download.eclipse.org/jetty/updates/jetty-bundles-9.x/9.4.29.v20200521"/>
<repository
url="http://download.oracle.com/otn_software/oepe/12.2.1.3/mars/repository"/>
<repository
@@ -390,6 +424,23 @@
<requirement
name="org.eclipse.equinox.executable.feature.group"/>
<repositoryList
+ name="4.10">
+ <repository
+ url="http://download.eclipse.org/modeling/emf/cdo/drops/R20200610-0035"/>
+ <repository
+ url="http://download.eclipse.org/releases/2020-06/202006171000"/>
+ <repository
+ url="http://download.eclipse.org/nebula/releases/2.4.0"/>
+ <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.29.v20200521"/>
+ <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.9">
<repository
url="http://download.eclipse.org/modeling/emf/cdo/drops/R20200311-1513"/>
@@ -778,15 +829,15 @@
<setupTask
xsi:type="setup:VariableTask"
name="cdo.target.platform"
- value="2020-06"/>
+ value="2020-09"/>
<setupTask
xsi:type="setup:VariableTask"
name="cdo.bugzilla.version"
- value="4.10"/>
+ value="4.11"/>
<setupTask
xsi:type="setup:VariableTask"
name="cdo.baseline.version"
- value="4.9"/>
+ value="4.10"/>
<setupTask
xsi:type="jdt:JRETask"
version="JavaSE-1.8"

Back to the top