diff options
| author | Zoltan Ujhelyi | 2016-10-07 08:11:33 +0000 |
|---|---|---|
| committer | Zoltan Ujhelyi | 2016-10-07 08:11:33 +0000 |
| commit | d0a50f4762d7ab90836376bd3abd2d5a0d67c5e6 (patch) | |
| tree | dcf210d2a48fbbfa1a6f7cacda9f0decca2dcf47 | |
| parent | 0f21d4d6c3c37043ff29df7386b5d6ffebc7f613 (diff) | |
| download | org.eclipse.viatra-d0a50f4762d7ab90836376bd3abd2d5a0d67c5e6.tar.gz org.eclipse.viatra-d0a50f4762d7ab90836376bd3abd2d5a0d67c5e6.tar.xz org.eclipse.viatra-d0a50f4762d7ab90836376bd3abd2d5a0d67c5e6.zip | |
[503318] Fixing DSE build
Change-Id: I5113784cfbb4c79256e36eac07376bd732751fc8
Signed-off-by: Zoltan Ujhelyi <ujhelyiz@incquerylabs.com>
| -rw-r--r-- | dse/features/org.eclipse.viatra.dse.feature/pom.xml | 4 | ||||
| -rw-r--r-- | dse/plugins/org.eclipse.viatra.dse.genetic/pom.xml | 4 | ||||
| -rw-r--r-- | dse/plugins/org.eclipse.viatra.dse/pom.xml | 4 | ||||
| -rw-r--r-- | releng/org.eclipse.viatra.parent.dse/pom.xml | 27 |
4 files changed, 33 insertions, 6 deletions
diff --git a/dse/features/org.eclipse.viatra.dse.feature/pom.xml b/dse/features/org.eclipse.viatra.dse.feature/pom.xml index 373968089..91dd84a8e 100644 --- a/dse/features/org.eclipse.viatra.dse.feature/pom.xml +++ b/dse/features/org.eclipse.viatra.dse.feature/pom.xml @@ -4,10 +4,10 @@ xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> <modelVersion>4.0.0</modelVersion> <parent> - <artifactId>org.eclipse.viatra.parent.incubation</artifactId> + <artifactId>org.eclipse.viatra.parent.dse</artifactId> <groupId>org.eclipse.viatra</groupId> <version>0.15.0-SNAPSHOT</version> - <relativePath>../../../releng/org.eclipse.viatra.parent.incubation/pom.xml</relativePath> + <relativePath>../../../releng/org.eclipse.viatra.parent.dse/pom.xml</relativePath> </parent> <artifactId>org.eclipse.viatra.dse.feature</artifactId> <packaging>eclipse-feature</packaging> diff --git a/dse/plugins/org.eclipse.viatra.dse.genetic/pom.xml b/dse/plugins/org.eclipse.viatra.dse.genetic/pom.xml index 6aabbf290..b1ceb18c2 100644 --- a/dse/plugins/org.eclipse.viatra.dse.genetic/pom.xml +++ b/dse/plugins/org.eclipse.viatra.dse.genetic/pom.xml @@ -3,10 +3,10 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> <modelVersion>4.0.0</modelVersion> <parent> - <artifactId>org.eclipse.viatra.parent.incubation</artifactId> + <artifactId>org.eclipse.viatra.parent.dse</artifactId> <groupId>org.eclipse.viatra</groupId> <version>0.15.0-SNAPSHOT</version> - <relativePath>../../../releng/org.eclipse.viatra.parent.incubation/pom.xml</relativePath> + <relativePath>../../../releng/org.eclipse.viatra.parent.dse/pom.xml</relativePath> </parent> <artifactId>org.eclipse.viatra.dse.genetic</artifactId> <packaging>eclipse-plugin</packaging> diff --git a/dse/plugins/org.eclipse.viatra.dse/pom.xml b/dse/plugins/org.eclipse.viatra.dse/pom.xml index 231581276..8166f74b9 100644 --- a/dse/plugins/org.eclipse.viatra.dse/pom.xml +++ b/dse/plugins/org.eclipse.viatra.dse/pom.xml @@ -4,10 +4,10 @@ xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> <modelVersion>4.0.0</modelVersion> <parent> - <artifactId>org.eclipse.viatra.parent.incubation</artifactId> + <artifactId>org.eclipse.viatra.parent.dse</artifactId> <groupId>org.eclipse.viatra</groupId> <version>0.15.0-SNAPSHOT</version> - <relativePath>../../../releng/org.eclipse.viatra.parent.incubation/pom.xml</relativePath> + <relativePath>../../../releng/org.eclipse.viatra.parent.dse/pom.xml</relativePath> </parent> <artifactId>org.eclipse.viatra.dse</artifactId> <packaging>eclipse-plugin</packaging> diff --git a/releng/org.eclipse.viatra.parent.dse/pom.xml b/releng/org.eclipse.viatra.parent.dse/pom.xml index 608e09aed..4539a513e 100644 --- a/releng/org.eclipse.viatra.parent.dse/pom.xml +++ b/releng/org.eclipse.viatra.parent.dse/pom.xml @@ -45,6 +45,33 @@ </repository> </repositories> <build> + <plugins> + <plugin> + <groupId>org.eclipse.tycho</groupId> + <artifactId>target-platform-configuration</artifactId> + <version>${tycho.version}</version> + <configuration> + <resolver>p2</resolver> + <target> + <artifact> + <groupId>org.eclipse.viatra</groupId> + <artifactId>org.eclipse.viatra.target.core</artifactId> + <version>${viatra.main.version}</version> + </artifact> + <dependency-resolution> + <extraRequirements> + <requirement> + <type>eclipse-plugin</type> + <id>com.google.inject.multibindings</id> + <versionRange>[3.0.0,4.0.0)</versionRange> + </requirement> + </extraRequirements> + </dependency-resolution> + </target> + <ignoreTychoRepositories>true</ignoreTychoRepositories> + </configuration> + </plugin> + </plugins> <pluginManagement> <plugins> <plugin> |