Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFlorian Noyrit2015-06-26 17:40:55 +0000
committerflorian noyrit2015-06-26 17:49:47 +0000
commitdc05ba08549e97800bc10ca547cacb235c1d58de (patch)
tree00d07c07276ea186a24ea8022d1ce918518abfed /releng/rcp
parent18814ac4bce633daf93a07bdae0a311804081206 (diff)
downloadorg.eclipse.papyrus-dc05ba08549e97800bc10ca547cacb235c1d58de.tar.gz
org.eclipse.papyrus-dc05ba08549e97800bc10ca547cacb235c1d58de.tar.xz
org.eclipse.papyrus-dc05ba08549e97800bc10ca547cacb235c1d58de.zip
Update RCP releng to build on Hudson.
Change-Id: Iefc217836807d0bb12fad8b122f38f606225df74 Signed-off-by: Florian Noyrit <florian.noyrit@cea.fr> Reviewed-on: https://git.eclipse.org/r/50972
Diffstat (limited to 'releng/rcp')
-rw-r--r--releng/rcp/org.eclipse.papyrus.rcp.feature/.project28
-rwxr-xr-xreleng/rcp/org.eclipse.papyrus.rcp.feature/feature.xml86
-rwxr-xr-xreleng/rcp/org.eclipse.papyrus.rcp.feature/pom.xml2
-rw-r--r--releng/rcp/org.eclipse.papyrus.rcp.product/.project28
-rw-r--r--releng/rcp/org.eclipse.papyrus.rcp.product/papyrus.p2.inf6
-rw-r--r--releng/rcp/org.eclipse.papyrus.rcp.product/papyrus.product28
-rw-r--r--releng/rcp/org.eclipse.papyrus.rcp.product/pom.xml2
-rw-r--r--releng/rcp/org.eclipse.papyrus.rcp/.classpath2
-rw-r--r--releng/rcp/org.eclipse.papyrus.rcp/.project28
-rw-r--r--releng/rcp/org.eclipse.papyrus.rcp/META-INF/MANIFEST.MF9
-rw-r--r--releng/rcp/org.eclipse.papyrus.rcp/icons/papyrus_lg.pngbin17690 -> 4394 bytes
-rw-r--r--releng/rcp/org.eclipse.papyrus.rcp/plugin.properties12
-rw-r--r--releng/rcp/org.eclipse.papyrus.rcp/plugin.xml4
-rwxr-xr-xreleng/rcp/org.eclipse.papyrus.rcp/pom.xml2
-rw-r--r--releng/rcp/pom.xml96
15 files changed, 263 insertions, 70 deletions
diff --git a/releng/rcp/org.eclipse.papyrus.rcp.feature/.project b/releng/rcp/org.eclipse.papyrus.rcp.feature/.project
new file mode 100644
index 00000000000..de8422f4814
--- /dev/null
+++ b/releng/rcp/org.eclipse.papyrus.rcp.feature/.project
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>org.eclipse.papyrus.rcp.feature</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.jdt.core.javabuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.pde.ManifestBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.pde.SchemaBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.pde.PluginNature</nature>
+ <nature>org.eclipse.jdt.core.javanature</nature>
+ </natures>
+</projectDescription>
diff --git a/releng/rcp/org.eclipse.papyrus.rcp.feature/feature.xml b/releng/rcp/org.eclipse.papyrus.rcp.feature/feature.xml
index 6061279f471..7f0962b671b 100755
--- a/releng/rcp/org.eclipse.papyrus.rcp.feature/feature.xml
+++ b/releng/rcp/org.eclipse.papyrus.rcp.feature/feature.xml
@@ -2,20 +2,19 @@
<feature
id="org.eclipse.papyrus.rcp.feature"
label="Papyrus RCP Feature"
- version="1.0.1.qualifier"
+ version="1.1.0.qualifier"
provider-name="Eclipse Modeling Project">
<description url="http://www.eclipse.org/papyrus">
This package contains Papyrus and a collection of Eclipse Modeling
-Project components, including EMF, GMF, MDT XSD/OCL/UML2, M2M,
-M2T, and EMFT elements. It includes a complete SDK, developer
-tools and source code. Note that the Modeling package includes
-some incubating components, as indicated by feature numbers less
-than 1.0.0 on the feature list.
+Project components, including EMF, MDT XSD/OCL/UML2 elements.
+It includes a complete SDK, developer tools and source code.
+Note that the Modeling package includes some incubating components,
+as indicated by feature numbers less than 1.0.0 on the feature list.
</description>
<copyright>
- Copyright (c) 2013 CEA LIST.
+ Copyright (c) 2015 CEA LIST.
All rights reserved. This program and the accompanying materials
are made available under the terms of the Eclipse Public License
v1.0
@@ -28,60 +27,49 @@ http://www.eclipse.org/legal/epl-v10.html
</license>
<url>
- <discovery label="Luna" url="http://download.eclipse.org/releases/luna/"/>
- <discovery label="Eclipse Platform 4.4" url="http://download.eclipse.org/eclipse/updates/4.4"/>
+ <discovery label="Mars" url="http://download.eclipse.org/releases/mars/"/>
+ <discovery label="Eclipse Platform 4.5" url="http://download.eclipse.org/eclipse/updates/4.5"/>
</url>
<requires>
- <!-- Features for the Eclipse Modeling Tools distribution -->
- <import feature="org.eclipse.amalgam.discovery"/>
- <import feature="org.eclipse.cvs"/>
- <import feature="org.eclipse.egit"/>
- <import feature="org.eclipse.egit.import"/>
- <import feature="org.eclipse.emf.cdo.epp"/>
- <import feature="org.eclipse.emf.compare.ide.ui.source"/>
- <import feature="org.eclipse.emf.compare.source"/>
- <import feature="org.eclipse.emf.eef.codegen.ecore-feature"/>
- <import feature="org.eclipse.emf.query.sdk"/>
- <import feature="org.eclipse.emf.sdk"/>
- <import feature="org.eclipse.emf.transaction.sdk"/>
- <import feature="org.eclipse.emf.validation.sdk"/>
- <import feature="org.eclipse.epp.package.common.feature"/>
+ <!-- Features from Eclipse Modeling -->
<import feature="org.eclipse.equinox.p2.user.ui"/>
- <import feature="org.eclipse.gef.sdk"/>
- <import feature="org.eclipse.gmf.runtime.sdk"/>
<import feature="org.eclipse.help"/>
<import feature="org.eclipse.jdt"/>
- <import feature="org.eclipse.mylyn.bugzilla_feature"/>
- <import feature="org.eclipse.mylyn.context_feature"/>
+ <import feature="org.eclipse.pde"/>
+ <import feature="org.eclipse.sdk"/>
+ <import feature="org.eclipse.e4.core.tools.feature"/>
+ <import feature="org.eclipse.rcp"/>
<import feature="org.eclipse.mylyn.ide_feature"/>
<import feature="org.eclipse.mylyn.java_feature"/>
<import feature="org.eclipse.mylyn.pde_feature"/>
- <import feature="org.eclipse.mylyn.wikitext_feature"/>
+ <import feature="org.eclipse.mylyn.bugzilla_feature"/>
+ <import feature="org.eclipse.mylyn.context_feature"/>
<import feature="org.eclipse.mylyn_feature"/>
- <import feature="org.eclipse.ocl.all.sdk"/>
- <import feature="org.eclipse.emf.cdo.dawn.sdk"/>
- <import feature="org.eclipse.pde"/>
- <import feature="org.eclipse.rcp"/>
- <import feature="org.eclipse.sdk"/>
+ <import feature="org.eclipse.mylyn.wikitext_feature"/>
+ <import feature="org.eclipse.emf.sdk"/>
+ <import feature="org.eclipse.gef.sdk"/>
<import feature="org.eclipse.uml2.sdk"/>
+ <import feature="org.eclipse.ocl.all.sdk"/>
+ <import feature="org.eclipse.emf.transaction.sdk"/>
+ <!--<import feature="org.eclipse.emf.ecoretools.design" version="3.0.0" match="compatible"/>-->
+ <import feature="org.eclipse.emf.query.sdk"/>
<import feature="org.eclipse.xsd.sdk"/>
-
- <!-- Papyrus components -->
- <import feature="org.eclipse.papyrus.sdk.feature.source"/>
- <import feature="org.eclipse.papyrus.extra.feature.source"/>
- <import feature="org.eclipse.papyrus.dev.feature.source"/>
-
- <!-- Additional components -->
- <import feature="org.eclipse.team.svn"/>
- <import feature="org.eclipse.team.svn.revision.graph"/>
- <import feature="org.eclipse.team.svn.mylyn"/>
- <import feature="org.eclipse.gmf.sdk"/>
- <import feature="org.eclipse.gmf.tooling.codegen.xtend2"/>
- <import feature="net.sf.jautodoc.feature"/>
- <import feature="net.sf.eclipsecs"/>
- <import feature="edu.umd.cs.findbugs.plugin.eclipse"/>
- <import feature="org.eclipse.xtend.sdk"/>
+ <import feature="org.eclipse.emf.validation.sdk"/>
+ <import feature="org.eclipse.emf.compare.source"/>
+ <import feature="org.eclipse.emf.compare.ide.ui.source"/>
+ <!--<import feature="org.eclipse.amalgam.discovery"/>-->
+ <import feature="org.eclipse.emf.cdo.epp" />
+ <import feature="org.eclipse.gmf.runtime.sdk"/>
+ <import feature="org.eclipse.egit"/>
+ <import feature="org.eclipse.egit.import"/>
+ <!--<import feature="org.eclipse.emf.eef.codegen.ecore-feature" version="1.2.0.qualifier" match="compatible"/>-->
+ <!--<import feature="org.eclipse.epp.package.common.feature"/>-->
+ <!--<import feature="org.eclipse.emf.ecp.sdk.feature"/>-->
+ <!--<import feature="org.eclipse.emf.emfstore.sdk.feature"/>-->
+
+ <import feature="org.eclipse.epp.logging.aeri.feature"/>
+ <import feature="org.eclipse.papyrus.sdk.feature.source"/>
</requires>
<plugin
diff --git a/releng/rcp/org.eclipse.papyrus.rcp.feature/pom.xml b/releng/rcp/org.eclipse.papyrus.rcp.feature/pom.xml
index 61694e2d3e3..a2a24c58e44 100755
--- a/releng/rcp/org.eclipse.papyrus.rcp.feature/pom.xml
+++ b/releng/rcp/org.eclipse.papyrus.rcp.feature/pom.xml
@@ -2,7 +2,7 @@
<project>
<modelVersion>4.0.0</modelVersion>
<parent>
- <artifactId>org.eclipse.papyrus</artifactId>
+ <artifactId>org.eclipse.papyrus.rcp.releng</artifactId>
<groupId>org.eclipse.papyrus</groupId>
<version>1.1.0-SNAPSHOT</version>
<relativePath>..</relativePath>
diff --git a/releng/rcp/org.eclipse.papyrus.rcp.product/.project b/releng/rcp/org.eclipse.papyrus.rcp.product/.project
new file mode 100644
index 00000000000..a51d907500a
--- /dev/null
+++ b/releng/rcp/org.eclipse.papyrus.rcp.product/.project
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>org.eclipse.papyrus.rcp.product</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.jdt.core.javabuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.pde.ManifestBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.pde.SchemaBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.pde.PluginNature</nature>
+ <nature>org.eclipse.jdt.core.javanature</nature>
+ </natures>
+</projectDescription>
diff --git a/releng/rcp/org.eclipse.papyrus.rcp.product/papyrus.p2.inf b/releng/rcp/org.eclipse.papyrus.rcp.product/papyrus.p2.inf
index c71c0269901..e7361cb6e63 100644
--- a/releng/rcp/org.eclipse.papyrus.rcp.product/papyrus.p2.inf
+++ b/releng/rcp/org.eclipse.papyrus.rcp.product/papyrus.p2.inf
@@ -7,8 +7,4 @@ instructions.configure=\
org.eclipse.equinox.p2.touchpoint.natives.remove(path:${installFolder}/Eclipse.app/Contents/MacOS);\
org.eclipse.equinox.p2.touchpoint.natives.remove(path:${installFolder}/Eclipse.app/Contents);\
org.eclipse.equinox.p2.touchpoint.natives.remove(path:${installFolder}/Eclipse.app);\
- org.eclipse.equinox.p2.touchpoint.natives.remove(path:${installFolder}/eclipse);\
- addRepository(type:0,name:Eclipse Luna,location:http${#58}//download.eclipse.org/releases/luna/);\
- addRepository(type:1,name:Eclipse Luna,location:http${#58}//download.eclipse.org/releases/luna/);\
- addRepository(type:0,name:Eclipse Platform 4.4,location:http${#58}//download.eclipse.org/eclipse/updates/4.4);\
- addRepository(type:1,name:Eclipse Platform 4.4,location:http${#58}//download.eclipse.org/eclipse/updates/4.4);
+ org.eclipse.equinox.p2.touchpoint.natives.remove(path:${installFolder}/eclipse);\ \ No newline at end of file
diff --git a/releng/rcp/org.eclipse.papyrus.rcp.product/papyrus.product b/releng/rcp/org.eclipse.papyrus.rcp.product/papyrus.product
index b179b18a44d..016e4b76d97 100644
--- a/releng/rcp/org.eclipse.papyrus.rcp.product/papyrus.product
+++ b/releng/rcp/org.eclipse.papyrus.rcp.product/papyrus.product
@@ -1,14 +1,14 @@
<?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="1.0.1.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="1.1.0.qualifier" useFeatures="true" includeLaunchers="true">
<aboutInfo>
<image path="/org.eclipse.papyrus.rcp/icons/papyrus_lg.png"/>
<text>
Papyrus
-Version: 1.0.0
+Version: 1.1.0
(c) Copyright Eclipse contributors and others 2000, 2013. All rights reserved.
Visit http://www.eclipse.org/platform
@@ -22,9 +22,12 @@ Apache Software Foundation http://www.apache.org/
</configIni>
<launcherArgs>
- <programArgs>-showsplash org.eclipse.papyrus.rcp --launcher.XXMaxPermSize 256m --launcher.defaultAction openFile</programArgs>
- <vmArgs>-Xms128m -Xmx900m</vmArgs>
- <vmArgsMac>-Xdock:icon=../Resources/papyrus.icns -XstartOnFirstThread -Dorg.eclipse.swt.internal.carbon.smallFonts</vmArgsMac>
+ <programArgs>-showsplash org.eclipse.papyrus.rcp --launcher.XXMaxPermSize 256m --launcher.defaultAction openFile
+ </programArgs>
+ <vmArgs>-Xms128m -Xmx900m
+ </vmArgs>
+ <vmArgsMac>-Xdock:icon=../Resources/papyrus.icns -XstartOnFirstThread -Dorg.eclipse.swt.internal.carbon.smallFonts
+ </vmArgsMac>
</launcherArgs>
<windowImages i16="/org.eclipse.papyrus.rcp/icons/papyrus16.png" i32="/org.eclipse.papyrus.rcp/icons/papyrus32.png" i48="/org.eclipse.papyrus.rcp/icons/papyrus48.png" i64="/org.eclipse.papyrus.rcp/icons/papyrus64.png" i128="/org.eclipse.papyrus.rcp/icons/papyrus128.png"/>
@@ -51,7 +54,7 @@ Apache Software Foundation http://www.apache.org/
<url>http://eclipse.org/legal/epl/notice.php</url>
<text>
Eclipse Foundation Software User Agreement
-February 1, 2011
+February 1, 2015
Usage Of Content
@@ -198,4 +201,17 @@ Java and all Java-based trademarks are trademarks of Oracle Corporation in the U
<property name="osgi.bundles.defaultStartLevel" value="4" />
</configurations>
+ <repositories>
+ <repository location="http://download.eclipse.org/releases/mars/" enabled="true" />
+ <repository location="http://download.eclipse.org/eclipse/updates/4.5" enabled="true" />
+ <repository location="http://download.eclipse.org/modeling/mdt/papyrus/updates/nightly/mars" enabled="true" />
+ </repositories>
+
+ <preferencesInfo>
+ <targetfile overwrite="false"/>
+ </preferencesInfo>
+
+ <cssInfo>
+ </cssInfo>
+
</product>
diff --git a/releng/rcp/org.eclipse.papyrus.rcp.product/pom.xml b/releng/rcp/org.eclipse.papyrus.rcp.product/pom.xml
index 0e6a9be9277..af5decbab7d 100644
--- a/releng/rcp/org.eclipse.papyrus.rcp.product/pom.xml
+++ b/releng/rcp/org.eclipse.papyrus.rcp.product/pom.xml
@@ -2,7 +2,7 @@
<project>
<modelVersion>4.0.0</modelVersion>
<parent>
- <artifactId>org.eclipse.papyrus</artifactId>
+ <artifactId>org.eclipse.papyrus.rcp.releng</artifactId>
<groupId>org.eclipse.papyrus</groupId>
<version>1.1.0-SNAPSHOT</version>
<relativePath>..</relativePath>
diff --git a/releng/rcp/org.eclipse.papyrus.rcp/.classpath b/releng/rcp/org.eclipse.papyrus.rcp/.classpath
index f6e5811e42c..49e77f4e0f2 100644
--- a/releng/rcp/org.eclipse.papyrus.rcp/.classpath
+++ b/releng/rcp/org.eclipse.papyrus.rcp/.classpath
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="output" path="bin"/>
</classpath>
diff --git a/releng/rcp/org.eclipse.papyrus.rcp/.project b/releng/rcp/org.eclipse.papyrus.rcp/.project
new file mode 100644
index 00000000000..a4c8c582447
--- /dev/null
+++ b/releng/rcp/org.eclipse.papyrus.rcp/.project
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>org.eclipse.papyrus.rcp</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.jdt.core.javabuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.pde.ManifestBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.pde.SchemaBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.pde.PluginNature</nature>
+ <nature>org.eclipse.jdt.core.javanature</nature>
+ </natures>
+</projectDescription>
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 d21c77108cd..f7157105bc0 100644
--- a/releng/rcp/org.eclipse.papyrus.rcp/META-INF/MANIFEST.MF
+++ b/releng/rcp/org.eclipse.papyrus.rcp/META-INF/MANIFEST.MF
@@ -1,10 +1,11 @@
Manifest-Version: 1.0
Bundle-ManifestVersion: 2
-Bundle-Name: Papyrus
+Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.papyrus.rcp;singleton:=true
-Bundle-Version: 1.0.1.qualifier
-Bundle-Vendor: Eclipse Modeling Project
+Bundle-Version: 1.1.0.qualifier
+Bundle-Vendor: %pluginProvider
Bundle-ActivationPolicy: lazy
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Bundle-Localization: plugin
+Bundle-RequiredExecutionEnvironment: JavaSE-1.7
Require-Bundle: org.eclipse.e4.ui.css.swt.theme
Eclipse-BundleShape: dir
diff --git a/releng/rcp/org.eclipse.papyrus.rcp/icons/papyrus_lg.png b/releng/rcp/org.eclipse.papyrus.rcp/icons/papyrus_lg.png
index e3f1513c1d7..6117d400ec3 100644
--- a/releng/rcp/org.eclipse.papyrus.rcp/icons/papyrus_lg.png
+++ b/releng/rcp/org.eclipse.papyrus.rcp/icons/papyrus_lg.png
Binary files differ
diff --git a/releng/rcp/org.eclipse.papyrus.rcp/plugin.properties b/releng/rcp/org.eclipse.papyrus.rcp/plugin.properties
new file mode 100644
index 00000000000..3dc7358c285
--- /dev/null
+++ b/releng/rcp/org.eclipse.papyrus.rcp/plugin.properties
@@ -0,0 +1,12 @@
+################################################################################
+# Copyright (c) 2008 CEA LIST.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+#
+# Contributors:
+# CEA LIST - initial API and implementation
+################################################################################
+pluginName=Papyrus RCP
+pluginProvider=Eclipse Modeling Project
diff --git a/releng/rcp/org.eclipse.papyrus.rcp/plugin.xml b/releng/rcp/org.eclipse.papyrus.rcp/plugin.xml
index 99008c544c5..2c19eb0cad1 100644
--- a/releng/rcp/org.eclipse.papyrus.rcp/plugin.xml
+++ b/releng/rcp/org.eclipse.papyrus.rcp/plugin.xml
@@ -6,7 +6,7 @@
point="org.eclipse.core.runtime.products">
<product
application="org.eclipse.ui.ide.workbench"
- description="Papyrus&#x0D;&#x0A;&#x0D;&#x0A;Version: 1.0.0&#x0D;&#x0A;&#x0D;&#x0A;(c) Copyright Eclipse contributors and others 2000, 2013. All rights reserved.&#x0D;&#x0A;Visit http://www.eclipse.org/platform&#x0D;&#x0A;&#x0D;&#x0A;This product includes software developed by the&#x0D;&#x0A;Apache Software Foundation http://www.apache.org/"
+ description="Papyrus&#x0D;&#x0A;&#x0D;&#x0A;Version: 1.0.0&#x0D;&#x0A;&#x0D;&#x0A;(c) Copyright Eclipse contributors and others 2000, 2015. All rights reserved.&#x0D;&#x0A;Visit http://www.eclipse.org/platform&#x0D;&#x0A;&#x0D;&#x0A;This product includes software developed by the&#x0D;&#x0A;Apache Software Foundation http://www.apache.org/"
name="Papyrus">
<property name="windowImages" value="icons/papyrus16.png,icons/papyrus32.png,icons/papyrus48.png,icons/papyrus64.png,icons/papyrus128.png"/>
<property name="aboutImage" value="icons/papyrus_lg.png"/>
@@ -51,7 +51,7 @@
</property>
<property
name="aboutText"
- value="Papyrus&#x0A;&#x0A;Version: 1.0.0&#x0A;&#x0A;(c) Copyright Eclipse contributors and others 2000, 2013. All rights reserved.&#x0A;Visit http://www.eclipse.org/platform&#x0A;&#x0A;This product includes software developed by the&#x0A;Apache Software Foundation http://www.apache.org/">
+ value="Papyrus&#x0A;&#x0A;Version: 1.0.0&#x0A;&#x0A;(c) Copyright Eclipse contributors and others 2000, 2015. All rights reserved.&#x0A;Visit http://www.eclipse.org/platform&#x0A;&#x0A;This product includes software developed by the&#x0A;Apache Software Foundation http://www.apache.org/">
</property>
</product>
</extension>
diff --git a/releng/rcp/org.eclipse.papyrus.rcp/pom.xml b/releng/rcp/org.eclipse.papyrus.rcp/pom.xml
index 6f7f0d84a98..c725782e866 100755
--- a/releng/rcp/org.eclipse.papyrus.rcp/pom.xml
+++ b/releng/rcp/org.eclipse.papyrus.rcp/pom.xml
@@ -2,7 +2,7 @@
<project>
<modelVersion>4.0.0</modelVersion>
<parent>
- <artifactId>org.eclipse.papyrus</artifactId>
+ <artifactId>org.eclipse.papyrus.rcp.releng</artifactId>
<groupId>org.eclipse.papyrus</groupId>
<version>1.1.0-SNAPSHOT</version>
<relativePath>..</relativePath>
diff --git a/releng/rcp/pom.xml b/releng/rcp/pom.xml
index 520b6098aee..445f36808c6 100644
--- a/releng/rcp/pom.xml
+++ b/releng/rcp/pom.xml
@@ -13,9 +13,92 @@
<properties>
<tycho-version>0.23.0</tycho-version>
<tychoExtrasVersion>0.23.0</tychoExtrasVersion>
+ <jarSignerVersion>1.1.2</jarSignerVersion>
+ <findbugs.version>2.5.3</findbugs.version>
+ <xtext.version>2.7.3</xtext.version>
+ <java.source.version>1.7</java.source.version>
+ <java.target.version>1.7</java.target.version>
+ <papyrus.eclipse.target>mars</papyrus.eclipse.target>
+ <mylyn.wikitext.version>2.4.0-SNAPSHOT</mylyn.wikitext.version>
+ <skipAllTests>false</skipAllTests>
+ <skipInnerTests>true</skipInnerTests>
+ <papyrus.repo.main>http://download.eclipse.org/modeling/mdt/papyrus/updates/nightly/${papyrus.eclipse.target}</papyrus.repo.main>
</properties>
<repositories>
<repository>
+ <id>papyrus-main</id>
+ <layout>p2</layout>
+ <url>${papyrus.repo.main}</url>
+ </repository>
+ <repository>
+ <id>mylyn-mars</id>
+ <layout>p2</layout>
+ <!-- updateFrom("Mylyn Mars",0) -->
+ <url>http://download.eclipse.org/mylyn/snapshots/3.16</url>
+ </repository>
+ <repository>
+ <id>emf-query</id>
+ <layout>p2</layout>
+ <!-- updateFrom("EMF Query",0) -->
+ <url>http://download.eclipse.org/modeling/emf/query/updates/releases/R201505312221</url>
+ </repository>
+ <repository>
+ <id>emf-compare</id>
+ <layout>p2</layout>
+ <!-- updateFrom("EMF Compare",0) -->
+ <url>http://download.eclipse.org/modeling/emf/compare/updates/milestones/3.1/S201506080833</url>
+ </repository>
+ <repository>
+ <id>emf-cdo</id>
+ <layout>p2</layout>
+ <!-- updateFrom("EMF CDO",0) -->
+ <url>http://download.eclipse.org/modeling/emf/cdo/drops/R20150610-1526</url>
+ </repository>
+ <repository>
+ <id>egit</id>
+ <layout>p2</layout>
+ <!-- updateFrom("EGIT",0) -->
+ <url>http://download.eclipse.org/egit/updates-4.0</url>
+ </repository>
+ <repository>
+ <id>eef</id>
+ <layout>p2</layout>
+ <!-- updateFrom("EEF",0) -->
+ <url>http://download.eclipse.org/modeling/emft/eef/updates/milestones/1.5/S201505291308/</url>
+ </repository>
+ <repository>
+ <id>acceleo</id>
+ <layout>p2</layout>
+ <!-- updateFrom("acceleo",0) -->
+ <url>http://download.eclipse.org/acceleo/updates/milestones/3.6/S201506080954</url>
+ </repository>
+ <repository>
+ <id>epp-log</id>
+ <layout>p2</layout>
+ <!-- updateFrom("EPP Log",0) -->
+ <url>http://download.eclipse.org/technology/epp/logging/milestones/</url>
+ </repository>
+ <repository>
+ <id>oomph</id>
+ <layout>p2</layout>
+ <!-- updateFrom("oomph",0) -->
+ <url>http://download.eclipse.org/oomph/drops/milestone/S20150610-124713-1.1.0-RC4</url>
+ </repository>
+ <!--<repository>
+ <id>ecp</id>
+ <layout>p2</layout>
+ <url>http://download.eclipse.org/ecp/rt/160_2</url>
+ </repository>
+ <repository>
+ <id>emfstore</id>
+ <layout>p2</layout>
+ <url>http://download.eclipse.org/emfstore/rt/150</url>
+ </repository> -->
+
+
+
+ <!-- From Main Papyrus -->
+ <repository>
<id>emf-emf</id>
<layout>p2</layout>
<!-- updateFrom("EMF (Core)",0) -->
@@ -105,6 +188,13 @@
<!-- manualUpdate -->
<url>http://download.eclipse.org/nattable/releases/1.2.0/repository/</url>
</repository>
+ <!-- Bug 468668: Reinstate and update this when the TableCombo has a new release for Mars or later.
+ <repository>
+ <id>nebula-tablecombo</id>
+ <layout>p2</layout>
+ <url>http://download.eclipse.org/technology/nebula/archives/Q12015/release/</url>
+ </repository>
+ -->
<repository>
<id>orbit</id>
<layout>p2</layout>
@@ -128,6 +218,12 @@
<layout>p2</layout>
<!-- updateFrom("XWT",0) -->
<url>http://download.eclipse.org/xwt/release-1.1.0</url>
+ </repository>
+ <repository>
+ <id>subversive</id>
+ <layout>p2</layout>
+ <!-- updateFrom("Subversive",0) -->
+ <url>http://download.eclipse.org/technology/subversive/3.0/mars-site/</url>
</repository>
</repositories>
<build>

Back to the top