Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCamille Letavernier2015-02-02 15:24:20 +0000
committerCamille Letavernier2015-02-02 15:24:20 +0000
commit9b60853d9b65cdcfd1330ea91e44e0ea2eaf819a (patch)
tree9de440a42d80f8ffffbfd7586e52545736e0d816
parent4ba1f362fbae6ca568d400c9df3ede822fe57d96 (diff)
downloadorg.eclipse.papyrus-9b60853d9b65cdcfd1330ea91e44e0ea2eaf819a.tar.gz
org.eclipse.papyrus-9b60853d9b65cdcfd1330ea91e44e0ea2eaf819a.tar.xz
org.eclipse.papyrus-9b60853d9b65cdcfd1330ea91e44e0ea2eaf819a.zip
[Developer Tools - Releng] Add releng.tools and project.management
plug-ins to the developer build - Add missing dependencies - Fix Java version - Add a dependency to extra-plugins for eclipse.project.editors
-rwxr-xr-xfeatures/papyrus-dev-features/org.eclipse.papyrus.dev.feature/feature.xml159
-rw-r--r--releng/Dev.launch1
-rw-r--r--releng/top-pom-dev.xml24
3 files changed, 138 insertions, 46 deletions
diff --git a/features/papyrus-dev-features/org.eclipse.papyrus.dev.feature/feature.xml b/features/papyrus-dev-features/org.eclipse.papyrus.dev.feature/feature.xml
index 95b3ea2a156..0c85fe8f35f 100755
--- a/features/papyrus-dev-features/org.eclipse.papyrus.dev.feature/feature.xml
+++ b/features/papyrus-dev-features/org.eclipse.papyrus.dev.feature/feature.xml
@@ -1,40 +1,119 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><feature id="org.eclipse.papyrus.dev.feature" label="Papyrus Developer Tools (Incubation)" provider-name="Eclipse Modeling Project" version="1.1.0.qualifier">
-
- <copyright url="http://www.eclipse.org/legal/epl-v10.html">
- Copyright (c) 2014 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
- </copyright>
-
- <license url="%licenseURL">
- %license
- </license>
-
- <plugin download-size="0" id="org.eclipse.papyrus.codegen" install-size="0" unpack="false" version="0.0.0"/>
-
- <plugin download-size="0" id="org.eclipse.papyrus.dev.view.services.edit.request" install-size="0" unpack="false" version="0.0.0"/>
-
- <plugin download-size="0" id="org.eclipse.papyrus.documentation.plugin" install-size="0" unpack="false" version="0.0.0"/>
-
- <plugin download-size="0" id="org.eclipse.papyrus.documentation.plugin.edit" install-size="0" unpack="false" version="0.0.0"/>
-
- <plugin download-size="0" id="org.eclipse.papyrus.gmf.editpoliciesstates" install-size="0" unpack="false" version="0.0.0"/>
-
- <plugin download-size="0" id="org.eclipse.papyrus.gmf.editpartview" install-size="0" unpack="false" version="0.0.0"/>
-
- <plugin download-size="0" id="org.eclipse.papyrus.gmf.figureview" install-size="0" unpack="false" version="0.0.0"/>
-
- <plugin download-size="0" id="org.eclipse.papyrus.gmfgenextension" install-size="0" unpack="false" version="0.0.0"/>
-
- <plugin download-size="0" id="org.eclipse.papyrus.infra.gmfdiag.css.debug" install-size="0" unpack="false" version="0.0.0"/>
-
- <plugin download-size="0" id="org.eclipse.papyrus.domaincontextcodegen" install-size="0" unpack="false" version="0.0.0"/>
-
- <plugin download-size="0" id="org.eclipse.papyrus.domaincontextcodegen.edit" install-size="0" unpack="false" version="0.0.0"/>
-
- <plugin download-size="0" id="org.eclipse.papyrus.domaincontextcodegen.editor" install-size="0" unpack="false" version="0.0.0"/>
-
-</feature> \ No newline at end of file
+<?xml version="1.0" encoding="UTF-8"?>
+<feature
+ id="org.eclipse.papyrus.dev.feature"
+ label="Papyrus Developer Tools (Incubation)"
+ version="1.1.0.qualifier"
+ provider-name="Eclipse Modeling Project">
+
+ <copyright url="http://www.eclipse.org/legal/epl-v10.html">
+ Copyright (c) 2014 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
+ </copyright>
+
+ <license url="%licenseURL">
+ %license
+ </license>
+
+ <plugin
+ id="org.eclipse.papyrus.codegen"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="org.eclipse.papyrus.dev.view.services.edit.request"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="org.eclipse.papyrus.documentation.plugin"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="org.eclipse.papyrus.documentation.plugin.edit"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="org.eclipse.papyrus.gmf.editpoliciesstates"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="org.eclipse.papyrus.gmf.editpartview"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="org.eclipse.papyrus.gmf.figureview"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="org.eclipse.papyrus.gmfgenextension"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="org.eclipse.papyrus.infra.gmfdiag.css.debug"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="org.eclipse.papyrus.domaincontextcodegen"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="org.eclipse.papyrus.domaincontextcodegen.edit"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="org.eclipse.papyrus.domaincontextcodegen.editor"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="org.eclipse.papyrus.releng.tools"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="org.eclipse.papyrus.dev.project.management"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+</feature>
diff --git a/releng/Dev.launch b/releng/Dev.launch
index 83214400eeb..7e4069c2b4f 100644
--- a/releng/Dev.launch
+++ b/releng/Dev.launch
@@ -7,6 +7,7 @@
<stringAttribute key="M2_PROFILES" value=""/>
<listAttribute key="M2_PROPERTIES">
<listEntry value="papyrus.repo.main=file:/${project_loc:releng}/main/target/repository"/>
+<listEntry value="papyrus.repo.extra=file:/${project_loc:releng}/extras/target/repository"/>
</listAttribute>
<stringAttribute key="M2_RUNTIME" value="EMBEDDED"/>
<booleanAttribute key="M2_SKIP_TESTS" value="false"/>
diff --git a/releng/top-pom-dev.xml b/releng/top-pom-dev.xml
index fce4c78ae9c..b89086ce51a 100644
--- a/releng/top-pom-dev.xml
+++ b/releng/top-pom-dev.xml
@@ -8,7 +8,7 @@
<modules>
<module>../plugins/developer/org.eclipse.papyrus.codegen</module>
<module>../plugins/developer/org.eclipse.papyrus.dev.java.utils</module>
- <!-- <module>../plugins/developer/org.eclipse.papyrus.dev.project.management</module> -->
+ <module>../plugins/developer/org.eclipse.papyrus.dev.project.management</module>
<module>../plugins/developer/org.eclipse.papyrus.dev.view.services.edit.request</module>
<module>../plugins/developer/org.eclipse.papyrus.developer.profile</module>
<!-- <module>../plugins/developer/org.eclipse.papyrus.diagramdev.modelexplorer</module> -->
@@ -25,7 +25,7 @@
<!-- <module>../plugins/developer/org.eclipse.papyrus.infra.emf.commandstack</module>-->
<module>../plugins/developer/org.eclipse.papyrus.infra.extendedtypes.elementtypeview</module>
<module>../plugins/developer/org.eclipse.papyrus.mwe2.utils</module>
- <!-- <module>../plugins/developer/org.eclipse.papyrus.releng.tools</module>-->
+ <module>../plugins/developer/org.eclipse.papyrus.releng.tools</module>
<!-- <module>../plugins/developer/org.eclipse.papyrus.sysml.sysmloveruml.codegen</module> -->
<module>../plugins/developer/org.eclipse.papyrus.uml.developer.mde</module>
<module>../plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.debug</module>
@@ -35,13 +35,14 @@
<properties>
<tycho-version>0.22.0</tycho-version>
<tychoExtrasVersion>0.22.0</tychoExtrasVersion>
- <papyrus.repo.main>http://download.eclipse.org/modeling/mdt/papyrus/updates/nightly/mars</papyrus.repo.main>
+ <papyrus.repo.main>http://download.eclipse.org/modeling/mdt/papyrus/updates/nightly/mars/main</papyrus.repo.main>
+ <papyrus.repo.extra>http://download.eclipse.org/modeling/mdt/papyrus/updates/nightly/mars/extra</papyrus.repo.extra>
</properties>
<repositories>
<repository>
<id>eclipse</id>
<layout>p2</layout>
- <url>http://download.eclipse.org/releases/staging</url>
+ <url>http://download.eclipse.org/releases/mars</url>
</repository>
<repository>
<id>ep</id>
@@ -56,10 +57,21 @@
<url>http://download.eclipse.org/modeling/emf/cdo/drops/R20140610-0212</url>
</repository>
<repository>
+ <id>b3</id>
+ <layout>p2</layout>
+ <!-- B3 is not in the release train. Always targets the latest released version (i.e. Luna for Mars Development) -->
+ <url>http://download.eclipse.org/modeling/emft/b3/updates-4.4</url>
+ </repository>
+ <repository>
<id>papyrus-main</id>
<layout>p2</layout>
<url>${papyrus.repo.main}</url>
</repository>
+ <repository>
+ <id>papyrus-extra</id>
+ <layout>p2</layout>
+ <url>${papyrus.repo.extra}</url>
+ </repository>
</repositories>
<build>
<plugins>
@@ -76,8 +88,8 @@
<artifactId>tycho-compiler-plugin</artifactId>
<version>${tycho-version}</version>
<configuration>
- <source>1.6</source>
- <target>1.6</target>
+ <source>1.7</source>
+ <target>1.7</target>
<optimize>true</optimize>
<showWarnings>true</showWarnings>
</configuration>

Back to the top