JDK 9's source code is now modular

[David Holmes]

On 19/08/2014 9:05 AM, mark.reinhold at oracle.com wrote:
> FYI, the changesets for JEP 201: Modular Source Code were merged earlier
> today, so if you're working on JDK 9 then your forest will have a very
> different structure after your next pull.  See the JEP for details
> (http://openjdk.java.net/jeps/201); a related subtask has links to the
> Mercurial changesets (https://bugs.openjdk.java.net/browse/JDK-8054834).

I got the following "possible conflict" warnings:

pulling from http://hg.openjdk.java.net/jdk9/dev/jdk
searching for changes
adding changesets
adding manifests
adding file changes
added 6 changesets with 12616 changes to 12554 files
note: possible conflict - src/aix/porting/porting_aix.c was renamed 
multiple times to:
  src/demo/aix/jvmti/hprof/porting_aix.c
  src/java.desktop/aix/native/libawt/porting_aix.c
note: possible conflict - src/aix/porting/porting_aix.h was renamed 
multiple times to:
  src/demo/aix/jvmti/hprof/porting_aix.h
  src/java.desktop/aix/native/libawt/porting_aix.h
note: possible conflict - 
src/share/classes/java/lang/instrument/package.html was renamed multiple 
times to:
  src/java.instrument/share/classes/java/lang/instrument/package.html
  src/java.management/share/classes/java/lang/management/package.html
12548 files updated, 0 files merged, 12465 files removed, 0 files unresolved

Are they harmless and expected?

Thanks,
David H.

> My thanks to Alan Bateman and Mandy Chung for their work over the last
> several years to tease out the modular structure that's been hiding all
> along inside the massive, monolithic JDK; to Erik Joelsson for rewriting
> the build system (again!) to accommodate modules; and to Chris Hegarty
> for wrangling patches and attending to the myriad details of landing
> this huge change in JDK 9.
>
> - Mark
>