This is an automated email from the ASF dual-hosted git repository.
tjwatson pushed a change to branch scrR8
in repository https://gitbox.apache.org/repos/asf/felix-dev.git.
from 2de0937 Merge branch 'master' into scrR8
add 9725b1e FELIX-6375 : Configuration Admin Service not available with
org.apache.felix.webconsole_4.6.0.all
add 111525f FELIX-6375 : Configuration Admin Service not available with
org.apache.felix.webconsole_4.6.0.all
add d641cd2 FELIX-6371 : JSONConfigurationWriter does not escape
backslash and other chars
add 80a500d FELIX-6371 : JSONConfigurationWriter does not escape
backslash and other chars
add de42f92 Bump version to 1.1.0-SNAPSHOT
add 896c139 FELIX-6375 : Require Java 8 as minimum version
add 6a75e12 FELIX-6009 : Metatype AD empty String default value
add 170485f Update changelog
add 26a666d [maven-release-plugin] prepare release
org.apache.felix.metatype-1.2.4
add 28250c3 [maven-release-plugin] prepare for next development iteration
add a0af23b FELIX-6278: Update Dependency Manager with latest bndtools
version
add 76d77a0 FELIX-6278: added toplevel changelog file, which was removed
by mistake
add b5e7aba FELIX-6278: Fixed license/readme files.
add 12c52d0 FELIX-6380 : Make configuration map case-insensitive
add 308c199 [dependency manager] prepare for next r17 development
iteration
add 64e2e1f FELIX-6380 : Make configuration map case-insensitive
add 677a94c [maven-release-plugin] prepare release
org.apache.felix.cm.json-1.0.4
add 3069e3e [maven-release-plugin] prepare for next development iteration
add 1291b8f Fix typo (#68)
add d268db5 FELIX-6383 : Unable to persist state to state.ser
add 18ff48c FELIX-6383 : Unable to persist state to state.ser
add fd328c8 [maven-release-plugin] prepare release
org.apache.felix.cm.json-1.0.6
add 35238c4 [maven-release-plugin] prepare for next development iteration
add 0aa232a Add test cases with spaces in values
add bc66937 FELIX-6287: Support running the framework and the main on the
module path
add c562829 FELIX-6287: set override existing to true for the moditect
plugin
add 0e8c8da FELIX-6384 support empty directive values
add 0b07b35 Merge pull request #69 from
kwin/feature/support-empty-default-values
add 56da82c Update dependencies to latest version
add b3c1ba1 [maven-release-plugin] prepare release
org.apache.felix.configadmin.plugin.interpolation-1.1.2
add 22bc647 [maven-release-plugin] prepare for next development iteration
add bf03b9d Update change log for 2.1.26
add 67fae3d [maven-release-plugin] prepare release
org.apache.felix.scr-2.1.26
add e8fbf5b [maven-release-plugin] prepare for next development iteration
add 532788d FELIX-6386 : Unable to read persisted state from state.ser
add 884aae0 [maven-release-plugin] prepare release
org.apache.felix.configurator-1.0.14
add f93e648 [maven-release-plugin] prepare for next development iteration
add 2408520 FELIX-6391 - Update embedded commons-io to 2.8.0 (#72)
add 90eee74 FELIX-6392 : Webconsole configadmin javascript error:
Uncaught TypeError: parsers is undefined
add bfeba55 FELIX-6394 : Update Jetty to 9.4.38.v20210224
add b7d4807 Update to latest http jetty snapshot
add 2c6d92c [maven-release-plugin] prepare release
org.apache.felix.http.jetty-4.1.6
add 3432cfb [maven-release-plugin] prepare for next development iteration
add 9417fc7 FELIX-6388 : ERROR: Bundle org.apache.felix.log [4]
EventDispatcher: Error during dispatch. (java.lang.NullPointerException)
add 4c9f671 [FELIX-6337] Maven Bundle Plugin generates incorrect
Provide-Capability
add 6f12db3 Merge pull request #58 from Fenrock/felix6337
add b0b577b Revert "[FELIX-6337] Maven Bundle Plugin generates incorrect
Provide-Capability"
add 94928ea Revert "[FELIX-6269] Reformat header / capabilities clauses
to ensure predictable builds"
add e9e674b Revert "FELIX-6193 - Update maven-archiver + plexus-utils
(#8)"
add 1b0471e [maven-release-plugin] prepare release
maven-bundle-plugin-5.1.2
add 3e5671a [maven-release-plugin] prepare for next development iteration
add 6aef60e [FELIX-6397] Allow java.* packages export in ResourceBuilder
(as it's required since R7)
add e6cf27e [maven-release-plugin] prepare release
org.apache.felix.utils-1.11.8
add 8736598 [maven-release-plugin] prepare for next development iteration
add 2278487 FELIX-6390 Refactor the default authentication mechanism of
the (#71)
add 00c9523 FELIX-6398: Update packages to osgi.core 8
add b54de6e FELIX-6405 : Update Jetty version to 9.4.39
add b0c1196 [maven-release-plugin] prepare release
org.apache.felix.http.jetty-4.1.8
add 1499b19 [maven-release-plugin] prepare for next development iteration
add 5c1b9fa FELIX-6405 : Update Jetty version to 9.4.40
add ddcfaf0 [maven-release-plugin] prepare release
org.apache.felix.http.jetty-4.1.8
add 7aca0f9 [maven-release-plugin] prepare for next development iteration
add 2b02482 FELIX-6406 : Exception when parsing multi-line configurations
add e683130 [maven-release-plugin] prepare release
org.apache.felix.configadmin-1.9.22
add 23feae7 [maven-release-plugin] prepare for next development iteration
add 18aa59f FELIX-6402 don't swallow exception when converting to array
add b178fda Merge pull request #74 from kwin/FELIX-6402_dont-swallow-CME
add a195e1e [FELIX-6409] FileInstall logs useless messages due to
incorrect interpolations
add bbaa489 [FELIX-6410] Set the READ_ONLY attribute for configurations
add 98d3533 [FELIX-6412] Use Configuration.updateIfDifferent
add 7c160b6 [FELIX-6413] Make sure file checksums account for write
permissions
add 131ceab [FELIX-6411] use friendly name as factory name when creating
new configurations
add afa3924 [FELIX-6414] Interpolation plugin support multiple secrets
directories
add a66bfa1 simplify write permission check
add 9b14584 cleanup build warnings
add ffe8394 FIX: Prevent Null pointer exception in fileinstall watcher
add 101a360 [FELIX-6229] Not compatible with the symlinks Kubernetes uses
to mount ConfigMaps
add c2a1e57 [maven-release-plugin] prepare release
org.apache.felix.fileinstall-3.7.0
add 0b31a09 [maven-release-plugin] prepare for next development iteration
add 1be9dba update changelog
add 2794177 [maven-release-plugin] prepare release
org.apache.felix.configadmin.plugin.interpolation-1.1.4
add c4a7dbe [maven-release-plugin] prepare for next development iteration
add 589ccc2 [FELIX-6407] SCR Logging Fixes and Improvements
add c1197d9 Merge pull request #75 from amitjoy/scr-logging-enhancement
add b747b7d Update framework implementations
add addf139 Update to compile with Java 8
add 4dc2ed1 Hide LoggerFactory from Equinox for unit test.
add d59927b Fix test cases to tolerate both felix and equinox
add 20272ad FELIX-6408 - NPE in
MultipleStaticReluctantCustomizer.modifiedService
add 616c772 FELIX-6416: special case runtime ref in bundle urls
add c54edd6 Merge pull request #77 from apache/issues/FELIX-6416
add 841272d [FELIX-6417] Remove dependency on configadmin
add 88c71ec [FELIX-6418] Really shade felix.utils packages
new e1b5490 Merge branch 'master' into scrR8
new 6701c6c Add Optional service injection tests
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
cm.json/pom.xml | 12 +-
.../org/apache/felix/cm/json/Configurations.java | 2 +-
.../cm/json/impl/ConfigurationReaderImpl.java | 12 +-
.../felix/cm/json/impl/OrderedDictionary.java | 274 ++++++++++--
.../org/apache/felix/cm/json/package-info.java | 2 +-
.../cm/json/impl/ConfigurationReaderImplTest.java | 9 +
.../felix/cm/json/impl/OrderedDictionaryTest.java | 134 ++++++
.../resources/configs/single-duplicatekeys.json | 4 +
configadmin-plugins/interpolation/README.md | 7 +-
configadmin-plugins/interpolation/pom.xml | 6 +-
.../InterpolationConfigurationPlugin.java | 27 +-
.../plugin/interpolation/Interpolator.java | 7 +-
.../InterpolationConfigurationPluginTest.java | 43 +-
.../interpolation/src/test/resources/foo.bar | 1 +
.../src/test/resources/{ => other}/testfile.txt | 0
configadmin/README.md | 2 +-
configadmin/pom.xml | 2 +-
.../apache/felix/cm/file/ConfigurationHandler.java | 4 +-
.../felix/cm/file/ConfigurationHandlerTest.java | 60 +++
configurator/pom.xml | 4 +-
.../felix/configurator/impl/model/Config.java | 20 +-
.../org/osgi/util/converter/ConvertingImpl.java | 8 +-
.../org/osgi/util/converter/ConverterTest.java | 33 ++
.../.gradle-wrapper/gradle-wrapper.properties | 2 +-
dependencymanager/changelog.txt | 16 +
dependencymanager/cnf/build.bnd | 13 +
dependencymanager/cnf/ext/libraries.bnd | 2 +-
dependencymanager/cnf/repository.mvn | 14 +-
dependencymanager/gradle.properties | 4 +-
.../bnd.bnd | 2 +-
.../changelog.txt | 13 +
.../resources/DEPENDENCIES | 2 +-
.../resources/NOTICE | 2 +-
.../bnd.bnd | 2 +-
.../changelog.txt | 13 +
.../resources/DEPENDENCIES | 2 +-
.../resources/NOTICE | 2 +-
.../.settings/org.eclipse.jdt.core.prefs | 28 +-
.../bnd.bnd | 2 +-
.../changelog.txt | 13 +
.../resources/DEPENDENCIES | 2 +-
.../resources/NOTICE | 2 +-
.../bnd.bnd | 2 +-
.../changelog.txt | 13 +
.../resources/DEPENDENCIES | 2 +-
.../resources/NOTICE | 2 +-
.../org.apache.felix.dependencymanager/bnd.bnd | 2 +-
.../changelog.txt | 13 +-
.../resources/DEPENDENCIES | 2 +-
.../resources/NOTICE | 2 +-
dependencymanager/release/README.release | 26 +-
dependencymanager/release/build.gradle | 29 +-
dependencymanager/release/resources/bin/NOTICE | 2 +-
dependencymanager/release/resources/bin/README.bin | 21 +-
dependencymanager/release/resources/src/NOTICE | 2 +-
dependencymanager/release/resources/src/README.src | 21 +-
fileinstall/doc/changelog.txt | 11 +
fileinstall/pom.xml | 40 +-
.../fileinstall/internal/ConfigInstaller.java | 308 ++++++++++++--
.../fileinstall/internal/DirectoryWatcher.java | 8 +-
.../apache/felix/fileinstall/internal/Scanner.java | 38 +-
.../apache/felix/fileinstall/internal/Util.java | 8 +
.../apache/felix/fileinstall/internal/Watcher.java | 28 +-
.../felix/fileinstall/internal/WatcherScanner.java | 6 +-
.../fileinstall/internal/ConfigInstallerTest.java | 179 ++++++--
framework.security/pom.xml | 4 +-
framework/pom.xml | 57 ++-
.../framework/URLHandlersBundleURLConnection.java | 35 +-
.../java/org/apache/felix/framework/util/Util.java | 18 +-
framework/src/main/java/org/osgi/dto/DTO.java | 462 +++++++++++----------
.../src/main/java/org/osgi/dto/package-info.java | 6 +-
.../java/org/osgi/resource/dto/CapabilityDTO.java | 2 +-
.../org/osgi/resource/dto/CapabilityRefDTO.java | 2 +-
.../java/org/osgi/resource/dto/RequirementDTO.java | 2 +-
.../org/osgi/resource/dto/RequirementRefDTO.java | 2 +-
.../java/org/osgi/resource/dto/ResourceDTO.java | 2 +-
.../main/java/org/osgi/resource/dto/WireDTO.java | 2 +-
.../main/java/org/osgi/resource/dto/WiringDTO.java | 2 +-
.../java/org/osgi/resource/dto/package-info.java | 6 +-
.../main/java/org/osgi/resource/package-info.java | 6 +-
.../osgi/service/packageadmin/package-info.java | 6 +-
.../org/osgi/service/startlevel/package-info.java | 6 +-
.../java/org/osgi/service/url/package-info.java | 6 +-
.../java/org/osgi/util/tracker/package-info.java | 6 +-
framework/src/main/resources/default.properties | 16 +-
.../felix/framework/ResourceLoadingTest.java | 58 +++
http/itest/pom.xml | 2 +-
http/jetty/pom.xml | 6 +-
.../apache/felix/http/jetty/ConnectorFactory.java | 1 +
.../felix/http/jetty/internal/JettyService.java | 4 +-
inventory/changelog.txt | 10 +-
inventory/pom.xml | 13 +-
.../inventory/impl/InventoryPrinterAdapter.java | 30 +-
.../impl/InventoryPrinterDescription.java | 18 +-
.../impl/InventoryPrinterManagerImpl.java | 71 ++--
.../impl/helper/JSONConfigurationWriter.java | 15 +-
.../org/apache/felix/inventory/FormatTest.java | 10 +-
.../impl/helper/JSONConfigurationWriterTest.java | 31 +-
.../felix/log/ConfigurationListenerImpl.java | 14 +-
log/src/main/java/org/apache/felix/log/Log.java | 32 +-
main/pom.xml | 81 +++-
metatype/changelog.txt | 6 +
metatype/pom.xml | 5 +-
.../main/java/org/apache/felix/metatype/AD.java | 9 +-
.../org/apache/felix/metatype/ADValidator.java | 45 +-
.../java/org/apache/felix/metatype/ADTest.java | 20 +-
.../org/apache/felix/metatype/ADValidatorTest.java | 11 +-
.../java/org/osgi/service/resolver/Resolver.java | 8 +-
.../org/osgi/service/resolver/package-info.java | 6 +-
scr/changelog.txt | 28 ++
scr/pom.xml | 15 +-
.../java/org/apache/felix/scr/impl/Activator.java | 6 +-
.../scr/impl/config/ScrConfigurationImpl.java | 53 ++-
.../felix/scr/impl/logger/ExtLogManager.java | 15 +-
.../felix/scr/impl/logger/LogConfiguration.java | 97 +++++
.../apache/felix/scr/impl/logger/LogManager.java | 32 +-
.../apache/felix/scr/impl/logger/NoOpLogger.java | 43 +-
.../felix/scr/impl/logger/ScrLogManager.java | 30 +-
.../felix/scr/impl/logger/ScrLoggerFactory.java | 71 ++++
.../felix/scr/impl/manager/DependencyManager.java | 2 +-
.../felix/scr/impl/manager/ScrConfiguration.java | 24 +-
.../apache/felix/scr/impl/logger/LoggerTest.java | 117 ++++--
.../scr/integration/ComponentConcurrencyTest.java | 1 +
.../scr/integration/ComponentOptionalTest.java | 76 +++-
.../felix/scr/integration/ComponentTestBase.java | 2 +-
.../components/InjectOptionalComponent.java | 59 ++-
.../resources/integration_test_inject_optional.xml | 25 ++
tools/maven-bundle-plugin/pom.xml | 4 +-
.../apache/felix/bundleplugin/BundlePlugin.java | 31 +-
utils/pom.xml | 2 +-
.../felix/utils/resource/ResourceBuilder.java | 7 +-
webconsole/changelog.txt | 9 +-
webconsole/pom.xml | 6 +-
.../internal/configuration/ConfigAdminSupport.java | 7 +-
.../internal/configuration/ConfigManager.java | 11 +-
...t.java => BasicWebConsoleSecurityProvider.java} | 141 ++-----
.../webconsole/internal/servlet/OsgiManager.java | 28 +-
.../internal/servlet/OsgiManagerHttpContext.java | 76 +---
.../main/resources/OSGI-INF/l10n/bundle.properties | 3 +
webconsole/src/main/resources/res/ui/config.js | 34 +-
.../src/main/resources/templates/config.html | 3 +
.../servlet/OsgiManagerHttpContextTest.java | 9 +-
142 files changed, 2711 insertions(+), 1084 deletions(-)
create mode 100644
cm.json/src/test/java/org/apache/felix/cm/json/impl/OrderedDictionaryTest.java
create mode 100644 cm.json/src/test/resources/configs/single-duplicatekeys.json
create mode 100644 configadmin-plugins/interpolation/src/test/resources/foo.bar
rename configadmin-plugins/interpolation/src/test/resources/{ =>
other}/testfile.txt (100%)
copy
http/jetty/src/main/java/org/apache/felix/http/jetty/internal/JettyManagedService.java
=>
inventory/src/test/java/org/apache/felix/inventory/impl/helper/JSONConfigurationWriterTest.java
(53%)
create mode 100644
scr/src/main/java/org/apache/felix/scr/impl/logger/LogConfiguration.java
copy configadmin/src/test/java/org/apache/felix/cm/MockServiceReference.java
=> scr/src/main/java/org/apache/felix/scr/impl/logger/NoOpLogger.java (58%)
create mode 100644
scr/src/main/java/org/apache/felix/scr/impl/logger/ScrLoggerFactory.java
copy
webconsole/src/main/java/org/apache/felix/webconsole/internal/servlet/{OsgiManagerHttpContext.java
=> BasicWebConsoleSecurityProvider.java} (53%)
