Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorQuentin Le Menez2018-09-13 08:27:32 -0400
committerQuentin Le Menez2018-09-13 09:37:50 -0400
commit6ef395417a548f3060d0874a463b52be5cf9b7a7 (patch)
tree7bce52f699372f4f2e48368a1b1d8a735af621ea
parentf91c7bcde630adb9bacb8f6eb14164539d7f3381 (diff)
downloadorg.eclipse.papyrus-6ef395417a548f3060d0874a463b52be5cf9b7a7.tar.gz
org.eclipse.papyrus-6ef395417a548f3060d0874a463b52be5cf9b7a7.tar.xz
org.eclipse.papyrus-6ef395417a548f3060d0874a463b52be5cf9b7a7.zip
Bug 539022 - [Releng] Update the RCP and SDK of Papyrus
Change-Id: If97bd9322c6619126f016ca50be85f6ffaa79769 Signed-off-by: Quentin Le Menez <quentin.lemenez@cea.fr>
-rw-r--r--features/papyrus-main-features/org.eclipse.papyrus.sdk.feature/feature.xml2
-rw-r--r--features/papyrus-main-features/org.eclipse.papyrus.sdk.feature/pom.xml2
-rw-r--r--plugins/sdk/org.eclipse.papyrus.sdk/META-INF/MANIFEST.MF2
-rw-r--r--plugins/sdk/org.eclipse.papyrus.sdk/pom.xml2
-rw-r--r--releng/main/site/category.xml4
-rwxr-xr-xreleng/rcp/org.eclipse.papyrus.rcp.feature/feature.xml2
-rwxr-xr-xreleng/rcp/org.eclipse.papyrus.rcp.feature/pom.xml2
-rw-r--r--releng/rcp/org.eclipse.papyrus.rcp.product/papyrus.product6
-rw-r--r--releng/rcp/org.eclipse.papyrus.rcp.product/pom.xml2
-rw-r--r--releng/rcp/org.eclipse.papyrus.rcp/META-INF/MANIFEST.MF2
-rwxr-xr-xreleng/rcp/org.eclipse.papyrus.rcp/pom.xml2
-rw-r--r--releng/rcp/pom.xml4
-rw-r--r--releng/rcp/targetPlatform/pom.xml2
13 files changed, 17 insertions, 17 deletions
diff --git a/features/papyrus-main-features/org.eclipse.papyrus.sdk.feature/feature.xml b/features/papyrus-main-features/org.eclipse.papyrus.sdk.feature/feature.xml
index 4921720324d..592d3762c78 100644
--- a/features/papyrus-main-features/org.eclipse.papyrus.sdk.feature/feature.xml
+++ b/features/papyrus-main-features/org.eclipse.papyrus.sdk.feature/feature.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<feature
id="org.eclipse.papyrus.sdk.feature"
- version="4.1.0.qualifier"
+ version="4.2.0.qualifier"
label="%featureName"
provider-name="%providerName"
plugin="org.eclipse.papyrus.sdk"
diff --git a/features/papyrus-main-features/org.eclipse.papyrus.sdk.feature/pom.xml b/features/papyrus-main-features/org.eclipse.papyrus.sdk.feature/pom.xml
index 676bbe5d8df..16701c977a4 100644
--- a/features/papyrus-main-features/org.eclipse.papyrus.sdk.feature/pom.xml
+++ b/features/papyrus-main-features/org.eclipse.papyrus.sdk.feature/pom.xml
@@ -7,6 +7,6 @@
<version>0.0.1-SNAPSHOT</version>
</parent>
<artifactId>org.eclipse.papyrus.sdk.feature</artifactId>
- <version>4.1.0-SNAPSHOT</version>
+ <version>4.2.0-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>
</project>
diff --git a/plugins/sdk/org.eclipse.papyrus.sdk/META-INF/MANIFEST.MF b/plugins/sdk/org.eclipse.papyrus.sdk/META-INF/MANIFEST.MF
index 3966d582c7f..76fcd6b93e7 100644
--- a/plugins/sdk/org.eclipse.papyrus.sdk/META-INF/MANIFEST.MF
+++ b/plugins/sdk/org.eclipse.papyrus.sdk/META-INF/MANIFEST.MF
@@ -1,7 +1,7 @@
Manifest-Version: 1.0
Bundle-Vendor: %providerName
Bundle-ActivationPolicy: lazy
-Bundle-Version: 4.1.0.qualifier
+Bundle-Version: 4.2.0.qualifier
Bundle-Name: %pluginName
Bundle-Localization: plugin
Bundle-ManifestVersion: 2
diff --git a/plugins/sdk/org.eclipse.papyrus.sdk/pom.xml b/plugins/sdk/org.eclipse.papyrus.sdk/pom.xml
index b6fe5c9b8d2..d70c67c7741 100644
--- a/plugins/sdk/org.eclipse.papyrus.sdk/pom.xml
+++ b/plugins/sdk/org.eclipse.papyrus.sdk/pom.xml
@@ -8,6 +8,6 @@
<version>0.0.1-SNAPSHOT</version>
</parent>
<artifactId>org.eclipse.papyrus.sdk</artifactId>
- <version>4.1.0-SNAPSHOT</version>
+ <version>4.2.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/releng/main/site/category.xml b/releng/main/site/category.xml
index f0bf462daf2..5e467d7685a 100644
--- a/releng/main/site/category.xml
+++ b/releng/main/site/category.xml
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<site>
- <feature url="features/org.eclipse.papyrus.sdk.feature_4.1.0.qualifier.jar" id="org.eclipse.papyrus.sdk.feature" version="4.1.0.qualifier">
+ <feature url="features/org.eclipse.papyrus.sdk.feature_4.2.0.qualifier.jar" id="org.eclipse.papyrus.sdk.feature" version="4.2.0.qualifier">
<category name="org.eclipse.papyrus.category"/>
</feature>
- <feature url="features/org.eclipse.papyrus.sdk.feature.source_4.1.0.qualifier.jar" id="org.eclipse.papyrus.sdk.feature.source" version="4.1.0.qualifier">
+ <feature url="features/org.eclipse.papyrus.sdk.feature.source_4.2.0.qualifier.jar" id="org.eclipse.papyrus.sdk.feature.source" version="4.2.0.qualifier">
<category name="org.eclipse.papyrus.category"/>
</feature>
diff --git a/releng/rcp/org.eclipse.papyrus.rcp.feature/feature.xml b/releng/rcp/org.eclipse.papyrus.rcp.feature/feature.xml
index 49b5ca34dd3..13398f8283e 100755
--- a/releng/rcp/org.eclipse.papyrus.rcp.feature/feature.xml
+++ b/releng/rcp/org.eclipse.papyrus.rcp.feature/feature.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<feature
id="org.eclipse.papyrus.rcp.feature"
- version="4.1.0.qualifier"
+ version="4.2.0.qualifier"
label="%featureName"
provider-name="%providerName"
license-feature="org.eclipse.license"
diff --git a/releng/rcp/org.eclipse.papyrus.rcp.feature/pom.xml b/releng/rcp/org.eclipse.papyrus.rcp.feature/pom.xml
index 1ff8375691a..47df953903f 100755
--- a/releng/rcp/org.eclipse.papyrus.rcp.feature/pom.xml
+++ b/releng/rcp/org.eclipse.papyrus.rcp.feature/pom.xml
@@ -6,7 +6,7 @@
<parent>
<artifactId>org.eclipse.papyrus.rcp.releng</artifactId>
<groupId>org.eclipse.papyrus</groupId>
- <version>4.1.0-SNAPSHOT</version>
+ <version>4.2.0-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
diff --git a/releng/rcp/org.eclipse.papyrus.rcp.product/papyrus.product b/releng/rcp/org.eclipse.papyrus.rcp.product/papyrus.product
index 38e24a95f20..dcf9569bb17 100644
--- a/releng/rcp/org.eclipse.papyrus.rcp.product/papyrus.product
+++ b/releng/rcp/org.eclipse.papyrus.rcp.product/papyrus.product
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<?pde version="3.5"?>
-<product name="Papyrus" uid="org.eclipse.papyrus.rcp.product" id="org.eclipse.papyrus.rcp.product" application="org.eclipse.ui.ide.workbench" version="4.1.0.qualifier" useFeatures="true" includeLaunchers="true">
+<product name="Papyrus" uid="org.eclipse.papyrus.rcp.product" id="org.eclipse.papyrus.rcp.product" application="org.eclipse.ui.ide.workbench" version="4.2.0.qualifier" useFeatures="true" includeLaunchers="true">
<aboutInfo>
<image path="/org.eclipse.papyrus.rcp/icons/papyrus_lg.png"/>
@@ -205,9 +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/photon/" enabled="true" />
<repository location="http://download.eclipse.org/eclipse/updates/4.8" enabled="true" />
- <repository location="http://download.eclipse.org/releases/photon/" enabled="true" />
+ <repository location="http://download.eclipse.org/releases/2018-09/" enabled="true" />
+ <repository location="http://download.eclipse.org/modeling/mdt/papyrus/updates/nightly/master/" enabled="true" />
</repositories>
<preferencesInfo>
diff --git a/releng/rcp/org.eclipse.papyrus.rcp.product/pom.xml b/releng/rcp/org.eclipse.papyrus.rcp.product/pom.xml
index 04573ae3298..42000613e43 100644
--- a/releng/rcp/org.eclipse.papyrus.rcp.product/pom.xml
+++ b/releng/rcp/org.eclipse.papyrus.rcp.product/pom.xml
@@ -6,7 +6,7 @@
<parent>
<artifactId>org.eclipse.papyrus.rcp.releng</artifactId>
<groupId>org.eclipse.papyrus</groupId>
- <version>4.1.0-SNAPSHOT</version>
+ <version>4.2.0-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
diff --git a/releng/rcp/org.eclipse.papyrus.rcp/META-INF/MANIFEST.MF b/releng/rcp/org.eclipse.papyrus.rcp/META-INF/MANIFEST.MF
index 4c23e43a513..ca7304e50a7 100644
--- a/releng/rcp/org.eclipse.papyrus.rcp/META-INF/MANIFEST.MF
+++ b/releng/rcp/org.eclipse.papyrus.rcp/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Require-Bundle: org.eclipse.e4.ui.css.swt.theme
Bundle-Vendor: %pluginProvider
Bundle-ActivationPolicy: lazy
-Bundle-Version: 4.1.0.qualifier
+Bundle-Version: 4.2.0.qualifier
Eclipse-BundleShape: dir
Bundle-Name: %pluginName
Bundle-Localization: plugin
diff --git a/releng/rcp/org.eclipse.papyrus.rcp/pom.xml b/releng/rcp/org.eclipse.papyrus.rcp/pom.xml
index 845a86a7d8e..9b15c0bc190 100755
--- a/releng/rcp/org.eclipse.papyrus.rcp/pom.xml
+++ b/releng/rcp/org.eclipse.papyrus.rcp/pom.xml
@@ -6,7 +6,7 @@
<parent>
<artifactId>org.eclipse.papyrus.rcp.releng</artifactId>
<groupId>org.eclipse.papyrus</groupId>
- <version>4.1.0-SNAPSHOT</version>
+ <version>4.2.0-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
diff --git a/releng/rcp/pom.xml b/releng/rcp/pom.xml
index 2e6512686e3..fd3e2a1b482 100644
--- a/releng/rcp/pom.xml
+++ b/releng/rcp/pom.xml
@@ -10,7 +10,7 @@
</parent>
<artifactId>org.eclipse.papyrus.rcp.releng</artifactId>
- <version>4.1.0-SNAPSHOT</version>
+ <version>4.2.0-SNAPSHOT</version>
<packaging>pom</packaging>
<modules>
@@ -24,7 +24,7 @@
<!-- Timestamp used in various places, e.g. the about dialog (see about.mappings) -->
<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>Photon (4.8.0)</eclipse.simultaneous.release.name>
+ <eclipse.simultaneous.release.name>2018-09 (4.8)</eclipse.simultaneous.release.name>
<target.platform>org.eclipse.papyrus.rcp.${target.suffix}.target</target.platform>
</properties>
diff --git a/releng/rcp/targetPlatform/pom.xml b/releng/rcp/targetPlatform/pom.xml
index 4ae34aff5f9..58071d331ff 100644
--- a/releng/rcp/targetPlatform/pom.xml
+++ b/releng/rcp/targetPlatform/pom.xml
@@ -6,7 +6,7 @@
<parent>
<artifactId>org.eclipse.papyrus.rcp.releng</artifactId>
<groupId>org.eclipse.papyrus</groupId>
- <version>4.1.0-SNAPSHOT</version>
+ <version>4.2.0-SNAPSHOT</version>
</parent>
<artifactId>org.eclipse.papyrus.rcp.target.parent</artifactId>

Back to the top