This Bugzilla instance is a read-only archive of historic NetBeans bug reports. To report a bug in NetBeans please follow the project's instructions for reporting issues.

Bug 240903 - need to update Netbinox Equinox 3.9.1
Summary: need to update Netbinox Equinox 3.9.1
Status: VERIFIED FIXED
Alias: None
Product: platform
Classification: Unclassified
Component: Netigso (show other bugs)
Version: 8.0
Hardware: PC Linux
: P2 normal (vote)
Assignee: Jaroslav Tulach
URL:
Keywords: NO80
Depends on:
Blocks:
 
Reported: 2014-01-23 20:29 UTC by stoto79
Modified: 2014-05-29 04:32 UTC (History)
4 users (show)

See Also:
Issue Type: DEFECT
Exception Reporter:


Attachments

Note You need to log in before you can comment on or make changes to this bug.
Description stoto79 2014-01-23 20:29:53 UTC
JDev, when run against Netbinox based on Equinox 3.8, has a bug

https://bug.oraclecorp.com/pls/bug/webbug_edit.edit_info_top?rptno=16198076

which is caused by a bug in Equinox:

https://bugs.eclipse.org/bugs/show_bug.cgi?id=393612

This bug is getting hit from a lot more places now. The fix is to migrate to Equinox Kepler or Kepler SR1 (3.9.1) both of which should contain the fix.
Comment 1 Jaroslav Tulach 2014-01-27 17:18:01 UTC
Not for NetBeans 8.0 - has to wait for another release.
Comment 2 Jaroslav Tulach 2014-05-23 07:07:22 UTC
Got the binary of Kepler SR2 and executed unit tests. There seems to be one failure due to incompatible change in Equinox which I need to resolve. If that is all, it would be good compared to previous update.
Comment 3 Jaroslav Tulach 2014-05-23 07:30:31 UTC
The change of one parameter constructor to two parameter has been done in 


rt.equinox.framework$ git show bda5862
commit bda586273cfe19c14ef7cc12517c6f6c5b7d68d0
Merge: 9e41c79 671f706
Author: Thomas Watson <tjwatson@us.ibm.com>
Date:   Mon Apr 15 20:49:44 2013 -0500

    Merge branch 'master' into twatson/container
    
    Conflicts:
        bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/storage/bundlefile/DirBundleFile.java
        bundles/org.eclipse.osgi/defaultAdaptor/src/org/eclipse/osgi/internal/baseadaptor/BaseStorage.java
        bundles/org.eclipse.osgi/eclipseAdaptor/src/org/eclipse/core/runtime/internal/adaptor/EclipseLazyStarter.java
Comment 4 Jaroslav Tulach 2014-05-23 07:34:28 UTC
The previous commit is just a merge. The actual error commit is

commit 5ad325360d09f89d8cb3766164e9340041aec535
Author: Thomas Watson <tjwatson@us.ibm.com>
Date:   Wed Apr 10 10:34:29 2013 -0500

    Bug 395274 - Equinox returns valid bundle entries for invalid paths
    - additional fix to properly use canonical paths for the basefile

diff --git a/bundles/org.eclipse.osgi/defaultAdaptor/src/org/eclipse/osgi/baseadaptor/bundlefile/DirBundleFile.java b/bundles/org.eclipse.osgi/defaultAdaptor/src/org/eclipse/osgi/baseadaptor/bundlefile/DirBundleFile
index 295a866..890104a 100644
--- a/bundles/org.eclipse.osgi/defaultAdaptor/src/org/eclipse/osgi/baseadaptor/bundlefile/DirBundleFile.java
+++ b/bundles/org.eclipse.osgi/defaultAdaptor/src/org/eclipse/osgi/baseadaptor/bundlefile/DirBundleFile.java
@@ -38,12 +35,16 @@ public class DirBundleFile extends BundleFile {
         * @param basefile the base file
         * @throws IOException
         */
-       public DirBundleFile(File basefile) throws IOException {
-               super(basefile);
+       public DirBundleFile(File basefile, boolean enableStrictBundleEntryPath) throws IOException {
+               super(getBaseFile(basefile, enableStrictBundleEntryPath));
                if (!BundleFile.secureAction.exists(basefile) || !BundleFile.secureAction.isDirectory(basefile)) {
Comment 5 Jaroslav Tulach 2014-05-23 07:52:20 UTC
Pushed as
https://hg.netbeans.org/ergonomics/rev/e8aefa38c492

The unit tests pass. IDE starts. I can connect to NetBeans bugzilla. Will see what the whole integration suite thinks about the change.

Tondo, please check if there is any necessary paperwork to be done. Thanks.
Comment 6 Quality Engineering 2014-05-26 01:11:53 UTC
Integrated into 'main-silver', will be available in build *201405260001* on http://bits.netbeans.org/dev/nightly/ (upload may still be in progress)

Changeset: http://hg.netbeans.org/main-silver/rev/e8aefa38c492
User: Jaroslav Tulach <jtulach@netbeans.org>
Log: #240903: Upgrading to equinox 3.9.1
Comment 7 Jaroslav Tulach 2014-05-29 04:32:25 UTC
According to Thomas[1] the next upgrade may not be as smooth.

[1] https://bugs.eclipse.org/bugs/show_bug.cgi?id=395274#c23