Automated merge with http://hg.netbeans.org/main
authorVita Stejskal <vstejskal@netbeans.org>
Mon, 03 Nov 2008 19:06:46 +0100
changeset 4015852a76722d4b
parent 3751 acc384ac0886
parent 4014 a9e92c3c8acf
child 4016 af20253362d1
Automated merge with http://hg.netbeans.org/main
     1.1 --- a/bpel.debugger.ui/nbproject/project.xml	Sat Nov 01 15:28:17 2008 -0400
     1.2 +++ b/bpel.debugger.ui/nbproject/project.xml	Mon Nov 03 19:06:46 2008 +0100
     1.3 @@ -100,7 +100,7 @@
     1.4                      <compile-dependency/>
     1.5                      <run-dependency>
     1.6                          <release-version>1</release-version>
     1.7 -                        <specification-version>1.27</specification-version>
     1.8 +                        <specification-version>1.30</specification-version>
     1.9                      </run-dependency>
    1.10                  </dependency>
    1.11                  <dependency>
    1.12 @@ -263,6 +263,15 @@
    1.13                          <specification-version>6.5.22</specification-version>
    1.14                      </run-dependency>
    1.15                  </dependency>
    1.16 +            <dependency>
    1.17 +                    <code-name-base>org.netbeans.modules.editor.deprecated.pre65formatting</code-name-base>
    1.18 +                    <build-prerequisite/>
    1.19 +                    <compile-dependency/>
    1.20 +                    <run-dependency>
    1.21 +                        <release-version>0-1</release-version>
    1.22 +                        <specification-version>1.0</specification-version>
    1.23 +                    </run-dependency>
    1.24 +                </dependency>
    1.25              </module-dependencies>
    1.26              <public-packages/>
    1.27          </data>
     2.1 --- a/compapp.casaeditor/nbproject/project.xml	Sat Nov 01 15:28:17 2008 -0400
     2.2 +++ b/compapp.casaeditor/nbproject/project.xml	Mon Nov 03 19:06:46 2008 +0100
     2.3 @@ -112,7 +112,7 @@
     2.4                      <compile-dependency/>
     2.5                      <run-dependency>
     2.6                          <release-version>1</release-version>
     2.7 -                        <specification-version>1.27</specification-version>
     2.8 +                        <specification-version>1.30</specification-version>
     2.9                      </run-dependency>
    2.10                  </dependency>
    2.11                  <dependency>
    2.12 @@ -363,6 +363,15 @@
    2.13                          <specification-version>6.5.21</specification-version>
    2.14                      </run-dependency>
    2.15                  </dependency>
    2.16 +                <dependency>
    2.17 +                    <code-name-base>org.netbeans.modules.editor.deprecated.pre65formatting</code-name-base>
    2.18 +                    <build-prerequisite/>
    2.19 +                    <compile-dependency/>
    2.20 +                    <run-dependency>
    2.21 +                        <release-version>0-1</release-version>
    2.22 +                        <specification-version>1.0</specification-version>
    2.23 +                    </run-dependency>
    2.24 +                </dependency>
    2.25              </module-dependencies>
    2.26              <friend-packages>
    2.27                  <friend>org.netbeans.modules.compapp.configextension</friend>
     3.1 --- a/compapp.projects.base/nbproject/project.xml	Sat Nov 01 15:28:17 2008 -0400
     3.2 +++ b/compapp.projects.base/nbproject/project.xml	Mon Nov 03 19:06:46 2008 +0100
     3.3 @@ -65,7 +65,7 @@
     3.4                      <compile-dependency/>
     3.5                      <run-dependency>
     3.6                          <release-version>1</release-version>
     3.7 -                        <specification-version>1.27</specification-version>
     3.8 +                        <specification-version>1.30</specification-version>
     3.9                      </run-dependency>
    3.10                  </dependency>
    3.11                  <dependency>
    3.12 @@ -305,6 +305,15 @@
    3.13                          <specification-version>3.9.1</specification-version>
    3.14                      </run-dependency>
    3.15                  </dependency>
    3.16 +            <dependency>
    3.17 +                    <code-name-base>org.netbeans.modules.editor.deprecated.pre65formatting</code-name-base>
    3.18 +                    <build-prerequisite/>
    3.19 +                    <compile-dependency/>
    3.20 +                    <run-dependency>
    3.21 +                        <release-version>0-1</release-version>
    3.22 +                        <specification-version>1.0</specification-version>
    3.23 +                    </run-dependency>
    3.24 +                </dependency>
    3.25              </module-dependencies>
    3.26              <friend-packages>
    3.27                  <friend>com.sun.mdm.index.project</friend>
     4.1 --- a/compapp.projects.jbi/nbproject/project.xml	Sat Nov 01 15:28:17 2008 -0400
     4.2 +++ b/compapp.projects.jbi/nbproject/project.xml	Mon Nov 03 19:06:46 2008 +0100
     4.3 @@ -157,7 +157,7 @@
     4.4                      <compile-dependency/>
     4.5                      <run-dependency>
     4.6                          <release-version>1</release-version>
     4.7 -                        <specification-version>1.27</specification-version>
     4.8 +                        <specification-version>1.30</specification-version>
     4.9                      </run-dependency>
    4.10                  </dependency>
    4.11                  <dependency>
    4.12 @@ -440,6 +440,15 @@
    4.13                          <specification-version>6.5.1</specification-version>
    4.14                      </run-dependency>
    4.15                  </dependency>
    4.16 +            <dependency>
    4.17 +                    <code-name-base>org.netbeans.modules.editor.deprecated.pre65formatting</code-name-base>
    4.18 +                    <build-prerequisite/>
    4.19 +                    <compile-dependency/>
    4.20 +                    <run-dependency>
    4.21 +                        <release-version>0-1</release-version>
    4.22 +                        <specification-version>1.0</specification-version>
    4.23 +                    </run-dependency>
    4.24 +                </dependency>
    4.25              </module-dependencies>
    4.26              <test-dependencies>
    4.27                  <test-type>
     5.1 --- a/xslt.core/nbproject/project.xml	Sat Nov 01 15:28:17 2008 -0400
     5.2 +++ b/xslt.core/nbproject/project.xml	Mon Nov 03 19:06:46 2008 +0100
     5.3 @@ -78,7 +78,7 @@
     5.4                      <compile-dependency/>
     5.5                      <run-dependency>
     5.6                          <release-version>1</release-version>
     5.7 -                        <specification-version>1.27</specification-version>
     5.8 +                        <specification-version>1.30</specification-version>
     5.9                      </run-dependency>
    5.10                  </dependency>
    5.11                  <dependency>
    5.12 @@ -355,6 +355,15 @@
    5.13                          <specification-version>6.5.22</specification-version>
    5.14                      </run-dependency>
    5.15                  </dependency>
    5.16 +            <dependency>
    5.17 +                    <code-name-base>org.netbeans.modules.editor.deprecated.pre65formatting</code-name-base>
    5.18 +                    <build-prerequisite/>
    5.19 +                    <compile-dependency/>
    5.20 +                    <run-dependency>
    5.21 +                        <release-version>0-1</release-version>
    5.22 +                        <specification-version>1.0</specification-version>
    5.23 +                    </run-dependency>
    5.24 +                </dependency>
    5.25              </module-dependencies>
    5.26              <public-packages/>
    5.27          </data>