This is an automated email from the ASF dual-hosted git repository. pauls pushed a commit to branch FELIX-6535 in repository https://gitbox.apache.org/repos/asf/felix-dev.git
commit e481f008172482855c4a7798cc3de772f401855b Merge: 6760756b15 2ced71c8bf Author: Karl Pauls <[email protected]> AuthorDate: Fri May 20 00:21:08 2022 +0200 Merge branch 'master' into cleanup .../apache/felix/framework/BundleWiringImpl.java | 18 +- .../apache/felix/framework/ExtensionManager.java | 2 +- .../java/org/apache/felix/framework/Felix.java | 57 +--- .../felix/framework/FrameworkStartLevelImpl.java | 72 +++-- .../apache/felix/framework/VersionConverter.java | 109 ++++++++ .../apache/felix/framework/cache/BundleCache.java | 1 + .../framework/capabilityset/SimpleFilter.java | 18 ++ .../util/manifestparser/ManifestParser.java | 56 +++- .../util/manifestparser/NativeLibraryClause.java | 92 +------ .../framework/wiring/BundleCapabilityImpl.java | 28 +- .../framework/wiring/BundleRequirementImpl.java | 23 ++ .../felix/framework/ExtensionManagerTest.java | 33 +++ .../felix/framework/FrameworkVersionTest.java | 49 ---- .../felix/framework/VersionConverterTest.java | 48 ++++ .../manifestparser/NativeLibraryClauseTest.java | 15 +- webconsole/pom.xml | 6 +- .../felix/webconsole/AbstractWebConsolePlugin.java | 164 +++++------ .../felix/webconsole/DefaultBrandingPlugin.java | 18 +- .../internal/configuration/ConfigAdminSupport.java | 4 +- .../internal/configuration/ConfigJsonSupport.java | 303 ++++++++++----------- .../configuration/MetaTypeServiceSupport.java | 246 ++++------------- .../internal/configuration/MetaTypeSupport.java | 19 +- .../internal/core/BaseUpdateInstallHelper.java | 10 +- .../i18n/ConsolePropertyResourceBundle.java | 20 +- .../webconsole/internal/misc/LicenseServlet.java | 103 +++---- .../webconsole/internal/servlet/OsgiManager.java | 25 +- .../configuration/ConfigJsonSupportTest.java | 14 +- 27 files changed, 751 insertions(+), 802 deletions(-)
