1.1 --- a/a11y/nbproject/project.xml	Wed Nov 18 14:28:55 2015 -0600
     1.2 +++ b/a11y/nbproject/project.xml	Mon Nov 30 20:19:12 2015 +0100
     1.3 @@ -72,6 +72,15 @@
     1.4                      </run-dependency>
     1.5                  </dependency>
     1.6                  <dependency>
     1.7 +                    <code-name-base>org.netbeans.spi.navigator</code-name-base>
     1.8 +                    <build-prerequisite/>
     1.9 +                    <compile-dependency/>
    1.10 +                    <run-dependency>
    1.11 +                        <release-version>1</release-version>
    1.12 +                        <specification-version>1.37</specification-version>
    1.13 +                    </run-dependency>
    1.14 +                </dependency>
    1.15 +                <dependency>
    1.16                      <code-name-base>org.openide.awt</code-name-base>
    1.17                      <build-prerequisite/>
    1.18                      <compile-dependency/>
    1.19 @@ -116,6 +125,14 @@
    1.20                      </run-dependency>
    1.21                  </dependency>
    1.22                  <dependency>
    1.23 +                    <code-name-base>org.openide.util.lookup</code-name-base>
    1.24 +                    <build-prerequisite/>
    1.25 +                    <compile-dependency/>
    1.26 +                    <run-dependency>
    1.27 +                        <specification-version>8.22</specification-version>
    1.28 +                    </run-dependency>
    1.29 +                </dependency>
    1.30 +                <dependency>
    1.31                      <code-name-base>org.openide.util.ui</code-name-base>
    1.32                      <build-prerequisite/>
    1.33                      <compile-dependency/>
    1.34 @@ -124,14 +141,6 @@
    1.35                      </run-dependency>
    1.36                  </dependency>
    1.37                  <dependency>
    1.38 -                    <code-name-base>org.openide.util.lookup</code-name-base>
    1.39 -                    <build-prerequisite/>
    1.40 -                    <compile-dependency/>
    1.41 -                    <run-dependency>
    1.42 -                        <specification-version>8.22</specification-version>
    1.43 -                    </run-dependency>
    1.44 -                </dependency>
    1.45 -                <dependency>
    1.46                      <code-name-base>org.openide.windows</code-name-base>
    1.47                      <build-prerequisite/>
    1.48                      <compile-dependency/>

     2.1 --- a/codetemplatetools/nbproject/project.xml	Wed Nov 18 14:28:55 2015 -0600
     2.2 +++ b/codetemplatetools/nbproject/project.xml	Mon Nov 30 20:19:12 2015 +0100
     2.3 @@ -56,6 +56,14 @@
     2.4                      </run-dependency>
     2.5                  </dependency>
     2.6                  <dependency>
     2.7 +                    <code-name-base>org.netbeans.modules.editor.document</code-name-base>
     2.8 +                    <build-prerequisite/>
     2.9 +                    <compile-dependency/>
    2.10 +                    <run-dependency>
    2.11 +                        <specification-version>1.6</specification-version>
    2.12 +                    </run-dependency>
    2.13 +                </dependency>
    2.14 +                <dependency>
    2.15                      <code-name-base>org.netbeans.modules.editor.lib</code-name-base>
    2.16                      <build-prerequisite/>
    2.17                      <compile-dependency/>
    2.18 @@ -107,14 +115,6 @@
    2.19                      </run-dependency>
    2.20                  </dependency>
    2.21                  <dependency>
    2.22 -                    <code-name-base>org.openide.util.ui</code-name-base>
    2.23 -                    <build-prerequisite/>
    2.24 -                    <compile-dependency/>
    2.25 -                    <run-dependency>
    2.26 -                        <specification-version>9.3</specification-version>
    2.27 -                    </run-dependency>
    2.28 -                </dependency>
    2.29 -                <dependency>
    2.30                      <code-name-base>org.openide.util</code-name-base>
    2.31                      <build-prerequisite/>
    2.32                      <compile-dependency/>
    2.33 @@ -131,6 +131,14 @@
    2.34                      </run-dependency>
    2.35                  </dependency>
    2.36                  <dependency>
    2.37 +                    <code-name-base>org.openide.util.ui</code-name-base>
    2.38 +                    <build-prerequisite/>
    2.39 +                    <compile-dependency/>
    2.40 +                    <run-dependency>
    2.41 +                        <specification-version>9.3</specification-version>
    2.42 +                    </run-dependency>
    2.43 +                </dependency>
    2.44 +                <dependency>
    2.45                      <code-name-base>org.openide.windows</code-name-base>
    2.46                      <build-prerequisite/>
    2.47                      <compile-dependency/>

     3.1 --- a/editor.deprecated.pre61completion/nbproject/project.xml	Wed Nov 18 14:28:55 2015 -0600
     3.2 +++ b/editor.deprecated.pre61completion/nbproject/project.xml	Mon Nov 30 20:19:12 2015 +0100
     3.3 @@ -15,6 +15,14 @@
     3.4                      </run-dependency>
     3.5                  </dependency>
     3.6                  <dependency>
     3.7 +                    <code-name-base>org.netbeans.modules.editor.document</code-name-base>
     3.8 +                    <build-prerequisite/>
     3.9 +                    <compile-dependency/>
    3.10 +                    <run-dependency>
    3.11 +                        <specification-version>1.6</specification-version>
    3.12 +                    </run-dependency>
    3.13 +                </dependency>
    3.14 +                <dependency>
    3.15                      <code-name-base>org.netbeans.modules.editor.lib</code-name-base>
    3.16                      <build-prerequisite/>
    3.17                      <compile-dependency/>
    3.18 @@ -33,6 +41,14 @@
    3.19                      </run-dependency>
    3.20                  </dependency>
    3.21                  <dependency>
    3.22 +                    <code-name-base>org.openide.util</code-name-base>
    3.23 +                    <build-prerequisite/>
    3.24 +                    <compile-dependency/>
    3.25 +                    <run-dependency>
    3.26 +                        <specification-version>9.3</specification-version>
    3.27 +                    </run-dependency>
    3.28 +                </dependency>
    3.29 +                <dependency>
    3.30                      <code-name-base>org.openide.util.ui</code-name-base>
    3.31                      <build-prerequisite/>
    3.32                      <compile-dependency/>
    3.33 @@ -40,15 +56,7 @@
    3.34                          <specification-version>9.3</specification-version>
    3.35                      </run-dependency>
    3.36                  </dependency>
    3.37 -                <dependency>
    3.38 -                    <code-name-base>org.openide.util</code-name-base>
    3.39 -                    <build-prerequisite/>
    3.40 -                    <compile-dependency/>
    3.41 -                    <run-dependency>
    3.42 -                        <specification-version>9.3</specification-version>
    3.43 -                    </run-dependency>
    3.44 -                </dependency>
    3.45 -                </module-dependencies>
    3.46 +            </module-dependencies>
    3.47              <public-packages>
    3.48                  <package>org.netbeans.editor.ext</package>
    3.49              </public-packages>

     4.1 --- a/editor.nexterror/nbproject/project.xml	Wed Nov 18 14:28:55 2015 -0600
     4.2 +++ b/editor.nexterror/nbproject/project.xml	Mon Nov 30 20:19:12 2015 +0100
     4.3 @@ -47,6 +47,14 @@
     4.4              <code-name-base>org.netbeans.modules.editor.nexterror</code-name-base>
     4.5              <module-dependencies>
     4.6                  <dependency>
     4.7 +                    <code-name-base>org.netbeans.modules.editor.document</code-name-base>
     4.8 +                    <build-prerequisite/>
     4.9 +                    <compile-dependency/>
    4.10 +                    <run-dependency>
    4.11 +                        <specification-version>1.6</specification-version>
    4.12 +                    </run-dependency>
    4.13 +                </dependency>
    4.14 +                <dependency>
    4.15                      <code-name-base>org.netbeans.modules.editor.lib</code-name-base>
    4.16                      <build-prerequisite/>
    4.17                      <compile-dependency/>
    4.18 @@ -65,6 +73,14 @@
    4.19                      </run-dependency>
    4.20                  </dependency>
    4.21                  <dependency>
    4.22 +                    <code-name-base>org.openide.util</code-name-base>
    4.23 +                    <build-prerequisite/>
    4.24 +                    <compile-dependency/>
    4.25 +                    <run-dependency>
    4.26 +                        <specification-version>9.3</specification-version>
    4.27 +                    </run-dependency>
    4.28 +                </dependency>
    4.29 +                <dependency>
    4.30                      <code-name-base>org.openide.util.ui</code-name-base>
    4.31                      <build-prerequisite/>
    4.32                      <compile-dependency/>
    4.33 @@ -72,15 +88,7 @@
    4.34                          <specification-version>9.3</specification-version>
    4.35                      </run-dependency>
    4.36                  </dependency>
    4.37 -                <dependency>
    4.38 -                    <code-name-base>org.openide.util</code-name-base>
    4.39 -                    <build-prerequisite/>
    4.40 -                    <compile-dependency/>
    4.41 -                    <run-dependency>
    4.42 -                        <specification-version>9.3</specification-version>
    4.43 -                    </run-dependency>
    4.44 -                </dependency>
    4.45 -                </module-dependencies>
    4.46 +            </module-dependencies>
    4.47              <public-packages/>
    4.48          </data>
    4.49      </configuration>

     5.1 --- a/fisheye/nbproject/project.xml	Wed Nov 18 14:28:55 2015 -0600
     5.2 +++ b/fisheye/nbproject/project.xml	Mon Nov 30 20:19:12 2015 +0100
     5.3 @@ -6,6 +6,14 @@
     5.4              <code-name-base>org.netbeans.modules.fisheye</code-name-base>
     5.5              <module-dependencies>
     5.6                  <dependency>
     5.7 +                    <code-name-base>org.netbeans.modules.editor.document</code-name-base>
     5.8 +                    <build-prerequisite/>
     5.9 +                    <compile-dependency/>
    5.10 +                    <run-dependency>
    5.11 +                        <specification-version>1.6</specification-version>
    5.12 +                    </run-dependency>
    5.13 +                </dependency>
    5.14 +                <dependency>
    5.15                      <code-name-base>org.netbeans.modules.editor.errorstripe</code-name-base>
    5.16                      <build-prerequisite/>
    5.17                      <compile-dependency/>