Skip to content

Commit 19c3af1

Browse files
committed
[Build] Add back sources to Eclipse-SDK product
The sources of all contained bundles were accidentally removed from the eclipse-SDK product in - #3549 That is because the p2-repository assembled for the eclipse-SDK product didn't contain sources before, as that repository is not used further. But now that the product is materialized from that p2-repository (since that mentioned change), sources went missing in the product itself too. Consequently the property 'repository.includeAllSources' must now be true if 'product.installSources' is true. Otherwise the latter has no effect. If no sources are available in the source-repository, of course Tycho cannot install them. Additionally remove dependencies again from eclipse-junit-tests product. They were added unintentionally in the mentioned change, too. Fixes - eclipse-jdt/eclipse.jdt.core#4684
1 parent acb9a05 commit 19c3af1

File tree

3 files changed

+15
-1
lines changed

3 files changed

+15
-1
lines changed

products/eclipse-junit-tests/pom.xml

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,17 @@
3939
</resource>
4040
</resources>
4141

42-
42+
<pluginManagement>
43+
<plugins>
44+
<plugin>
45+
<groupId>org.eclipse.tycho</groupId>
46+
<artifactId>tycho-p2-repository-plugin</artifactId>
47+
<configuration>
48+
<includeAllDependencies>false</includeAllDependencies>
49+
</configuration>
50+
</plugin>
51+
</plugins>
52+
</pluginManagement>
4353
<plugins>
4454
<plugin>
4555
<groupId>org.apache.maven.plugins</groupId>

products/eclipse-sdk/build.properties

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
pom.model.property.product.id = org.eclipse.sdk.ide
33
pom.model.property.product.rootFolder = eclipse
44
pom.model.property.product.rootFolder.macosx = Eclipse.app
5+
pom.model.property.repository.includeAllSources = true
56
pom.model.property.product.installSources = true
67

78
pom.model.property.eclipse.signing.skip = false

products/pom.xml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,9 @@
3838
<!-- TODO: Move site like products (e.g. equinox-sdk and junit-tests) into sites folder, which also avoids inheriting (for them) unwanted configuration?-->
3939

4040
<properties>
41+
<!-- If product.installSources is set to true,
42+
repository.includeAllSources must always be true too.
43+
Otherwise the former has no effect (because source=repository). -->
4144
<product.installSources>false</product.installSources>
4245
<repository.includeAllSources>false</repository.includeAllSources>
4346
</properties>

0 commit comments

Comments
 (0)