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

Fix build after changes for cluster reorganisation (PR #536) #732

Merged

Conversation

matthiasblaesing
Copy link
Contributor

  • junit4 and javahelp libraries were moved to platform subdirectory
  • platform-launchers-9.0-license.txt was placed in the wrong directory
  • VerifyLibsAndLicenses needed adjustments to scan correct directories
    in the per-module case and the "all modules" case

- junit4 and javahelp libraries were moved to platform subdirectory
- platform-launchers-9.0-license.txt was placed in the wrong directory
- VerifyLibsAndLicenses needed adjustments to scan correct directories
  in the per-module case and the "all modules" case
@matthiasblaesing
Copy link
Contributor Author

@geertjanw could you please have a look, this implements the first changes necessary as indicated in #725

@jtulach could please evaluate if you can identify further tasks, that need adjustments after your changeset for the per cluster subdirectory change in #536? It would be great if you could check the nbbuild project, as FixTestDependenciesTest is still broken, because you changed the constructor of org.netbeans.nbbuild.ModuleListParser.Entry

@geertjanw
Copy link
Member

Just checking -- what's wrong with javahelp being in platform?

@matthiasblaesing
Copy link
Contributor Author

Nothing is wrong with that - but the reference from the nbbuild project needs to be adjusted for the moved path - before the change in line 208:

https://github.com/apache/incubator-netbeans/blob/3a6f41789456fd1473163b1ac9e4e6616436c61b/nbbuild/nbproject/project.xml#L208

the reference pointed to a non-existing file after the cluster reorgnisation of platform.

@matthiasblaesing
Copy link
Contributor Author

I pushed a followup to fix the test failures revealed (not caused!) by the first commit.

@geertjanw
Copy link
Member

Thanks a lot, merging. This should fix all the problems you found, @jtulach.

@geertjanw geertjanw merged commit 74aa54b into apache:master Aug 21, 2018
@matthiasblaesing matthiasblaesing deleted the cluster_reorganisation_fixup1 branch August 28, 2018 18:33
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants