diff options
| author | András Szabolcs Nagy | 2016-10-06 11:54:23 +0000 |
|---|---|---|
| committer | András Szabolcs Nagy | 2016-10-06 11:54:23 +0000 |
| commit | 2d42c9964521b5f3bfd5f35466bb7a4ad86567ca (patch) | |
| tree | 46d7c2dd8b7a495a94e604d1d1bdb0f85a9530f5 | |
| parent | 706f3d42c7555e65717a085c6656b90ae55ad8d0 (diff) | |
| download | org.eclipse.viatra-2d42c9964521b5f3bfd5f35466bb7a4ad86567ca.tar.gz org.eclipse.viatra-2d42c9964521b5f3bfd5f35466bb7a4ad86567ca.tar.xz org.eclipse.viatra-2d42c9964521b5f3bfd5f35466bb7a4ad86567ca.zip | |
[503318] DSE maven build fix attempt v2
Change-Id: Iadbc1ab91bed8208ae2f182b06d4d22c482ce2a3
| -rw-r--r-- | releng/org.eclipse.viatra.parent.dse/pom.xml | 47 |
1 files changed, 20 insertions, 27 deletions
diff --git a/releng/org.eclipse.viatra.parent.dse/pom.xml b/releng/org.eclipse.viatra.parent.dse/pom.xml index d5acefdb7..608e09aed 100644 --- a/releng/org.eclipse.viatra.parent.dse/pom.xml +++ b/releng/org.eclipse.viatra.parent.dse/pom.xml @@ -19,13 +19,31 @@ </modules> <parent> <groupId>org.eclipse.viatra</groupId> - <artifactId>org.eclipse.viatra.parent.all</artifactId> + <artifactId>org.eclipse.viatra.parent</artifactId> <version>1.5.0-SNAPSHOT</version> - <relativePath>../org.eclipse.viatra.parent.all/pom.xml</relativePath> + <relativePath>../org.eclipse.viatra.parent/pom.xml</relativePath> </parent> <properties> <viatra.incubation.version>0.15.0-SNAPSHOT</viatra.incubation.version> + <core.repository.url>file://${basedir}/../../../releng/org.eclipse.viatra.update.core/target/repository</core.repository.url> </properties> + <repositories> + <repository> + <id>viatra.core</id> + <url>${core.repository.url}</url> + <layout>p2</layout> + </repository> + <repository> + <id>viatra.nexus</id> + <url>https://repo.eclipse.org/content/groups/viatra/</url> + <releases> + <enabled>true</enabled> + </releases> + <snapshots> + <enabled>true</enabled> + </snapshots> + </repository> + </repositories> <build> <pluginManagement> <plugins> @@ -37,31 +55,6 @@ <properties>viatra.incubation.version</properties> </configuration> </plugin> - <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> </build> |