Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[NETBEANS-2577] Prevent Maven libraries from being exluded #1271

Merged
merged 1 commit into from Jun 7, 2019

Conversation

@sdedic
Copy link
Member

commented May 30, 2019

I have essentially swapped two pieces of code: the explicit information from NB installation (update_tracking/*.xml) takes precedence.

Original behaviour:

  • if a file that just happens to be an OSGi bundle (or NB module) is present anywhere, it's filtered according to excluded modules
  • filters out also mave/lib contents, which is not managed by NB module system, but contains libraries supporting embedded maven

New behaviour:

  • the Platform defines what module the file belongs to. Maven libraries, although OSGi bundles themselves, will be attributed to maven embedder module
  • if not defined, and the file contains NB module or OSGi bundle manifest, it will be recognized as a module itself

@sdedic sdedic requested a review from JaroslavTulach May 30, 2019

@sdedic sdedic added the NB11.1 label May 30, 2019

@JaroslavTulach
Copy link
Contributor

left a comment

If that works...

A small (integration) test wouldn't hurt. Let the Travis build the IDE and then run ant -f nbbuild/build.xml localtest - then just add a test to verify that the Maven library NBM(?) contains the right files or something like that.

@sdedic

This comment has been minimized.

Copy link
Member Author

commented May 30, 2019

@JaroslavTulach it seemed to work; I built a distro from master and branch, and the filelist was just the same. Also note that the bug affects mainly NB platform applications, not NetBeans itself.

@sdedic sdedic force-pushed the sdedic:bugfix/2577-filtering_modules branch from 9e3ecfb to ee2ad24 May 31, 2019

@sdedic

This comment has been minimized.

Copy link
Member Author

commented May 31, 2019

just rebased this on the latest master.

@sdedic sdedic merged commit 4a8d8bf into apache:master Jun 7, 2019

1 check passed

continuous-integration/travis-ci/pr The Travis CI build passed
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
2 participants
You can’t perform that action at this time.