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 f343822 Merge branch 'master' into scrR8
add 5758834 FELIX-6308 : Revert changes
add 4c826f0 Format according to the rest of SCR codebase
add 462bfe2 FELIX-6361 - Avoid IllegalArgumentException for calls to
getLogger
add d2f25bf FELIX-6362 Utils ResourceBuilder does not allow java.* imports
add cf18cb6 Merge pull request #62 from bosschaert/FELIX-6362
add 964413a [maven-release-plugin] prepare release
org.apache.felix.utils-1.11.6
add 7be69de [maven-release-plugin] prepare for next development iteration
add e5e5bf1 FELIX-6364 Security vulnerability CVE-2020-27216 ,update
jetty (#63)
add 4169566 [maven-release-plugin] prepare release
org.apache.felix.http.jetty-4.1.4
add a1dfca9 [maven-release-plugin] prepare for next development iteration
add 7d91f8c FELIX-6363 : Simplify updating of OSGi configurations through
REST API
add 7fb5984 FELIX-6366 1.0.3 < jQuery <3.4.0 is vulnerable to
CVE-2020-11023 (#64)
add c09718b Update webconsole changelog
add d3fd46a Update changelog
add 6499084 FELIX-6222: Support for os.name Capability is missing for
Windows Server 2019
add bf1af68 Update changelog
add 67cd796 Update changelog and dependencies
add b006c4f Update changelogs, dependencies, and prepare for release
add 25f6f7d [maven-release-plugin] prepare release
org.apache.felix.resolver-2.0.2
add 4099d2c [maven-release-plugin] prepare for next development iteration
add 758ee60 Update to developer release version
add 7d666fb Update dependencies for release
add d3e64c2 [maven-release-plugin] prepare release
org.apache.felix.framework-6.0.4
add 7f88824 [maven-release-plugin] prepare for next development iteration
add 797c0fc Update dependencies after release
add 3033457 Update dependencies for release
add c4eb148 [maven-release-plugin] prepare release
org.apache.felix.main-6.0.4
add 93d68d1 [maven-release-plugin] prepare for next development iteration
add 1e86095 Update dependencies after release
add f12f258 Update dependencies for release
add 8362398 [maven-release-plugin] prepare release
org.apache.felix.main.distribution-6.0.4
add 4fff6e4 [maven-release-plugin] prepare for next development iteration
add 00be08c FELIX-6370 : Provide a User interface for checks within
plugins
add 814d8ca Update .gitignore
add 5b50cf0 FELIX-6370 : Provide a User interface for checks within
plugins
add 51a8628 [maven-release-plugin] prepare release
org.apache.felix.webconsole-4.6.0
add f9e5a42 [maven-release-plugin] prepare for next development iteration
add 69cfc5c Fix javadoc errors and warnings with Java 8
add 54a9590 [maven-release-plugin] prepare release
org.apache.felix.eventadmin-1.6.0
add 31fa52b [maven-release-plugin] prepare for next development iteration
new 9ab0150 Merge branch 'master' into scrR8
new c107424 Force Java 8 compiler
new 5d167e2 Add support for Optional<ServiceType> to be injected
add 8bccf4d FELIX-6369: Implement R8 core spec
add a1ec804 Merge pull request #65 from apache/frameworkR8
add af8cf08 FELIX-6294: add a slash to urls for directories
add 425655e Merge pull request #66 from apache/issues/FELIX-6294
add 2e18682 FELIX-6163: do not use System.currentTimeMillis() to check
timeouts
add 945008d Merge pull request #67 from apache/issues/FELIX-6163
add 0cd499d Update dependencies to released versions
add 55b5fe2 Update changelogs
add 8f5117c [maven-release-plugin] prepare release
org.apache.felix.framework-7.0.0
add 89bcce8 [maven-release-plugin] prepare for next development iteration
add 5edad1f [maven-release-plugin] prepare release
org.apache.felix.framework.security-2.8.0
add 2564eab [maven-release-plugin] prepare for next development iteration
add 3eab73e [maven-release-plugin] prepare release
org.apache.felix.main-7.0.0
add e602f1a [maven-release-plugin] prepare for next development iteration
add 4337c59 Update dependency for release
add 4a4c7a1 [maven-release-plugin] prepare release
org.apache.felix.main.distribution-7.0.0
add 3bd444d [maven-release-plugin] prepare for next development iteration
add bf58c61 [maven-release-plugin] prepare release
org.apache.felix.configadmin-1.9.20
add 7eac0ab [maven-release-plugin] prepare for next development iteration
add 1fd72ff FELIX-6373 : Wrong provide capability header
add 6334163 [maven-release-plugin] prepare release
org.apache.felix.eventadmin-1.6.2
add 72ab8ae [maven-release-plugin] prepare for next development iteration
new 2de0937 Merge branch 'master' into scrR8
The 4 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:
.gitignore | 1 +
configadmin/changelog.txt | 1 -
configadmin/pom.xml | 2 +-
.../felix/cm/file/FilePersistenceManager.java | 12 +-
eventadmin/impl/changelog.txt | 6 +
eventadmin/impl/pom.xml | 7 +-
.../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.security/doc/changelog.txt | 6 +
framework.security/pom.xml | 7 +-
.../org/apache/felix/framework/FakeBundle.java | 10 -
.../felix/framework/security/util/Permissions.java | 19 +-
framework/doc/changelog.txt | 24 +
framework/pom.xml | 47 +-
.../src/main/appended-resources/META-INF/NOTICE | 2 +-
.../org/apache/felix/framework/BundleImpl.java | 44 +-
.../felix/framework/BundleProtectionDomain.java | 13 +-
.../apache/felix/framework/BundleRevisionImpl.java | 40 +
.../apache/felix/framework/BundleWiringImpl.java | 88 +-
.../org/apache/felix/framework/DTOFactory.java | 5 +
.../apache/felix/framework/ExtensionManager.java | 117 +-
.../java/org/apache/felix/framework/Felix.java | 81 +-
.../apache/felix/framework/FrameworkFactory.java | 10 +-
.../felix/framework/FrameworkWiringImpl.java | 3 -
.../felix/framework/ServiceRegistrationImpl.java | 23 +-
.../apache/felix/framework/StatefulResolver.java | 18 +-
.../org/apache/felix/framework/URLHandlers.java | 60 +-
.../framework/URLHandlersBundleURLConnection.java | 14 +-
.../framework/URLHandlersStreamHandlerProxy.java | 3 +-
.../org/apache/felix/framework/WovenClassImpl.java | 54 +-
.../felix/framework/cache/BundleArchive.java | 43 +-
.../apache/felix/framework/cache/BundleCache.java | 30 +-
.../framework/cache/ConnectContentContent.java | 224 +++
...DirectoryRevision.java => ConnectRevision.java} | 63 +-
.../org/apache/felix/framework/cache/Content.java | 14 +
.../framework/cache/ContentDirectoryContent.java | 64 +-
.../felix/framework/cache/DirectoryContent.java | 54 +-
.../felix/framework/cache/DirectoryRevision.java | 2 +-
.../apache/felix/framework/cache/JarContent.java | 31 +-
.../apache/felix/framework/cache/JarRevision.java | 2 +-
.../framework/capabilityset/CapabilitySet.java | 2 +-
.../framework/capabilityset/SimpleFilter.java | 1 -
.../framework/ext/ClassPathExtenderFactory.java | 10 +-
.../felix/framework/util/MultiReleaseContent.java | 49 +-
.../apache/felix/framework/util/SecureAction.java | 234 ++-
.../apache/felix/framework/util/ThreadGate.java | 6 +-
.../java/org/apache/felix/framework/util/Util.java | 148 +-
.../util/manifestparser/ManifestParser.java | 70 +-
.../util/manifestparser/NativeLibraryClause.java | 5 +
.../framework/wiring/BundleCapabilityImpl.java | 75 +-
.../framework/wiring/BundleRequirementImpl.java | 4 +-
framework/src/main/java/org/osgi/dto/DTO.java | 2 +-
.../src/main/java/org/osgi/dto/package-info.java | 2 +-
.../java/org/osgi/framework/BundlePermission.java | 6 +-
.../org/osgi/framework/CapabilityPermission.java | 6 +-
.../main/java/org/osgi/framework/Constants.java | 12 +-
.../main/java/org/osgi/framework/FilterImpl.java | 1385 ++++++++++++++
.../java/org/osgi/framework/FrameworkEvent.java | 13 +-
.../java/org/osgi/framework/FrameworkUtil.java | 2017 +++++---------------
.../java/org/osgi/framework/PackagePermission.java | 6 +-
.../osgi/framework/PrototypeServiceFactory.java | 2 +-
.../java/org/osgi/framework/ServiceObjects.java | 2 +-
.../java/org/osgi/framework/ServicePermission.java | 6 +-
.../java/org/osgi/framework/ServiceReference.java | 59 +-
.../org/osgi/framework/connect/ConnectContent.java | 218 +++
.../framework/connect/ConnectFrameworkFactory.java | 79 +
.../org/osgi/framework/connect/ConnectModule.java | 47 +
.../framework/connect/FrameworkUtilHelper.java | 48 +
.../osgi/framework/connect/ModuleConnector.java | 105 +
.../{hooks/resolver => connect}/package-info.java | 13 +-
.../java/org/osgi/framework/dto/BundleDTO.java | 2 +-
.../java/org/osgi/framework/dto/FrameworkDTO.java | 2 +-
.../osgi/framework/dto/ServiceReferenceDTO.java | 9 +-
.../java/org/osgi/framework/dto/package-info.java | 2 +-
.../osgi/framework/hooks/bundle/package-info.java | 2 +-
.../framework/hooks/resolver/package-info.java | 2 +-
.../osgi/framework/hooks/service/package-info.java | 2 +-
.../framework/hooks/weaving/WeavingException.java | 7 +-
.../osgi/framework/hooks/weaving/WeavingHook.java | 21 +-
.../hooks/weaving/WovenClassListener.java | 2 +-
.../osgi/framework/hooks/weaving/package-info.java | 2 +-
.../java/org/osgi/framework/launch/Framework.java | 35 +-
.../osgi/framework/launch/FrameworkFactory.java | 5 +-
.../org/osgi/framework/launch/package-info.java | 4 +-
.../osgi/framework/namespace/HostNamespace.java | 20 +-
.../framework/namespace/IdentityNamespace.java | 14 +-
.../osgi/framework/namespace/NativeNamespace.java | 8 +-
.../org/osgi/framework/namespace/package-info.java | 8 +-
.../main/java/org/osgi/framework/package-info.java | 10 +-
.../startlevel/dto/BundleStartLevelDTO.java | 2 +-
.../startlevel/dto/FrameworkStartLevelDTO.java | 2 +-
.../framework/startlevel/dto/package-info.java | 2 +-
.../osgi/framework/startlevel/package-info.java | 2 +-
.../framework/wiring/dto/BundleRevisionDTO.java | 2 +-
.../osgi/framework/wiring/dto/BundleWireDTO.java | 2 +-
.../osgi/framework/wiring/dto/BundleWiringDTO.java | 2 +-
.../osgi/framework/wiring/dto/package-info.java | 2 +-
.../org/osgi/framework/wiring/package-info.java | 2 +-
.../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 | 2 +-
.../main/java/org/osgi/resource/package-info.java | 2 +-
.../java/org/osgi/service/condition/Condition.java | 0
.../dto => service/condition}/package-info.java | 15 +-
.../osgi/service/packageadmin/package-info.java | 2 +-
.../org/osgi/service/startlevel/package-info.java | 2 +-
.../java/org/osgi/service/url/package-info.java | 2 +-
.../java/org/osgi/util/tracker/ServiceTracker.java | 5 +-
.../java/org/osgi/util/tracker/package-info.java | 2 +-
.../native-image.properties | 5 +
.../org.apache.felix.framework/reflect-config.json | 27 +
.../resource-config.json | 9 +
....osgi.framework.connect.ConnectFrameworkFactory | 1 +
framework/src/main/resources/default.properties | 22 +-
.../org/apache/felix/framework/util/accessor.bytes | Bin 0 -> 816 bytes
.../org/apache/felix/framework/util/accessor.src} | 19 +-
.../apache/felix/framework/CollisionHookTest.java | 4 +-
.../org/apache/felix/framework/ConnectTest.java | 369 ++++
.../org/apache/felix/framework/LaunchTest.java | 156 ++
.../felix/framework/MultiReleaseVersionTest.java | 2 +-
.../felix/framework/ResourceLoadingTest.java | 76 +-
.../felix/framework/cache/BundleCacheTest.java | 10 +-
.../util/manifestparser/ManifestParserTest.java | 30 +-
http/jetty/pom.xml | 4 +-
http/sslfilter/pom.xml | 2 +-
main.distribution/NOTICE | 2 +-
main.distribution/doc/changelog.txt | 16 +
main.distribution/doc/changelog_framework.txt | 24 +
main.distribution/doc/changelog_gogo.command.txt | 46 +-
main.distribution/doc/changelog_gogo.runtime.txt | 89 +-
main.distribution/doc/changelog_main.txt | 16 +
main.distribution/doc/changelog_resolver.txt | 7 +
main.distribution/pom.xml | 17 +-
main/doc/changelog.txt | 16 +
main/pom.xml | 17 +-
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 +-
scr/pom.xml | 3 +
.../apache/felix/scr/impl/inject/ValueUtils.java | 14 +-
.../felix/scr/impl/inject/field/FieldHandler.java | 45 +-
.../felix/scr/impl/inject/internal/ClassUtils.java | 3 +
.../inject/internal/ComponentConstructorImpl.java | 10 +-
.../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 +-
.../scr/integration/ComponentOptionalTest.java | 170 ++
.../components/ConstructorSingleReference.java | 12 +
.../components/InjectOptionalComponent.java | 162 ++
.../resources/integration_test_inject_optional.xml | 121 ++
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 +-
201 files changed, 7343 insertions(+), 3704 deletions(-)
create mode 100644
framework/src/main/java/org/apache/felix/framework/cache/ConnectContentContent.java
copy
framework/src/main/java/org/apache/felix/framework/cache/{DirectoryRevision.java
=> ConnectRevision.java} (61%)
create mode 100755 framework/src/main/java/org/osgi/framework/FilterImpl.java
create mode 100644
framework/src/main/java/org/osgi/framework/connect/ConnectContent.java
create mode 100644
framework/src/main/java/org/osgi/framework/connect/ConnectFrameworkFactory.java
create mode 100644
framework/src/main/java/org/osgi/framework/connect/ConnectModule.java
create mode 100644
framework/src/main/java/org/osgi/framework/connect/FrameworkUtilHelper.java
create mode 100644
framework/src/main/java/org/osgi/framework/connect/ModuleConnector.java
copy framework/src/main/java/org/osgi/framework/{hooks/resolver =>
connect}/package-info.java (75%)
copy {scr/src/test =>
framework/src/main}/java/org/osgi/service/condition/Condition.java (100%)
mode change 100644 => 100755
copy framework/src/main/java/org/osgi/{resource/dto =>
service/condition}/package-info.java (75%)
mode change 100644 => 100755
create mode 100644
framework/src/main/resources/META-INF/native-image/org.apache.felix/org.apache.felix.framework/native-image.properties
create mode 100644
framework/src/main/resources/META-INF/native-image/org.apache.felix/org.apache.felix.framework/reflect-config.json
create mode 100644
framework/src/main/resources/META-INF/native-image/org.apache.felix/org.apache.felix.framework/resource-config.json
create mode 100644
framework/src/main/resources/META-INF/services/org.osgi.framework.connect.ConnectFrameworkFactory
create mode 100644
framework/src/main/resources/org/apache/felix/framework/util/accessor.bytes
copy framework/src/main/{java/org/apache/felix/framework/FrameworkFactory.java
=> resources/org/apache/felix/framework/util/accessor.src} (72%)
create mode 100644
framework/src/test/java/org/apache/felix/framework/ConnectTest.java
create mode 100644
framework/src/test/java/org/apache/felix/framework/LaunchTest.java
create mode 100644
scr/src/test/java/org/apache/felix/scr/integration/ComponentOptionalTest.java
create mode 100644
scr/src/test/java/org/apache/felix/scr/integration/components/InjectOptionalComponent.java
create mode 100644 scr/src/test/resources/integration_test_inject_optional.xml
create mode 100644
utils/src/test/java/org/apache/felix/utils/resource/ResourceBuilderTest.java
rename webconsole/src/main/debug-resources/res/lib/{jquery-3.4.1.js =>
jquery-3.5.1.js} (91%)
mode change 100755 => 100644
rename webconsole/src/main/debug-resources/res/lib/{jquery-migrate-3.1.0.js =>
jquery-migrate-3.3.0.js} (70%)
mode change 100755 => 100644
create mode 100644
webconsole/src/main/java/org/apache/felix/webconsole/User.java
copy scr/src/main/java/org/apache/felix/scr/impl/logger/ScrLogger.java =>
webconsole/src/main/java/org/apache/felix/webconsole/bundleinfo/package-info.java
(73%)
copy scr/src/main/java/org/apache/felix/scr/impl/logger/ScrLogger.java =>
webconsole/src/main/java/org/apache/felix/webconsole/i18n/package-info.java
(73%)
copy scr/src/main/java/org/apache/felix/scr/impl/logger/ScrLogger.java =>
webconsole/src/main/java/org/apache/felix/webconsole/package-info.java (73%)
delete mode 100755 webconsole/src/main/resources/res/lib/jquery-3.4.1.js
create mode 100644 webconsole/src/main/resources/res/lib/jquery-3.5.1.js
delete mode 100755
webconsole/src/main/resources/res/lib/jquery-migrate-3.1.0.js
create mode 100644
webconsole/src/main/resources/res/lib/jquery-migrate-3.3.0.js
