Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorQuentin Le Menez2019-01-10 05:50:27 -0500
committerQuentin Le Menez2019-01-10 08:24:51 -0500
commitd098893805927283c4d573fa2b293a19dcd441bc (patch)
tree9a8570bf8f117c2c193de2471f1f6577704b3f35
parent15340f43c95c3e7deed761447bd8e0002804707a (diff)
downloadorg.eclipse.papyrus-bugs/4.2.0_RCP.tar.gz
org.eclipse.papyrus-bugs/4.2.0_RCP.tar.xz
org.eclipse.papyrus-bugs/4.2.0_RCP.zip
Bug 539022 - [Releng] 2018-12 Update commit for 4.2.0 RCP releasebugs/4.2.0_RCP
- Modified the dependencies to point on the released material - Modified the splash screen Change-Id: Ia108076d698c3788825b1293edf6d627a4d539ea Signed-off-by: Quentin Le Menez <quentin.lemenez@cea.fr>
-rwxr-xr-xreleng/main-tests-with-cdo/targetPlatform/eclipse/org.eclipse.papyrus.main.tests.cdo.eclipse.target.target8
-rwxr-xr-xreleng/main-tests-with-cdo/targetPlatform/portable/org.eclipse.papyrus.main.tests.cdo.portable.target.target8
-rwxr-xr-xreleng/main-tests/targetPlatform/eclipse/org.eclipse.papyrus.main.tests.eclipse.target.target8
-rwxr-xr-xreleng/main-tests/targetPlatform/portable/org.eclipse.papyrus.main.tests.portable.target.target8
-rwxr-xr-xreleng/main/targetPlatform/eclipse/org.eclipse.papyrus.main.eclipse.target.target8
-rwxr-xr-xreleng/main/targetPlatform/portable/org.eclipse.papyrus.main.portable.target.target8
-rwxr-xr-xreleng/main/targetPlatform/portable/org.eclipse.papyrus.main.portable.target.tpd6
-rw-r--r--releng/pom.xml12
-rwxr-xr-xreleng/rcp/org.eclipse.papyrus.rcp.feature/feature.xml6
-rw-r--r--releng/rcp/org.eclipse.papyrus.rcp.product/papyrus.product4
-rw-r--r--releng/rcp/org.eclipse.papyrus.rcp/icons/splash.svg11
-rwxr-xr-xreleng/rcp/org.eclipse.papyrus.rcp/splash.bmpbin391914 -> 391914 bytes
-rw-r--r--releng/rcp/pom.xml2
-rwxr-xr-xreleng/rcp/targetPlatform/eclipse/org.eclipse.papyrus.rcp.eclipse.target.target8
-rwxr-xr-xreleng/rcp/targetPlatform/portable/org.eclipse.papyrus.rcp.portable.target.target8
-rw-r--r--releng/rcp/targetPlatform/portable/org.eclipse.papyrus.rcp.portable.target.tpd4
-rwxr-xr-xreleng/toolsmiths/targetPlatform/eclipse/org.eclipse.papyrus.toolsmiths.eclipse.targetplatform.target10
-rwxr-xr-xreleng/toolsmiths/targetPlatform/portable/org.eclipse.papyrus.toolsmiths.portable.targetplatform.target10
-rw-r--r--releng/toolsmiths/targetPlatform/portable/org.eclipse.papyrus.toolsmiths.portable.targetplatform.tpd2
19 files changed, 62 insertions, 69 deletions
diff --git a/releng/main-tests-with-cdo/targetPlatform/eclipse/org.eclipse.papyrus.main.tests.cdo.eclipse.target.target b/releng/main-tests-with-cdo/targetPlatform/eclipse/org.eclipse.papyrus.main.tests.cdo.eclipse.target.target
index 794953ff0fb..0f4ba6fd7ea 100755
--- a/releng/main-tests-with-cdo/targetPlatform/eclipse/org.eclipse.papyrus.main.tests.cdo.eclipse.target.target
+++ b/releng/main-tests-with-cdo/targetPlatform/eclipse/org.eclipse.papyrus.main.tests.cdo.eclipse.target.target
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<?pde?>
<!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl -->
-<target name="Papyrus CDO Tests" sequenceNumber="1544603116">
+<target name="Papyrus CDO Tests" sequenceNumber="1547115133">
<locations>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
<unit id="org.eclipse.nebula.widgets.richtext.feature.feature.group" version="1.2.0.201703081533"/>
@@ -39,11 +39,11 @@
</location>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
<unit id="org.eclipse.uml2.sdk.feature.group" version="5.5.0.v20181203-1331"/>
- <repository id="uml" location="file:/home/data/httpd/download.eclipse.org/modeling/mdt/uml2/updates/5.5milestones"/>
+ <repository id="uml" location="file:/home/data/httpd/download.eclipse.org/modeling/mdt/uml2/updates/5.5"/>
</location>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
<unit id="org.eclipse.sdk.feature.group" version="4.10.0.v20181206-1038"/>
- <repository id="platform" location="file:/home/data/httpd/download.eclipse.org/eclipse/updates/4.10milestones/S-4.10RC2-201812060815/"/>
+ <repository id="platform" location="file:/home/data/httpd/download.eclipse.org/eclipse/updates/4.10/R-4.10-201812060815/"/>
</location>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
<unit id="org.eclipse.ocl.examples.classic.feature.group" version="5.7.0.v20181210-1441"/>
@@ -80,7 +80,7 @@
</location>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
<unit id="org.eclipse.emf.sdk.feature.group" version="2.16.0.v20181206-1055"/>
- <repository id="emf" location="file:/home/data/httpd/download.eclipse.org/modeling/emf/emf/builds/milestone/S201812060606"/>
+ <repository id="emf" location="file:/home/data/httpd/download.eclipse.org/modeling/emf/emf/builds/release/2.16"/>
</location>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
<unit id="org.eclipse.emf.query.sdk.feature.group" version="1.12.0.201805030653"/>
diff --git a/releng/main-tests-with-cdo/targetPlatform/portable/org.eclipse.papyrus.main.tests.cdo.portable.target.target b/releng/main-tests-with-cdo/targetPlatform/portable/org.eclipse.papyrus.main.tests.cdo.portable.target.target
index 3be7525a506..91ca7686e1e 100755
--- a/releng/main-tests-with-cdo/targetPlatform/portable/org.eclipse.papyrus.main.tests.cdo.portable.target.target
+++ b/releng/main-tests-with-cdo/targetPlatform/portable/org.eclipse.papyrus.main.tests.cdo.portable.target.target
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<?pde?>
<!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl -->
-<target name="Papyrus CDO Tests" sequenceNumber="1544603116">
+<target name="Papyrus CDO Tests" sequenceNumber="1547115133">
<locations>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
<unit id="org.eclipse.nebula.widgets.richtext.feature.feature.group" version="1.2.0.201703081533"/>
@@ -39,11 +39,11 @@
</location>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
<unit id="org.eclipse.uml2.sdk.feature.group" version="5.5.0.v20181203-1331"/>
- <repository id="uml" location="http://download.eclipse.org/modeling/mdt/uml2/updates/5.5milestones"/>
+ <repository id="uml" location="http://download.eclipse.org/modeling/mdt/uml2/updates/5.5"/>
</location>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
<unit id="org.eclipse.sdk.feature.group" version="4.10.0.v20181206-1038"/>
- <repository id="platform" location="http://download.eclipse.org/eclipse/updates/4.10milestones/S-4.10RC2-201812060815/"/>
+ <repository id="platform" location="http://download.eclipse.org/eclipse/updates/4.10/R-4.10-201812060815/"/>
</location>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
<unit id="org.eclipse.ocl.examples.classic.feature.group" version="5.7.0.v20181210-1441"/>
@@ -80,7 +80,7 @@
</location>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
<unit id="org.eclipse.emf.sdk.feature.group" version="2.16.0.v20181206-1055"/>
- <repository id="emf" location="http://download.eclipse.org/modeling/emf/emf/builds/milestone/S201812060606"/>
+ <repository id="emf" location="http://download.eclipse.org/modeling/emf/emf/builds/release/2.16"/>
</location>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
<unit id="org.eclipse.emf.query.sdk.feature.group" version="1.12.0.201805030653"/>
diff --git a/releng/main-tests/targetPlatform/eclipse/org.eclipse.papyrus.main.tests.eclipse.target.target b/releng/main-tests/targetPlatform/eclipse/org.eclipse.papyrus.main.tests.eclipse.target.target
index 2ddc8c7e003..3a05e9c153a 100755
--- a/releng/main-tests/targetPlatform/eclipse/org.eclipse.papyrus.main.tests.eclipse.target.target
+++ b/releng/main-tests/targetPlatform/eclipse/org.eclipse.papyrus.main.tests.eclipse.target.target
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<?pde?>
<!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl -->
-<target name="Papyrus Tests" sequenceNumber="1544603088">
+<target name="Papyrus Tests" sequenceNumber="1547115128">
<locations>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
<unit id="org.eclipse.nebula.widgets.richtext.feature.feature.group" version="1.2.0.201703081533"/>
@@ -39,11 +39,11 @@
</location>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
<unit id="org.eclipse.uml2.sdk.feature.group" version="5.5.0.v20181203-1331"/>
- <repository id="uml" location="file:/home/data/httpd/download.eclipse.org/modeling/mdt/uml2/updates/5.5milestones"/>
+ <repository id="uml" location="file:/home/data/httpd/download.eclipse.org/modeling/mdt/uml2/updates/5.5"/>
</location>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
<unit id="org.eclipse.sdk.feature.group" version="4.10.0.v20181206-1038"/>
- <repository id="platform" location="file:/home/data/httpd/download.eclipse.org/eclipse/updates/4.10milestones/S-4.10RC2-201812060815/"/>
+ <repository id="platform" location="file:/home/data/httpd/download.eclipse.org/eclipse/updates/4.10/R-4.10-201812060815/"/>
</location>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
<unit id="org.eclipse.ocl.examples.classic.feature.group" version="5.7.0.v20181210-1441"/>
@@ -80,7 +80,7 @@
</location>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
<unit id="org.eclipse.emf.sdk.feature.group" version="2.16.0.v20181206-1055"/>
- <repository id="emf" location="file:/home/data/httpd/download.eclipse.org/modeling/emf/emf/builds/milestone/S201812060606"/>
+ <repository id="emf" location="file:/home/data/httpd/download.eclipse.org/modeling/emf/emf/builds/release/2.16"/>
</location>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
<unit id="org.eclipse.emf.query.sdk.feature.group" version="1.12.0.201805030653"/>
diff --git a/releng/main-tests/targetPlatform/portable/org.eclipse.papyrus.main.tests.portable.target.target b/releng/main-tests/targetPlatform/portable/org.eclipse.papyrus.main.tests.portable.target.target
index 8c4b18e9cc3..c7d43b2fc0b 100755
--- a/releng/main-tests/targetPlatform/portable/org.eclipse.papyrus.main.tests.portable.target.target
+++ b/releng/main-tests/targetPlatform/portable/org.eclipse.papyrus.main.tests.portable.target.target
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<?pde?>
<!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl -->
-<target name="Papyrus Tests" sequenceNumber="1544603088">
+<target name="Papyrus Tests" sequenceNumber="1547115128">
<locations>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
<unit id="org.eclipse.nebula.widgets.richtext.feature.feature.group" version="1.2.0.201703081533"/>
@@ -39,11 +39,11 @@
</location>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
<unit id="org.eclipse.uml2.sdk.feature.group" version="5.5.0.v20181203-1331"/>
- <repository id="uml" location="http://download.eclipse.org/modeling/mdt/uml2/updates/5.5milestones"/>
+ <repository id="uml" location="http://download.eclipse.org/modeling/mdt/uml2/updates/5.5"/>
</location>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
<unit id="org.eclipse.sdk.feature.group" version="4.10.0.v20181206-1038"/>
- <repository id="platform" location="http://download.eclipse.org/eclipse/updates/4.10milestones/S-4.10RC2-201812060815/"/>
+ <repository id="platform" location="http://download.eclipse.org/eclipse/updates/4.10/R-4.10-201812060815/"/>
</location>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
<unit id="org.eclipse.ocl.examples.classic.feature.group" version="5.7.0.v20181210-1441"/>
@@ -80,7 +80,7 @@
</location>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
<unit id="org.eclipse.emf.sdk.feature.group" version="2.16.0.v20181206-1055"/>
- <repository id="emf" location="http://download.eclipse.org/modeling/emf/emf/builds/milestone/S201812060606"/>
+ <repository id="emf" location="http://download.eclipse.org/modeling/emf/emf/builds/release/2.16"/>
</location>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
<unit id="org.eclipse.emf.query.sdk.feature.group" version="1.12.0.201805030653"/>
diff --git a/releng/main/targetPlatform/eclipse/org.eclipse.papyrus.main.eclipse.target.target b/releng/main/targetPlatform/eclipse/org.eclipse.papyrus.main.eclipse.target.target
index 76657fac640..1a71947f825 100755
--- a/releng/main/targetPlatform/eclipse/org.eclipse.papyrus.main.eclipse.target.target
+++ b/releng/main/targetPlatform/eclipse/org.eclipse.papyrus.main.eclipse.target.target
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<?pde?>
<!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl -->
-<target name="Papyrus Main" sequenceNumber="1544603088">
+<target name="Papyrus Main" sequenceNumber="1547115128">
<locations>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
<unit id="org.eclipse.nebula.widgets.richtext.feature.feature.group" version="1.2.0.201703081533"/>
@@ -39,11 +39,11 @@
</location>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
<unit id="org.eclipse.uml2.sdk.feature.group" version="5.5.0.v20181203-1331"/>
- <repository id="uml" location="file:/home/data/httpd/download.eclipse.org/modeling/mdt/uml2/updates/5.5milestones"/>
+ <repository id="uml" location="file:/home/data/httpd/download.eclipse.org/modeling/mdt/uml2/updates/5.5"/>
</location>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
<unit id="org.eclipse.sdk.feature.group" version="4.10.0.v20181206-1038"/>
- <repository id="platform" location="file:/home/data/httpd/download.eclipse.org/eclipse/updates/4.10milestones/S-4.10RC2-201812060815/"/>
+ <repository id="platform" location="file:/home/data/httpd/download.eclipse.org/eclipse/updates/4.10/R-4.10-201812060815/"/>
</location>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
<unit id="org.eclipse.ocl.examples.classic.feature.group" version="5.7.0.v20181210-1441"/>
@@ -80,7 +80,7 @@
</location>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
<unit id="org.eclipse.emf.sdk.feature.group" version="2.16.0.v20181206-1055"/>
- <repository id="emf" location="file:/home/data/httpd/download.eclipse.org/modeling/emf/emf/builds/milestone/S201812060606"/>
+ <repository id="emf" location="file:/home/data/httpd/download.eclipse.org/modeling/emf/emf/builds/release/2.16"/>
</location>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
<unit id="org.eclipse.emf.query.sdk.feature.group" version="1.12.0.201805030653"/>
diff --git a/releng/main/targetPlatform/portable/org.eclipse.papyrus.main.portable.target.target b/releng/main/targetPlatform/portable/org.eclipse.papyrus.main.portable.target.target
index e66ced178b2..2f6b22c2820 100755
--- a/releng/main/targetPlatform/portable/org.eclipse.papyrus.main.portable.target.target
+++ b/releng/main/targetPlatform/portable/org.eclipse.papyrus.main.portable.target.target
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<?pde?>
<!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl -->
-<target name="Papyrus Main" sequenceNumber="1544603088">
+<target name="Papyrus Main" sequenceNumber="1547115128">
<locations>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
<unit id="org.eclipse.nebula.widgets.richtext.feature.feature.group" version="1.2.0.201703081533"/>
@@ -39,11 +39,11 @@
</location>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
<unit id="org.eclipse.uml2.sdk.feature.group" version="5.5.0.v20181203-1331"/>
- <repository id="uml" location="http://download.eclipse.org/modeling/mdt/uml2/updates/5.5milestones"/>
+ <repository id="uml" location="http://download.eclipse.org/modeling/mdt/uml2/updates/5.5"/>
</location>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
<unit id="org.eclipse.sdk.feature.group" version="4.10.0.v20181206-1038"/>
- <repository id="platform" location="http://download.eclipse.org/eclipse/updates/4.10milestones/S-4.10RC2-201812060815/"/>
+ <repository id="platform" location="http://download.eclipse.org/eclipse/updates/4.10/R-4.10-201812060815/"/>
</location>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
<unit id="org.eclipse.ocl.examples.classic.feature.group" version="5.7.0.v20181210-1441"/>
@@ -80,7 +80,7 @@
</location>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
<unit id="org.eclipse.emf.sdk.feature.group" version="2.16.0.v20181206-1055"/>
- <repository id="emf" location="http://download.eclipse.org/modeling/emf/emf/builds/milestone/S201812060606"/>
+ <repository id="emf" location="http://download.eclipse.org/modeling/emf/emf/builds/release/2.16"/>
</location>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
<unit id="org.eclipse.emf.query.sdk.feature.group" version="1.12.0.201805030653"/>
diff --git a/releng/main/targetPlatform/portable/org.eclipse.papyrus.main.portable.target.tpd b/releng/main/targetPlatform/portable/org.eclipse.papyrus.main.portable.target.tpd
index 6f9d981153d..569d89dc59d 100755
--- a/releng/main/targetPlatform/portable/org.eclipse.papyrus.main.portable.target.tpd
+++ b/releng/main/targetPlatform/portable/org.eclipse.papyrus.main.portable.target.tpd
@@ -54,13 +54,13 @@ location xpand "http://download.eclipse.org/modeling/m2t/xpand/updates/releases/
//updateFrom("MDT UML2",0)
-location uml "http://download.eclipse.org/modeling/mdt/uml2/updates/5.5milestones" {
+location uml "http://download.eclipse.org/modeling/mdt/uml2/updates/5.5" {
org.eclipse.uml2.sdk.feature.group
}
//updateFrom("Eclipse",0)
-location platform "http://download.eclipse.org/eclipse/updates/4.10milestones/S-4.10RC2-201812060815/" {
+location platform "http://download.eclipse.org/eclipse/updates/4.10/R-4.10-201812060815/" {
org.eclipse.sdk.feature.group
}
@@ -113,7 +113,7 @@ location gmfNotation "http://download.eclipse.org/modeling/gmp/gmf-notation/upda
//updateFrom("EMF (Core)",0)
-location emf "http://download.eclipse.org/modeling/emf/emf/builds/milestone/S201812060606" {
+location emf "http://download.eclipse.org/modeling/emf/emf/builds/release/2.16" {
org.eclipse.emf.sdk.feature.group
}
diff --git a/releng/pom.xml b/releng/pom.xml
index 5eba39ce26c..4d6bfdb0f5c 100644
--- a/releng/pom.xml
+++ b/releng/pom.xml
@@ -9,8 +9,8 @@
<packaging>pom</packaging>
<properties>
- <tycho-version>1.3.0-SNAPSHOT</tycho-version>
- <tychoExtrasVersion>1.3.0-SNAPSHOT</tychoExtrasVersion>
+ <tycho-version>1.3.0</tycho-version>
+ <tychoExtrasVersion>1.3.0</tychoExtrasVersion>
<jarSignerVersion>1.1.5</jarSignerVersion>
<findbugs.version>3.0.1</findbugs.version>
<xtext.version>2.14.0</xtext.version>
@@ -122,14 +122,6 @@
<groupId>org.eclipse.xtend</groupId>
<artifactId>xtend-maven-plugin</artifactId>
<version>${xtext.version}</version>
- <!-- patch to fix a signer issue - https://github.com/eclipse/xtext/issues/1231 -->
- <dependencies>
- <dependency>
- <groupId>org.eclipse.platform</groupId>
- <artifactId>org.eclipse.equinox.common</artifactId>
- <version>3.10.0</version>
- </dependency>
- </dependencies>
</plugin>
<plugin>
diff --git a/releng/rcp/org.eclipse.papyrus.rcp.feature/feature.xml b/releng/rcp/org.eclipse.papyrus.rcp.feature/feature.xml
index 5412a444e94..d0346c5f33e 100755
--- a/releng/rcp/org.eclipse.papyrus.rcp.feature/feature.xml
+++ b/releng/rcp/org.eclipse.papyrus.rcp.feature/feature.xml
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<feature
id="org.eclipse.papyrus.rcp.feature"
- version="4.2.0.qualifier"
label="%featureName"
+ version="4.2.0.qualifier"
provider-name="%providerName"
license-feature="org.eclipse.license"
license-feature-version="2.0.0">
@@ -20,8 +20,8 @@
</license>
<url>
- <discovery label="2018-09" url="http://download.eclipse.org/releases/2018-09/"/>
- <discovery label="Eclipse Platform 4.9" url="http://download.eclipse.org/eclipse/updates/4.9"/>
+ <discovery label="2018-12" url="http://download.eclipse.org/releases/2018-12/"/>
+ <discovery label="Eclipse Platform 4.10" url="http://download.eclipse.org/eclipse/updates/4.10"/>
</url>
<requires>
diff --git a/releng/rcp/org.eclipse.papyrus.rcp.product/papyrus.product b/releng/rcp/org.eclipse.papyrus.rcp.product/papyrus.product
index d4cde72f23e..4fc68c218a1 100644
--- a/releng/rcp/org.eclipse.papyrus.rcp.product/papyrus.product
+++ b/releng/rcp/org.eclipse.papyrus.rcp.product/papyrus.product
@@ -205,11 +205,9 @@ Java and all Java-based trademarks are trademarks of Oracle Corporation in the U
</configurations>
<repositories>
- <repository location="http://download.eclipse.org/modeling/mdt/papyrus/updates/nightly/master/" enabled="true" />
- <repository location="http://download.eclipse.org/releases/2018-09/" enabled="true" />
+ <repository location="https://download.eclipse.org/modeling/mdt/papyrus/updates/releases/2018-12/4.2.0/" enabled="true" />
<repository location="http://download.eclipse.org/eclipse/updates/4.10/" enabled="true" />
<repository location="http://download.eclipse.org/releases/2018-12/" enabled="true" />
- <repository location="http://download.eclipse.org/eclipse/updates/4.9/" enabled="true" />
</repositories>
<preferencesInfo>
diff --git a/releng/rcp/org.eclipse.papyrus.rcp/icons/splash.svg b/releng/rcp/org.eclipse.papyrus.rcp/icons/splash.svg
index 2114809dd98..d4c1be65914 100644
--- a/releng/rcp/org.eclipse.papyrus.rcp/icons/splash.svg
+++ b/releng/rcp/org.eclipse.papyrus.rcp/icons/splash.svg
@@ -13,7 +13,10 @@
width="460"
version="1.2"
sodipodi:docname="splash.svg"
- inkscape:version="0.92.2 (5c3e80d, 2017-08-06)">
+ inkscape:version="0.92.3 (2405546, 2018-03-11)"
+ inkscape:export-filename="C:\cygwin64\home\Papyrus\Papyrus-Maintenance\releng\rcp\org.eclipse.papyrus.rcp\icons\splash.svg.png"
+ inkscape:export-xdpi="86.400002"
+ inkscape:export-ydpi="86.400002">
<sodipodi:namedview
pagecolor="#ffffff"
bordercolor="#666666"
@@ -23,12 +26,12 @@
guidetolerance="10"
inkscape:pageopacity="0"
inkscape:pageshadow="2"
- inkscape:window-width="1380"
+ inkscape:window-width="1730"
inkscape:window-height="898"
id="namedview334"
showgrid="false"
inkscape:zoom="0.953584"
- inkscape:cx="44.365474"
+ inkscape:cx="-147.01777"
inkscape:cy="80.855544"
inkscape:window-x="0"
inkscape:window-y="0"
@@ -1779,5 +1782,5 @@
id="tspan4832"
x="197.48167"
y="240.93285"
- style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:16.49736595px;line-height:1.25;font-family:'Open Sans';-inkscape-font-specification:'Open Sans';fill:#333333;fill-opacity:1;stroke:none;stroke-width:1;stroke-opacity:1">2018-12N</tspan></text>
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:16.49736595px;line-height:1.25;font-family:'Open Sans';-inkscape-font-specification:'Open Sans';fill:#333333;fill-opacity:1;stroke:none;stroke-width:1;stroke-opacity:1">2018-12</tspan></text>
</svg>
diff --git a/releng/rcp/org.eclipse.papyrus.rcp/splash.bmp b/releng/rcp/org.eclipse.papyrus.rcp/splash.bmp
index d0af5e1dd98..2f9c45a80ec 100755
--- a/releng/rcp/org.eclipse.papyrus.rcp/splash.bmp
+++ b/releng/rcp/org.eclipse.papyrus.rcp/splash.bmp
Binary files differ
diff --git a/releng/rcp/pom.xml b/releng/rcp/pom.xml
index ecbc0ee12ba..231b4938dc4 100644
--- a/releng/rcp/pom.xml
+++ b/releng/rcp/pom.xml
@@ -26,7 +26,7 @@
<eclipse.simultaneous.release.build>${maven.build.timestamp}</eclipse.simultaneous.release.build>
<!-- Human readable name of the release, e.g. used in the about dialog
(see about.mappings) -->
- <eclipse.simultaneous.release.name>2018-09 (4.8)</eclipse.simultaneous.release.name>
+ <eclipse.simultaneous.release.name>2018-12 (4.10)</eclipse.simultaneous.release.name>
<target.platform>org.eclipse.papyrus.rcp.${target.suffix}.target</target.platform>
</properties>
diff --git a/releng/rcp/targetPlatform/eclipse/org.eclipse.papyrus.rcp.eclipse.target.target b/releng/rcp/targetPlatform/eclipse/org.eclipse.papyrus.rcp.eclipse.target.target
index bed42494aed..4f69894f57e 100755
--- a/releng/rcp/targetPlatform/eclipse/org.eclipse.papyrus.rcp.eclipse.target.target
+++ b/releng/rcp/targetPlatform/eclipse/org.eclipse.papyrus.rcp.eclipse.target.target
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<?pde?>
<!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl -->
-<target name="Papyrus RCP" sequenceNumber="1544603111">
+<target name="Papyrus RCP" sequenceNumber="1547115129">
<locations>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
<unit id="org.eclipse.nebula.widgets.richtext.feature.feature.group" version="1.2.0.201703081533"/>
@@ -39,7 +39,7 @@
</location>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
<unit id="org.eclipse.uml2.sdk.feature.group" version="5.5.0.v20181203-1331"/>
- <repository id="uml" location="file:/home/data/httpd/download.eclipse.org/modeling/mdt/uml2/updates/5.5milestones"/>
+ <repository id="uml" location="file:/home/data/httpd/download.eclipse.org/modeling/mdt/uml2/updates/5.5"/>
</location>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
<unit id="org.eclipse.ocl.examples.classic.feature.group" version="5.7.0.v20181210-1441"/>
@@ -99,7 +99,7 @@
<unit id="org.eclipse.rcp.configuration.feature.group" version="1.1.300.v20181206-0815"/>
<unit id="org.eclipse.equinox.executable.feature.group" version="3.8.200.v20180922-1751"/>
<unit id="org.eclipse.sdk.feature.group" version="4.10.0.v20181206-1038"/>
- <repository id="platform" location="file:/home/data/httpd/download.eclipse.org/eclipse/updates/4.10milestones/S-4.10RC2-201812060815/"/>
+ <repository id="platform" location="file:/home/data/httpd/download.eclipse.org/eclipse/updates/4.10/R-4.10-201812060815/"/>
</location>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
<unit id="org.eclipse.mylyn.ide_feature.feature.group" version="3.24.2.v20180905-0014"/>
@@ -118,7 +118,7 @@
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
<unit id="org.eclipse.xsd.sdk.feature.group" version="2.16.0.v20181127-0852"/>
<unit id="org.eclipse.emf.sdk.feature.group" version="2.16.0.v20181206-1055"/>
- <repository id="emf" location="file:/home/data/httpd/download.eclipse.org/modeling/emf/emf/builds/milestone/S201812060606"/>
+ <repository id="emf" location="file:/home/data/httpd/download.eclipse.org/modeling/emf/emf/builds/release/2.16"/>
</location>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
<unit id="org.eclipse.emf.cdo.epp.feature.group" version="4.7.0.v20180530-1201"/>
diff --git a/releng/rcp/targetPlatform/portable/org.eclipse.papyrus.rcp.portable.target.target b/releng/rcp/targetPlatform/portable/org.eclipse.papyrus.rcp.portable.target.target
index 3f023bc0256..36b68632c4b 100755
--- a/releng/rcp/targetPlatform/portable/org.eclipse.papyrus.rcp.portable.target.target
+++ b/releng/rcp/targetPlatform/portable/org.eclipse.papyrus.rcp.portable.target.target
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<?pde?>
<!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl -->
-<target name="Papyrus RCP" sequenceNumber="1544603111">
+<target name="Papyrus RCP" sequenceNumber="1547115129">
<locations>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
<unit id="org.eclipse.nebula.widgets.richtext.feature.feature.group" version="1.2.0.201703081533"/>
@@ -39,7 +39,7 @@
</location>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
<unit id="org.eclipse.uml2.sdk.feature.group" version="5.5.0.v20181203-1331"/>
- <repository id="uml" location="http://download.eclipse.org/modeling/mdt/uml2/updates/5.5milestones"/>
+ <repository id="uml" location="http://download.eclipse.org/modeling/mdt/uml2/updates/5.5"/>
</location>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
<unit id="org.eclipse.ocl.examples.classic.feature.group" version="5.7.0.v20181210-1441"/>
@@ -99,7 +99,7 @@
<unit id="org.eclipse.rcp.configuration.feature.group" version="1.1.300.v20181206-0815"/>
<unit id="org.eclipse.equinox.executable.feature.group" version="3.8.200.v20180922-1751"/>
<unit id="org.eclipse.sdk.feature.group" version="4.10.0.v20181206-1038"/>
- <repository id="platform" location="http://download.eclipse.org/eclipse/updates/4.10milestones/S-4.10RC2-201812060815/"/>
+ <repository id="platform" location="http://download.eclipse.org/eclipse/updates/4.10/R-4.10-201812060815/"/>
</location>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
<unit id="org.eclipse.mylyn.ide_feature.feature.group" version="3.24.2.v20180905-0014"/>
@@ -118,7 +118,7 @@
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
<unit id="org.eclipse.xsd.sdk.feature.group" version="2.16.0.v20181127-0852"/>
<unit id="org.eclipse.emf.sdk.feature.group" version="2.16.0.v20181206-1055"/>
- <repository id="emf" location="http://download.eclipse.org/modeling/emf/emf/builds/milestone/S201812060606"/>
+ <repository id="emf" location="http://download.eclipse.org/modeling/emf/emf/builds/release/2.16"/>
</location>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
<unit id="org.eclipse.emf.cdo.epp.feature.group" version="4.7.0.v20180530-1201"/>
diff --git a/releng/rcp/targetPlatform/portable/org.eclipse.papyrus.rcp.portable.target.tpd b/releng/rcp/targetPlatform/portable/org.eclipse.papyrus.rcp.portable.target.tpd
index 2c589e789d9..20d3418a953 100644
--- a/releng/rcp/targetPlatform/portable/org.eclipse.papyrus.rcp.portable.target.tpd
+++ b/releng/rcp/targetPlatform/portable/org.eclipse.papyrus.rcp.portable.target.tpd
@@ -13,7 +13,7 @@ location egit "http://download.eclipse.org/egit/updates-5.2" {
//updateFrom("Eclipse",0)
-location platform "http://download.eclipse.org/eclipse/updates/4.10milestones/S-4.10RC2-201812060815/" {
+location platform "http://download.eclipse.org/eclipse/updates/4.10/R-4.10-201812060815/" {
org.eclipse.e4.core.tools.feature.feature.group
org.eclipse.rcp.configuration.feature.group
org.eclipse.equinox.executable.feature.group
@@ -39,7 +39,7 @@ location emfCompare "http://download.eclipse.org/modeling/emf/compare/updates/mi
//updateFrom("EMF (Core)",0)
-location emf "http://download.eclipse.org/modeling/emf/emf/builds/milestone/S201812060606" {
+location emf "http://download.eclipse.org/modeling/emf/emf/builds/release/2.16" {
org.eclipse.xsd.sdk.feature.group
}
diff --git a/releng/toolsmiths/targetPlatform/eclipse/org.eclipse.papyrus.toolsmiths.eclipse.targetplatform.target b/releng/toolsmiths/targetPlatform/eclipse/org.eclipse.papyrus.toolsmiths.eclipse.targetplatform.target
index 4a18592e5d5..c4f0ae9570b 100755
--- a/releng/toolsmiths/targetPlatform/eclipse/org.eclipse.papyrus.toolsmiths.eclipse.targetplatform.target
+++ b/releng/toolsmiths/targetPlatform/eclipse/org.eclipse.papyrus.toolsmiths.eclipse.targetplatform.target
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<?pde?>
<!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl -->
-<target name="Papyrus Toolsmiths" sequenceNumber="1544603119">
+<target name="Papyrus Toolsmiths" sequenceNumber="1547115135">
<locations>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
<unit id="org.eclipse.nebula.widgets.richtext.feature.feature.group" version="1.2.0.201703081533"/>
@@ -39,11 +39,11 @@
</location>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
<unit id="org.eclipse.uml2.sdk.feature.group" version="5.5.0.v20181203-1331"/>
- <repository id="uml" location="file:/home/data/httpd/download.eclipse.org/modeling/mdt/uml2/updates/5.5milestones"/>
+ <repository id="uml" location="file:/home/data/httpd/download.eclipse.org/modeling/mdt/uml2/updates/5.5"/>
</location>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
<unit id="org.eclipse.sdk.feature.group" version="4.10.0.v20181206-1038"/>
- <repository id="platform" location="file:/home/data/httpd/download.eclipse.org/eclipse/updates/4.10milestones/S-4.10RC2-201812060815/"/>
+ <repository id="platform" location="file:/home/data/httpd/download.eclipse.org/eclipse/updates/4.10/R-4.10-201812060815/"/>
</location>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
<unit id="org.eclipse.ocl.examples.classic.feature.group" version="5.7.0.v20181210-1441"/>
@@ -80,7 +80,7 @@
</location>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
<unit id="org.eclipse.emf.sdk.feature.group" version="2.16.0.v20181206-1055"/>
- <repository id="emf" location="file:/home/data/httpd/download.eclipse.org/modeling/emf/emf/builds/milestone/S201812060606"/>
+ <repository id="emf" location="file:/home/data/httpd/download.eclipse.org/modeling/emf/emf/builds/release/2.16"/>
</location>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
<unit id="org.eclipse.emf.query.sdk.feature.group" version="1.12.0.201805030653"/>
@@ -132,7 +132,7 @@
<unit id="org.eclipse.oomph.p2.feature.group" version="1.11.0.v20181203-0741"/>
<unit id="org.eclipse.oomph.setup.feature.group" version="1.11.0.v20181203-0741"/>
<unit id="org.eclipse.oomph.preferences.feature.group" version="1.10.0.v20180706-1242"/>
- <repository id="oomph" location="file:/home/data/httpd/download.eclipse.org/oomph/drops/milestone/S20181204-063112-1.11.0-RC1"/>
+ <repository id="oomph" location="https://download.eclipse.org/oomph/drops/release/1.11.0"/>
</location>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
<repository id="egit" location="file:/home/data/httpd/download.eclipse.org/egit/updates-5.2"/>
diff --git a/releng/toolsmiths/targetPlatform/portable/org.eclipse.papyrus.toolsmiths.portable.targetplatform.target b/releng/toolsmiths/targetPlatform/portable/org.eclipse.papyrus.toolsmiths.portable.targetplatform.target
index e9b4618c370..a7a623599ba 100755
--- a/releng/toolsmiths/targetPlatform/portable/org.eclipse.papyrus.toolsmiths.portable.targetplatform.target
+++ b/releng/toolsmiths/targetPlatform/portable/org.eclipse.papyrus.toolsmiths.portable.targetplatform.target
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<?pde?>
<!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl -->
-<target name="Papyrus Toolsmiths" sequenceNumber="1544603119">
+<target name="Papyrus Toolsmiths" sequenceNumber="1547115135">
<locations>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
<unit id="org.eclipse.nebula.widgets.richtext.feature.feature.group" version="1.2.0.201703081533"/>
@@ -39,11 +39,11 @@
</location>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
<unit id="org.eclipse.uml2.sdk.feature.group" version="5.5.0.v20181203-1331"/>
- <repository id="uml" location="http://download.eclipse.org/modeling/mdt/uml2/updates/5.5milestones"/>
+ <repository id="uml" location="http://download.eclipse.org/modeling/mdt/uml2/updates/5.5"/>
</location>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
<unit id="org.eclipse.sdk.feature.group" version="4.10.0.v20181206-1038"/>
- <repository id="platform" location="http://download.eclipse.org/eclipse/updates/4.10milestones/S-4.10RC2-201812060815/"/>
+ <repository id="platform" location="http://download.eclipse.org/eclipse/updates/4.10/R-4.10-201812060815/"/>
</location>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
<unit id="org.eclipse.ocl.examples.classic.feature.group" version="5.7.0.v20181210-1441"/>
@@ -80,7 +80,7 @@
</location>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
<unit id="org.eclipse.emf.sdk.feature.group" version="2.16.0.v20181206-1055"/>
- <repository id="emf" location="http://download.eclipse.org/modeling/emf/emf/builds/milestone/S201812060606"/>
+ <repository id="emf" location="http://download.eclipse.org/modeling/emf/emf/builds/release/2.16"/>
</location>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
<unit id="org.eclipse.emf.query.sdk.feature.group" version="1.12.0.201805030653"/>
@@ -132,7 +132,7 @@
<unit id="org.eclipse.oomph.p2.feature.group" version="1.11.0.v20181203-0741"/>
<unit id="org.eclipse.oomph.setup.feature.group" version="1.11.0.v20181203-0741"/>
<unit id="org.eclipse.oomph.preferences.feature.group" version="1.10.0.v20180706-1242"/>
- <repository id="oomph" location="http://download.eclipse.org/oomph/drops/milestone/S20181204-063112-1.11.0-RC1"/>
+ <repository id="oomph" location="https://download.eclipse.org/oomph/drops/release/1.11.0"/>
</location>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
<repository id="egit" location="http://download.eclipse.org/egit/updates-5.2"/>
diff --git a/releng/toolsmiths/targetPlatform/portable/org.eclipse.papyrus.toolsmiths.portable.targetplatform.tpd b/releng/toolsmiths/targetPlatform/portable/org.eclipse.papyrus.toolsmiths.portable.targetplatform.tpd
index 38b79cc92a0..da6095c4f49 100644
--- a/releng/toolsmiths/targetPlatform/portable/org.eclipse.papyrus.toolsmiths.portable.targetplatform.tpd
+++ b/releng/toolsmiths/targetPlatform/portable/org.eclipse.papyrus.toolsmiths.portable.targetplatform.tpd
@@ -33,7 +33,7 @@ location gmfTooling "http://download.eclipse.org/modeling/gmp/gmf-tooling/update
//updateFrom("oomph",0)
-location oomph "http://download.eclipse.org/oomph/drops/milestone/S20181204-063112-1.11.0-RC1" {
+location oomph "https://download.eclipse.org/oomph/drops/release/1.11.0" {
org.eclipse.oomph.version.feature.group
org.eclipse.oomph.setup.workingsets.feature.group
org.eclipse.oomph.projectconfig.feature.group

Back to the top