diff options
| -rw-r--r-- | features/papyrus-dev-features/org.eclipse.papyrus.dev.feature/feature.xml | 6 | ||||
| -rw-r--r-- | plugins/pom.xml | 2 | ||||
| -rwxr-xr-x | releng/dev/pom.xml | 2 | ||||
| -rw-r--r-- | releng/dev/site/category.xml | 1 | ||||
| -rw-r--r-- | releng/dev/site/pom.xml | 25 | ||||
| -rw-r--r-- | releng/pom.xml | 18 |
6 files changed, 48 insertions, 6 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 35f43cc5654..c14e12d4692 100644 --- a/features/papyrus-dev-features/org.eclipse.papyrus.dev.feature/feature.xml +++ b/features/papyrus-dev-features/org.eclipse.papyrus.dev.feature/feature.xml @@ -33,6 +33,12 @@ http://www.eclipse.org/legal/epl-v10.html id="org.eclipse.papyrus.uml.m2m.qvto.tests.tools.feature" version="0.0.0"/> + <requires> + <import feature="org.eclipse.gmf.tooling" version="0.0.0"/> + <import feature="org.eclipse.gmf.tooling.runtime" version="0.0.0"/> + <import feature="org.eclipse.gmf.tooling.codegen.xtend2" version="0.0.0"/> + </requires> + <plugin id="org.eclipse.papyrus.codegen" download-size="0" diff --git a/plugins/pom.xml b/plugins/pom.xml index 80fe7c8b567..d46a4c58d83 100644 --- a/plugins/pom.xml +++ b/plugins/pom.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8" standalone="no"?> -<project> +<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> <artifactId>org.eclipse.papyrus.plugins</artifactId> <packaging>pom</packaging> diff --git a/releng/dev/pom.xml b/releng/dev/pom.xml index 33959dd707e..d8ae780ca6c 100755 --- a/releng/dev/pom.xml +++ b/releng/dev/pom.xml @@ -32,6 +32,7 @@ <module>site</module> <module>targetPlatform</module> </modules> + <build> <pluginManagement> <plugins> @@ -142,6 +143,7 @@ </plugin> </plugins> </build> + <profiles> <profile> <id>defaultProfile</id> diff --git a/releng/dev/site/category.xml b/releng/dev/site/category.xml index f13e6608281..f37cbfd2dbe 100644 --- a/releng/dev/site/category.xml +++ b/releng/dev/site/category.xml @@ -22,4 +22,5 @@ Papyrus Developer Examples </description> </category-def> + <repository-reference location="http://download.eclipse.org/modeling/gmp/gmf-tooling/updates/releases-3.3.1a" enabled="true" /> </site> diff --git a/releng/dev/site/pom.xml b/releng/dev/site/pom.xml index eac686abec0..fad7ab4431e 100644 --- a/releng/dev/site/pom.xml +++ b/releng/dev/site/pom.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8" standalone="no"?> -<project> +<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> <parent> @@ -12,7 +12,7 @@ <groupId>org.eclipse.papyrus</groupId> <version>3.0.0-SNAPSHOT</version> <packaging>eclipse-repository</packaging> - + <build> <plugins> <plugin> @@ -23,6 +23,27 @@ <includePackedArtifacts>true</includePackedArtifacts> </configuration> </plugin> + + <!-- workaround https://bugs.eclipse.org/bugs/show_bug.cgi?id=453708 --> + <plugin> + <groupId>org.jboss.tools.tycho-plugins</groupId> + <artifactId>repository-utils</artifactId> + <executions> + <execution> + <phase>package</phase> + <goals> + <goal>generate-repository-facade</goal> + </goals> + <configuration> + + <!-- p2 update site transitive dependencies repositories --> + <associateSites> + <site>http://download.eclipse.org/modeling/gmp/gmf-tooling/updates/releases-3.3.1a</site> + </associateSites> + </configuration> + </execution> + </executions> + </plugin> </plugins> </build> </project> diff --git a/releng/pom.xml b/releng/pom.xml index 268b6cadd59..b43ad27bac9 100644 --- a/releng/pom.xml +++ b/releng/pom.xml @@ -30,7 +30,8 @@ <!-- Papyrus repositories. Used when we're building individual components (vs building the parent pom including everything) --> <papyrus.eclipse.target>photon</papyrus.eclipse.target> - <eclipse.download>http://download.eclipse.org</eclipse.download> <!-- Deprecated; kept for Legacy. Can be set to file:/home/data/httpd/download.eclipse.org when building on HIPP --> + <eclipse.download>http://download.eclipse.org</eclipse.download> <!-- Deprecated; kept for Legacy. Can be set to file:/home/data/httpd/download.eclipse.org + when building on HIPP --> <papyrus.repo.main>http://download.eclipse.org/modeling/mdt/papyrus/updates/nightly/${papyrus.eclipse.target}</papyrus.repo.main> <papyrus.repo.dev>https://hudson.eclipse.org/papyrus/job/Papyrus-Master-Developer/lastSuccessfulBuild/artifact/repository/</papyrus.repo.dev> </properties> @@ -58,9 +59,14 @@ <!-- url>https://repo.eclipse.org/content/repositories/mylyn-releases/</url --> <url>https://repo.eclipse.org/content/repositories/mylyn/</url> </pluginRepository> + <pluginRepository> + <id>org.jboss.tools.tycho-plugins</id> + <url>https://repository.jboss.org/</url> + </pluginRepository> </pluginRepositories> + <build> - <outputDirectory>bin</outputDirectory> + <outputDirectory>bin</outputDirectory> <pluginManagement> <plugins> <plugin> @@ -138,10 +144,16 @@ </target> </configuration> </plugin> + + <plugin> + <groupId>org.jboss.tools.tycho-plugins</groupId> + <artifactId>repository-utils</artifactId> + <version>0.26.0</version> + </plugin> </plugins> </pluginManagement> </build> - + <profiles> <profile> <id>eclipsehippIntegration</id> |