This is an automated email from the ASF dual-hosted git repository. cziegeler pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-distribution-core.git
commit 374e9fc148f57bcadaf629e0a080136e21abc357 Merge: 271e0186 6fb2b04f Author: Carsten Ziegeler <[email protected]> AuthorDate: Thu May 28 15:23:23 2026 +0200 Merge pull request #76 from apache/maia/workflow-1779973348428 build: migrate to Java 17 and update OSGi annotations pom.xml | 150 ++++---- .../distribution/agent/DistributionAgentState.java | 1 - .../impl/AbstractDistributionAgentFactory.java | 39 ++- .../DistributionRequestAuthorizationStrategy.java | 4 +- .../impl/ForwardDistributionAgentFactory.java | 90 +++-- .../ForwardDistributionAgentFactoryConfig.java | 164 +++++---- .../ImportingDistributionPackageProcessor.java | 39 ++- ...geDistributionRequestAuthorizationStrategy.java | 20 +- ...ibutionRequestAuthorizationStrategyFactory.java | 51 +-- .../agent/impl/QueueDistributionAgentFactory.java | 154 ++++++--- .../impl/QueueingDistributionPackageProcessor.java | 51 ++- .../impl/ReverseDistributionAgentFactory.java | 169 +++++---- .../agent/impl/SimpleDistributionAgent.java | 206 +++++++---- .../SimpleDistributionAgentAuthenticationInfo.java | 8 +- .../agent/impl/SimpleDistributionAgentFactory.java | 139 +++++--- .../SimpleDistributionAgentQueueProcessor.java | 101 ++++-- .../agent/impl/SyncDistributionAgentFactory.java | 221 +++++++----- .../agent/impl/TriggerAgentRequestHandler.java | 23 +- .../distribution/agent/spi/DistributionAgent.java | 5 +- .../common/RecoverableDistributionException.java | 1 - .../impl/DefaultDistributionComponentProvider.java | 137 +++++--- .../DefaultDistributionConfigurationManager.java | 48 ++- .../component/impl/DistributionComponent.java | 4 +- .../impl/DistributionComponentConstants.java | 2 - .../impl/DistributionComponentFactoryMap.java | 136 ++++---- .../component/impl/DistributionComponentKind.java | 67 ++-- .../impl/DistributionComponentProvider.java | 3 - .../component/impl/DistributionConfiguration.java | 13 +- .../impl/DistributionConfigurationManager.java | 5 +- .../component/impl/OsgiConfigurationManager.java | 21 +- .../impl/ResourceConfigurationManager.java | 39 +-- .../distribution/component/impl/SettingsUtils.java | 23 +- .../impl/DefaultDistributionEventFactory.java | 12 +- .../event/impl/DistributionEventFactory.java | 8 +- .../impl/CompositeDistributionResponse.java | 27 +- .../distribution/impl/DefaultDistributor.java | 12 +- .../distribution/impl/DistributionParameter.java | 1 - .../impl/SimpleDistributionResponse.java | 19 +- .../log/impl/DefaultDistributionLog.java | 11 +- .../distribution/log/spi/DistributionLog.java | 1 - .../monitor/DistributionQueueHealthCheck.java | 45 ++- .../monitor/impl/DistributionPackageMBean.java | 1 - .../monitor/impl/DistributionPackageMBeanImpl.java | 5 +- .../monitor/impl/DistributionQueueMBean.java | 1 - .../monitor/impl/DistributionQueueMBeanImpl.java | 1 - .../impl/ForwardDistributionAgentMBean.java | 1 - .../impl/ForwardDistributionAgentMBeanImpl.java | 3 +- .../impl/MonitoringDistributionPackageBuilder.java | 39 ++- .../impl/MonitoringDistributionQueueProvider.java | 20 +- .../monitor/impl/QueueDistributionAgentMBean.java | 1 - .../impl/QueueDistributionAgentMBeanImpl.java | 3 +- .../impl/ReverseDistributionAgentMBean.java | 1 - .../impl/ReverseDistributionAgentMBeanImpl.java | 3 +- .../monitor/impl/SimpleDistributionAgentMBean.java | 1 - .../impl/SimpleDistributionAgentMBeanImpl.java | 3 +- .../monitor/impl/SyncDistributionAgentMBean.java | 1 - .../impl/SyncDistributionAgentMBeanImpl.java | 3 +- ...redentialsDistributionTransportSecretMBean.java | 1 - ...ntialsDistributionTransportSecretMBeanImpl.java | 3 +- .../packaging/DistributionPackage.java | 1 - .../packaging/DistributionPackageBuilder.java | 18 +- .../packaging/DistributionPackageInfo.java | 14 +- .../impl/AbstractDistributionPackage.java | 1 - .../impl/AbstractDistributionPackageBuilder.java | 51 +-- .../impl/DistributionPackageExporter.java | 12 +- .../impl/DistributionPackageImporter.java | 7 +- .../impl/DistributionPackageProcessor.java | 5 +- .../packaging/impl/DistributionPackageUtils.java | 83 +++-- .../packaging/impl/DistributionPackageWrapper.java | 5 +- .../packaging/impl/FileDistributionPackage.java | 15 +- .../impl/FileDistributionPackageBuilder.java | 36 +- .../impl/InMemoryDistributionPackage.java | 3 +- .../impl/InMemoryDistributionPackageBuilder.java | 40 ++- .../impl/ResourceDistributionPackage.java | 19 +- .../impl/ResourceDistributionPackageBuilder.java | 91 +++-- .../impl/ResourceDistributionPackageCleanup.java | 15 +- .../packaging/impl/SharedDistributionPackage.java | 1 - .../packaging/impl/SimpleDistributionPackage.java | 25 +- .../exporter/AgentDistributionPackageExporter.java | 45 ++- .../AgentDistributionPackageExporterFactory.java | 47 +-- .../exporter/LocalDistributionPackageExporter.java | 16 +- .../LocalDistributionPackageExporterFactory.java | 37 +- .../RemoteDistributionPackageExporter.java | 40 ++- .../RemoteDistributionPackageExporterFactory.java | 69 ++-- .../importer/LocalDistributionPackageImporter.java | 42 ++- .../LocalDistributionPackageImporterFactory.java | 34 +- .../RemoteDistributionPackageImporter.java | 32 +- .../RemoteDistributionPackageImporterFactory.java | 48 ++- .../RepositoryDistributionPackageImporter.java | 34 +- ...positoryDistributionPackageImporterFactory.java | 31 +- .../queue/DistributionQueueCapabilities.java | 2 - .../distribution/queue/DistributionQueueEntry.java | 3 +- .../distribution/queue/DistributionQueueItem.java | 9 +- .../queue/DistributionQueueItemState.java | 1 - .../queue/DistributionQueueItemStatus.java | 12 +- .../distribution/queue/DistributionQueueState.java | 1 - .../queue/DistributionQueueStatus.java | 2 - .../distribution/queue/DistributionQueueType.java | 1 - .../impl/AsyncDeliveryDispatchingStrategy.java | 22 +- .../queue/impl/CachingDistributionQueue.java | 12 +- .../impl/DistributionQueueDispatchingStrategy.java | 5 +- .../queue/impl/DistributionQueueProvider.java | 3 +- .../impl/DistributionQueueProviderFactory.java | 2 - .../queue/impl/DistributionQueueUtils.java | 4 +- .../queue/impl/DistributionQueueWrapper.java | 9 +- .../queue/impl/ErrorQueueDispatchingStrategy.java | 15 +- .../impl/MultipleQueueDispatchingStrategy.java | 20 +- .../impl/PriorityQueueDispatchingStrategy.java | 29 +- .../queue/impl/SimpleAgentDistributionQueue.java | 3 +- .../queue/impl/SingleQueueDispatchingStrategy.java | 3 +- .../jobhandling/DistributionAgentJobConsumer.java | 1 - .../jobhandling/JobHandlingDistributionQueue.java | 29 +- .../JobHandlingDistributionQueueProvider.java | 46 ++- ...obHandlingQueueDistributionProviderFactory.java | 20 +- .../queue/impl/jobhandling/JobHandlingUtils.java | 14 +- .../queue/impl/resource/ActiveResourceQueue.java | 15 +- .../queue/impl/resource/ResourceIterator.java | 11 +- .../queue/impl/resource/ResourceQueue.java | 41 +-- .../impl/resource/ResourceQueueCleanupTask.java | 15 +- .../queue/impl/resource/ResourceQueueProvider.java | 50 +-- .../resource/ResourceQueueProviderFactory.java | 19 +- .../queue/impl/resource/ResourceQueueUtils.java | 72 ++-- .../queue/impl/simple/QueueItemMapper.java | 18 +- .../queue/impl/simple/SimpleDistributionQueue.java | 18 +- .../simple/SimpleDistributionQueueCheckpoint.java | 2 +- .../simple/SimpleDistributionQueueProcessor.java | 19 +- .../simple/SimpleDistributionQueueProvider.java | 36 +- .../DistributionConfigurationResourceProvider.java | 18 +- ...butionConfigurationResourceProviderFactory.java | 28 +- .../impl/DistributionServiceResourceProvider.java | 7 +- ...DistributionServiceResourceProviderFactory.java | 29 +- ...xtendedDistributionServiceResourceProvider.java | 35 +- .../distribution/resources/impl/OsgiUtils.java | 3 - .../common/AbstractModifyingResourceProvider.java | 32 +- .../common/AbstractReadableResourceProvider.java | 43 +-- .../impl/common/SimpleModifiableResource.java | 8 +- .../impl/common/SimpleModifiableValueMap.java | 11 +- .../resources/impl/common/SimplePathInfo.java | 7 +- .../impl/common/SimpleReadableResource.java | 14 +- .../common/SimpleReadableResourceIterator.java | 12 +- .../DistributionContentSerializer.java | 5 +- .../DistributionContentSerializerProvider.java | 6 +- .../serialization/DistributionExportFilter.java | 28 +- .../serialization/DistributionExportOptions.java | 1 + .../distribution/serialization/ExportSettings.java | 81 ++--- .../distribution/serialization/ImportSettings.java | 40 ++- .../DefaultDistributionPackageBuilderProvider.java | 11 +- .../impl/DistributionPackageBuilderFactory.java | 150 +++++--- .../serialization/impl/vlt/ErrorListener.java | 3 +- .../impl/vlt/FileVaultContentSerializer.java | 52 ++- .../vlt/FileVaultContentSerializerProvider.java | 6 +- .../VaultDistributionPackageBuilderFactory.java | 287 ++++++++------- .../serialization/impl/vlt/VltUtils.java | 48 +-- .../servlet/DistributionAgentCreationFilter.java | 41 ++- .../servlet/DistributionAgentLogServlet.java | 10 +- .../servlet/DistributionAgentQueueServlet.java | 46 +-- .../servlet/DistributionAgentServlet.java | 6 +- .../DistributionPackageExporterServlet.java | 117 ++++--- .../DistributionPackageImporterServlet.java | 46 +-- .../servlet/DistributionTriggerServlet.java | 23 +- .../distribution/servlet/ServletJsonUtils.java | 11 +- .../impl/DefaultRemoteDistributionPackage.java | 17 +- .../transport/impl/DistributionEndpoint.java | 1 - .../transport/impl/DistributionTransport.java | 15 +- .../impl/DistributionTransportContext.java | 1 - .../transport/impl/HttpTransportUtils.java | 18 +- .../transport/impl/RemoteDistributionPackage.java | 2 - .../impl/SimpleHttpDistributionTransport.java | 55 ++- ...entialsDistributionTransportSecretProvider.java | 40 ++- .../trigger/DistributionRequestHandler.java | 1 - .../trigger/impl/AbstractJcrEventTrigger.java | 44 +-- ...ributionEventDistributeDistributionTrigger.java | 23 +- ...nEventDistributeDistributionTriggerFactory.java | 20 +- .../trigger/impl/JcrEventDistributionTrigger.java | 28 +- .../impl/JcrEventDistributionTriggerFactory.java | 40 ++- .../impl/PersistedJcrEventDistributionTrigger.java | 11 +- ...ersistedJcrEventDistributionTriggerFactory.java | 29 +- .../impl/RemoteEventDistributionTrigger.java | 26 +- .../RemoteEventDistributionTriggerFactory.java | 27 +- .../impl/ResourceEventDistributionTrigger.java | 27 +- .../ResourceEventDistributionTriggerFactory.java | 22 +- .../trigger/impl/ScheduledDistributionTrigger.java | 21 +- .../impl/ScheduledDistributionTriggerFactory.java | 42 ++- .../distribution/util/DistributionJcrUtils.java | 1 - .../sling/distribution/util/RequestUtils.java | 10 +- .../util/impl/ByteBufferBackedInputStream.java | 4 +- .../sling/distribution/util/impl/DigestUtils.java | 16 +- .../distribution/util/impl/DistributionUtils.java | 22 +- .../util/impl/FileBackedMemoryOutputStream.java | 29 +- .../sling/distribution/util/package-info.java | 6 +- .../sling/distribution/DistributionBaseIT.java | 62 ++-- .../ImportingDistributionPackageProcessorTest.java | 43 ++- ...stributionRequestAuthorizationStrategyTest.java | 85 +++-- .../QueueingDistributionPackageProcessorTest.java | 21 +- ...pleDistributionAgentAuthenticationInfoTest.java | 7 +- .../SimpleDistributionAgentQueueProcessorTest.java | 20 +- .../agent/impl/SimpleDistributionAgentTest.java | 384 ++++++++++++++------- .../agent/impl/TriggerAgentRequestHandlerTest.java | 16 +- .../impl/DistributionComponentFactoryMapTest.java | 20 +- .../component/impl/SettingsUtilsTest.java | 19 +- .../impl/DistributionResponseTest.java | 48 +-- .../log/impl/DefaultDistributionLogTest.java | 5 +- .../monitor/DistributionQueueHealthCheckTest.java | 17 +- .../monitor/impl/DistributionPackageMBeanTest.java | 20 +- .../monitor/impl/DistributionQueueMBeanTest.java | 28 +- .../impl/ForwardDistributionAgentMBeanTest.java | 11 +- .../impl/QueueDistributionAgentMBeanTest.java | 11 +- .../impl/ReverseDistributionAgentMBeanTest.java | 11 +- .../impl/SimpleDistributionAgentMBeanTest.java | 11 +- .../impl/SyncDistributionAgentMBeanTest.java | 11 +- ...ntialsDistributionTransportSecretMBeanTest.java | 8 +- .../packaging/DistributionPackageInfoTest.java | 4 +- .../impl/DistributionPackageUtilsTest.java | 26 +- .../impl/FileDistributionPackageBuilderTest.java | 56 +-- .../InMemoryDistributionPackageBuilderTest.java | 23 +- .../impl/InMemoryDistributionPackageTest.java | 31 +- .../packaging/impl/ReferencePackageTest.java | 3 +- .../ResourceDistributionPackageBuilderTest.java | 65 ++-- .../impl/SimpleDistributionPackageTest.java | 27 +- .../AgentDistributionPackageExporterTest.java | 52 ++- .../LocalDistributionPackageExporterTest.java | 51 +-- .../RemoteDistributionPackageExporterTest.java | 71 ++-- .../LocalDistributionPackageImporterTest.java | 30 +- .../RemoteDistributionPackageImporterTest.java | 18 +- .../RepositoryDistributionPackageImporterTest.java | 17 +- .../queue/DistributionQueueItemStatusTest.java | 10 +- .../impl/AsyncDeliveryDispatchingStrategyTest.java | 42 ++- .../impl/PriorityQueueDispatchingStrategyTest.java | 49 ++- .../impl/SingleQueueDistributionStrategyTest.java | 40 ++- .../DistributionAgentJobConsumerTest.java | 2 +- .../JobHandlingDistributionQueueProviderTest.java | 24 +- .../JobHandlingDistributionQueueTest.java | 14 +- .../impl/jobhandling/JobHandlingUtilsTest.java | 8 +- .../queue/impl/resource/ResourceIteratorTest.java | 137 ++++---- .../queue/impl/resource/ResourceQueueIT.java | 33 +- .../impl/resource/ResourceQueueProcessingTest.java | 107 +++--- .../impl/resource/ResourceQueueUtilsTest.java | 22 +- .../queue/impl/simple/QueueItemMapperTest.java | 10 +- .../SimpleDistributionQueueCheckpointTest.java | 30 +- .../SimpleDistributionQueueProcessorTest.java | 28 +- .../SimpleDistributionQueueProviderTest.java | 34 +- .../impl/simple/SimpleDistributionQueueTest.java | 5 +- .../common/SimpleReadableResourceTestCase.java | 13 +- .../DistributionExportFilterTest.java | 2 +- .../serialization/impl/vlt/ErrorListenerTest.java | 2 +- .../FileVaultContentSerializerProviderTest.java | 23 +- .../impl/vlt/FileVaultContentSerializerTest.java | 79 +++-- .../serialization/impl/vlt/VltUtilsTest.java | 27 +- .../distribution/servlet/ServletJsonUtilsTest.java | 9 +- .../impl/SimpleHttpDistributionTransportTest.java | 68 ++-- .../trigger/impl/AbstractJcrEventTriggerTest.java | 19 +- ...tionEventDistributeDistributionTriggerTest.java | 45 ++- .../impl/JcrEventDistributionTriggerTest.java | 18 +- .../PersistingJcrEventDistributionTriggerTest.java | 34 +- .../impl/RemoteEventDistributionTriggerTest.java | 16 +- .../impl/ResourceEventDistributionTriggerTest.java | 19 +- .../impl/ScheduledDistributionTriggerTest.java | 16 +- .../util/DistributionJcrUtilsTest.java | 13 +- .../sling/distribution/util/RequestUtilsTest.java | 18 +- .../util/impl/ByteBufferBackedInputStreamTest.java | 25 +- .../distribution/util/impl/DigestUtilsTest.java | 7 +- .../impl/FileBackedMemoryOutputStreamTest.java | 80 +++-- 262 files changed, 4611 insertions(+), 3574 deletions(-)
