Bug 571003 - Move to Tycho 2.3.0-SNAPSHOT
Usage of newer OSGi resolver in Tycho 2.3.0 make issues with split
package (bug 403196) surface more obviously.
So we apply workaround to ensure the proper bundle is added to
resolution.
Change-Id: I88c8d3d9cd6a326e16624a9cd3f25a257b6d8597
Signed-off-by: Mickael Istria <mistria@redhat.com>
diff --git a/bundles/org.eclipse.equinox.security.linux.x86_64/pom.xml b/bundles/org.eclipse.equinox.security.linux.x86_64/pom.xml
index d878c79..5af5ed2 100644
--- a/bundles/org.eclipse.equinox.security.linux.x86_64/pom.xml
+++ b/bundles/org.eclipse.equinox.security.linux.x86_64/pom.xml
@@ -27,4 +27,24 @@
<skipAPIAnalysis>true</skipAPIAnalysis>
</properties>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.eclipse.tycho</groupId>
+ <artifactId>target-platform-configuration</artifactId>
+ <configuration>
+ <dependency-resolution>
+ <extraRequirements>
+ <requirement>
+ <!-- workaround usage of split package https://bugs.eclipse.org/bugs/show_bug.cgi?id=403196 -->
+ <id>org.eclipse.equinox.registry</id>
+ <versionRange>0.0.0</versionRange>
+ <type>p2-installable-unit</type>
+ </requirement>
+ </extraRequirements>
+ </dependency-resolution>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
</project>
diff --git a/bundles/org.eclipse.equinox.security.linux/pom.xml b/bundles/org.eclipse.equinox.security.linux/pom.xml
index 4aedf43..052ece3 100644
--- a/bundles/org.eclipse.equinox.security.linux/pom.xml
+++ b/bundles/org.eclipse.equinox.security.linux/pom.xml
@@ -40,6 +40,16 @@
<ws>gtk</ws>
</environment>
</environments>
+ <dependency-resolution>
+ <extraRequirements>
+ <requirement>
+ <!-- workaround usage of split package https://bugs.eclipse.org/bugs/show_bug.cgi?id=403196 -->
+ <id>org.eclipse.equinox.registry</id>
+ <versionRange>0.0.0</versionRange>
+ <type>p2-installable-unit</type>
+ </requirement>
+ </extraRequirements>
+ </dependency-resolution>
</configuration>
</plugin>
</plugins>
diff --git a/bundles/org.eclipse.equinox.security.macosx/pom.xml b/bundles/org.eclipse.equinox.security.macosx/pom.xml
index 2f57e81..ec36fc9 100644
--- a/bundles/org.eclipse.equinox.security.macosx/pom.xml
+++ b/bundles/org.eclipse.equinox.security.macosx/pom.xml
@@ -41,6 +41,16 @@
<arch>x86_64</arch>
</environment>
</environments>
+ <dependency-resolution>
+ <extraRequirements>
+ <requirement>
+ <!-- workaround usage of split package https://bugs.eclipse.org/bugs/show_bug.cgi?id=403196 -->
+ <id>org.eclipse.equinox.registry</id>
+ <versionRange>0.0.0</versionRange>
+ <type>p2-installable-unit</type>
+ </requirement>
+ </extraRequirements>
+ </dependency-resolution>
</configuration>
</plugin>
</plugins>
diff --git a/bundles/org.eclipse.equinox.security.win32.x86/pom.xml b/bundles/org.eclipse.equinox.security.win32.x86/pom.xml
index a322ed1..f4b41a1 100644
--- a/bundles/org.eclipse.equinox.security.win32.x86/pom.xml
+++ b/bundles/org.eclipse.equinox.security.win32.x86/pom.xml
@@ -39,6 +39,16 @@
<arch>x86</arch>
</environment>
</environments>
+ <dependency-resolution>
+ <extraRequirements>
+ <requirement>
+ <!-- workaround usage of split package https://bugs.eclipse.org/bugs/show_bug.cgi?id=403196 -->
+ <id>org.eclipse.equinox.registry</id>
+ <versionRange>0.0.0</versionRange>
+ <type>p2-installable-unit</type>
+ </requirement>
+ </extraRequirements>
+ </dependency-resolution>
</configuration>
</plugin>
</plugins>
diff --git a/bundles/org.eclipse.equinox.security.win32.x86_64/pom.xml b/bundles/org.eclipse.equinox.security.win32.x86_64/pom.xml
index 02dbd98..c38c117 100644
--- a/bundles/org.eclipse.equinox.security.win32.x86_64/pom.xml
+++ b/bundles/org.eclipse.equinox.security.win32.x86_64/pom.xml
@@ -41,6 +41,16 @@
<arch>x86_64</arch>
</environment>
</environments>
+ <dependency-resolution>
+ <extraRequirements>
+ <requirement>
+ <!-- workaround usage of split package https://bugs.eclipse.org/bugs/show_bug.cgi?id=403196 -->
+ <id>org.eclipse.equinox.registry</id>
+ <versionRange>0.0.0</versionRange>
+ <type>p2-installable-unit</type>
+ </requirement>
+ </extraRequirements>
+ </dependency-resolution>
</configuration>
</plugin>
</plugins>
