Bug 573336 -[CDO] Stereotype applications not found at startup
-Moved build to tmp Papyrus milestone
2.1/I2 waiting for fix in ArchitectureFramework
-Updated com.google.* Import-Package version range
Change-Id: I5e9230d518f40575593e2aa38bbba6d4e0a40bd1
Signed-off-by: Sebastien Revol <sebastien.revol@cea.fr>
diff --git a/cdo/bundles/org.eclipse.papyrus.infra.gmfdiag.css.cdo/META-INF/MANIFEST.MF b/cdo/bundles/org.eclipse.papyrus.infra.gmfdiag.css.cdo/META-INF/MANIFEST.MF
index aa84339..6ed86f7 100644
--- a/cdo/bundles/org.eclipse.papyrus.infra.gmfdiag.css.cdo/META-INF/MANIFEST.MF
+++ b/cdo/bundles/org.eclipse.papyrus.infra.gmfdiag.css.cdo/META-INF/MANIFEST.MF
@@ -14,7 +14,7 @@
org.eclipse.gmf.runtime.notation;bundle-version="[1.10.0,2.0.0)";visibility:=reexport,
org.eclipse.papyrus.infra.gmfdiag.css.model;bundle-version="[2.0.0,3.0.0)",
org.eclipse.core.databinding.observable;bundle-version="[1.10.0,2.0.0)"
-Import-Package: com.google.common.collect;version="[27.1.0,28.0.0)"
+Import-Package: com.google.common.collect;version="[30.1.0, 31.0.0)"
Automatic-Module-Name: org.eclipse.papyrus.infra.gmfdiag.css.cdo
Export-Package: org.eclipse.papyrus.infra.gmfdiag.css.cdo;version="2.2.1",
org.eclipse.papyrus.infra.gmfdiag.css.cdo.factory;version="2.2.1",
diff --git a/cdo/bundles/uml/org.eclipse.uml2.uml.cdo/migrate.ant b/cdo/bundles/uml/org.eclipse.uml2.uml.cdo/migrate.ant
index 6f5b07e..a84c254 100644
--- a/cdo/bundles/uml/org.eclipse.uml2.uml.cdo/migrate.ant
+++ b/cdo/bundles/uml/org.eclipse.uml2.uml.cdo/migrate.ant
@@ -122,7 +122,7 @@
-->
<replacestring from="private static final int ADAPTING = 1 << 7;" to="private boolean adapting;" />
<replacestring from="(eFlags & ADAPTING) == 0" to="!adapting" />
- <replacestring from="eFlags |= ADAPTING;" to="adapting = true; org.eclipse.emf.spi.cdo.InternalCDOView view = cdoView(); if (view != null && !view.isClosed()) {" />
+ <replacestring from="eFlags |= ADAPTING;" to="adapting = true; org.eclipse.emf.spi.cdo.InternalCDOView view = cdoView(); if (view == null || (view != null && !view.isClosed())) {" />
<replacestring from="eFlags &= ~ADAPTING;" to="adapting = false; }" />
<tokenfilter>
diff --git a/cdo/bundles/uml/org.eclipse.uml2.uml.cdo/src/org/eclipse/uml2/uml/cdo/internal/impl/ElementImpl.java b/cdo/bundles/uml/org.eclipse.uml2.uml.cdo/src/org/eclipse/uml2/uml/cdo/internal/impl/ElementImpl.java
index 23ca989..e87eae0 100644
--- a/cdo/bundles/uml/org.eclipse.uml2.uml.cdo/src/org/eclipse/uml2/uml/cdo/internal/impl/ElementImpl.java
+++ b/cdo/bundles/uml/org.eclipse.uml2.uml.cdo/src/org/eclipse/uml2/uml/cdo/internal/impl/ElementImpl.java
@@ -912,7 +912,7 @@
public EList<Adapter> eAdapters() {
if (!adapting && !eBasicHasAdapters()) {
- adapting = true; org.eclipse.emf.spi.cdo.InternalCDOView view = cdoView(); if (view != null && !view.isClosed()) {
+ adapting = true; org.eclipse.emf.spi.cdo.InternalCDOView view = cdoView(); if (view == null || (view != null && !view.isClosed())) {
CacheAdapter cacheAdapter = getCacheAdapter();
diff --git a/cdo/releng/targetplatforms/org.eclipse.papyrus.cdo.targetplatform/org.eclipse.papyrus.cdo.targetplatform.target b/cdo/releng/targetplatforms/org.eclipse.papyrus.cdo.targetplatform/org.eclipse.papyrus.cdo.targetplatform.target
index 8f57200..df68cbc 100755
--- a/cdo/releng/targetplatforms/org.eclipse.papyrus.cdo.targetplatform/org.eclipse.papyrus.cdo.targetplatform.target
+++ b/cdo/releng/targetplatforms/org.eclipse.papyrus.cdo.targetplatform/org.eclipse.papyrus.cdo.targetplatform.target
@@ -1,20 +1,20 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<?pde?>
<!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl -->
-<target name="CollaborativeModeling CDO - Papyrus Nightly" sequenceNumber="1611332287">
+<target name="CollaborativeModeling CDO - Papyrus Nightly" sequenceNumber="1620135709">
<locations>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
<unit id="org.eclipse.papyrus.sdk.feature.feature.group" version="0.0.0"/>
<unit id="org.eclipse.papyrus.junit.utils" version="0.0.0"/>
<unit id="org.eclipse.papyrus.junit.framework" version="0.0.0"/>
<unit id="org.eclipse.papyrus.toolsmiths.feature.feature.group" version="0.0.0"/>
- <repository id="papyrus" location="https://download.eclipse.org/modeling/mdt/papyrus/updates/nightly/master/"/>
+ <repository id="papyrus" location="https://download.eclipse.org/modeling/mdt/papyrus/updates/milestones/5.2/I2/"/>
</location>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
<unit id="org.eclipse.sdk.feature.group" version="0.0.0"/>
<unit id="org.eclipse.emf.sdk.feature.group" version="0.0.0"/>
<unit id="org.eclipse.uml2.sdk.feature.group" version="0.0.0"/>
- <repository id="eclipse" location="https://download.eclipse.org/releases/2020-12/"/>
+ <repository id="eclipse" location="https://download.eclipse.org/releases/2021-03/"/>
</location>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
<unit id="org.eclipse.emf.cdo.sdk.feature.group" version="0.0.0"/>
diff --git a/cdo/releng/targetplatforms/org.eclipse.papyrus.cdo.targetplatform/org.eclipse.papyrus.cdo.targetplatform.tpd b/cdo/releng/targetplatforms/org.eclipse.papyrus.cdo.targetplatform/org.eclipse.papyrus.cdo.targetplatform.tpd
index 4fba406..87f0bf4 100755
--- a/cdo/releng/targetplatforms/org.eclipse.papyrus.cdo.targetplatform/org.eclipse.papyrus.cdo.targetplatform.tpd
+++ b/cdo/releng/targetplatforms/org.eclipse.papyrus.cdo.targetplatform/org.eclipse.papyrus.cdo.targetplatform.tpd
@@ -2,14 +2,14 @@
/** Manual dependencies */
/* Papyrus Nightly */
-location "https://download.eclipse.org/modeling/mdt/papyrus/updates/nightly/master/" papyrus {
+location "https://download.eclipse.org/modeling/mdt/papyrus/updates/milestones/5.2/I2/" papyrus {
org.eclipse.papyrus.sdk.feature.feature.group lazy
org.eclipse.papyrus.junit.utils lazy
org.eclipse.papyrus.junit.framework lazy
org.eclipse.papyrus.toolsmiths.feature.feature.group lazy
}
-location "https://download.eclipse.org/releases/2020-12/" eclipse {
+location "https://download.eclipse.org/releases/2021-03/" eclipse {
org.eclipse.sdk.feature.group lazy
org.eclipse.emf.sdk.feature.group lazy
org.eclipse.uml2.sdk.feature.group lazy
diff --git a/cdo/tests/org.eclipse.papyrus.cdo.core.tests/META-INF/MANIFEST.MF b/cdo/tests/org.eclipse.papyrus.cdo.core.tests/META-INF/MANIFEST.MF
index 10c4361..760c7f0 100755
--- a/cdo/tests/org.eclipse.papyrus.cdo.core.tests/META-INF/MANIFEST.MF
+++ b/cdo/tests/org.eclipse.papyrus.cdo.core.tests/META-INF/MANIFEST.MF
@@ -30,7 +30,7 @@
Bundle-ManifestVersion: 2
Bundle-Description: %pluginDescription
Bundle-SymbolicName: org.eclipse.papyrus.cdo.core.tests
-Import-Package: com.google.common.base;version="[27.1.0,28.0.0)",
- com.google.common.collect;version="[27.1.0,28.0.0)",
- com.google.common.io;version="[27.1.0,28.0.0)"
+Import-Package: com.google.common.base;version="[30.1.0, 31.0.0)",
+ com.google.common.collect;version="[30.1.0, 31.0.0)",
+ com.google.common.io;version="[30.1.0, 31.0.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-11
diff --git a/cdo/tests/org.eclipse.papyrus.cdo.ui.tests/META-INF/MANIFEST.MF b/cdo/tests/org.eclipse.papyrus.cdo.ui.tests/META-INF/MANIFEST.MF
index d6ba57c..fc7be4d 100755
--- a/cdo/tests/org.eclipse.papyrus.cdo.ui.tests/META-INF/MANIFEST.MF
+++ b/cdo/tests/org.eclipse.papyrus.cdo.ui.tests/META-INF/MANIFEST.MF
@@ -26,7 +26,7 @@
Bundle-ManifestVersion: 2
Bundle-Description: %pluginDescription
Bundle-SymbolicName: org.eclipse.papyrus.cdo.ui.tests;singleton:=true
-Import-Package: com.google.common.base;version="[27.1.0,28.0.0)",
- com.google.common.cache;version="[27.1.0,28.0.0)",
- com.google.common.collect;version="[27.1.0,28.0.0)"
+Import-Package: com.google.common.base;version="[30.1.0, 31.0.0)",
+ com.google.common.cache;version="[30.1.0, 31.0.0)",
+ com.google.common.collect;version="[30.1.0, 31.0.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-11
diff --git a/cdo/tests/org.eclipse.papyrus.cdo.uml.search.ui.tests/META-INF/MANIFEST.MF b/cdo/tests/org.eclipse.papyrus.cdo.uml.search.ui.tests/META-INF/MANIFEST.MF
index e632819..c9138a4 100755
--- a/cdo/tests/org.eclipse.papyrus.cdo.uml.search.ui.tests/META-INF/MANIFEST.MF
+++ b/cdo/tests/org.eclipse.papyrus.cdo.uml.search.ui.tests/META-INF/MANIFEST.MF
@@ -14,6 +14,6 @@
Bundle-ManifestVersion: 2
Bundle-Description: %pluginDescription
Bundle-SymbolicName: org.eclipse.papyrus.cdo.uml.search.ui.tests
-Import-Package: com.google.common.base;version="[27.1.0,28.0.0)",
- com.google.common.collect;version="[27.1.0,28.0.0)"
+Import-Package: com.google.common.base;version="[30.1.0, 31.0.0)",
+ com.google.common.collect;version="[30.1.0, 31.0.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-11
