[Releng] Switch from 2020-06 to 2022-06
Signed-off-by: Ansgar Radermacher <ansgar.radermacher@cea.fr>
Change-Id: I1cf50ce71fdce17b36f86e6fc5435bdfe99031ec
diff --git a/plugins/transformation/org.eclipse.papyrus.designer.transformation.ui/src/org/eclipse/papyrus/designer/transformation/ui/handlers/SyncHandler.java b/plugins/transformation/org.eclipse.papyrus.designer.transformation.ui/src/org/eclipse/papyrus/designer/transformation/ui/handlers/SyncHandler.java
index bbada2a..13129a7 100644
--- a/plugins/transformation/org.eclipse.papyrus.designer.transformation.ui/src/org/eclipse/papyrus/designer/transformation/ui/handlers/SyncHandler.java
+++ b/plugins/transformation/org.eclipse.papyrus.designer.transformation.ui/src/org/eclipse/papyrus/designer/transformation/ui/handlers/SyncHandler.java
@@ -92,7 +92,7 @@
} catch (TransformationRTException e) {
Shell shell = Display.getCurrent().getActiveShell();
MessageDialog.openError(shell, Messages.SyncHandler_CANNOT_SYNCHRONIZE, e.getMessage());
- return Status.error(Messages.SyncHandler_CANNOT_SYNCHRONIZE + ": " + e.getMessage()); //$NON-NLS-1$
+ return Status.error(Messages.SyncHandler_CANNOT_SYNCHRONIZE, e);
}
}
});
diff --git a/releng/org.eclipse.papyrus.designer.product/p2.inf b/releng/org.eclipse.papyrus.designer.product/p2.inf
index f72ba4d..4367760 100644
--- a/releng/org.eclipse.papyrus.designer.product/p2.inf
+++ b/releng/org.eclipse.papyrus.designer.product/p2.inf
@@ -1,6 +1,6 @@
instructions.configure=\
- addRepository(type:0,location:https${#58}//download.eclipse.org/releases/2021-12,name:2021-12);\
- addRepository(type:1,location:https${#58}//download.eclipse.org/releases/2021-12,name:2021-12);\
+ addRepository(type:0,location:https${#58}//download.eclipse.org/releases/2022-06,name:2022-06);\
+ addRepository(type:1,location:https${#58}//download.eclipse.org/releases/2022-06,name:2022-06);\
addRepository(type:0,location:https${#58}//download.eclipse.org/modeling/mdt/papyrus/components/designer,name:Papyrus SW designer release);\
addRepository(type:1,location:https${#58}//download.eclipse.org/modeling/mdt/papyrus/components/designer,name:Papyrus SW designer release);\
addRepository(type:0,location:https${#58}//download.eclipse.org/modeling/mdt/papyrus/components/marte,name:MARTE);\
diff --git a/releng/org.eclipse.papyrus.designer.product/papyrusDesigner.product b/releng/org.eclipse.papyrus.designer.product/papyrusDesigner.product
index 0845eb9..243f676 100644
--- a/releng/org.eclipse.papyrus.designer.product/papyrusDesigner.product
+++ b/releng/org.eclipse.papyrus.designer.product/papyrusDesigner.product
@@ -6,9 +6,9 @@
<aboutInfo>
<image path="/org.eclipse.papyrus.designer.rcp/icons/papyrus_lg.png"/>
<text>
- Papyrus security (Beta - Incubation)
+ Papyrus SW Designer
-(c) Copyright Eclipse contributors and others 2000, 2016. All rights reserved.
+(c) Copyright Eclipse contributors and others 2000-2022 All rights reserved.
Visit http://www.eclipse.org/platform
This product includes software developed by the
diff --git a/targetplatform/org.eclipse.papyrus.designer.targetplatform.2021-12/org.eclipse.papyrus.designer.targetplatform.2021-12.target b/targetplatform/org.eclipse.papyrus.designer.targetplatform.2021-12/org.eclipse.papyrus.designer.targetplatform.2021-12.target
index cf3360c..2a6fd7d 100644
--- a/targetplatform/org.eclipse.papyrus.designer.targetplatform.2021-12/org.eclipse.papyrus.designer.targetplatform.2021-12.target
+++ b/targetplatform/org.eclipse.papyrus.designer.targetplatform.2021-12/org.eclipse.papyrus.designer.targetplatform.2021-12.target
@@ -1,4 +1,5 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><?pde version="3.8"?><target name="Papyrus Designer for Eclipse 2021-03" sequenceNumber="1466666614">
+<?xml version="1.0" encoding="UTF-8" standalone="no"?><?pde version="3.8"?>
+<target name="Papyrus Designer for Eclipse 2021-12" sequenceNumber="1466666614">
<locations>
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
<unit id="org.eclipse.platform.feature.group" version="0.0.0"/>
diff --git a/targetplatform/org.eclipse.papyrus.designer.targetplatform.2020-06/.project b/targetplatform/org.eclipse.papyrus.designer.targetplatform.2022-06/.project
similarity index 84%
rename from targetplatform/org.eclipse.papyrus.designer.targetplatform.2020-06/.project
rename to targetplatform/org.eclipse.papyrus.designer.targetplatform.2022-06/.project
index 3e3b6f5..49b71e9 100644
--- a/targetplatform/org.eclipse.papyrus.designer.targetplatform.2020-06/.project
+++ b/targetplatform/org.eclipse.papyrus.designer.targetplatform.2022-06/.project
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
- <name>org.eclipse.papyrus.designer.targetplatform.2020-06</name>
+ <name>org.eclipse.papyrus.designer.targetplatform.2022-06</name>
<comment></comment>
<projects>
</projects>
diff --git a/targetplatform/org.eclipse.papyrus.designer.targetplatform.2020-06/org.eclipse.papyrus.designer.targetplatform.2020-06.target b/targetplatform/org.eclipse.papyrus.designer.targetplatform.2022-06/org.eclipse.papyrus.designer.targetplatform.2022-06.target
similarity index 80%
rename from targetplatform/org.eclipse.papyrus.designer.targetplatform.2020-06/org.eclipse.papyrus.designer.targetplatform.2020-06.target
rename to targetplatform/org.eclipse.papyrus.designer.targetplatform.2022-06/org.eclipse.papyrus.designer.targetplatform.2022-06.target
index 4b67d8a..3b526d7 100644
--- a/targetplatform/org.eclipse.papyrus.designer.targetplatform.2020-06/org.eclipse.papyrus.designer.targetplatform.2020-06.target
+++ b/targetplatform/org.eclipse.papyrus.designer.targetplatform.2022-06/org.eclipse.papyrus.designer.targetplatform.2022-06.target
@@ -1,4 +1,5 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><?pde version="3.8"?><target name="Papyrus Designer for Eclipse 2020-06" sequenceNumber="1466666614">
+<?xml version="1.0" encoding="UTF-8" standalone="no"?><?pde version="3.8"?>
+<target name="Papyrus Designer for Eclipse 2022-06" sequenceNumber="1466666614">
<locations>
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
<unit id="org.eclipse.platform.feature.group" version="0.0.0"/>
@@ -6,17 +7,22 @@
<unit id="org.eclipse.jdt.feature.group" version="0.0.0"/>
<unit id="org.eclipse.pde.feature.group" version="0.0.0"/>
<unit id="org.eclipse.cdt.feature.group" version="0.0.0"/>
+ <unit id="org.eclipse.epp.mpc.feature.group" version="0.0.0"/>
<unit id="org.eclipse.equinox.p2.discovery.feature.feature.group" version="0.0.0"/>
<unit id="org.eclipse.equinox.executable.feature.group" version="0.0.0"/>
<unit id="org.eclipse.m2e.feature.feature.group" version="0.0.0"/>
- <unit id="org.eclipse.papyrus.sdk.feature.feature.group" version="0.0.0"/>
<unit id="org.eclipse.ocl.uml.feature.group" version="0.0.0"/>
<unit id="org.eclipse.m2m.qvt.oml.sdk.feature.group" version="0.0.0"/>
<unit id="org.eclipse.xtext.sdk.feature.group" version="0.0.0"/>
<unit id="org.eclipse.wst.web_ui.feature.feature.group" version="0.0.0"/>
<unit id="org.eclipse.json" version="0.0.0"/>
<unit id="org.eclipse.acceleo.feature.group" version="0.0.0"/>
- <repository location="https://download.eclipse.org/releases/2020-06"/>
+ <unit id="org.eclipse.papyrus.sdk.feature.feature.group" version="0.0.0"/>
+ <repository location="https://download.eclipse.org/releases/2022-06"/>
+ </location>
+ <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
+ <unit id="org.eclipse.papyrus.junit.feature.feature.group" version="0.0.0"/>
+ <repository location="https://download.eclipse.org/modeling/mdt/papyrus/updates/nightly/master"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
<unit id="org.eclipse.papyrus.marte.core.feature.feature.group" version="0.0.0"/>
@@ -25,14 +31,14 @@
<repository id="papyrus-marte" location="https://download.eclipse.org/modeling/mdt/papyrus/components/marte/"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
- <unit id="org.eclipse.papyrus.junit.feature.feature.group" version="0.0.0"/>
- <repository id="papyrus" location="https://download.eclipse.org/modeling/mdt/papyrus/updates/releases/2020-06"/>
- </location>
- <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
<unit id="org.eclipse.papyrus.moka.kernel.animation" version="0.0.0"/>
<unit id="org.eclipse.papyrus.moka.tracepoint.service" version="0.0.0"/>
<unit id="org.eclipse.papyrus.moka.ui.tracepoint.view" version="0.0.0"/>
<repository id="moka" location="https://ci.eclipse.org/papyrus/view/Moka/job/papyrus-moka-master/lastSuccessfulBuild/artifact/releng/org.eclipse.papyrus.moka.p2/target/repository/"/>
</location>
+ <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+ <unit id="org.eclipse.justj.openjdk.hotspot.jre.full.feature.group" version="0.0.0"/>
+ <repository id="justj" location="https://download.eclipse.org/justj/jres/11/updates/release"/>
+ </location>
</locations>
</target>
diff --git a/targetplatform/org.eclipse.papyrus.designer.targetplatform.2020-06/pom.xml b/targetplatform/org.eclipse.papyrus.designer.targetplatform.2022-06/pom.xml
similarity index 77%
rename from targetplatform/org.eclipse.papyrus.designer.targetplatform.2020-06/pom.xml
rename to targetplatform/org.eclipse.papyrus.designer.targetplatform.2022-06/pom.xml
index c7dd8ee..10fc309 100644
--- a/targetplatform/org.eclipse.papyrus.designer.targetplatform.2020-06/pom.xml
+++ b/targetplatform/org.eclipse.papyrus.designer.targetplatform.2022-06/pom.xml
@@ -6,8 +6,8 @@
<groupId>org.eclipse.papyrus.designer</groupId>
<version>3.0.0-SNAPSHOT</version>
</parent>
- <artifactId>org.eclipse.papyrus.designer.targetplatform.2020-06</artifactId>
+ <artifactId>org.eclipse.papyrus.designer.targetplatform.2022-06</artifactId>
<packaging>eclipse-target-definition</packaging>
- <name>org.eclipse.papyrus.designer.targetplatform.2020-06</name>
- <description>This plug-in contains the target definition for Papyrus Designer in 2020-06.</description>
+ <name>org.eclipse.papyrus.designer.targetplatform.2022-06</name>
+ <description>This plug-in contains the target definition for Papyrus Designer in 2022-06.</description>
</project>
diff --git a/targetplatform/pom.xml b/targetplatform/pom.xml
index 455f4f5..8a77cdb 100644
--- a/targetplatform/pom.xml
+++ b/targetplatform/pom.xml
@@ -25,15 +25,15 @@
</modules>
</profile>
<profile>
- <id>2020-06</id>
+ <id>2022-06</id>
<activation>
<property>
<name>eclipse.targetrelease</name>
- <value>2020-06</value>
+ <value>2022-06</value>
</property>
</activation>
<modules>
- <module>org.eclipse.papyrus.designer.targetplatform.2020-06</module>
+ <module>org.eclipse.papyrus.designer.targetplatform.2022-06</module>
</modules>
</profile>
</profiles>
