Skip to content
  • Karina Cadette's avatar
    Squashed commit of the following · b77f4e57
    Karina Cadette authored
    commit fac8925e 
    Author: David Diederich <d.diederich@opengroup.org> 
    Date: Wed Feb 02 2022 11:21:29 GMT-0600 (Central Standard Time) 
    
        Update version of default branch to 0.14.0-SNAPSHOT
    
    
    commit 432b83e9 
    Author: Alok Joshi <ajoshi19@slb.com> 
    Date: Tue Feb 01 2022 15:24:10 GMT-0600 (Central Standard Time) 
    
        Merge branch 'json_smart_fix' into 'master'
    
    Upgrade json-smart
    
    See merge request !179
    
    commit 528f4079 
    Author: David Diederich <d.diederich@opengroup.org> 
    Date: Fri Jan 28 2022 09:16:54 GMT-0600 (Central Standard Time) 
    
        Merge branch 'upgrade-log4j-2.17.1' into 'master'
    
    Upgrade Log4J to 2.17.1
    
    Closes #38
    
    See merge request !174
    
    commit d7d0491b 
    Author: Alok Joshi <AJoshi19@slb.com> 
    Date: Tue Feb 01 2022 14:17:02 GMT-0600 (Central Standard Time) 
    
        update NOTICE
    
    
    commit 9574ec7e 
    Author: Yunhua Koglin <kogliny@amazon.com> 
    Date: Thu Jan 27 2022 15:15:27 GMT-0600 (Central Standard Time) 
    
        Merge branch 'aws-integration' into 'master'
    
    Changes for m10
    
    See merge request !176
    
    commit 6e480f17 
    Author: David Diederich <d.diederich@opengroup.org> 
    Date: Fri Jan 28 2022 07:51:16 GMT-0600 (Central Standard Time) 
    
        Updating NOTICE
    
    
    commit b9c04c85 
    Author: Alok Joshi <AJoshi19@slb.com> 
    Date: Tue Feb 01 2022 13:31:17 GMT-0600 (Central Standard Time) 
    
        upgrade json-smart
    
    
    commit 7a05afe9 
    Author: David Diederich <d.diederich@opengroup.org> 
    Date: Fri Jan 28 2022 06:22:14 GMT-0600 (Central Standard Time) 
    
        Merge remote-tracking branch 'origin/master' into upgrade-log4j-2.17.1
    
    
    commit d4ce607b 
    Author: David Diederich <d.diederich@opengroup.org> 
    Date: Wed Jan 26 2022 03:43:07 GMT-0600 (Central Standard Time) 
    
        Updating NOTICE
    
    
    commit 9625c972 
    Author: David Diederich <d.diederich@opengroup.org> 
    Date: Tue Jan 25 2022 12:04:24 GMT-0600 (Central Standard Time) 
    
        Upgrading explicit Log4J version
    
    
    commit 3432a41f 
    Author: David Diederich <d.diederich@opengroup.org> 
    Date: Tue Jan 25 2022 10:47:00 GMT-0600 (Central Standard Time) 
    
        Upgrade core library dependencies
    
    This will pick up the latest log4j 2.17.1 change, addressing CVE-2021-44832
    b77f4e57