Skip to main content

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index] [List Home]
[cbi-dev] Bug 378234 - CBI should produce a comparable build output repo

Hi Everyone,

I was investigating why some bundles had classes different in CBI [1] today and discovered there is a parent file in the rt.equinox.p2 repo that has a workaround that seems to have overrided the BREE for some of the bundles. Looking at the Bug 353505 [2] it seems like the Bug was fixed in Tycho so I decided to remove it with the patch below.

After using this patch I noticed the following bundles are now no longer showing up as having different classes via the comparator.

org.eclipse.equinox.p2.transport.ecf
org.eclipse.equinox.p2.discovery
org.eclipse.equinox.p2.discovery.compatibility
org.eclipse.equinox.p2.tests.verifier
org.eclipse.equinox.p2.tests.ui


I was thinking of pushing this into CBI but wanted to make sure I wasn't overlooking anything by including this patch.


Thanks,


Thanh

[1] https://bugs.eclipse.org/bugs/show_bug.cgi?id=378234#c29
[2] https://bugs.eclipse.org/bugs/show_bug.cgi?id=353505


diff --git a/org.eclipse.equinox.p2.releng/org.eclipse.equinox.p2-parent/pom.xml b/org.eclipse.equinox.p2.releng/org.eclipse.equinox.p2-parent/pom.xml
index 2027baf..ab5899d 100644
--- a/org.eclipse.equinox.p2.releng/org.eclipse.equinox.p2-parent/pom.xml
+++ b/org.eclipse.equinox.p2.releng/org.eclipse.equinox.p2-parent/pom.xml
@@ -62,15 +62,6 @@
                                </configuration>
                        </plugin>
 
-                       <!-- workaround for bug 353505 - need to repeat compiler source and target levels in POM -->
-                       <plugin>
-                               <groupId>org.eclipse.tycho</groupId>
-                               <artifactId>tycho-compiler-plugin</artifactId>
-                               <configuration>
-                                       <source>1.5</source>
-                                       <target>jsr14</target>
-                               </configuration>
-                       </plugin>
                </plugins>
        </build>

Back to the top