This is an automated email from the ASF dual-hosted git repository. tjwatson pushed a commit to branch scrR8 in repository https://gitbox.apache.org/repos/asf/felix-dev.git
commit 9ab0150bda3a033d12e14a3bd8778fa5e570edfb Merge: f343822 31fa52b Author: Thomas Watson <[email protected]> AuthorDate: Tue Dec 15 09:38:19 2020 -0600 Merge branch 'master' into scrR8 .gitignore | 1 + configadmin/changelog.txt | 1 - .../felix/cm/file/FilePersistenceManager.java | 12 +- eventadmin/impl/pom.xml | 5 +- .../apache/felix/eventadmin/impl/Activator.java | 2 +- .../felix/eventadmin/impl/Configuration.java | 20 +- .../eventadmin/impl/adapter/AbstractAdapter.java | 2 +- .../impl/adapter/BundleEventAdapter.java | 6 +- .../impl/adapter/FrameworkEventAdapter.java | 6 +- .../eventadmin/impl/adapter/LogEventAdapter.java | 20 +- .../impl/adapter/ServiceEventAdapter.java | 6 +- .../eventadmin/impl/handler/EventAdminImpl.java | 27 +- .../eventadmin/impl/handler/EventHandlerProxy.java | 11 +- .../impl/handler/EventHandlerTracker.java | 4 +- .../impl/security/EventAdminSecurityDecorator.java | 20 +- .../eventadmin/impl/security/PermissionsUtil.java | 8 +- .../impl/security/SecureEventAdminFactory.java | 22 +- .../eventadmin/impl/tasks/AsyncDeliverTasks.java | 1 + .../eventadmin/impl/tasks/DefaultThreadPool.java | 4 + .../felix/eventadmin/impl/tasks/DenylistLatch.java | 2 +- .../felix/eventadmin/impl/tasks/HandlerTask.java | 1 + .../eventadmin/impl/tasks/SyncDeliverTasks.java | 7 +- .../felix/eventadmin/impl/tasks/SyncThread.java | 1 + .../felix/eventadmin/impl/util/LogWrapper.java | 18 +- framework/doc/changelog.txt | 11 + framework/pom.xml | 1 + .../src/main/appended-resources/META-INF/NOTICE | 2 +- .../util/manifestparser/NativeLibraryClause.java | 5 + framework/src/main/resources/default.properties | 1 + http/jetty/pom.xml | 4 +- http/sslfilter/pom.xml | 2 +- main.distribution/NOTICE | 2 +- main.distribution/doc/changelog.txt | 10 + main.distribution/doc/changelog_framework.txt | 11 + main.distribution/doc/changelog_gogo.command.txt | 46 +- main.distribution/doc/changelog_gogo.runtime.txt | 89 +- main.distribution/doc/changelog_main.txt | 10 + main.distribution/doc/changelog_resolver.txt | 7 + main.distribution/pom.xml | 15 +- main/doc/changelog.txt | 10 + main/pom.xml | 13 +- main/src/main/appended-resources/META-INF/NOTICE | 2 +- resolver/doc/changelog.txt | 7 + resolver/pom.xml | 1 + .../src/main/appended-resources/META-INF/NOTICE | 2 +- .../apache/felix/scr/impl/logger/BundleLogger.java | 6 +- .../felix/scr/impl/logger/ComponentLogger.java | 5 +- .../felix/scr/impl/logger/ExtLogManager.java | 77 +- .../felix/scr/impl/logger/InternalLogger.java | 152 +-- .../apache/felix/scr/impl/logger/LogManager.java | 422 ++++--- .../felix/scr/impl/logger/ScrLogManager.java | 570 +++++---- .../apache/felix/scr/impl/logger/ScrLogger.java | 19 +- utils/pom.xml | 5 +- .../felix/utils/resource/ResourceBuilder.java | 7 +- .../felix/utils/resource/ResourceBuilderTest.java | 33 + webconsole/changelog.txt | 4 + webconsole/pom.xml | 27 +- .../res/lib/{jquery-3.4.1.js => jquery-3.5.1.js} | 1238 ++++++++++++-------- ...ry-migrate-3.1.0.js => jquery-migrate-3.3.0.js} | 292 +++-- .../java/org/apache/felix/webconsole/User.java | 53 + .../webconsole/WebConsoleSecurityProvider.java | 2 +- .../felix/webconsole/bundleinfo/package-info.java | 21 +- .../apache/felix/webconsole/i18n/package-info.java | 21 +- .../internal/configuration/ConfigAdminSupport.java | 24 +- .../internal/configuration/ConfigManager.java | 3 +- .../webconsole/internal/servlet/OsgiManager.java | 121 +- .../internal/servlet/OsgiManagerHttpContext.java | 80 +- .../org/apache/felix/webconsole/package-info.java | 21 +- .../src/main/resources/res/lib/jquery-3.4.1.js | 2 - .../src/main/resources/res/lib/jquery-3.5.1.js | 2 + .../main/resources/res/lib/jquery-migrate-3.1.0.js | 2 - .../main/resources/res/lib/jquery-migrate-3.3.0.js | 2 + .../src/main/resources/templates/main_header.html | 4 +- .../servlet/OsgiManagerHttpContextTest.java | 4 +- .../internal/servlet/OsgiManagerTest.java | 5 +- 75 files changed, 2268 insertions(+), 1414 deletions(-)
