Commit Graph

6 Commits

Author SHA1 Message Date
Raluca Munteanu
6afb44e712 Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)
125606 rmunteanu: Merged 5.1.1 (5.1.1) to 5.1.N (5.1.2)
      125515 slanglois: MNT-16155 Update source headers - add new Copyrights for Java and JSP source files + automatic check in the build


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@125788 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-04-26 13:45:01 +00:00
Raluca Munteanu
8674e2bfc8 Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)
125603 rmunteanu: Merged 5.1.1 (5.1.1) to 5.1.N (5.1.2)
      125484 slanglois: MNT-16155 Update source headers - remove old Copyrights from Java and JSP dource files


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@125781 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-04-26 12:48:49 +00:00
Alan Davis
fa24838717 Merged 5.1.N (5.1.1) to HEAD (5.1)
120340 adavis: Merged 5.0.N (5.0.4) to 5.1.N (5.1.1)
      120335 adavis: Merged V4.2-BUG-FIX (4.2.6) to 5.0.N (5.0.4)
         120325 cturlica: MNT-15399: Need to be able to turn off vulnerable classes bootstrap check
            - new alfresco global property added (default is true): unserializer.validator.enabled


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@123617 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-11 21:35:26 +00:00
Jean-Pierre Huynh
6a404625ad Merged 5.1-MC1 (5.1.0) to HEAD (5.1)
119081 adavis: Merged 5.1.N (5.1.1) to 5.1-MC1 (5.1.0)
      118524 arebegea: Merged 5.0.N (5.0.4) to 5.1.N (5.1.1)
         118435 cturlica: Merged V4.2-BUG-FIX (4.2.6) to 5.0.N (5.0.4)
            118397 cturlica: MNT-15229: Add check of vulnerable classes to bootstrap
               -  changes on bootstrap bean validator and bootstrap-context.xml 


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@119920 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-12-10 10:03:13 +00:00
Jean-Pierre Huynh
73630bc71f Merged 5.1-MC1 (5.1.0) to HEAD (5.1)
119079 adavis: Merged 5.1.N (5.1.1) to 5.1-MC1 (5.1.0)
      118314 nsmintanca: Merged 5.0.N (5.0.4) to 5.1.N (5.1.1)
         118271 adavis: Merged 5.0.2-CLOUD42 (Cloud ) to 5.0.N (5.0.4)
            118270 adavis: Merged 5.0.2-CLOUD (Cloud ) to 5.0.2-CLOUD42 (Cloud )
               118269 adavis: Merged 5.0.2-PLUS (5.0.2-PLUS) to 5.0.2-CLOUD (Cloud )
                  118268 adavis:       Reverse merged 5.0.2-PLUS (5.0.2-PLUS)
                        << Caused lots of failures with the real fix rather than the patched one in 39.6.6 >>
                           118213 adavis: Merged CLOUD39.6 (Cloud 39.6.6) to 5.0.2-PLUS (5.0.2-PLUS)
                              116649 cturlica: MNT-15229/MNT-15170: [Security] Java unserialize remote code execution
                                 - added bootstrap unserializer validator: a bootstrap bean that checks that the classes that would favor Java unserialize remote code execution are not available. Check is needed because libs could be introduced by the application server (attached jars should be uploaded).


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@119918 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-12-10 10:02:31 +00:00
Jean-Pierre Huynh
3f00433ac8 Merged 5.1-MC1 (5.1.0) to HEAD (5.1)
119078 adavis: Merged 5.1.N (5.1.1) to 5.1-MC1 (5.1.0)
      118305 nsmintanca: Merged 5.0.N (5.0.4) to 5.1.N (5.1.1)
         118217 adavis: Merged V4.2-BUG-FIX (4.2.6) to 5.0.N (5.0.4)
            118216 adavis: Merged 5.0.2-CLOUD42 (Cloud ) to V4.2-BUG-FIX (4.2.6)
               118215 adavis: Merged 5.0.2-CLOUD (Cloud ) to 5.0.2-CLOUD42 (Cloud )
                  118214 adavis: Merged 5.0.2-PLUS (5.0.2-PLUS) to 5.0.2-CLOUD (Cloud )
                     118213 adavis: Merged CLOUD39.6 (Cloud 39.6.6) to 5.0.2-PLUS (5.0.2-PLUS)
                        116649 cturlica: MNT-15229/MNT-15170: [Security] Java unserialize remote code execution
                           - added bootstrap unserializer validator: a bootstrap bean that checks that the classes that would favor Java unserialize remote code execution are not available. Check is needed because libs could be introduced by the application server (attached jars should be uploaded).


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@119917 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-12-10 10:02:26 +00:00