Build: #3014 was successful Changes by daryl herzmann
Code commits
Openfire (master)
-
daryl herzmann 73e1dea67362d76973b6b4525dac42dc55a9fd94
Merge pull request #3354 from guusdk/OF-3297_System-Property-migration
OF-3297: Refactor setup property migration handling -
daryl herzmann 82bd882d40e2b1a68323f9d2f85f534fa36a2f5e
Merge pull request #3353 from guusdk/OF-3296_Property-migration-encryption
OF-3296: Ensure that 'encryption' state is retained when migrating XML properties -
Guus der Kinderen 01ff47e90ab5b1aa6c77e104fbe0777f65e178bb m
OF-3297: Refactor setup property migration handling
Remove redundant setup-time property assignment logic that duplicated migration behavior, causing loss of data.
Rely on existing SystemProperty migration/default mechanisms to avoid unintended overwrites.
Also clean up related setup-page code after removing duplicate logic.- xmppserver/src/main/java/org/jivesoftware/openfire/XMPPServer.java (version 01ff47e90ab5b1aa6c77e104fbe0777f65e178bb)
- xmppserver/src/main/webapp/setup/setup-profile-settings.jsp (version 01ff47e90ab5b1aa6c77e104fbe0777f65e178bb)
-
Guus der Kinderen b114e5cff6d6884714c39c0054697740765137d9 m
OF-3296: Ensure that 'encryption' state is retained when migrating XML properties
When migrating a property that's defined in `openfire.xml`, its value can be defined to be encrypted. During migration, this encrypted state must be retained in the database. Prior to this commit, this was not always the case.- xmppserver/src/main/java/org/jivesoftware/util/XMLProperties.java (version b114e5cff6d6884714c39c0054697740765137d9)
- xmppserver/src/test/java/org/jivesoftware/util/XMLPropertiesMigrationEncryptionTest.java (version b114e5cff6d6884714c39c0054697740765137d9)