Bug 561166 - [Robotics, releng] Update target platform to 2019-12, fix xtext target issue
- move to 2019-12 target
- for xtext: use standard release update site instead of specific xtext one
Change-Id: I500d99e224615945d5b01722e58e666eb173fd61
Signed-off-by: Ansgar Radermacher <ansgar.radermacher@cea.fr>
diff --git a/releng/org.eclipse.papyrus.robotics.p2/pom.xml b/releng/org.eclipse.papyrus.robotics.p2/pom.xml
index 0ca1a7e..096b14b 100644
--- a/releng/org.eclipse.papyrus.robotics.p2/pom.xml
+++ b/releng/org.eclipse.papyrus.robotics.p2/pom.xml
@@ -48,7 +48,7 @@
<!-- p2 update site transitive dependencies repositories -->
<associateSites>
- <site>https://download.eclipse.org/modeling/mdt/papyrus/updates/releases/2019-09</site>
+ <site>https://download.eclipse.org/modeling/mdt/papyrus/updates/releases/2019-12</site>
<!-- <site>https://download.eclipse.org/modeling/mdt/papyrus/components/designer/</site> -->
<site>https://hudson.eclipse.org/papyrus/job/papyrus-designer-2019-06/lastSuccessfulBuild/artifact/releng/org.eclipse.papyrus.designer.p2/target/repository/</site>
<site>https://download.eclipse.org/modeling/mdt/papyrus/components/marte/</site>
diff --git a/releng/org.eclipse.papyrus.robotics.product/p2.inf b/releng/org.eclipse.papyrus.robotics.product/p2.inf
index 336f0e6..85694af 100644
--- a/releng/org.eclipse.papyrus.robotics.product/p2.inf
+++ b/releng/org.eclipse.papyrus.robotics.product/p2.inf
@@ -1,8 +1,8 @@
instructions.configure=\
- addRepository(type:0,location:https${#58}//download.eclipse.org/releases/2019-09,name:2019-09);\
- addRepository(type:1,location:https${#58}//download.eclipse.org/releases/2019-09,name:2019-09);\
- addRepository(type:0,location:https${#58}//hudson.eclipse.org/papyrus/job/papyrus-robotics-2019-09/lastSuccessfulBuild/artifact/releng/org.eclipse.papyrus.robotics.p2/target/repository/,name:Papyrus for Robotics nightly);\
- addRepository(type:1,location:https${#58}//hudson.eclipse.org/papyrus/job/papyrus-robotics-2019-09/lastSuccessfulBuild/artifact/releng/org.eclipse.papyrus.robotics.p2/target/repository/,name:Papyrus for Robotics nightly);\
+ addRepository(type:0,location:https${#58}//download.eclipse.org/releases/2019-12,name:2019-12);\
+ addRepository(type:1,location:https${#58}//download.eclipse.org/releases/2019-12,name:2019-12);\
+ addRepository(type:0,location:https${#58}//hudson.eclipse.org/papyrus/job/papyrus-robotics-2019-12/lastSuccessfulBuild/artifact/releng/org.eclipse.papyrus.robotics.p2/target/repository/,name:Papyrus for Robotics nightly);\
+ addRepository(type:1,location:https${#58}//hudson.eclipse.org/papyrus/job/papyrus-robotics-2019-12/lastSuccessfulBuild/artifact/releng/org.eclipse.papyrus.robotics.p2/target/repository/,name:Papyrus for Robotics nightly);\
addRepository(type:0,location:https${#58}//download.eclipse.org/modeling/mdt/papyrus/components/marte,name:MARTE);\
addRepository(type:1,location:https${#58}//download.eclipse.org/modeling/mdt/papyrus/components/marte,name:MARTE);\
addRepository(type:0,location:https${#58}//hudson.eclipse.org/papyrus/job/papyrus-designer-2019-06/lastSuccessfulBuild/artifact/releng/org.eclipse.papyrus.designer.p2/target/repository/,name:Designer);\
diff --git a/targetplatform/org.eclipse.papyrus.robotics.targetplatform.2019-09/.project b/targetplatform/org.eclipse.papyrus.robotics.targetplatform.2019-12/.project
similarity index 84%
rename from targetplatform/org.eclipse.papyrus.robotics.targetplatform.2019-09/.project
rename to targetplatform/org.eclipse.papyrus.robotics.targetplatform.2019-12/.project
index 75df11e..f516c05 100644
--- a/targetplatform/org.eclipse.papyrus.robotics.targetplatform.2019-09/.project
+++ b/targetplatform/org.eclipse.papyrus.robotics.targetplatform.2019-12/.project
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
- <name>org.eclipse.papyrus.robotics.targetplatform.2019-09</name>
+ <name>org.eclipse.papyrus.robotics.targetplatform.2019-12</name>
<comment></comment>
<projects>
</projects>
diff --git a/targetplatform/org.eclipse.papyrus.robotics.targetplatform.2019-09/.settings/org.eclipse.core.resources.prefs b/targetplatform/org.eclipse.papyrus.robotics.targetplatform.2019-12/.settings/org.eclipse.core.resources.prefs
similarity index 100%
rename from targetplatform/org.eclipse.papyrus.robotics.targetplatform.2019-09/.settings/org.eclipse.core.resources.prefs
rename to targetplatform/org.eclipse.papyrus.robotics.targetplatform.2019-12/.settings/org.eclipse.core.resources.prefs
diff --git a/targetplatform/org.eclipse.papyrus.robotics.targetplatform.2019-09/.settings/org.eclipse.m2e.core.prefs b/targetplatform/org.eclipse.papyrus.robotics.targetplatform.2019-12/.settings/org.eclipse.m2e.core.prefs
similarity index 100%
rename from targetplatform/org.eclipse.papyrus.robotics.targetplatform.2019-09/.settings/org.eclipse.m2e.core.prefs
rename to targetplatform/org.eclipse.papyrus.robotics.targetplatform.2019-12/.settings/org.eclipse.m2e.core.prefs
diff --git a/targetplatform/org.eclipse.papyrus.robotics.targetplatform.2019-09/org.eclipse.papyrus.robotics.targetplatform.2019-09.target b/targetplatform/org.eclipse.papyrus.robotics.targetplatform.2019-12/org.eclipse.papyrus.robotics.targetplatform.2019-12.target
similarity index 92%
rename from targetplatform/org.eclipse.papyrus.robotics.targetplatform.2019-09/org.eclipse.papyrus.robotics.targetplatform.2019-09.target
rename to targetplatform/org.eclipse.papyrus.robotics.targetplatform.2019-12/org.eclipse.papyrus.robotics.targetplatform.2019-12.target
index c78dddf..0a9901d 100644
--- a/targetplatform/org.eclipse.papyrus.robotics.targetplatform.2019-09/org.eclipse.papyrus.robotics.targetplatform.2019-09.target
+++ b/targetplatform/org.eclipse.papyrus.robotics.targetplatform.2019-12/org.eclipse.papyrus.robotics.targetplatform.2019-12.target
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<?pde?>
-<target name="Papyrus 2019-09" sequenceNumber="1466666549">
+<target name="Papyrus 2019-12" sequenceNumber="1466666549">
<locations>
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
<unit id="org.eclipse.platform.feature.group" version="0.0.0"/>
@@ -12,12 +12,9 @@
<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"/>
- <repository location="https://download.eclipse.org/releases/2019-09/"/>
- </location>
- <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
<unit id="org.eclipse.xtext.xbase.feature.group" version="0.0.0"/>
<unit id="org.eclipse.xtext.xbase.lib.feature.group" version="0.0.0"/>
- <repository location="https://download.eclipse.org/modeling/tmf/xtext/updates/composite/releases/"/>
+ <repository location="https://download.eclipse.org/releases/2019-12/"/>
</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"/>
diff --git a/targetplatform/org.eclipse.papyrus.robotics.targetplatform.2019-09/pom.xml b/targetplatform/org.eclipse.papyrus.robotics.targetplatform.2019-12/pom.xml
similarity index 77%
rename from targetplatform/org.eclipse.papyrus.robotics.targetplatform.2019-09/pom.xml
rename to targetplatform/org.eclipse.papyrus.robotics.targetplatform.2019-12/pom.xml
index 1cd798a..64c073f 100644
--- a/targetplatform/org.eclipse.papyrus.robotics.targetplatform.2019-09/pom.xml
+++ b/targetplatform/org.eclipse.papyrus.robotics.targetplatform.2019-12/pom.xml
@@ -6,8 +6,8 @@
<groupId>org.eclipse.papyrus.robotics</groupId>
<version>0.7.0-SNAPSHOT</version>
</parent>
- <artifactId>org.eclipse.papyrus.robotics.targetplatform.2019-09</artifactId>
+ <artifactId>org.eclipse.papyrus.robotics.targetplatform.2019-12</artifactId>
<packaging>eclipse-target-definition</packaging>
- <name>org.eclipse.papyrus.robotics.targetplatform.2019-09</name>
- <description>This plug-in contains the target definition for Papyrus Robotics for 2019-09.</description>
+ <name>org.eclipse.papyrus.robotics.targetplatform.2019-12</name>
+ <description>This plug-in contains the target definition for Papyrus Robotics for 2019-12.</description>
</project>
diff --git a/targetplatform/pom.xml b/targetplatform/pom.xml
index 3960e71..8970563 100644
--- a/targetplatform/pom.xml
+++ b/targetplatform/pom.xml
@@ -25,12 +25,12 @@
</modules>
</profile>
<profile>
- <id>2019-09</id>
+ <id>2019-12</id>
<activation>
<activeByDefault>true</activeByDefault>
</activation>
<modules>
- <module>org.eclipse.papyrus.robotics.targetplatform.2019-09</module>
+ <module>org.eclipse.papyrus.robotics.targetplatform.2019-12</module>
</modules>
</profile>
</profiles>
