Automated merge with http://hg.netbeans.org/jet-main
authorVita Stejskal <vstejskal@netbeans.org>
Fri, 27 Aug 2010 10:17:42 +0200
changeset 4019e74a7eb28bab
parent 4012 7b67315f9d4f
parent 4018 1a06922c1f50
child 4020 d223f4f064bd
child 4027 9d033c6cd86a
child 4028 9dd6fc1e9b4a
Automated merge with http://hg.netbeans.org/jet-main
bpel.debugger.ui/nbproject/project.xml
compapp.casaeditor/nbproject/project.xml
compapp.projects.base/nbproject/project.xml
compapp.projects.jbi/nbproject/project.xml
soa.ui/nbproject/project.xml
xslt.core/nbproject/project.xml
xslt.tmap/nbproject/project.xml
     1.1 --- a/bpel.debugger.ui/nbproject/project.xml	Tue Aug 24 10:03:37 2010 -0400
     1.2 +++ b/bpel.debugger.ui/nbproject/project.xml	Fri Aug 27 10:17:42 2010 +0200
     1.3 @@ -96,8 +96,8 @@
     1.4                      <build-prerequisite/>
     1.5                      <compile-dependency/>
     1.6                      <run-dependency>
     1.7 -                        <release-version>2</release-version>
     1.8 -                        <specification-version>2.1</specification-version>
     1.9 +                        <release-version>3</release-version>
    1.10 +                        <specification-version>3.1</specification-version>
    1.11                      </run-dependency>
    1.12                  </dependency>
    1.13                  <dependency>
     2.1 --- a/compapp.casaeditor/nbproject/project.xml	Tue Aug 24 10:03:37 2010 -0400
     2.2 +++ b/compapp.casaeditor/nbproject/project.xml	Fri Aug 27 10:17:42 2010 +0200
     2.3 @@ -123,8 +123,8 @@
     2.4                      <build-prerequisite/>
     2.5                      <compile-dependency/>
     2.6                      <run-dependency>
     2.7 -                        <release-version>2</release-version>
     2.8 -                        <specification-version>2.1</specification-version>
     2.9 +                        <release-version>3</release-version>
    2.10 +                        <specification-version>3.1</specification-version>
    2.11                      </run-dependency>
    2.12                  </dependency>
    2.13                  <dependency>
     3.1 --- a/compapp.projects.base/nbproject/project.xml	Tue Aug 24 10:03:37 2010 -0400
     3.2 +++ b/compapp.projects.base/nbproject/project.xml	Fri Aug 27 10:17:42 2010 +0200
     3.3 @@ -64,8 +64,8 @@
     3.4                      <build-prerequisite/>
     3.5                      <compile-dependency/>
     3.6                      <run-dependency>
     3.7 -                        <release-version>2</release-version>
     3.8 -                        <specification-version>2.1</specification-version>
     3.9 +                        <release-version>3</release-version>
    3.10 +                        <specification-version>3.1</specification-version>
    3.11                      </run-dependency>
    3.12                  </dependency>
    3.13                  <dependency>
     4.1 --- a/compapp.projects.jbi/nbproject/project.xml	Tue Aug 24 10:03:37 2010 -0400
     4.2 +++ b/compapp.projects.jbi/nbproject/project.xml	Fri Aug 27 10:17:42 2010 +0200
     4.3 @@ -174,8 +174,8 @@
     4.4                      <build-prerequisite/>
     4.5                      <compile-dependency/>
     4.6                      <run-dependency>
     4.7 -                        <release-version>2</release-version>
     4.8 -                        <specification-version>2.1</specification-version>
     4.9 +                        <release-version>3</release-version>
    4.10 +                        <specification-version>3.1</specification-version>
    4.11                      </run-dependency>
    4.12                  </dependency>
    4.13                  <dependency>
     5.1 --- a/soa.jca.base/nbproject/project.xml	Tue Aug 24 10:03:37 2010 -0400
     5.2 +++ b/soa.jca.base/nbproject/project.xml	Fri Aug 27 10:17:42 2010 +0200
     5.3 @@ -81,8 +81,8 @@
     5.4                      <build-prerequisite/>
     5.5                      <compile-dependency/>
     5.6                      <run-dependency>
     5.7 -                        <release-version>2</release-version>
     5.8 -                        <specification-version>2.1</specification-version>
     5.9 +                        <release-version>3</release-version>
    5.10 +                        <specification-version>3.1</specification-version>
    5.11                      </run-dependency>
    5.12                  </dependency>
    5.13                  <dependency>
     6.1 --- a/soa.palette.java/nbproject/project.xml	Tue Aug 24 10:03:37 2010 -0400
     6.2 +++ b/soa.palette.java/nbproject/project.xml	Fri Aug 27 10:17:42 2010 +0200
     6.3 @@ -81,8 +81,8 @@
     6.4                      <build-prerequisite/>
     6.5                      <compile-dependency/>
     6.6                      <run-dependency>
     6.7 -                        <release-version>2</release-version>
     6.8 -                        <specification-version>2.1</specification-version>
     6.9 +                        <release-version>3</release-version>
    6.10 +                        <specification-version>3.1</specification-version>
    6.11                      </run-dependency>
    6.12                  </dependency>
    6.13                  <dependency>
     7.1 --- a/soa.pojo/nbproject/project.xml	Tue Aug 24 10:03:37 2010 -0400
     7.2 +++ b/soa.pojo/nbproject/project.xml	Fri Aug 27 10:17:42 2010 +0200
     7.3 @@ -123,8 +123,8 @@
     7.4                      <build-prerequisite/>
     7.5                      <compile-dependency/>
     7.6                      <run-dependency>
     7.7 -                        <release-version>2</release-version>
     7.8 -                        <specification-version>2.1</specification-version>
     7.9 +                        <release-version>3</release-version>
    7.10 +                        <specification-version>3.1</specification-version>
    7.11                      </run-dependency>
    7.12                  </dependency>
    7.13                  <dependency>
     8.1 --- a/soa.ui/nbproject/project.xml	Tue Aug 24 10:03:37 2010 -0400
     8.2 +++ b/soa.ui/nbproject/project.xml	Fri Aug 27 10:17:42 2010 +0200
     8.3 @@ -239,8 +239,8 @@
     8.4                      <build-prerequisite/>
     8.5                      <compile-dependency/>
     8.6                      <run-dependency>
     8.7 -                        <release-version>2</release-version>
     8.8 -                        <specification-version>2.1</specification-version>
     8.9 +                        <release-version>3</release-version>
    8.10 +                        <specification-version>3.1</specification-version>
    8.11                      </run-dependency>
    8.12                  </dependency>
    8.13              </module-dependencies>
     9.1 --- a/xslt.core/nbproject/project.xml	Tue Aug 24 10:03:37 2010 -0400
     9.2 +++ b/xslt.core/nbproject/project.xml	Fri Aug 27 10:17:42 2010 +0200
     9.3 @@ -80,8 +80,8 @@
     9.4                      <build-prerequisite/>
     9.5                      <compile-dependency/>
     9.6                      <run-dependency>
     9.7 -                        <release-version>2</release-version>
     9.8 -                        <specification-version>2.1</specification-version>
     9.9 +                        <release-version>3</release-version>
    9.10 +                        <specification-version>3.1</specification-version>
    9.11                      </run-dependency>
    9.12                  </dependency>
    9.13                  <dependency>
    10.1 --- a/xslt.tmap/nbproject/project.xml	Tue Aug 24 10:03:37 2010 -0400
    10.2 +++ b/xslt.tmap/nbproject/project.xml	Fri Aug 27 10:17:42 2010 +0200
    10.3 @@ -64,8 +64,8 @@
    10.4                      <build-prerequisite/>
    10.5                      <compile-dependency/>
    10.6                      <run-dependency>
    10.7 -                        <release-version>2</release-version>
    10.8 -                        <specification-version>2.1</specification-version>
    10.9 +                        <release-version>3</release-version>
   10.10 +                        <specification-version>3.1</specification-version>
   10.11                      </run-dependency>
   10.12                  </dependency>
   10.13                  <dependency>