diff options
| author | Dani Megert | 2019-06-19 22:15:56 +0000 |
|---|---|---|
| committer | Dani Megert | 2019-06-19 22:16:02 +0000 |
| commit | 5f09f84856009fd285b9268ff70090eeab9a048f (patch) | |
| tree | 186575172fc1916128ad28278edd463a03c6a557 /eclipse-platform-parent | |
| parent | d39435739d12f8559322828afe183ed26ea19187 (diff) | |
| download | eclipse.platform.releng.aggregator-5f09f84856009fd285b9268ff70090eeab9a048f.tar.gz eclipse.platform.releng.aggregator-5f09f84856009fd285b9268ff70090eeab9a048f.tar.xz eclipse.platform.releng.aggregator-5f09f84856009fd285b9268ff70090eeab9a048f.zip | |
Revert "Bug 548242 - API Analysis in Tycho build fail for deps w/ nested jars"I20190619-1820
This reverts commit 3335e09ac004c861db1624d9f7fdeb306d46390f.
There are for example JDT compiler settings that affect the binaries. So, excluding the .settings is not an option.
Change-Id: Ifffe63148c30b42820ec0c875bb34849ac78c0b4
Diffstat (limited to 'eclipse-platform-parent')
| -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 f0631b115..1bd2a8495 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.5.0-SNAPSHOT</tycho.version> - <tycho-extras.version>1.5.0-SNAPSHOT</tycho-extras.version> + <tycho.version>1.4.0</tycho.version> + <tycho-extras.version>1.4.0</tycho-extras.version> <cbi-plugins.version>1.1.5</cbi-plugins.version> @@ -476,7 +476,6 @@ <jgit.ignore> pom.xml .polyglot.build.properties - .settings/ </jgit.ignore> <jgit.dirtyWorkingTree>${jgit.dirtyWorkingTree-platformDefault}</jgit.dirtyWorkingTree> <sourceReferences> @@ -960,18 +959,19 @@ </executions> </plugin> <plugin> - <groupId>org.eclipse.tycho.extras</groupId> - <artifactId>tycho-dependency-tools-plugin</artifactId> - <version>${tycho-extras.version}</version> + <artifactId>maven-dependency-plugin</artifactId> <executions> <execution> <id>list-dependencies</id> <goals> - <goal>list-dependencies</goal> + <goal>list</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-list.txt</args> + <args>${project.build.directory}/dependencies.txt</args> <args>-failOnError</args> </applicationsArgs> <jvmArgs> |