Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFrancois Le Fevre - CEA2016-01-29 07:21:20 +0000
committerGerrit Code Review @ Eclipse.org2016-02-01 12:01:59 +0000
commit964f8076a2c938edebc3fc0568aa19c5a9734cce (patch)
tree4c1322dacec887a56b57f2d1fc268ae31ddb93f3
parent6b44efc045b4b4dfe89d3a1b53c35a0a525dae61 (diff)
downloadorg.eclipse.papyrus-964f8076a2c938edebc3fc0568aa19c5a9734cce.tar.gz
org.eclipse.papyrus-964f8076a2c938edebc3fc0568aa19c5a9734cce.tar.xz
org.eclipse.papyrus-964f8076a2c938edebc3fc0568aa19c5a9734cce.zip
Bug 486789 - [releng] target platform configuration seems to lack of
linux and macos - proposition to factorize the tycho target platform configuration in the parent pom. -needed to succeed for diagram class code generation -see https://wiki.eclipse.org/Tycho/Reference_Card#Target_runtime_environment Change-Id: I248a8effe638a4541577fecc3792496b07554e5b Signed-off-by: Francois Le Fevre - CEA <francois.le-fevre@cea.fr>
-rwxr-xr-xreleng/dev/pom.xml484
-rwxr-xr-xreleng/extra-tests/pom.xml44
-rw-r--r--releng/extra/pom.xml14
-rw-r--r--releng/main-tests/pom.xml38
-rwxr-xr-xreleng/main/pom.xml10
-rw-r--r--releng/pom.xml577
-rw-r--r--releng/rcp/pom.xml396
7 files changed, 734 insertions, 829 deletions
diff --git a/releng/dev/pom.xml b/releng/dev/pom.xml
index 29f23dfdbe0..8a86f74e77a 100755
--- a/releng/dev/pom.xml
+++ b/releng/dev/pom.xml
@@ -1,247 +1,237 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <groupId>org.eclipse.papyrus</groupId>
- <artifactId>org.eclipse.papyrus.dev.releng</artifactId>
- <version>1.2.0-SNAPSHOT</version>
- <packaging>pom</packaging>
- <parent>
- <groupId>org.eclipse.papyrus</groupId>
- <artifactId>org.eclipse.papyrus.all.releng</artifactId>
- <version>1.2.0-SNAPSHOT</version>
- <relativePath>..</relativePath>
- </parent>
- <modules>
- <module>../../plugins/developer/org.eclipse.papyrus.codegen</module>
- <module>../../plugins/developer/org.eclipse.papyrus.def</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.assistants.codegen</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> -->
- <module>../../plugins/developer/org.eclipse.papyrus.domaincodegen.ui</module>
- <module>../../plugins/developer/org.eclipse.papyrus.domaincontextcodegen</module>
- <module>../../plugins/developer/org.eclipse.papyrus.domaincontextcodegen.edit</module>
- <module>../../plugins/developer/org.eclipse.papyrus.domaincontextcodegen.editor</module>
- <module>../../plugins/developer/org.eclipse.papyrus.gmf.editpartview</module>
- <module>../../plugins/developer/org.eclipse.papyrus.gmf.editpoliciesstates</module>
- <module>../../plugins/developer/org.eclipse.papyrus.gmf.figureview</module>
- <module>../../plugins/developer/org.eclipse.papyrus.gmfgenextension</module>
- <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.uml.developer.mde</module>
- <module>../../plugins/developer/org.eclipse.papyrus.dev.tests.framework</module>
- <module>../../plugins/developer/org.eclipse.papyrus.dev.tests.framework.ui</module>
- <module>../../tests/framework/org.eclipse.papyrus.tests.framework</module>
- <module>../../tests/framework/org.eclipse.papyrus.tests.framework.annotations</module>
- <module>../../tests/framework/org.eclipse.papyrus.tests.framework.edit</module>
- <module>../../tests/framework/org.eclipse.papyrus.tests.framework.editor</module>
- <module>../../plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.debug</module>
- <module>../../features/papyrus-dev-features/org.eclipse.papyrus.dev.feature</module>
- <module>../../features/papyrus-dev-features/org.eclipse.papyrus.junit.feature</module>
- <module>../../tests/junit/plugins/junit/org.eclipse.papyrus.junit.framework</module>
- <module>../../tests/junit/plugins/junit/org.eclipse.papyrus.junit.utils</module>
- <module>../../tests/junit/plugins/developer/org.eclipse.papyrus.bundles.tests</module>
- <module>site</module>
- </modules>
- <repositories>
- <repository>
- <id>nebula-tablecombo</id>
- <layout>p2</layout>
- <url>${nebula-tablecombo.repo.url}</url>
- </repository>
- <repository>
- <id>m2t-acceleo</id>
- <layout>p2</layout>
- <url>${m2t-acceleo.repo.url}</url>
- </repository>
- <repository>
- <id>b3</id>
- <layout>p2</layout>
- <url>${b3.repo.url}</url>
- </repository>
- <repository>
- <id>oomph</id>
- <layout>p2</layout>
- <url>${oomph.repo.url}</url>
- </repository>
- <repository>
- <id>UPR</id>
- <layout>p2</layout>
- <url>${upr.repo.url}</url>
- </repository>
- </repositories>
- <build>
- <pluginManagement>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <version>3.2</version>
- <configuration>
- <source>${java.source.version}</source>
- <target>${java.target.version}</target>
- </configuration>
- </plugin>
- </plugins>
- </pluginManagement>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-resources-plugin</artifactId>
- <configuration>
- <encoding>UTF-8</encoding>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.eclipse.tycho</groupId>
- <artifactId>tycho-compiler-plugin</artifactId>
- <version>${tycho-version}</version>
- <configuration>
- <source>${java.source.version}</source>
- <target>${java.target.version}</target>
- <optimize>true</optimize>
- <showWarnings>true</showWarnings>
- <!-- Tycho build using the project's JDT settings. -->
- <useProjectSettings>true</useProjectSettings>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.eclipse.tycho</groupId>
- <artifactId>tycho-maven-plugin</artifactId>
- <version>${tycho-version}</version>
- <extensions>true</extensions>
- </plugin>
- <plugin>
- <groupId>org.eclipse.tycho</groupId>
- <artifactId>target-platform-configuration</artifactId>
- <version>${tycho-version}</version>
- <configuration>
- <environments>
- <environment>
- <os>win32</os>
- <ws>win32</ws>
- <arch>x86_64</arch>
- </environment>
- </environments>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.eclipse.tycho</groupId>
- <artifactId>tycho-p2-repository-plugin</artifactId>
- <version>${tycho-version}</version>
- </plugin>
- <plugin>
- <groupId>org.eclipse.tycho</groupId>
- <artifactId>tycho-source-plugin</artifactId>
- <version>${tycho-version}</version>
- <executions>
- <execution>
- <id>plugin-source</id>
- <goals>
- <goal>plugin-source</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.eclipse.tycho.extras</groupId>
- <artifactId>tycho-source-feature-plugin</artifactId>
- <version>${tychoExtrasVersion}</version>
- <executions>
- <execution>
- <id>source-feature</id>
- <phase>package</phase>
- <goals>
- <goal>source-feature</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <!-- Pack200 -->
- <plugin>
- <groupId>org.eclipse.tycho.extras</groupId>
- <artifactId>tycho-pack200b-plugin</artifactId>
- <version>${tychoExtrasVersion}</version>
- <executions>
- <execution>
- <id>pack200-pack</id>
- <goals>
- <goal>pack</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.eclipse.tycho</groupId>
- <artifactId>tycho-p2-plugin</artifactId>
- <version>${tycho-version}</version>
- <executions>
- <execution>
- <id>attach-p2-metadata</id>
- <phase>package</phase>
- <goals>
- <goal>p2-metadata</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <defaultP2Metadata>false</defaultP2Metadata>
- </configuration>
- </plugin>
- </plugins>
- </build>
- <profiles>
- <profile>
- <id>defaultProfile</id>
- <repositories>
- <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>
- <activation>
- <activeByDefault>true</activeByDefault>
- </activation>
- </profile>
- <profile>
- <id>buildAll</id>
- <!-- Papyrus Update sites not included (They are included in the same build) -->
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.eclipse.tycho</groupId>
- <artifactId>tycho-p2-plugin</artifactId>
- <version>${tycho-version}</version>
- <executions>
- <execution>
- <id>attach-p2-metadata</id>
- <phase>package</phase>
- <goals>
- <goal>p2-metadata</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-
- <activation>
- <property>
- <name>buildAll</name>
- <value>true</value>
- </property>
- </activation>
- </profile>
- </profiles>
-</project>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.eclipse.papyrus</groupId>
+ <artifactId>org.eclipse.papyrus.dev.releng</artifactId>
+ <version>1.2.0-SNAPSHOT</version>
+ <packaging>pom</packaging>
+ <parent>
+ <groupId>org.eclipse.papyrus</groupId>
+ <artifactId>org.eclipse.papyrus.all.releng</artifactId>
+ <version>1.2.0-SNAPSHOT</version>
+ <relativePath>..</relativePath>
+ </parent>
+ <modules>
+ <module>../../plugins/developer/org.eclipse.papyrus.codegen</module>
+ <module>../../plugins/developer/org.eclipse.papyrus.def</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.assistants.codegen</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> -->
+ <module>../../plugins/developer/org.eclipse.papyrus.domaincodegen.ui</module>
+ <module>../../plugins/developer/org.eclipse.papyrus.domaincontextcodegen</module>
+ <module>../../plugins/developer/org.eclipse.papyrus.domaincontextcodegen.edit</module>
+ <module>../../plugins/developer/org.eclipse.papyrus.domaincontextcodegen.editor</module>
+ <module>../../plugins/developer/org.eclipse.papyrus.gmf.editpartview</module>
+ <module>../../plugins/developer/org.eclipse.papyrus.gmf.editpoliciesstates</module>
+ <module>../../plugins/developer/org.eclipse.papyrus.gmf.figureview</module>
+ <module>../../plugins/developer/org.eclipse.papyrus.gmfgenextension</module>
+ <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.uml.developer.mde</module>
+ <module>../../plugins/developer/org.eclipse.papyrus.dev.tests.framework</module>
+ <module>../../plugins/developer/org.eclipse.papyrus.dev.tests.framework.ui</module>
+ <module>../../tests/framework/org.eclipse.papyrus.tests.framework</module>
+ <module>../../tests/framework/org.eclipse.papyrus.tests.framework.annotations</module>
+ <module>../../tests/framework/org.eclipse.papyrus.tests.framework.edit</module>
+ <module>../../tests/framework/org.eclipse.papyrus.tests.framework.editor</module>
+ <module>../../plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.debug</module>
+ <module>../../features/papyrus-dev-features/org.eclipse.papyrus.dev.feature</module>
+ <module>../../features/papyrus-dev-features/org.eclipse.papyrus.junit.feature</module>
+ <module>../../tests/junit/plugins/junit/org.eclipse.papyrus.junit.framework</module>
+ <module>../../tests/junit/plugins/junit/org.eclipse.papyrus.junit.utils</module>
+ <module>../../tests/junit/plugins/developer/org.eclipse.papyrus.bundles.tests</module>
+ <module>site</module>
+ </modules>
+ <repositories>
+ <repository>
+ <id>nebula-tablecombo</id>
+ <layout>p2</layout>
+ <url>${nebula-tablecombo.repo.url}</url>
+ </repository>
+ <repository>
+ <id>m2t-acceleo</id>
+ <layout>p2</layout>
+ <url>${m2t-acceleo.repo.url}</url>
+ </repository>
+ <repository>
+ <id>b3</id>
+ <layout>p2</layout>
+ <url>${b3.repo.url}</url>
+ </repository>
+ <repository>
+ <id>oomph</id>
+ <layout>p2</layout>
+ <url>${oomph.repo.url}</url>
+ </repository>
+ <repository>
+ <id>UPR</id>
+ <layout>p2</layout>
+ <url>${upr.repo.url}</url>
+ </repository>
+ </repositories>
+ <build>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <version>3.2</version>
+ <configuration>
+ <source>${java.source.version}</source>
+ <target>${java.target.version}</target>
+ </configuration>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-resources-plugin</artifactId>
+ <configuration>
+ <encoding>UTF-8</encoding>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.eclipse.tycho</groupId>
+ <artifactId>tycho-compiler-plugin</artifactId>
+ <version>${tycho-version}</version>
+ <configuration>
+ <source>${java.source.version}</source>
+ <target>${java.target.version}</target>
+ <optimize>true</optimize>
+ <showWarnings>true</showWarnings>
+ <!-- Tycho build using the project's JDT settings. -->
+ <useProjectSettings>true</useProjectSettings>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.eclipse.tycho</groupId>
+ <artifactId>tycho-maven-plugin</artifactId>
+ <version>${tycho-version}</version>
+ <extensions>true</extensions>
+ </plugin>
+ <plugin>
+ <groupId>org.eclipse.tycho</groupId>
+ <artifactId>target-platform-configuration</artifactId>
+ </plugin>
+ <plugin>
+ <groupId>org.eclipse.tycho</groupId>
+ <artifactId>tycho-p2-repository-plugin</artifactId>
+ <version>${tycho-version}</version>
+ </plugin>
+ <plugin>
+ <groupId>org.eclipse.tycho</groupId>
+ <artifactId>tycho-source-plugin</artifactId>
+ <version>${tycho-version}</version>
+ <executions>
+ <execution>
+ <id>plugin-source</id>
+ <goals>
+ <goal>plugin-source</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.eclipse.tycho.extras</groupId>
+ <artifactId>tycho-source-feature-plugin</artifactId>
+ <version>${tychoExtrasVersion}</version>
+ <executions>
+ <execution>
+ <id>source-feature</id>
+ <phase>package</phase>
+ <goals>
+ <goal>source-feature</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <!-- Pack200 -->
+ <plugin>
+ <groupId>org.eclipse.tycho.extras</groupId>
+ <artifactId>tycho-pack200b-plugin</artifactId>
+ <version>${tychoExtrasVersion}</version>
+ <executions>
+ <execution>
+ <id>pack200-pack</id>
+ <goals>
+ <goal>pack</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.eclipse.tycho</groupId>
+ <artifactId>tycho-p2-plugin</artifactId>
+ <version>${tycho-version}</version>
+ <executions>
+ <execution>
+ <id>attach-p2-metadata</id>
+ <phase>package</phase>
+ <goals>
+ <goal>p2-metadata</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <defaultP2Metadata>false</defaultP2Metadata>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ <profiles>
+ <profile>
+ <id>defaultProfile</id>
+ <repositories>
+ <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>
+ <activation>
+ <activeByDefault>true</activeByDefault>
+ </activation>
+ </profile>
+ <profile>
+ <id>buildAll</id>
+ <!-- Papyrus Update sites not included (They are included in the same build) -->
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.eclipse.tycho</groupId>
+ <artifactId>tycho-p2-plugin</artifactId>
+ <version>${tycho-version}</version>
+ <executions>
+ <execution>
+ <id>attach-p2-metadata</id>
+ <phase>package</phase>
+ <goals>
+ <goal>p2-metadata</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+
+ <activation>
+ <property>
+ <name>buildAll</name>
+ <value>true</value>
+ </property>
+ </activation>
+ </profile>
+ </profiles>
+</project>
diff --git a/releng/extra-tests/pom.xml b/releng/extra-tests/pom.xml
index 4340fbc1e5c..ce03fce88e9 100755
--- a/releng/extra-tests/pom.xml
+++ b/releng/extra-tests/pom.xml
@@ -34,7 +34,7 @@
<repository>
<id>cdt</id>
<layout>p2</layout>
- <url>${cdt.repo.url}</url>
+ <url>${cdt.repo.url}</url>
</repository>
<repository>
<id>cdt-launchbar</id>
@@ -44,22 +44,22 @@
<repository>
<id>emf-cdo</id>
<layout>p2</layout>
- <url>${emf-cdo.repo.url}</url>
+ <url>${emf-cdo.repo.url}</url>
</repository>
<repository>
<id>emf-compare</id>
<layout>p2</layout>
- <url>${emf-compare.repo.url}</url>
+ <url>${emf-compare.repo.url}</url>
</repository>
<repository>
<id>emf-query</id>
<layout>p2</layout>
- <url>${emf-query.repo.url}</url>
+ <url>${emf-query.repo.url}</url>
</repository>
<repository>
<id>m2t-acceleo</id>
<layout>p2</layout>
- <url>${m2t-acceleo.repo.url}</url>
+ <url>${m2t-acceleo.repo.url}</url>
</repository>
<repository>
<id>RMF</id>
@@ -106,40 +106,6 @@
<version>${tycho-version}</version>
<extensions>true</extensions>
</plugin>
- <plugin>
- <groupId>org.eclipse.tycho</groupId>
- <artifactId>target-platform-configuration</artifactId>
- <version>${tycho-version}</version>
- <configuration>
- <environments>
- <environment>
- <os>win32</os>
- <ws>win32</ws>
- <arch>x86</arch>
- </environment>
- <environment>
- <os>win32</os>
- <ws>win32</ws>
- <arch>x86_64</arch>
- </environment>
- <environment>
- <os>linux</os>
- <ws>gtk</ws>
- <arch>x86</arch>
- </environment>
- <environment>
- <os>linux</os>
- <ws>gtk</ws>
- <arch>x86_64</arch>
- </environment>
- <environment>
- <os>macosx</os>
- <ws>cocoa</ws>
- <arch>x86_64</arch>
- </environment>
- </environments>
- </configuration>
- </plugin>
</plugins>
</pluginManagement>
<plugins>
diff --git a/releng/extra/pom.xml b/releng/extra/pom.xml
index d932bf4f80f..ed47f3a492e 100644
--- a/releng/extra/pom.xml
+++ b/releng/extra/pom.xml
@@ -348,20 +348,6 @@
<version>${tycho-version}</version>
<extensions>true</extensions>
</plugin>
- <plugin>
- <groupId>org.eclipse.tycho</groupId>
- <artifactId>target-platform-configuration</artifactId>
- <version>${tycho-version}</version>
- <configuration>
- <environments>
- <environment>
- <os>win32</os>
- <ws>win32</ws>
- <arch>x86_64</arch>
- </environment>
- </environments>
- </configuration>
- </plugin>
</plugins>
</pluginManagement>
<plugins>
diff --git a/releng/main-tests/pom.xml b/releng/main-tests/pom.xml
index c3d4ccbd366..501f28a630d 100644
--- a/releng/main-tests/pom.xml
+++ b/releng/main-tests/pom.xml
@@ -108,12 +108,12 @@
<repository>
<id>emf-compare</id>
<layout>p2</layout>
- <url>${emf-compare.repo.url}</url>
+ <url>${emf-compare.repo.url}</url>
</repository>
<repository>
<id>m2t-acceleo</id>
<layout>p2</layout>
- <url>${m2t-acceleo.repo.url}</url>
+ <url>${m2t-acceleo.repo.url}</url>
</repository>
<repository>
<id>swtbot</id>
@@ -166,40 +166,6 @@
<extensions>true</extensions>
</plugin>
<plugin>
- <groupId>org.eclipse.tycho</groupId>
- <artifactId>target-platform-configuration</artifactId>
- <version>${tycho-version}</version>
- <configuration>
- <environments>
- <environment>
- <os>win32</os>
- <ws>win32</ws>
- <arch>x86</arch>
- </environment>
- <environment>
- <os>win32</os>
- <ws>win32</ws>
- <arch>x86_64</arch>
- </environment>
- <environment>
- <os>linux</os>
- <ws>gtk</ws>
- <arch>x86</arch>
- </environment>
- <environment>
- <os>linux</os>
- <ws>gtk</ws>
- <arch>x86_64</arch>
- </environment>
- <environment>
- <os>macosx</os>
- <ws>cocoa</ws>
- <arch>x86_64</arch>
- </environment>
- </environments>
- </configuration>
- </plugin>
- <plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>exec-maven-plugin</artifactId>
<version>1.4.0</version>
diff --git a/releng/main/pom.xml b/releng/main/pom.xml
index 6ba134f1ea9..6651046d91f 100755
--- a/releng/main/pom.xml
+++ b/releng/main/pom.xml
@@ -398,16 +398,6 @@
<plugin>
<groupId>org.eclipse.tycho</groupId>
<artifactId>target-platform-configuration</artifactId>
- <version>${tycho-version}</version>
- <configuration>
- <environments>
- <environment>
- <os>win32</os>
- <ws>win32</ws>
- <arch>x86_64</arch>
- </environment>
- </environments>
- </configuration>
</plugin>
<plugin>
<groupId>org.eclipse.mylyn.docs</groupId>
diff --git a/releng/pom.xml b/releng/pom.xml
index 350dac53872..d0169ab837c 100644
--- a/releng/pom.xml
+++ b/releng/pom.xml
@@ -1,270 +1,307 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<project>
- <modelVersion>4.0.0</modelVersion>
- <groupId>org.eclipse.papyrus</groupId>
- <artifactId>org.eclipse.papyrus.all.releng</artifactId>
- <version>1.2.0-SNAPSHOT</version>
- <packaging>pom</packaging>
-
- <properties>
- <tycho-version>0.23.1</tycho-version>
- <tychoExtrasVersion>0.23.1</tychoExtrasVersion>
- <tycho.scmUrl>scm:git:git://git.eclipse.org/gitroot/papyrus/org.eclipse.papyrus</tycho.scmUrl>
- <jarSignerVersion>1.1.2</jarSignerVersion>
- <findbugs.version>3.0.1</findbugs.version>
- <xtext.version>2.7.3</xtext.version>
- <java.source.version>1.8</java.source.version>
- <java.target.version>1.8</java.target.version>
- <mylyn.wikitext.version>2.4.0-SNAPSHOT</mylyn.wikitext.version>
- <skipAllTests>false</skipAllTests>
- <skipInnerTests>true</skipInnerTests>
- <eclipse.download>http://download.eclipse.org</eclipse.download> <!-- Set to file:/home/data/httpd/download.eclipse.org when building on Eclipse servers to improve performances -->
-
- <!-- TODO: Is it possible to automatically detect that we are building this pom rather than a child pom? That would remove the need for this manual variable -->
- <buildAll>false</buildAll> <!-- Set to true when building this pom directly (Rather than individual components). This will disable Papyrus Update Sites (Since they are being built by this POM). -->
-
- <!-- manualUpdate -->
- <nattable.repo.url>${eclipse.download}/nattable/snapshots/475/repository/</nattable.repo.url>
-
- <!-- manualUpdate -->
- <nebula-tablecombo.repo.url>${eclipse.download}/technology/nebula/archives/Q12015/release/</nebula-tablecombo.repo.url>
-
- <!-- manualUpdate -->
- <orbit.repo.url>${eclipse.download}/tools/orbit/downloads/drops/R20150821153341/repository</orbit.repo.url>
-
- <!-- updateFrom("Extended Editing Framework (EEF)",0) -->
- <eef.repo.url>${eclipse.download}/modeling/emft/eef/updates/milestones/1.5/S201505291308/</eef.repo.url>
-
- <!-- manualUpdate -->
- <rmf.repo.url>${eclipse.download}/rmf/updates/releases</rmf.repo.url>
-
- <!-- manualUpdate -->
- <swtbot.repo.url>${eclipse.download}/technology/swtbot/snapshots</swtbot.repo.url>
-
- <!-- updateFrom("CDT",0) -->
- <cdt.repo.url>${eclipse.download}/tools/cdt/builds/neon/milestones/m4</cdt.repo.url>
-
- <!-- updateFrom("CDT",1) -->
- <cdt.launchbar.repo.url>${eclipse.download}/tools/cdt/launchbar/neon.m5</cdt.launchbar.repo.url>
-
- <!-- updateFrom("EMF CDO",0) -->
- <emf-cdo.repo.url>${eclipse.download}/modeling/emf/cdo/drops/S20151216-1133</emf-cdo.repo.url>
-
- <!-- updateFrom("EMF COMPARE",0) -->
- <emf-compare.repo.url>${eclipse.download}/modeling/emf/compare/updates/milestones/3.2/S201512130548</emf-compare.repo.url>
-
- <!-- updateFrom("EMF Query",0) -->
- <emf-query.repo.url>${eclipse.download}/modeling/emf/query/updates/milestones</emf-query.repo.url>
-
- <!-- updateFrom("M2T ACCELEO",0) -->
- <m2t-acceleo.repo.url>${eclipse.download}/acceleo/updates/milestones/3.6/S201601191321</m2t-acceleo.repo.url>
-
- <!-- manualUpdate -->
- <upr.repo.url>${eclipse.download}/upr/0.9RC1/update/</upr.repo.url>
-
- <!-- manualUpdate -->
- <b3.repo.url>${eclipse.download}/modeling/emft/b3/updates-4.4</b3.repo.url>
-
- <!-- updateFrom("Mylyn",0) -->
- <mylyn.repo.url>${eclipse.download}/mylyn/snapshots/3.18</mylyn.repo.url>
-
- <!-- updateFrom("EGIT",0) -->
- <egit.repo.url>${eclipse.download}/egit/staging/v4.2.0.201512141825-rc1</egit.repo.url>
-
- <!-- updateFrom("EPP Logging",0) -->
- <epp-logging.repo.url>${eclipse.download}/technology/epp/logging/milestones/</epp-logging.repo.url>
-
- <!-- updateFrom("oomph",0) -->
- <oomph.repo.url>${eclipse.download}/oomph/drops/milestone/S20151217-022042-1.3.0-M4</oomph.repo.url>
-
- <!-- Papyrus repositories. Used when we're building individual components (vs building the parent pom including everything) -->
- <papyrus.eclipse.target>neon</papyrus.eclipse.target>
- <papyrus.repo.main>${eclipse.download}/modeling/mdt/papyrus/updates/nightly/${papyrus.eclipse.target}/main</papyrus.repo.main>
- <papyrus.repo.extra>${eclipse.download}/modeling/mdt/papyrus/updates/nightly/${papyrus.eclipse.target}/extra</papyrus.repo.extra>
- <papyrus.repo.dev>https://hudson.eclipse.org/papyrus/job/Papyrus-Master-Developer/lastSuccessfulBuild/artifact/repository/</papyrus.repo.dev>
-
- </properties>
-
- <modules>
- <module>main</module>
- <module>extra</module>
- <module>dev</module>
- <module>main-tests</module>
- <module>extra-tests</module>
- </modules>
-
- <pluginRepositories>
- <pluginRepository>
- <id>org.eclipse.cbi.maven.plugins</id>
- <name>Eclipse CBI</name>
- <url>https://repo.eclipse.org/content/repositories/cbi-releases/</url>
- <releases>
- <enabled>true</enabled>
- </releases>
- <snapshots>
- <enabled>false</enabled>
- </snapshots>
- </pluginRepository>
- <pluginRepository>
- <id>eclipse.org-mylyn</id>
- <!-- url>https://repo.eclipse.org/content/repositories/mylyn-releases/</url -->
- <url>https://repo.eclipse.org/content/repositories/mylyn/</url>
- </pluginRepository>
- </pluginRepositories>
-
- <repositories>
- <repository>
- <id>emf-emf</id>
- <layout>p2</layout>
- <!-- updateFrom("EMF (Core)",0) -->
- <url>${eclipse.download}/modeling/emf/emf/updates/2.12milestones/</url>
- </repository>
- <repository>
- <id>emft-mwe[0]</id>
- <layout>p2</layout>
- <!-- updateFrom("EMFT MWE",0) -->
- <url>${eclipse.download}/modeling/emft/mwe/updates/milestones/S201512150804/mwe</url>
- </repository>
- <repository>
- <id>emft-mwe[1]</id>
- <layout>p2</layout>
- <!-- updateFrom("EMFT MWE",1) -->
- <url>${eclipse.download}/modeling/emft/mwe/updates/milestones/S201512150821/mwe2lang/</url>
- </repository>
- <repository>
- <id>emf-transaction</id>
- <layout>p2</layout>
- <!-- updateFrom("EMF TRANSACTION",0) -->
- <url>${eclipse.download}/modeling/emf/transaction/updates/milestones</url>
- </repository>
- <repository>
- <id>emf-validation</id>
- <layout>p2</layout>
- <!-- updateFrom("EMF VALIDATION",0) -->
- <url>${eclipse.download}/modeling/emf/validation/updates/milestones</url>
- </repository>
- <repository>
- <id>ep</id>
- <layout>p2</layout>
- <!-- updateFrom("Eclipse",0) -->
- <url>${eclipse.download}/eclipse/updates/4.6-I-builds/I20160119-0800/</url>
- </repository>
- <repository>
- <id>gef</id>
- <layout>p2</layout>
- <!-- updateFrom("GEF",0) -->
- <url>${eclipse.download}/tools/gef/updates/milestones</url>
- </repository>
- <repository>
- <id>gmp-gmf-notation</id>
- <layout>p2</layout>
- <!-- updateFrom("GMF Notation",0) -->
- <url>${eclipse.download}/modeling/gmp/gmf-notation/updates/milestones</url>
- </repository>
- <repository>
- <id>gmp-gmf-runtime</id>
- <layout>p2</layout>
- <!-- updateFrom("GMF Runtime",0) -->
- <url>${eclipse.download}/modeling/gmp/gmf-runtime/updates/milestones</url>
- </repository>
- <repository>
- <id>gmf-tooling</id>
- <layout>p2</layout>
- <!-- updateFrom("GMF Tooling",0) -->
- <url>${eclipse.download}/modeling/gmp/gmf-tooling/updates/milestones-3.3/S201506090500</url>
- </repository>
- <repository>
- <id>m2t-xpand</id>
- <layout>p2</layout>
- <!-- updateFrom("M2T XPAND",0) -->
- <url>${eclipse.download}/modeling/m2t/xpand/updates/milestones/S201512150757/</url>
- </repository>
- <repository>
- <id>mdt-ocl</id>
- <layout>p2</layout>
- <!-- updateFrom("MDT OCL 6.0",0) -->
- <url>${eclipse.download}/modeling/mdt/ocl/updates/milestones/6.1.0/S201512161807</url>
- </repository>
- <repository>
- <id>mdt-uml2</id>
- <layout>p2</layout>
- <!-- updateFrom("MDT UML2",0) -->
- <url>${eclipse.download}/modeling/mdt/uml2/updates/5.2milestones</url>
- </repository>
- <repository>
- <id>mmt-qvto</id>
- <layout>p2</layout>
- <!-- updateFrom("QVT Operational",0) -->
- <url>${eclipse.download}/mmt/qvto/updates/milestones/3.6.0/S201512100140</url>
- </repository>
- <repository>
- <id>nattable</id>
- <layout>p2</layout>
- <!-- manualUpdate -->
- <url>${nattable.repo.url}</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>
- <!-- manualUpdate -->
- <url>${orbit.repo.url}</url>
- </repository>
- <repository>
- <id>tmf-xtext</id>
- <layout>p2</layout>
- <!-- updateFrom("Xtext, Xtend",0) -->
- <url>${eclipse.download}/modeling/tmf/xtext/updates/releases/2.9.0/</url>
- </repository>
- <repository>
- <id>webtools</id>
- <layout>p2</layout>
- <!-- updateFrom("WebTools",0) -->
- <url>${eclipse.download}/webtools/downloads/drops/R3.8.0/I-3.8.0-20160118010043/repository/</url>
- </repository>
- <repository>
- <id>XWT</id>
- <layout>p2</layout>
- <!-- updateFrom("XWT",0) -->
- <url>${eclipse.download}/xwt/release-1.1.0</url>
- </repository>
- <repository>
- <id>subversive</id>
- <layout>p2</layout>
- <!-- updateFrom("Subversive",0) -->
- <url>${eclipse.download}/technology/subversive/3.0/neon-site/</url>
- </repository>
- </repositories>
- <build>
- <pluginManagement>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-resources-plugin</artifactId>
- <version>2.6</version>
- <configuration>
- <encoding>UTF-8</encoding>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-clean-plugin</artifactId>
- <version>2.6</version>
- </plugin>
- <plugin>
- <groupId>org.eclipse.xtend</groupId>
- <artifactId>xtend-maven-plugin</artifactId>
- <version>${xtext.version}</version>
- </plugin>
- </plugins>
- </pluginManagement>
- </build>
-</project>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<project>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.eclipse.papyrus</groupId>
+ <artifactId>org.eclipse.papyrus.all.releng</artifactId>
+ <version>1.2.0-SNAPSHOT</version>
+ <packaging>pom</packaging>
+
+ <properties>
+ <tycho-version>0.23.1</tycho-version>
+ <tychoExtrasVersion>0.23.1</tychoExtrasVersion>
+ <tycho.scmUrl>scm:git:git://git.eclipse.org/gitroot/papyrus/org.eclipse.papyrus</tycho.scmUrl>
+ <jarSignerVersion>1.1.2</jarSignerVersion>
+ <findbugs.version>3.0.1</findbugs.version>
+ <xtext.version>2.7.3</xtext.version>
+ <java.source.version>1.8</java.source.version>
+ <java.target.version>1.8</java.target.version>
+ <mylyn.wikitext.version>2.4.0-SNAPSHOT</mylyn.wikitext.version>
+ <skipAllTests>false</skipAllTests>
+ <skipInnerTests>true</skipInnerTests>
+ <eclipse.download>http://download.eclipse.org</eclipse.download> <!-- Set to file:/home/data/httpd/download.eclipse.org when building on Eclipse
+ servers to improve performances -->
+
+ <!-- TODO: Is it possible to automatically detect that we are building
+ this pom rather than a child pom? That would remove the need for this manual
+ variable -->
+ <buildAll>false</buildAll> <!-- Set to true when building this pom directly (Rather than individual
+ components). This will disable Papyrus Update Sites (Since they are being
+ built by this POM). -->
+
+ <!-- manualUpdate -->
+ <nattable.repo.url>${eclipse.download}/nattable/snapshots/475/repository/</nattable.repo.url>
+
+ <!-- manualUpdate -->
+ <nebula-tablecombo.repo.url>${eclipse.download}/technology/nebula/archives/Q12015/release/</nebula-tablecombo.repo.url>
+
+ <!-- manualUpdate -->
+ <orbit.repo.url>${eclipse.download}/tools/orbit/downloads/drops/R20150821153341/repository</orbit.repo.url>
+
+ <!-- updateFrom("Extended Editing Framework (EEF)",0) -->
+ <eef.repo.url>${eclipse.download}/modeling/emft/eef/updates/milestones/1.5/S201505291308/</eef.repo.url>
+
+ <!-- manualUpdate -->
+ <rmf.repo.url>${eclipse.download}/rmf/updates/releases</rmf.repo.url>
+
+ <!-- manualUpdate -->
+ <swtbot.repo.url>${eclipse.download}/technology/swtbot/snapshots</swtbot.repo.url>
+
+ <!-- updateFrom("CDT",0) -->
+ <cdt.repo.url>${eclipse.download}/tools/cdt/builds/neon/milestones/m4</cdt.repo.url>
+
+ <!-- updateFrom("CDT",1) -->
+ <cdt.launchbar.repo.url>${eclipse.download}/tools/cdt/launchbar/neon.m5</cdt.launchbar.repo.url>
+
+ <!-- updateFrom("EMF CDO",0) -->
+ <emf-cdo.repo.url>${eclipse.download}/modeling/emf/cdo/drops/S20151216-1133</emf-cdo.repo.url>
+
+ <!-- updateFrom("EMF COMPARE",0) -->
+ <emf-compare.repo.url>${eclipse.download}/modeling/emf/compare/updates/milestones/3.2/S201512130548</emf-compare.repo.url>
+
+ <!-- updateFrom("EMF Query",0) -->
+ <emf-query.repo.url>${eclipse.download}/modeling/emf/query/updates/milestones</emf-query.repo.url>
+
+ <!-- updateFrom("M2T ACCELEO",0) -->
+ <m2t-acceleo.repo.url>${eclipse.download}/acceleo/updates/milestones/3.6/S201601191321</m2t-acceleo.repo.url>
+
+ <!-- manualUpdate -->
+ <upr.repo.url>${eclipse.download}/upr/0.9RC1/update/</upr.repo.url>
+
+ <!-- manualUpdate -->
+ <b3.repo.url>${eclipse.download}/modeling/emft/b3/updates-4.4</b3.repo.url>
+
+ <!-- updateFrom("Mylyn",0) -->
+ <mylyn.repo.url>${eclipse.download}/mylyn/snapshots/3.18</mylyn.repo.url>
+
+ <!-- updateFrom("EGIT",0) -->
+ <egit.repo.url>${eclipse.download}/egit/staging/v4.2.0.201512141825-rc1</egit.repo.url>
+
+ <!-- updateFrom("EPP Logging",0) -->
+ <epp-logging.repo.url>${eclipse.download}/technology/epp/logging/milestones/</epp-logging.repo.url>
+
+ <!-- updateFrom("oomph",0) -->
+ <oomph.repo.url>${eclipse.download}/oomph/drops/milestone/S20151217-022042-1.3.0-M4</oomph.repo.url>
+
+ <!-- Papyrus repositories. Used when we're building individual components
+ (vs building the parent pom including everything) -->
+ <papyrus.eclipse.target>neon</papyrus.eclipse.target>
+ <papyrus.repo.main>${eclipse.download}/modeling/mdt/papyrus/updates/nightly/${papyrus.eclipse.target}/main</papyrus.repo.main>
+ <papyrus.repo.extra>${eclipse.download}/modeling/mdt/papyrus/updates/nightly/${papyrus.eclipse.target}/extra</papyrus.repo.extra>
+ <papyrus.repo.dev>https://hudson.eclipse.org/papyrus/job/Papyrus-Master-Developer/lastSuccessfulBuild/artifact/repository/</papyrus.repo.dev>
+
+ </properties>
+
+ <modules>
+ <module>main</module>
+ <module>extra</module>
+ <module>dev</module>
+ <module>main-tests</module>
+ <module>extra-tests</module>
+ </modules>
+
+ <pluginRepositories>
+ <pluginRepository>
+ <id>org.eclipse.cbi.maven.plugins</id>
+ <name>Eclipse CBI</name>
+ <url>https://repo.eclipse.org/content/repositories/cbi-releases/</url>
+ <releases>
+ <enabled>true</enabled>
+ </releases>
+ <snapshots>
+ <enabled>false</enabled>
+ </snapshots>
+ </pluginRepository>
+ <pluginRepository>
+ <id>eclipse.org-mylyn</id>
+ <!-- url>https://repo.eclipse.org/content/repositories/mylyn-releases/</url -->
+ <url>https://repo.eclipse.org/content/repositories/mylyn/</url>
+ </pluginRepository>
+ </pluginRepositories>
+
+ <repositories>
+ <repository>
+ <id>emf-emf</id>
+ <layout>p2</layout>
+ <!-- updateFrom("EMF (Core)",0) -->
+ <url>${eclipse.download}/modeling/emf/emf/updates/2.12milestones/</url>
+ </repository>
+ <repository>
+ <id>emft-mwe[0]</id>
+ <layout>p2</layout>
+ <!-- updateFrom("EMFT MWE",0) -->
+ <url>${eclipse.download}/modeling/emft/mwe/updates/milestones/S201512150804/mwe</url>
+ </repository>
+ <repository>
+ <id>emft-mwe[1]</id>
+ <layout>p2</layout>
+ <!-- updateFrom("EMFT MWE",1) -->
+ <url>${eclipse.download}/modeling/emft/mwe/updates/milestones/S201512150821/mwe2lang/</url>
+ </repository>
+ <repository>
+ <id>emf-transaction</id>
+ <layout>p2</layout>
+ <!-- updateFrom("EMF TRANSACTION",0) -->
+ <url>${eclipse.download}/modeling/emf/transaction/updates/milestones</url>
+ </repository>
+ <repository>
+ <id>emf-validation</id>
+ <layout>p2</layout>
+ <!-- updateFrom("EMF VALIDATION",0) -->
+ <url>${eclipse.download}/modeling/emf/validation/updates/milestones</url>
+ </repository>
+ <repository>
+ <id>ep</id>
+ <layout>p2</layout>
+ <!-- updateFrom("Eclipse",0) -->
+ <url>${eclipse.download}/eclipse/updates/4.6-I-builds/I20160119-0800/</url>
+ </repository>
+ <repository>
+ <id>gef</id>
+ <layout>p2</layout>
+ <!-- updateFrom("GEF",0) -->
+ <url>${eclipse.download}/tools/gef/updates/milestones</url>
+ </repository>
+ <repository>
+ <id>gmp-gmf-notation</id>
+ <layout>p2</layout>
+ <!-- updateFrom("GMF Notation",0) -->
+ <url>${eclipse.download}/modeling/gmp/gmf-notation/updates/milestones</url>
+ </repository>
+ <repository>
+ <id>gmp-gmf-runtime</id>
+ <layout>p2</layout>
+ <!-- updateFrom("GMF Runtime",0) -->
+ <url>${eclipse.download}/modeling/gmp/gmf-runtime/updates/milestones</url>
+ </repository>
+ <repository>
+ <id>gmf-tooling</id>
+ <layout>p2</layout>
+ <!-- updateFrom("GMF Tooling",0) -->
+ <url>${eclipse.download}/modeling/gmp/gmf-tooling/updates/milestones-3.3/S201506090500</url>
+ </repository>
+ <repository>
+ <id>m2t-xpand</id>
+ <layout>p2</layout>
+ <!-- updateFrom("M2T XPAND",0) -->
+ <url>${eclipse.download}/modeling/m2t/xpand/updates/milestones/S201512150757/</url>
+ </repository>
+ <repository>
+ <id>mdt-ocl</id>
+ <layout>p2</layout>
+ <!-- updateFrom("MDT OCL 6.0",0) -->
+ <url>${eclipse.download}/modeling/mdt/ocl/updates/milestones/6.1.0/S201512161807</url>
+ </repository>
+ <repository>
+ <id>mdt-uml2</id>
+ <layout>p2</layout>
+ <!-- updateFrom("MDT UML2",0) -->
+ <url>${eclipse.download}/modeling/mdt/uml2/updates/5.2milestones</url>
+ </repository>
+ <repository>
+ <id>mmt-qvto</id>
+ <layout>p2</layout>
+ <!-- updateFrom("QVT Operational",0) -->
+ <url>${eclipse.download}/mmt/qvto/updates/milestones/3.6.0/S201512100140</url>
+ </repository>
+ <repository>
+ <id>nattable</id>
+ <layout>p2</layout>
+ <!-- manualUpdate -->
+ <url>${nattable.repo.url}</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>
+ <!-- manualUpdate -->
+ <url>${orbit.repo.url}</url>
+ </repository>
+ <repository>
+ <id>tmf-xtext</id>
+ <layout>p2</layout>
+ <!-- updateFrom("Xtext, Xtend",0) -->
+ <url>${eclipse.download}/modeling/tmf/xtext/updates/releases/2.9.0/</url>
+ </repository>
+ <repository>
+ <id>webtools</id>
+ <layout>p2</layout>
+ <!-- updateFrom("WebTools",0) -->
+ <url>${eclipse.download}/webtools/downloads/drops/R3.8.0/I-3.8.0-20160118010043/repository/</url>
+ </repository>
+ <repository>
+ <id>XWT</id>
+ <layout>p2</layout>
+ <!-- updateFrom("XWT",0) -->
+ <url>${eclipse.download}/xwt/release-1.1.0</url>
+ </repository>
+ <repository>
+ <id>subversive</id>
+ <layout>p2</layout>
+ <!-- updateFrom("Subversive",0) -->
+ <url>${eclipse.download}/technology/subversive/3.0/neon-site/</url>
+ </repository>
+ </repositories>
+ <build>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-resources-plugin</artifactId>
+ <version>2.6</version>
+ <configuration>
+ <encoding>UTF-8</encoding>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-clean-plugin</artifactId>
+ <version>2.6</version>
+ </plugin>
+ <plugin>
+ <groupId>org.eclipse.xtend</groupId>
+ <artifactId>xtend-maven-plugin</artifactId>
+ <version>${xtext.version}</version>
+ </plugin>
+ <plugin>
+ <groupId>org.eclipse.tycho</groupId>
+ <artifactId>target-platform-configuration</artifactId>
+ <version>${tycho-version}</version>
+ <configuration>
+ <environments>
+ <environment>
+ <os>linux</os>
+ <ws>gtk</ws>
+ <arch>x86_64</arch>
+ </environment>
+ <environment>
+ <os>linux</os>
+ <ws>gtk</ws>
+ <arch>x86</arch>
+ </environment>
+ <environment>
+ <os>win32</os>
+ <ws>win32</ws>
+ <arch>x86_64</arch>
+ </environment>
+ <environment>
+ <os>win32</os>
+ <ws>win32</ws>
+ <arch>x86</arch>
+ </environment>
+ <environment>
+ <os>macosx</os>
+ <ws>cocoa</ws>
+ <arch>x86_64</arch>
+ </environment>
+ </environments>
+ </configuration>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+ </build>
+</project>
diff --git a/releng/rcp/pom.xml b/releng/rcp/pom.xml
index 9bd040df819..28a6194ec6a 100644
--- a/releng/rcp/pom.xml
+++ b/releng/rcp/pom.xml
@@ -1,83 +1,83 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<project>
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.eclipse.papyrus</groupId>
- <artifactId>org.eclipse.papyrus.all.releng</artifactId>
- <version>1.2.0-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
- </parent>
- <groupId>org.eclipse.papyrus</groupId>
- <artifactId>org.eclipse.papyrus.rcp.releng</artifactId>
- <version>1.2.0-SNAPSHOT</version>
- <packaging>pom</packaging>
- <modules>
- <module>org.eclipse.papyrus.rcp</module>
- <module>org.eclipse.papyrus.rcp.feature</module>
- <module>org.eclipse.papyrus.rcp.product</module>
- </modules>
- <properties>
- <!-- 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>Neon Milestone 3 (4.6.0M3)</eclipse.simultaneous.release.name>
- </properties>
- <repositories>
- <!-- Modeling features -->
- <repository>
- <id>mylyn</id>
- <layout>p2</layout>
- <!-- updateFrom("Mylyn",0) -->
- <url>${mylyn.repo.url}</url>
- </repository>
- <repository>
- <id>emf-query</id>
- <layout>p2</layout>
- <!-- updateFrom("EMF Query",0) -->
- <url>${emf-query.repo.url}</url>
- </repository>
- <repository>
- <id>emf-compare</id>
- <layout>p2</layout>
- <!-- updateFrom("EMF Compare",0) -->
- <url>${emf-compare.repo.url}</url>
- </repository>
- <repository>
- <id>emf-cdo</id>
- <layout>p2</layout>
- <!-- updateFrom("EMF CDO",0) -->
- <url>${emf-cdo.repo.url}</url>
- </repository>
- <repository>
- <id>egit</id>
- <layout>p2</layout>
- <!-- updateFrom("EGIT",0) -->
- <url>${egit.repo.url}</url>
- </repository>
- <repository>
- <id>emft-eef</id>
- <layout>p2</layout>
- <!-- updateFrom("Extended Editing Framework (EEF)",0) -->
- <url>${eef.repo.url}</url>
- </repository>
- <repository>
- <id>M2T ACCELEO</id>
- <layout>p2</layout>
- <!-- updateFrom("M2T ACCELEO",0) -->
- <url>${m2t-acceleo.repo.url}</url>
- </repository>
- <repository>
- <id>EPP Logging</id>
- <layout>p2</layout>
- <!-- updateFrom("EPP Logging",0) -->
- <url>${epp-logging.repo.url}</url>
- </repository>
- <repository>
- <id>oomph</id>
- <layout>p2</layout>
- <!-- updateFrom("oomph",0) -->
- <url>${oomph.repo.url}</url>
- </repository>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<project>
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.eclipse.papyrus</groupId>
+ <artifactId>org.eclipse.papyrus.all.releng</artifactId>
+ <version>1.2.0-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
+ </parent>
+ <groupId>org.eclipse.papyrus</groupId>
+ <artifactId>org.eclipse.papyrus.rcp.releng</artifactId>
+ <version>1.2.0-SNAPSHOT</version>
+ <packaging>pom</packaging>
+ <modules>
+ <module>org.eclipse.papyrus.rcp</module>
+ <module>org.eclipse.papyrus.rcp.feature</module>
+ <module>org.eclipse.papyrus.rcp.product</module>
+ </modules>
+ <properties>
+ <!-- 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>Neon Milestone 3 (4.6.0M3)</eclipse.simultaneous.release.name>
+ </properties>
+ <repositories>
+ <!-- Modeling features -->
+ <repository>
+ <id>mylyn</id>
+ <layout>p2</layout>
+ <!-- updateFrom("Mylyn",0) -->
+ <url>${mylyn.repo.url}</url>
+ </repository>
+ <repository>
+ <id>emf-query</id>
+ <layout>p2</layout>
+ <!-- updateFrom("EMF Query",0) -->
+ <url>${emf-query.repo.url}</url>
+ </repository>
+ <repository>
+ <id>emf-compare</id>
+ <layout>p2</layout>
+ <!-- updateFrom("EMF Compare",0) -->
+ <url>${emf-compare.repo.url}</url>
+ </repository>
+ <repository>
+ <id>emf-cdo</id>
+ <layout>p2</layout>
+ <!-- updateFrom("EMF CDO",0) -->
+ <url>${emf-cdo.repo.url}</url>
+ </repository>
+ <repository>
+ <id>egit</id>
+ <layout>p2</layout>
+ <!-- updateFrom("EGIT",0) -->
+ <url>${egit.repo.url}</url>
+ </repository>
+ <repository>
+ <id>emft-eef</id>
+ <layout>p2</layout>
+ <!-- updateFrom("Extended Editing Framework (EEF)",0) -->
+ <url>${eef.repo.url}</url>
+ </repository>
+ <repository>
+ <id>M2T ACCELEO</id>
+ <layout>p2</layout>
+ <!-- updateFrom("M2T ACCELEO",0) -->
+ <url>${m2t-acceleo.repo.url}</url>
+ </repository>
+ <repository>
+ <id>EPP Logging</id>
+ <layout>p2</layout>
+ <!-- updateFrom("EPP Logging",0) -->
+ <url>${epp-logging.repo.url}</url>
+ </repository>
+ <repository>
+ <id>oomph</id>
+ <layout>p2</layout>
+ <!-- updateFrom("oomph",0) -->
+ <url>${oomph.repo.url}</url>
+ </repository>
<!--<repository>
<id>ecp</id>
<layout>p2</layout>
@@ -87,136 +87,106 @@
<id>emfstore</id>
<layout>p2</layout>
<url>http://download.eclipse.org/emfstore/rt/150</url>
- </repository> -->
-
- <!-- Papyrus repository -->
- <repository>
- <id>papyrus-main</id>
- <layout>p2</layout>
- <url>${papyrus.repo.main}</url>
- </repository>
- </repositories>
- <build>
- <plugins>
- <plugin>
- <!-- enable tycho build extension -->
- <groupId>org.eclipse.tycho</groupId>
- <artifactId>tycho-maven-plugin</artifactId>
- <version>${tycho-version}</version>
- <extensions>true</extensions>
- </plugin>
- <plugin>
- <groupId>org.eclipse.tycho</groupId>
- <artifactId>tycho-versions-plugin</artifactId>
- <version>${tycho-version}</version>
- </plugin>
- <plugin>
- <groupId>org.eclipse.tycho</groupId>
- <artifactId>target-platform-configuration</artifactId>
- <version>${tycho-version}</version>
- <configuration>
- <environments>
- <environment>
- <os>linux</os>
- <ws>gtk</ws>
- <arch>x86_64</arch>
- </environment>
- <environment>
- <os>linux</os>
- <ws>gtk</ws>
- <arch>x86</arch>
- </environment>
- <environment>
- <os>win32</os>
- <ws>win32</ws>
- <arch>x86_64</arch>
- </environment>
- <environment>
- <os>win32</os>
- <ws>win32</ws>
- <arch>x86</arch>
- </environment>
- <environment>
- <os>macosx</os>
- <ws>cocoa</ws>
- <arch>x86_64</arch>
- </environment>
- </environments>
- </configuration>
- </plugin>
- <!-- enable source bundle generation -->
- <plugin>
- <groupId>org.eclipse.tycho</groupId>
- <artifactId>tycho-source-plugin</artifactId>
- <version>${tycho-version}</version>
- <executions>
- <execution>
- <id>plugin-source</id>
- <goals>
- <goal>plugin-source</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-resources-plugin</artifactId>
- </plugin>
- </plugins>
- </build>
- <profiles>
- <profile>
- <id>update-branding-plugins-about.mappings</id>
- <activation>
- <file>
- <exists>${basedir}/about.mappings</exists>
- </file>
- </activation>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-resources-plugin</artifactId>
- <executions>
- <execution>
- <id>process-about.mappings</id>
- <phase>prepare-package</phase>
- <configuration>
- <outputDirectory>${project.build.directory}</outputDirectory>
- <overwrite>true</overwrite>
- <resources>
- <resource>
- <directory>${basedir}</directory>
- <includes>
- <include>about.mappings</include>
- </includes>
- <filtering>true</filtering>
- </resource>
- </resources>
- </configuration>
- <goals>
- <goal>copy-resources</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.eclipse.tycho</groupId>
- <artifactId>tycho-packaging-plugin</artifactId>
- <version>${tycho-version}</version>
- <configuration>
- <additionalFileSets>
- <fileSet>
- <directory>${project.build.directory}</directory>
- <includes>
- <include>about.mappings</include>
- </includes>
- </fileSet>
- </additionalFileSets>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
-</project>
+ </repository> -->
+
+ <!-- Papyrus repository -->
+ <repository>
+ <id>papyrus-main</id>
+ <layout>p2</layout>
+ <url>${papyrus.repo.main}</url>
+ </repository>
+ </repositories>
+ <build>
+ <plugins>
+ <plugin>
+ <!-- enable tycho build extension -->
+ <groupId>org.eclipse.tycho</groupId>
+ <artifactId>tycho-maven-plugin</artifactId>
+ <version>${tycho-version}</version>
+ <extensions>true</extensions>
+ </plugin>
+ <plugin>
+ <groupId>org.eclipse.tycho</groupId>
+ <artifactId>tycho-versions-plugin</artifactId>
+ <version>${tycho-version}</version>
+ </plugin>
+ <plugin>
+ <groupId>org.eclipse.tycho</groupId>
+ <artifactId>target-platform-configuration</artifactId>
+ </plugin>
+ <!-- enable source bundle generation -->
+ <plugin>
+ <groupId>org.eclipse.tycho</groupId>
+ <artifactId>tycho-source-plugin</artifactId>
+ <version>${tycho-version}</version>
+ <executions>
+ <execution>
+ <id>plugin-source</id>
+ <goals>
+ <goal>plugin-source</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-resources-plugin</artifactId>
+ </plugin>
+ </plugins>
+ </build>
+ <profiles>
+ <profile>
+ <id>update-branding-plugins-about.mappings</id>
+ <activation>
+ <file>
+ <exists>${basedir}/about.mappings</exists>
+ </file>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-resources-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>process-about.mappings</id>
+ <phase>prepare-package</phase>
+ <configuration>
+ <outputDirectory>${project.build.directory}</outputDirectory>
+ <overwrite>true</overwrite>
+ <resources>
+ <resource>
+ <directory>${basedir}</directory>
+ <includes>
+ <include>about.mappings</include>
+ </includes>
+ <filtering>true</filtering>
+ </resource>
+ </resources>
+ </configuration>
+ <goals>
+ <goal>copy-resources</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.eclipse.tycho</groupId>
+ <artifactId>tycho-packaging-plugin</artifactId>
+ <version>${tycho-version}</version>
+ <configuration>
+ <additionalFileSets>
+ <fileSet>
+ <directory>${project.build.directory}</directory>
+ <includes>
+ <include>about.mappings</include>
+ </includes>
+ </fileSet>
+ </additionalFileSets>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
+</project>

Back to the top