diff options
| author | Mickael Istria | 2019-06-13 21:23:23 +0000 |
|---|---|---|
| committer | Mickael Istria | 2019-06-19 15:37:24 +0000 |
| commit | 3335e09ac004c861db1624d9f7fdeb306d46390f (patch) | |
| tree | 18eb62743ab3124c5f2e98b1ecf726dd105da0e5 | |
| parent | babd76b41287c9c7bcda874a51b92bb38b773c23 (diff) | |
| download | eclipse.platform.releng.aggregator-3335e09ac004c861db1624d9f7fdeb306d46390f.tar.gz eclipse.platform.releng.aggregator-3335e09ac004c861db1624d9f7fdeb306d46390f.tar.xz eclipse.platform.releng.aggregator-3335e09ac004c861db1624d9f7fdeb306d46390f.zip | |
Bug 548242 - API Analysis in Tycho build fail for deps w/ nested jars
Use specific Tycho way to list dependencies instead of default
maven-dependency-plugin
Change-Id: I802ad196ec329a11d4ba85611166fcdd4947bf56
Signed-off-by: Mickael Istria <mistria@redhat.com>
| -rw-r--r-- | eclipse-platform-parent/pom.xml | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/eclipse-platform-parent/pom.xml b/eclipse-platform-parent/pom.xml index 1bd2a8495..f0631b115 100644 --- a/eclipse-platform-parent/pom.xml +++ b/eclipse-platform-parent/pom.xml @@ -79,8 +79,8 @@ <!-- using released version (normal case) when upgrading make sure you change pom-version-updater version in build-functions.shsource --> - <tycho.version>1.4.0</tycho.version> - <tycho-extras.version>1.4.0</tycho-extras.version> + <tycho.version>1.5.0-SNAPSHOT</tycho.version> + <tycho-extras.version>1.5.0-SNAPSHOT</tycho-extras.version> <cbi-plugins.version>1.1.5</cbi-plugins.version> @@ -476,6 +476,7 @@ <jgit.ignore> pom.xml .polyglot.build.properties + .settings/ </jgit.ignore> <jgit.dirtyWorkingTree>${jgit.dirtyWorkingTree-platformDefault}</jgit.dirtyWorkingTree> <sourceReferences> @@ -959,19 +960,18 @@ </executions> </plugin> <plugin> - <artifactId>maven-dependency-plugin</artifactId> + <groupId>org.eclipse.tycho.extras</groupId> + <artifactId>tycho-dependency-tools-plugin</artifactId> + <version>${tycho-extras.version}</version> <executions> <execution> <id>list-dependencies</id> <goals> - <goal>list</goal> + <goal>list-dependencies</goal> </goals> <phase>verify</phase> <configuration> <skip>${skipAPIAnalysis}</skip> - <outputAbsoluteArtifactFilename>true</outputAbsoluteArtifactFilename> - <outputScope>false</outputScope> - <outputFile>${project.build.directory}/dependencies.txt</outputFile> </configuration> </execution> </executions> @@ -1000,7 +1000,7 @@ <args>-baseline</args> <args>default</args> <args>-dependencyList</args> - <args>${project.build.directory}/dependencies.txt</args> + <args>${project.build.directory}/dependencies-list.txt</args> <args>-failOnError</args> </applicationsArgs> <jvmArgs> |