Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat (limited to 'plugins')
-rw-r--r--plugins/org.eclipse.emf.cdo.examples.client.offline/META-INF/MANIFEST.MF6
-rw-r--r--plugins/org.eclipse.emf.cdo.examples.client.offline/src/org/eclipse/wb/swt/ExampleResourceManager.java1
-rw-r--r--plugins/org.eclipse.emf.cdo.examples.installer/META-INF/MANIFEST.MF2
-rw-r--r--plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.client.offline/META-INF/MANIFEST.MF6
-rw-r--r--plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.client.offline/src/org/eclipse/wb/swt/ExampleResourceManager.java1
-rw-r--r--plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.rcp.department/META-INF/MANIFEST.MF4
-rw-r--r--plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.rcp.department/src/com/swtdesigner/ResourceManager.java1
-rw-r--r--plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.rcp.table/META-INF/MANIFEST.MF6
-rw-r--r--plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.rcp.table/src/com/swtdesigner/ResourceManager.java1
-rw-r--r--plugins/org.eclipse.emf.cdo.releng/CDO.setup184
-rw-r--r--plugins/org.eclipse.emf.cdo.transfer.ui/META-INF/MANIFEST.MF12
-rw-r--r--plugins/org.eclipse.emf.cdo.transfer.ui/src/org/eclipse/wb/swt/ResourceManager.java1
-rw-r--r--plugins/org.gastro.rcp.department/META-INF/MANIFEST.MF4
-rw-r--r--plugins/org.gastro.rcp.department/src/com/swtdesigner/ResourceManager.java1
-rw-r--r--plugins/org.gastro.rcp.table/META-INF/MANIFEST.MF6
-rw-r--r--plugins/org.gastro.rcp.table/src/com/swtdesigner/ResourceManager.java1
16 files changed, 180 insertions, 57 deletions
diff --git a/plugins/org.eclipse.emf.cdo.examples.client.offline/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo.examples.client.offline/META-INF/MANIFEST.MF
index a3404837d2..eab754cb05 100644
--- a/plugins/org.eclipse.emf.cdo.examples.client.offline/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.cdo.examples.client.offline/META-INF/MANIFEST.MF
@@ -1,7 +1,7 @@
Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-SymbolicName: org.eclipse.emf.cdo.examples.client.offline;singleton:=true
-Bundle-Version: 4.2.400.qualifier
+Bundle-Version: 4.2.500.qualifier
Bundle-Name: %pluginName
Bundle-Vendor: %providerName
Bundle-ActivationPolicy: lazy
@@ -23,6 +23,6 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)",
org.eclipse.net4j.util.ui;bundle-version="[3.0.0,4.0.0)"
Import-Package: org.h2.jdbcx;version="[1.0.0,2.0.0)"
Bundle-ClassPath: .
-Export-Package: org.eclipse.emf.cdo.examples.client.offline;version="4.2.400";x-internal:=true,
- org.eclipse.emf.cdo.examples.client.offline.nodes;version="4.2.400";x-internal:=true,
+Export-Package: org.eclipse.emf.cdo.examples.client.offline;version="4.2.500";x-internal:=true,
+ org.eclipse.emf.cdo.examples.client.offline.nodes;version="4.2.500";x-internal:=true,
org.eclipse.wb.swt;version="4.2.100";x-internal:=true
diff --git a/plugins/org.eclipse.emf.cdo.examples.client.offline/src/org/eclipse/wb/swt/ExampleResourceManager.java b/plugins/org.eclipse.emf.cdo.examples.client.offline/src/org/eclipse/wb/swt/ExampleResourceManager.java
index 604c7b51c3..7a39198f97 100644
--- a/plugins/org.eclipse.emf.cdo.examples.client.offline/src/org/eclipse/wb/swt/ExampleResourceManager.java
+++ b/plugins/org.eclipse.emf.cdo.examples.client.offline/src/org/eclipse/wb/swt/ExampleResourceManager.java
@@ -166,6 +166,7 @@ public class ExampleResourceManager extends ExampleSWTResourceManager
final Point baseImageSize = new Point(bib.width, bib.height);
CompositeImageDescriptor compositImageDesc = new CompositeImageDescriptor()
{
+ @SuppressWarnings("deprecation")
@Override
protected void drawCompositeImage(int width, int height)
{
diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo.examples.installer/META-INF/MANIFEST.MF
index 78adcba70e..c8c5df40b1 100644
--- a/plugins/org.eclipse.emf.cdo.examples.installer/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.cdo.examples.installer/META-INF/MANIFEST.MF
@@ -1,7 +1,7 @@
Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-SymbolicName: org.eclipse.emf.cdo.examples.installer;singleton:=true
-Bundle-Version: 4.1.500.qualifier
+Bundle-Version: 4.1.600.qualifier
Bundle-Name: %pluginName
Bundle-Vendor: %providerName
Bundle-ActivationPolicy: lazy
diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.client.offline/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.client.offline/META-INF/MANIFEST.MF
index a3404837d2..eab754cb05 100644
--- a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.client.offline/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.client.offline/META-INF/MANIFEST.MF
@@ -1,7 +1,7 @@
Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-SymbolicName: org.eclipse.emf.cdo.examples.client.offline;singleton:=true
-Bundle-Version: 4.2.400.qualifier
+Bundle-Version: 4.2.500.qualifier
Bundle-Name: %pluginName
Bundle-Vendor: %providerName
Bundle-ActivationPolicy: lazy
@@ -23,6 +23,6 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)",
org.eclipse.net4j.util.ui;bundle-version="[3.0.0,4.0.0)"
Import-Package: org.h2.jdbcx;version="[1.0.0,2.0.0)"
Bundle-ClassPath: .
-Export-Package: org.eclipse.emf.cdo.examples.client.offline;version="4.2.400";x-internal:=true,
- org.eclipse.emf.cdo.examples.client.offline.nodes;version="4.2.400";x-internal:=true,
+Export-Package: org.eclipse.emf.cdo.examples.client.offline;version="4.2.500";x-internal:=true,
+ org.eclipse.emf.cdo.examples.client.offline.nodes;version="4.2.500";x-internal:=true,
org.eclipse.wb.swt;version="4.2.100";x-internal:=true
diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.client.offline/src/org/eclipse/wb/swt/ExampleResourceManager.java b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.client.offline/src/org/eclipse/wb/swt/ExampleResourceManager.java
index 604c7b51c3..7a39198f97 100644
--- a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.client.offline/src/org/eclipse/wb/swt/ExampleResourceManager.java
+++ b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.client.offline/src/org/eclipse/wb/swt/ExampleResourceManager.java
@@ -166,6 +166,7 @@ public class ExampleResourceManager extends ExampleSWTResourceManager
final Point baseImageSize = new Point(bib.width, bib.height);
CompositeImageDescriptor compositImageDesc = new CompositeImageDescriptor()
{
+ @SuppressWarnings("deprecation")
@Override
protected void drawCompositeImage(int width, int height)
{
diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.rcp.department/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.rcp.department/META-INF/MANIFEST.MF
index 4fed648bab..81ad37ee38 100644
--- a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.rcp.department/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.rcp.department/META-INF/MANIFEST.MF
@@ -2,11 +2,11 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: CDO Electronic Restaurant Example RCP Department
Bundle-SymbolicName: org.gastro.rcp.department; singleton:=true
-Bundle-Version: 4.0.500.qualifier
+Bundle-Version: 4.0.600.qualifier
Bundle-Activator: org.gastro.rcp.internal.department.Activator
Bundle-ActivationPolicy: lazy
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Bundle-Vendor: Eclipse Modeling Project
Require-Bundle: org.gastro.rcp;bundle-version="[4.0.0,5.0.0)";visibility:=reexport
Export-Package: com.swtdesigner;version="4.0.300";x-internal:=true,
- org.gastro.rcp.internal.department;version="4.0.500";x-internal:=true
+ org.gastro.rcp.internal.department;version="4.0.600";x-internal:=true
diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.rcp.department/src/com/swtdesigner/ResourceManager.java b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.rcp.department/src/com/swtdesigner/ResourceManager.java
index 7741200880..d8f151fee9 100644
--- a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.rcp.department/src/com/swtdesigner/ResourceManager.java
+++ b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.rcp.department/src/com/swtdesigner/ResourceManager.java
@@ -157,6 +157,7 @@ public class ResourceManager extends SWTResourceManager
final Point baseImageSize = new Point(bib.width, bib.height);
CompositeImageDescriptor compositImageDesc = new CompositeImageDescriptor()
{
+ @SuppressWarnings("deprecation")
@Override
protected void drawCompositeImage(int width, int height)
{
diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.rcp.table/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.rcp.table/META-INF/MANIFEST.MF
index 704ff8844c..c5f0a58213 100644
--- a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.rcp.table/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.rcp.table/META-INF/MANIFEST.MF
@@ -2,11 +2,11 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: CDO Electronic Restaurant Example RCP Table
Bundle-SymbolicName: org.gastro.rcp.table; singleton:=true
-Bundle-Version: 4.0.400.qualifier
+Bundle-Version: 4.0.500.qualifier
Bundle-Activator: org.gastro.rcp.internal.table.Activator
Require-Bundle: org.gastro.rcp;bundle-version="[4.0.0,5.0.0)";visibility:=reexport
Bundle-ActivationPolicy: lazy
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Bundle-Vendor: Eclipse Modeling Project
-Export-Package: com.swtdesigner;version="4.0.300";x-internal:=true,
- org.gastro.rcp.internal.table;version="4.0.400";x-internal:=true
+Export-Package: com.swtdesigner;version="4.0.500";x-internal:=true,
+ org.gastro.rcp.internal.table;version="4.0.500";x-internal:=true
diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.rcp.table/src/com/swtdesigner/ResourceManager.java b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.rcp.table/src/com/swtdesigner/ResourceManager.java
index 72ed9ff70a..97fa65ad41 100644
--- a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.rcp.table/src/com/swtdesigner/ResourceManager.java
+++ b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.rcp.table/src/com/swtdesigner/ResourceManager.java
@@ -157,6 +157,7 @@ public class ResourceManager extends SWTResourceManager
final Point baseImageSize = new Point(bib.width, bib.height);
CompositeImageDescriptor compositImageDesc = new CompositeImageDescriptor()
{
+ @SuppressWarnings("deprecation")
@Override
protected void drawCompositeImage(int width, int height)
{
diff --git a/plugins/org.eclipse.emf.cdo.releng/CDO.setup b/plugins/org.eclipse.emf.cdo.releng/CDO.setup
index 526564adb0..62109d6f3f 100644
--- a/plugins/org.eclipse.emf.cdo.releng/CDO.setup
+++ b/plugins/org.eclipse.emf.cdo.releng/CDO.setup
@@ -64,6 +64,7 @@
vm="true"/>
<setupTask
xsi:type="setup:EclipseIniTask"
+ disabled="true"
option="-Doomph.targlets.iu.filter"
value="=.*cdo.*"
vm="true"/>
@@ -75,15 +76,23 @@
encoding="UTF-8"/>
<setupTask
xsi:type="setup:PreferenceTask"
- key="instance/org.eclipse.jdt.launching/org.eclipse.jdt.launching.PREF_STRICTLY_COMPATIBLE_JRE_NOT_AVAILABLE"
+ key="/instance/org.eclipse.jdt.launching/org.eclipse.jdt.launching.PREF_STRICTLY_COMPATIBLE_JRE_NOT_AVAILABLE"
value="ignore"/>
<setupTask
xsi:type="setup:PreferenceTask"
- key="instance/org.eclipse.jdt.core/org.eclipse.jdt.core.compiler.problem.unclosedCloseable"
+ key="/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.compiler.problem.unclosedCloseable"
value="ignore"/>
<setupTask
xsi:type="setup:PreferenceTask"
- key="instance/org.eclipse.pde/compilers.f.unresolved-features"
+ key="/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.compiler.problem.unlikelyCollectionMethodArgumentType"
+ value="ignore"/>
+ <setupTask
+ xsi:type="setup:PreferenceTask"
+ key="/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.compiler.problem.unlikelyEqualsArgumentType"
+ value="ignore"/>
+ <setupTask
+ xsi:type="setup:PreferenceTask"
+ key="/instance/org.eclipse.pde/compilers.f.unresolved-features"
value="2"/>
<setupTask
xsi:type="setup:VariableTask"
@@ -115,7 +124,8 @@
xsi:type="setup.targlets:TargletTask">
<targlet
name="CDO"
- activeRepositoryList="${eclipse.target.platform}">
+ activeRepositoryList="${eclipse.target.platform}"
+ includeBinaryEquivalents="false">
<requirement
name="org.eclipse.emf.cdo.site.feature.group"/>
<requirement
@@ -141,6 +151,25 @@
<sourceLocator
rootFolder="${cdo.git.clone.location}"/>
<repositoryList
+ name="Photon">
+ <repository
+ url="http://download.eclipse.org/releases/oxygen"/>
+ <repository
+ url="http://download.eclipse.org/eclipse/updates/4.7-I-builds"/>
+ <repository
+ url="http://download.eclipse.org/tools/orbit/downloads/latest-S"/>
+ <repository
+ url="http://download.eclipse.org/modeling/mdt/uml2/updates/5.3milestones"/>
+ <repository
+ url="http://download.eclipse.org/modeling/emf/teneo/updates/2.1.0/interim"/>
+ <repository
+ url="http://download.eclipse.org/nebula/releases/latest"/>
+ <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="Oxygen">
<repository
url="http://download.eclipse.org/releases/oxygen"/>
@@ -188,25 +217,9 @@
activateTarget="false">
<targlet
name="CDO"
- activeRepositoryList="${cdo.baseline.version}">
- <requirement
- name="org.eclipse.emf.cdo.dawn.codegen.feature.group"/>
- <requirement
- name="org.eclipse.emf.cdo.dawn.codegen.emf.feature.group"/>
- <requirement
- name="org.eclipse.emf.cdo.dawn.codegen.gmf.feature.group"/>
- <requirement
- name="org.eclipse.emf.cdo.dawn.ecore.editor.dawn.feature.group"/>
- <requirement
- name="org.eclipse.emf.cdo.dawn.ecoretools.diagram.dawn.feature.group"/>
- <requirement
- name="org.eclipse.emf.cdo.dawn.examples.feature.group"/>
- <requirement
- name="org.eclipse.emf.cdo.dawn.feature.group"/>
- <requirement
- name="org.eclipse.emf.cdo.dawn.sdk.feature.group"/>
- <requirement
- name="org.eclipse.emf.cdo.dawn.tests.feature.group"/>
+ activeRepositoryList="${cdo.baseline.version}"
+ includeSources="false"
+ includeBinaryEquivalents="false">
<requirement
name="org.gastro.feature.group"/>
<requirement
@@ -294,6 +307,27 @@
<requirement
name="org.eclipse.equinox.executable.feature.group"/>
<repositoryList
+ name="4.6">
+ <repository
+ url="http://download.eclipse.org/modeling/emf/cdo/drops/R20170614-0227"/>
+ <repository
+ url="http://download.eclipse.org/releases/oxygen/201706281000"/>
+ <repository
+ url="http://download.eclipse.org/eclipse/updates/4.7"/>
+ <repository
+ url="http://download.eclipse.org/modeling/mdt/uml2/updates/5.3"/>
+ <repository
+ url="http://download.eclipse.org/modeling/emf/teneo/updates/2.1.0/interim"/>
+ <repository
+ url="http://download.eclipse.org/nebula/releases/1.3.0"/>
+ <repository
+ url="http://download.eclipse.org/ecoretools/updates/1.2/201306071421"/>
+ <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.5">
<repository
url="http://download.eclipse.org/modeling/emf/cdo/drops/R20160607-1209"/>
@@ -317,6 +351,34 @@
</targlet>
</setupTask>
<setupTask
+ xsi:type="setup.targlets:TargletTask"
+ disabled="true"
+ targetName="Baseline Target"
+ activateTarget="false">
+ <targlet
+ name="CDO Dawn"
+ activeRepositoryList="${cdo.baseline.version}">
+ <requirement
+ name="org.eclipse.emf.cdo.dawn.codegen.feature.group"/>
+ <requirement
+ name="org.eclipse.emf.cdo.dawn.codegen.emf.feature.group"/>
+ <requirement
+ name="org.eclipse.emf.cdo.dawn.codegen.gmf.feature.group"/>
+ <requirement
+ name="org.eclipse.emf.cdo.dawn.ecore.editor.dawn.feature.group"/>
+ <requirement
+ name="org.eclipse.emf.cdo.dawn.ecoretools.diagram.dawn.feature.group"/>
+ <requirement
+ name="org.eclipse.emf.cdo.dawn.examples.feature.group"/>
+ <requirement
+ name="org.eclipse.emf.cdo.dawn.feature.group"/>
+ <requirement
+ name="org.eclipse.emf.cdo.dawn.sdk.feature.group"/>
+ <requirement
+ name="org.eclipse.emf.cdo.dawn.tests.feature.group"/>
+ </targlet>
+ </setupTask>
+ <setupTask
xsi:type="setup.workingsets:WorkingSetTask">
<workingSet
name="CDO"
@@ -334,7 +396,7 @@
</operand>
<operand
xsi:type="workingsets:ExclusionPredicate"
- excludedWorkingSet="//@setupTasks.11/@workingSets.1 //@setupTasks.11/@workingSets.2 //@setupTasks.11/@workingSets.3 //@setupTasks.11/@workingSets.7 //@setupTasks.11/@workingSets.8"/>
+ excludedWorkingSet="//@setupTasks.14/@workingSets.1 //@setupTasks.14/@workingSets.2 //@setupTasks.14/@workingSets.3 //@setupTasks.14/@workingSets.7 //@setupTasks.14/@workingSets.8"/>
</predicate>
</workingSet>
<workingSet
@@ -347,7 +409,7 @@
pattern="org\.eclipse\.emf\.cdo\.tests.*"/>
<operand
xsi:type="workingsets:ExclusionPredicate"
- excludedWorkingSet="//@setupTasks.11/@workingSets.7"/>
+ excludedWorkingSet="//@setupTasks.14/@workingSets.7"/>
</predicate>
</workingSet>
<workingSet
@@ -366,7 +428,7 @@
</operand>
<operand
xsi:type="workingsets:ExclusionPredicate"
- excludedWorkingSet="//@setupTasks.11/@workingSets.7"/>
+ excludedWorkingSet="//@setupTasks.14/@workingSets.7"/>
</predicate>
</workingSet>
<workingSet
@@ -379,7 +441,7 @@
pattern="org\.eclipse\.emf\.cdo\.dawn.*"/>
<operand
xsi:type="workingsets:ExclusionPredicate"
- excludedWorkingSet="//@setupTasks.11/@workingSets.7"/>
+ excludedWorkingSet="//@setupTasks.14/@workingSets.7"/>
</predicate>
</workingSet>
<workingSet
@@ -392,7 +454,7 @@
pattern="org\.eclipse\.net4j.*"/>
<operand
xsi:type="workingsets:ExclusionPredicate"
- excludedWorkingSet="//@setupTasks.11/@workingSets.5 //@setupTasks.11/@workingSets.6 //@setupTasks.11/@workingSets.7"/>
+ excludedWorkingSet="//@setupTasks.14/@workingSets.5 //@setupTasks.14/@workingSets.6 //@setupTasks.14/@workingSets.7"/>
</predicate>
</workingSet>
<workingSet
@@ -405,7 +467,7 @@
pattern="org\.eclipse\.net4j\.db.*"/>
<operand
xsi:type="workingsets:ExclusionPredicate"
- excludedWorkingSet="//@setupTasks.11/@workingSets.7"/>
+ excludedWorkingSet="//@setupTasks.14/@workingSets.7"/>
</predicate>
</workingSet>
<workingSet
@@ -427,7 +489,7 @@
</operand>
<operand
xsi:type="workingsets:ExclusionPredicate"
- excludedWorkingSet="//@setupTasks.11/@workingSets.7"/>
+ excludedWorkingSet="//@setupTasks.14/@workingSets.7"/>
</predicate>
</workingSet>
<workingSet
@@ -453,7 +515,7 @@
pattern="org\.eclipse\.emf\.cdo\.releng.*"/>
<operand
xsi:type="workingsets:ExclusionPredicate"
- excludedWorkingSet="//@setupTasks.11/@workingSets.7"/>
+ excludedWorkingSet="//@setupTasks.14/@workingSets.7"/>
</predicate>
</workingSet>
</setupTask>
@@ -553,7 +615,7 @@
</setupTask>
</setupTask>
<stream name="master"
- label="4.6 Integration (Oxygen)">
+ label="4.7 Integration (Photon)">
<setupTask
xsi:type="setup.p2:P2Task">
<requirement
@@ -571,6 +633,60 @@
<setupTask
xsi:type="setup:VariableTask"
name="cdo.target.platform"
+ value="Photon"/>
+ <setupTask
+ xsi:type="setup:VariableTask"
+ name="cdo.bugzilla.version"
+ value="4.7"/>
+ <setupTask
+ xsi:type="setup:VariableTask"
+ name="cdo.baseline.version"
+ value="4.6"/>
+ <setupTask
+ xsi:type="jdt:JRETask"
+ version="JavaSE-1.8"
+ location="${jre.location-1.8}"/>
+ <setupTask
+ xsi:type="pde:APIBaselineFromTargetTask"
+ name="CDO 4.6"
+ targetName="Baseline Target"/>
+ <setupTask
+ xsi:type="setup.workingsets:WorkingSetTask">
+ <workingSet
+ name="Infrastructure"
+ id="CDO Infrastructure">
+ <predicate
+ xsi:type="predicates:NamePredicate"
+ pattern="org\.eclipse\.emf\.cdo\.releng\.promotion.*"/>
+ <predicate
+ xsi:type="predicates:NamePredicate"
+ pattern="org\.eclipse\.emf\.cdo\.releng\.doc\.supplemental.*"/>
+ <predicate
+ xsi:type="predicates:NamePredicate"
+ pattern="cdo\.www.*"/>
+ <predicate
+ xsi:type="predicates:NamePredicate"
+ pattern="org\.eclipse\.simrel\.build.*"/>
+ <predicate
+ xsi:type="predicates:NamePredicate"
+ pattern="com\.ibm\.db2\.jcc.*"/>
+ </workingSet>
+ </setupTask>
+ </stream>
+ <stream name="4.6-maintenance"
+ label="4.6 Maintenance (Oxygen)">
+ <setupTask
+ xsi:type="setup.p2:P2Task">
+ <requirement
+ name="org.eclipse.emf.sdk.feature.group"/>
+ </setupTask>
+ <setupTask
+ xsi:type="setup:VariableTask"
+ name="cdo.git.branch"
+ value="streams/4.6-maintenance"/>
+ <setupTask
+ xsi:type="setup:VariableTask"
+ name="cdo.target.platform"
value="Oxygen"/>
<setupTask
xsi:type="setup:VariableTask"
@@ -579,14 +695,14 @@
<setupTask
xsi:type="setup:VariableTask"
name="cdo.baseline.version"
- value="4.5"/>
+ value="4.6"/>
<setupTask
xsi:type="jdt:JRETask"
version="JavaSE-1.8"
location="${jre.location-1.8}"/>
<setupTask
xsi:type="pde:APIBaselineFromTargetTask"
- name="CDO 4.5"
+ name="CDO 4.6"
targetName="Baseline Target"/>
<setupTask
xsi:type="setup.workingsets:WorkingSetTask">
diff --git a/plugins/org.eclipse.emf.cdo.transfer.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo.transfer.ui/META-INF/MANIFEST.MF
index 50fa0c4024..050e11df57 100644
--- a/plugins/org.eclipse.emf.cdo.transfer.ui/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.cdo.transfer.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.emf.cdo.transfer.ui;singleton:=true
-Bundle-Version: 4.2.400.qualifier
+Bundle-Version: 4.2.500.qualifier
Bundle-ClassPath: .
Bundle-Vendor: %providerName
Bundle-Localization: plugin
@@ -15,11 +15,11 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)",
org.eclipse.emf.cdo.ui.shared;bundle-version="[4.1.0,5.0.0)",
org.eclipse.emf.cdo.transfer;bundle-version="[4.2.0,5.0.0)";visibility:=reexport,
org.eclipse.emf.cdo.transfer.workspace;bundle-version="[4.2.0,5.0.0)";resolution:=optional
-Export-Package: org.eclipse.emf.cdo.transfer.internal.ui;version="4.2.400";x-internal:=true,
- org.eclipse.emf.cdo.transfer.internal.ui.bundle;version="4.2.400";x-internal:=true,
- org.eclipse.emf.cdo.transfer.spi.ui;version="4.2.400",
- org.eclipse.emf.cdo.transfer.ui;version="4.2.400",
- org.eclipse.emf.cdo.transfer.ui.swt;version="4.2.400",
+Export-Package: org.eclipse.emf.cdo.transfer.internal.ui;version="4.2.500";x-internal:=true,
+ org.eclipse.emf.cdo.transfer.internal.ui.bundle;version="4.2.500";x-internal:=true,
+ org.eclipse.emf.cdo.transfer.spi.ui;version="4.2.500",
+ org.eclipse.emf.cdo.transfer.ui;version="4.2.500",
+ org.eclipse.emf.cdo.transfer.ui.swt;version="4.2.500",
org.eclipse.wb.swt;version="4.2.100";x-internal:=true
Bundle-ActivationPolicy: lazy
Bundle-Activator: org.eclipse.emf.cdo.transfer.internal.ui.bundle.OM$Activator
diff --git a/plugins/org.eclipse.emf.cdo.transfer.ui/src/org/eclipse/wb/swt/ResourceManager.java b/plugins/org.eclipse.emf.cdo.transfer.ui/src/org/eclipse/wb/swt/ResourceManager.java
index 299ead2c31..44046b21b3 100644
--- a/plugins/org.eclipse.emf.cdo.transfer.ui/src/org/eclipse/wb/swt/ResourceManager.java
+++ b/plugins/org.eclipse.emf.cdo.transfer.ui/src/org/eclipse/wb/swt/ResourceManager.java
@@ -166,6 +166,7 @@ public class ResourceManager extends SWTResourceManager
final Point baseImageSize = new Point(bib.width, bib.height);
CompositeImageDescriptor compositImageDesc = new CompositeImageDescriptor()
{
+ @SuppressWarnings("deprecation")
@Override
protected void drawCompositeImage(int width, int height)
{
diff --git a/plugins/org.gastro.rcp.department/META-INF/MANIFEST.MF b/plugins/org.gastro.rcp.department/META-INF/MANIFEST.MF
index 4fed648bab..81ad37ee38 100644
--- a/plugins/org.gastro.rcp.department/META-INF/MANIFEST.MF
+++ b/plugins/org.gastro.rcp.department/META-INF/MANIFEST.MF
@@ -2,11 +2,11 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: CDO Electronic Restaurant Example RCP Department
Bundle-SymbolicName: org.gastro.rcp.department; singleton:=true
-Bundle-Version: 4.0.500.qualifier
+Bundle-Version: 4.0.600.qualifier
Bundle-Activator: org.gastro.rcp.internal.department.Activator
Bundle-ActivationPolicy: lazy
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Bundle-Vendor: Eclipse Modeling Project
Require-Bundle: org.gastro.rcp;bundle-version="[4.0.0,5.0.0)";visibility:=reexport
Export-Package: com.swtdesigner;version="4.0.300";x-internal:=true,
- org.gastro.rcp.internal.department;version="4.0.500";x-internal:=true
+ org.gastro.rcp.internal.department;version="4.0.600";x-internal:=true
diff --git a/plugins/org.gastro.rcp.department/src/com/swtdesigner/ResourceManager.java b/plugins/org.gastro.rcp.department/src/com/swtdesigner/ResourceManager.java
index 7741200880..d8f151fee9 100644
--- a/plugins/org.gastro.rcp.department/src/com/swtdesigner/ResourceManager.java
+++ b/plugins/org.gastro.rcp.department/src/com/swtdesigner/ResourceManager.java
@@ -157,6 +157,7 @@ public class ResourceManager extends SWTResourceManager
final Point baseImageSize = new Point(bib.width, bib.height);
CompositeImageDescriptor compositImageDesc = new CompositeImageDescriptor()
{
+ @SuppressWarnings("deprecation")
@Override
protected void drawCompositeImage(int width, int height)
{
diff --git a/plugins/org.gastro.rcp.table/META-INF/MANIFEST.MF b/plugins/org.gastro.rcp.table/META-INF/MANIFEST.MF
index 704ff8844c..c5f0a58213 100644
--- a/plugins/org.gastro.rcp.table/META-INF/MANIFEST.MF
+++ b/plugins/org.gastro.rcp.table/META-INF/MANIFEST.MF
@@ -2,11 +2,11 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: CDO Electronic Restaurant Example RCP Table
Bundle-SymbolicName: org.gastro.rcp.table; singleton:=true
-Bundle-Version: 4.0.400.qualifier
+Bundle-Version: 4.0.500.qualifier
Bundle-Activator: org.gastro.rcp.internal.table.Activator
Require-Bundle: org.gastro.rcp;bundle-version="[4.0.0,5.0.0)";visibility:=reexport
Bundle-ActivationPolicy: lazy
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Bundle-Vendor: Eclipse Modeling Project
-Export-Package: com.swtdesigner;version="4.0.300";x-internal:=true,
- org.gastro.rcp.internal.table;version="4.0.400";x-internal:=true
+Export-Package: com.swtdesigner;version="4.0.500";x-internal:=true,
+ org.gastro.rcp.internal.table;version="4.0.500";x-internal:=true
diff --git a/plugins/org.gastro.rcp.table/src/com/swtdesigner/ResourceManager.java b/plugins/org.gastro.rcp.table/src/com/swtdesigner/ResourceManager.java
index 72ed9ff70a..97fa65ad41 100644
--- a/plugins/org.gastro.rcp.table/src/com/swtdesigner/ResourceManager.java
+++ b/plugins/org.gastro.rcp.table/src/com/swtdesigner/ResourceManager.java
@@ -157,6 +157,7 @@ public class ResourceManager extends SWTResourceManager
final Point baseImageSize = new Point(bib.width, bib.height);
CompositeImageDescriptor compositImageDesc = new CompositeImageDescriptor()
{
+ @SuppressWarnings("deprecation")
@Override
protected void drawCompositeImage(int width, int height)
{

Back to the top