[api-changes] Golden file changes in nbms-and-javadoc build #8902

  • From:
  • To:
  • Subject: [api-changes] Golden file changes in nbms-and-javadoc build #8902
  • Date: Wed, 28 Mar 2012 22:06:19 +0000

http://deadlock.netbeans.org/hudson/job/nbms-and-javadoc/8902/changes
http://deadlock.netbeans.org/hudson/job/nbms-and-javadoc/8902/artifact/nbbuild/build/generated/

diff -r -u --minimal --show-function-line='^[A-Z][A-Z]' 
--ignore-matching-lines=' [(]merged[)]$' -x kits.txt 
nbbuild/build/prior-generated/external-libraries.txt 
nbbuild/build/generated/external-libraries.txt
--- nbbuild/build/prior-generated/external-libraries.txt        2012-03-28 
20:10:14.509320238 +0000
+++ nbbuild/build/generated/external-libraries.txt      2012-03-28 
22:06:19.362912364 +0000
@@ -72,7 +72,7 @@ THIRD-PARTY COMPONENT FILE              
 enterprise/modules/ext/rest/oauth-server-1.8.jar             CDDL-1.1
 enterprise/modules/ext/rest/oauth-signature-1.8.jar          CDDL-1.1
 enterprise/modules/ext/servlet3.0-jsp2.2-api.jar             CDDL-1.0
-enterprise/modules/ext/spring/spring-webmvc-2.5.6.SEC01.jar  Apache-2.0
+enterprise/modules/ext/spring/spring-webmvc-2.5.6.SEC03.jar  Apache-2.0
 enterprise/modules/ext/standard.jar                          Apache-2.0
 enterprise/modules/ext/struts/antlr-2.7.2.jar                Apache-2.0
 enterprise/modules/ext/struts/bsf-2.3.0.jar                  Apache-2.0
@@ -345,7 +345,7 @@ THIRD-PARTY COMPONENT FILE              
 java/modules/ext/spring-3.0/spring-web-3.1.1.RELEASE.jar     Apache-2.0
 java/modules/ext/spring-3.0/spring-webmvc-3.1.1.RELEASE.jar  Apache-2.0
 java/modules/ext/spring-3.0/spring-webmvc-portlet-3.1.1.RELEASE.jar 
Apache-2.0
-java/modules/ext/spring/spring-2.5.6.SEC01.jar               Apache-2.0
+java/modules/ext/spring/spring-2.5.6.SEC03.jar               Apache-2.0
 java/modules/ext/toplink/toplink-essentials-agent.jar        CDDL-1.0
 java/modules/ext/toplink/toplink-essentials.jar              CDDL-1.0
 javacard/JCDK3.0.2_ConnectedEdition/Uninstaller/uninstaller.jar License 
Agreement for Java Card Development Kit 3.0.2 Revenue Release
@@ -613,11 +613,11 @@ THIRD-PARTY COMPONENT FILE              
 enterprise/modules/ext/servlet3.0-jsp2.2-api.jar
 
 Name: Spring Web MVC
-Version: 2.5.6.SEC01
+Version: 2.5.6.SEC03
 Description: Java web application framework
 Origin: http://www.springframework.org
 Files:
-enterprise/modules/ext/spring/spring-webmvc-2.5.6.SEC01.jar
+enterprise/modules/ext/spring/spring-webmvc-2.5.6.SEC03.jar
 
 Name: <unknown>
 Version: 2.2 
@@ -1443,11 +1443,11 @@ THIRD-PARTY COMPONENT FILE              
 java/modules/ext/spring-3.0/spring-webmvc-portlet-3.1.1.RELEASE.jar
 
 Name: Spring Framework
-Version: 2.5
+Version: 2.5.6
 Description: Java/J2EE application framework
 Origin: http://www.springframework.org
 Files:
-java/modules/ext/spring/spring-2.5.6.SEC01.jar
+java/modules/ext/spring/spring-2.5.6.SEC03.jar
 
 Name: TopLink Essentials
 Version: v2ur1-build-09d
diff -r -u --minimal --show-function-line='^[A-Z][A-Z]' 
--ignore-matching-lines=' [(]merged[)]$' -x kits.txt 
nbbuild/build/prior-generated/files-layout.txt 
nbbuild/build/generated/files-layout.txt
--- nbbuild/build/prior-generated/files-layout.txt      2012-03-28 
20:10:14.600166184 +0000
+++ nbbuild/build/generated/files-layout.txt    2012-03-28 22:06:12.212162673 
+0000
@@ -354,7 +354,7 @@
 o.n.m.websvc.restlib                         
enterprise/modules/ext/rest/oauth-server-1.8.jar
 o.n.m.websvc.restlib                         
enterprise/modules/ext/rest/oauth-signature-1.8.jar
 o.n.m.servletjspapi                          
enterprise/modules/ext/servlet3.0-jsp2.2-api.jar
-o.n.m.spring.webmvc                          
enterprise/modules/ext/spring/spring-webmvc-2.5.6.SEC01.jar
+o.n.m.spring.webmvc                          
enterprise/modules/ext/spring/spring-webmvc-2.5.6.SEC03.jar
 o.n.m.web.jstl11                             
enterprise/modules/ext/standard.jar
 o.n.m.web.struts                             
enterprise/modules/ext/struts/antlr-2.7.2.jar
 o.n.m.web.struts                             
enterprise/modules/ext/struts/bsf-2.3.0.jar
@@ -6759,7 +6759,7 @@
 o.n.libs.springframework                     
java/modules/ext/spring-3.0/spring-web-3.1.1.RELEASE.jar
 o.n.libs.springframework                     
java/modules/ext/spring-3.0/spring-webmvc-3.1.1.RELEASE.jar
 o.n.libs.springframework                     
java/modules/ext/spring-3.0/spring-webmvc-portlet-3.1.1.RELEASE.jar
-o.n.libs.springframework                     
java/modules/ext/spring/spring-2.5.6.SEC01.jar
+o.n.libs.springframework                     
java/modules/ext/spring/spring-2.5.6.SEC03.jar
 o.n.m.j2ee.toplinklib                        
java/modules/ext/toplink/3RD-PARTY-LICENSE.txt
 o.n.m.j2ee.toplinklib                        
java/modules/ext/toplink/LICENSE.txt
 o.n.m.j2ee.toplinklib                        java/modules/ext/toplink/README
diff -r -u --minimal --show-function-line='^[A-Z][A-Z]' 
--ignore-matching-lines=' [(]merged[)]$' -x kits.txt 
nbbuild/build/prior-generated/layers.txt nbbuild/build/generated/layers.txt
--- nbbuild/build/prior-generated/layers.txt    2012-03-28 20:10:14.889912165 
+0000
+++ nbbuild/build/generated/layers.txt  2012-03-28 22:06:18.034288248 +0000
@@ -3085,6 +3085,16 @@
 o.n.m.javascript.editing@                Editors/text/javascript/FoldManager/
 o.n.m.javascript.editing@                
Editors/text/javascript/FoldManager/o-n-m-csl-editor-fold-GsfFoldManagerFactory.instance
                                          Editors/text/javascript/FontsColors/
+o.n.m.defaults                           
Editors/text/javascript/FontsColors/BlueTheme/
+o.n.m.defaults                           
Editors/text/javascript/FontsColors/BlueTheme/Defaults/
+o.n.m.defaults                           
Editors/text/javascript/FontsColors/BlueTheme/Defaults/o-n-m-defaults-highlight-colorings.xml
 (merged)
+o.n.m.defaults                           
Editors/text/javascript/FontsColors/BlueTheme/Defaults/o-n-m-defaults-token-colorings.xml
 (merged)
+o.n.m.defaults                           
Editors/text/javascript/FontsColors/BlueTheme/Defaults/o-n-m-web-core-syntax-token-colorings.xml
+o.n.m.defaults                           
Editors/text/javascript/FontsColors/CityLights/
+o.n.m.defaults                           
Editors/text/javascript/FontsColors/CityLights/Defaults/
+o.n.m.defaults                           
Editors/text/javascript/FontsColors/CityLights/Defaults/o-n-m-defaults-highlight-colorings.xml
 (merged)
+o.n.m.defaults                           
Editors/text/javascript/FontsColors/CityLights/Defaults/o-n-m-defaults-token-colorings.xml
 (merged)
+o.n.m.defaults                           
Editors/text/javascript/FontsColors/CityLights/Defaults/o-n-m-web-core-syntax-token-colorings.xml
 o.n.m.javascript.editing                 
Editors/text/javascript/FontsColors/NetBeans/
 o.n.m.javascript.editing                 
Editors/text/javascript/FontsColors/NetBeans/Defaults/
 o.n.m.javascript.editing                 
Editors/text/javascript/FontsColors/NetBeans/Defaults/coloring.xml
@@ -3093,6 +3103,11 @@
 o.n.m.editor                             
Editors/text/javascript/FontsColors/NetBeans/Defaults/o-n-m-editor-token-colorings.xml
 (merged)
 o.n.m.editor                             
Editors/text/javascript/FontsColors/NetBeans/Defaults/o-n-m-editor-url-coloring.xml
 (merged)
 o.n.m.showtodos                          
Editors/text/javascript/FontsColors/NetBeans/Defaults/o-n-m-showtodos-todo-colorings.xml
 (merged)
+o.n.m.defaults                           
Editors/text/javascript/FontsColors/NetBeans55/
+o.n.m.defaults                           
Editors/text/javascript/FontsColors/NetBeans55/Defaults/
+o.n.m.defaults                           
Editors/text/javascript/FontsColors/NetBeans55/Defaults/o-n-m-defaults-highlight-colorings.xml
 (merged)
+o.n.m.defaults                           
Editors/text/javascript/FontsColors/NetBeans55/Defaults/o-n-m-defaults-token-colorings.xml
 (merged)
+o.n.m.defaults                           
Editors/text/javascript/FontsColors/NetBeans55/Defaults/o-n-m-web-core-syntax-token-colorings.xml
 o.n.m.tanui                              
Editors/text/javascript/FontsColors/Tan/
 o.n.m.tanui                              
Editors/text/javascript/FontsColors/Tan/o-n-m-editor-settings-CustomFontsColors-highlights.xml
 (merged)
 o.n.m.tanui                              
Editors/text/javascript/FontsColors/Tan/o-n-m-editor-settings-CustomFontsColors-tokenColorings.xml
@@ -9367,6 +9382,16 @@
 o.n.m.php.editor                         
Editors/text/x-php5/FoldManager/o-n-editor-CustomFoldManager$Factory.instance
 o.n.m.php.editor@                        
Editors/text/x-php5/FoldManager/o-n-m-csl-editor-fold-GsfFoldManagerFactory.instance
                                          Editors/text/x-php5/FontsColors/
+o.n.m.defaults                           
Editors/text/x-php5/FontsColors/BlueTheme/
+o.n.m.defaults                           
Editors/text/x-php5/FontsColors/BlueTheme/Defaults/
+o.n.m.defaults                           
Editors/text/x-php5/FontsColors/BlueTheme/Defaults/o-n-m-defaults-highlight-colorings.xml
 (merged)
+o.n.m.defaults                           
Editors/text/x-php5/FontsColors/BlueTheme/Defaults/o-n-m-defaults-token-colorings.xml
 (merged)
+o.n.m.defaults                           
Editors/text/x-php5/FontsColors/BlueTheme/Defaults/o-n-m-web-core-syntax-token-colorings.xml
+o.n.m.defaults                           
Editors/text/x-php5/FontsColors/CityLights/
+o.n.m.defaults                           
Editors/text/x-php5/FontsColors/CityLights/Defaults/
+o.n.m.defaults                           
Editors/text/x-php5/FontsColors/CityLights/Defaults/o-n-m-defaults-highlight-colorings.xml
 (merged)
+o.n.m.defaults                           
Editors/text/x-php5/FontsColors/CityLights/Defaults/o-n-m-defaults-token-colorings.xml
 (merged)
+o.n.m.defaults                           
Editors/text/x-php5/FontsColors/CityLights/Defaults/o-n-m-web-core-syntax-token-colorings.xml
 o.n.m.php.editor                         
Editors/text/x-php5/FontsColors/NetBeans/
 o.n.m.php.editor                         
Editors/text/x-php5/FontsColors/NetBeans/Defaults/
 o.n.m.editor.bracesmatching              
Editors/text/x-php5/FontsColors/NetBeans/Defaults/o-n-m-editor-bracesmatching-fontsColors.xml
 (merged)
@@ -9375,6 +9400,11 @@
 o.n.m.editor                             
Editors/text/x-php5/FontsColors/NetBeans/Defaults/o-n-m-editor-url-coloring.xml
 (merged)
 o.n.m.php.editor                         
Editors/text/x-php5/FontsColors/NetBeans/Defaults/o-n-m-php-editor-fontsColors.xml
 o.n.m.showtodos                          
Editors/text/x-php5/FontsColors/NetBeans/Defaults/o-n-m-showtodos-todo-colorings.xml
 (merged)
+o.n.m.defaults                           
Editors/text/x-php5/FontsColors/NetBeans55/
+o.n.m.defaults                           
Editors/text/x-php5/FontsColors/NetBeans55/Defaults/
+o.n.m.defaults                           
Editors/text/x-php5/FontsColors/NetBeans55/Defaults/o-n-m-defaults-highlight-colorings.xml
 (merged)
+o.n.m.defaults                           
Editors/text/x-php5/FontsColors/NetBeans55/Defaults/o-n-m-defaults-token-colorings.xml
 (merged)
+o.n.m.defaults                           
Editors/text/x-php5/FontsColors/NetBeans55/Defaults/o-n-m-web-core-syntax-token-colorings.xml
 o.n.m.tanui                              Editors/text/x-php5/FontsColors/Tan/
 o.n.m.tanui                              
Editors/text/x-php5/FontsColors/Tan/o-n-m-editor-settings-CustomFontsColors-highlights.xml
 (merged)
 o.n.m.tanui                              
Editors/text/x-php5/FontsColors/Tan/o-n-m-editor-settings-CustomFontsColors-tokenColorings.xml
@@ -15848,7 +15878,7 @@
 o.n.m.options.keymap                     OptionsExport/Keymaps/Profiles 
("Keymap Profiles")
                                          OptionsExport/PHP/ @700 
(o.n.m.php.project: "PHP")
 o.n.m.php.project                        OptionsExport/PHP/General @100 
("General")
-o.n.m.php.project                        OptionsExport/PHP/Remote @200 
("Remote Configurations (FTP/SFTP)")
+o.n.m.php.project                        OptionsExport/PHP/Remote @200 
("Remote Connections (FTP/SFTP)")
 o.n.m.php.project                        OptionsExport/PHP/Annotations @210 
("User Annotations")
 o.n.m.hudson.php                         OptionsExport/PHP/Hudson @240 
("Hudson")
 o.n.m.php.apigen                         OptionsExport/PHP/ApiGen @245 
("ApiGen")
@@ -19075,9 +19105,9 @@
 o.n.m.javascript.libraries.scriptaculous 
o-n-api-project-libraries/Libraries/scriptaculous.xml
 o.n.m.j2me.cdc.project.semc              
o-n-api-project-libraries/Libraries/semc-ant-utils.xml ("Sony Ericsson Build 
System Ant Utilities")
 o.n.m.j2me.cdc.project.sjmc              
o-n-api-project-libraries/Libraries/sjmc-ant-utils.xml ("Oracle Java Media 
Client Build System Ant Utilities")
-o.n.libs.springframework                 
o-n-api-project-libraries/Libraries/spring-framework.xml ("Spring Framework 
2.5.6.SEC01")
+o.n.libs.springframework                 
o-n-api-project-libraries/Libraries/spring-framework.xml ("Spring Framework 
2.5.6.SEC03")
 o.n.libs.springframework                 
o-n-api-project-libraries/Libraries/spring-framework300.xml ("Spring 
Framework 3.1.1.RELEASE")
-o.n.m.spring.webmvc                      
o-n-api-project-libraries/Libraries/spring-webmvc-2.5.xml ("Spring Web MVC 
2.5.6.SEC01")
+o.n.m.spring.webmvc                      
o-n-api-project-libraries/Libraries/spring-webmvc-2.5.xml ("Spring Web MVC 
2.5.6.SEC03")
 o.n.m.spring.webmvc                      
o-n-api-project-libraries/Libraries/spring-webmvc-3.0.xml ("Spring Web MVC 
3.0.6.RELEASE")
 o.n.m.web.struts                         
o-n-api-project-libraries/Libraries/struts.xml ("Struts 1.3.10")
 o.n.m.mobility.databindingme             
o-n-api-project-libraries/Libraries/svg.xml ("NetBeans DataBindingME SVG")


[api-changes] Golden file changes in nbms-and-javadoc build #8902

hudson 03/28/2012

Project Features

About this Project

www was started in November 2009, is owned by jpirek, and has 21 members.
By use of this website, you agree to the NetBeans Policies and Terms of Use (revision 20140418.2d69abc). © 2013, Oracle Corporation and/or its affiliates. Sponsored by Oracle logo
 
 
Close
loading
Please Confirm
Close