Skip to content

Changes

Summary

  1. Prepare release org.glassfish.hk2:hk2-parent:3.0.6 (details)
  2. Prepare next development cycle for 3.0.7-SNAPSHOT (details)
  3. Update pom.xml (details)
  4. Update pom.xml (details)
  5. Update pom.xml (details)
  6. Update pom.xml (details)
  7. Update OSGi Enterprise to 7.0.0 (details)
  8. Update OSGi Enterprise to 7.0.0 (details)
  9. Merge pull request #963 from jbescos/reentrantlock (details)
  10. Reentrantlock additions of master (details)
  11. Bump org.springframework:spring-context from 6.1.3 to 6.1.4 (details)
  12. Bump com.google.protobuf:protobuf-java from 3.25.2 to 3.25.3 (details)
  13. Bump org.apache.maven.plugins:maven-shade-plugin from 3.5.1 to 3.5.2 (details)
  14. Bump org.mockito:mockito-core from 5.10.0 to 5.11.0 (details)
  15. Fix merge error (details)
Commit a4e56e3824145b58014de20de8a8da76ad875a62 by Glassfish Bot
Prepare release org.glassfish.hk2:hk2-parent:3.0.6
The file was modified hk2-testing/interceptor-events/pom.xml (diff)
The file was modified hk2-testing/hk2-locator-no-proxies/pom.xml (diff)
The file was modified osgi/adapter-tests/contract-bundle/pom.xml (diff)
The file was modified hk2-configuration/persistence/hk2-xml/pom.xml (diff)
The file was modified hk2-configuration/persistence/hk2-xml/test1/pom.xml (diff)
The file was modified examples/security-lockdown/alice/pom.xml (diff)
The file was modified hk2-testing/hk2-junitrunner/pom.xml (diff)
The file was modified hk2-configuration/persistence/hk2-xml/schema/pom.xml (diff)
The file was modified examples/pom.xml (diff)
The file was modified hk2-configuration/persistence/pom.xml (diff)
The file was modified maven-plugins/pom.xml (diff)
The file was modified hk2-metadata-generator/main/pom.xml (diff)
The file was modified osgi/adapter/pom.xml (diff)
The file was modified hk2-testing/pom.xml (diff)
The file was modified hk2-testing/hk2-runlevel-extras/pom.xml (diff)
The file was modified examples/caching/runner/pom.xml (diff)
The file was modified external/pom.xml (diff)
The file was modified hk2-testing/hk2-locator-extras/pom.xml (diff)
The file was modified osgi/adapter-tests/sdp-management-bundle/pom.xml (diff)
The file was modified examples/security-lockdown/system/pom.xml (diff)
The file was modified hk2-configuration/persistence/hk2-xml/hk2-json/pom.xml (diff)
The file was modified class-model/pom.xml (diff)
The file was modified examples/events/threaded/pom.xml (diff)
The file was modified examples/configuration/xml/pom.xml (diff)
The file was modified hk2-testing/jersey/jersey-guice/pom.xml (diff)
The file was modified hk2-configuration/persistence/hk2-xml/main/pom.xml (diff)
The file was modified hk2-testing/jersey/jersey-guice/form-param/pom.xml (diff)
The file was modified examples/caching/pom.xml (diff)
The file was modified hk2-configuration/persistence/hk2-xml/integration-test/pom.xml (diff)
The file was modified hk2-core/pom.xml (diff)
The file was modified osgi/adapter-tests/no-hk2-bundle/pom.xml (diff)
The file was modified examples/configuration/webserver/pom.xml (diff)
The file was modified hk2/pom.xml (diff)
The file was modified examples/events/pom.xml (diff)
The file was modified hk2-testing/jersey/pom.xml (diff)
The file was modified osgi/adapter-tests/osgi-adapter-test/pom.xml (diff)
The file was modified examples/operations/pom.xml (diff)
The file was modified hk2-testing/hk2-testng/pom.xml (diff)
The file was modified hk2-testing/collections/pom.xml (diff)
The file was modified hk2-metadata-generator/test1/pom.xml (diff)
The file was modified hk2-testing/di-tck/pom.xml (diff)
The file was modified examples/security-lockdown/pom.xml (diff)
The file was modified maven-plugins/consolidatedbundle-maven-plugin/pom.xml (diff)
The file was modified hk2-utils/pom.xml (diff)
The file was modified hk2-jmx/pom.xml (diff)
The file was modified external/aopalliance/pom.xml (diff)
The file was modified hk2-extras/pom.xml (diff)
The file was modified hk2-testing/ant/pom.xml (diff)
The file was modified hk2-api/pom.xml (diff)
The file was modified hk2-configuration/manager/pom.xml (diff)
The file was modified osgi/adapter-tests/pom.xml (diff)
The file was modified bom/pom.xml (diff)
The file was modified maven-plugins/osgiversion-maven-plugin/pom.xml (diff)
The file was modified examples/security-lockdown/mallory/pom.xml (diff)
The file was modified examples/security-lockdown/runner/pom.xml (diff)
The file was modified osgi/pom.xml (diff)
The file was modified guice-bridge/pom.xml (diff)
The file was modified hk2-configuration/hk2-integration/pom.xml (diff)
The file was modified maven-plugins/hk2-inhabitant-generator/pom.xml (diff)
The file was modified osgi/adapter-tests/faux-sdp-bundle/pom.xml (diff)
The file was modified examples/configuration/pom.xml (diff)
The file was modified hk2-configuration/persistence/hk2-xml/hk2-pbuf/pom.xml (diff)
The file was modified hk2-configuration/persistence/property-file/pom.xml (diff)
The file was modified pom.xml (diff)
The file was modified hk2-locator/pom.xml (diff)
The file was modified hk2-testing/hk2-locator-no-proxies2/pom.xml (diff)
The file was modified spring-bridge/pom.xml (diff)
The file was modified javadocs/pom.xml (diff)
The file was modified hk2-runlevel/pom.xml (diff)
The file was modified osgi/adapter-tests/test-module-startup/pom.xml (diff)
The file was modified hk2-metadata-generator/pom.xml (diff)
The file was modified hk2-configuration/pom.xml (diff)
The file was modified examples/caching/system/pom.xml (diff)
The file was modified examples/custom-resolver/pom.xml (diff)
The file was modified hk2-testing/hk2-mockito/pom.xml (diff)
Commit 33a0cf78cb00c3bd0b5b2a9333b00c42f8492b69 by Glassfish Bot
Prepare next development cycle for 3.0.7-SNAPSHOT
The file was modified hk2-metadata-generator/main/pom.xml (diff)
The file was modified maven-plugins/consolidatedbundle-maven-plugin/pom.xml (diff)
The file was modified hk2-testing/ant/pom.xml (diff)
The file was modified hk2-testing/pom.xml (diff)
The file was modified maven-plugins/hk2-inhabitant-generator/pom.xml (diff)
The file was modified hk2-configuration/persistence/hk2-xml/integration-test/pom.xml (diff)
The file was modified hk2-testing/jersey/jersey-guice/form-param/pom.xml (diff)
The file was modified maven-plugins/pom.xml (diff)
The file was modified hk2-extras/pom.xml (diff)
The file was modified hk2-testing/collections/pom.xml (diff)
The file was modified examples/pom.xml (diff)
The file was modified maven-plugins/osgiversion-maven-plugin/pom.xml (diff)
The file was modified examples/security-lockdown/runner/pom.xml (diff)
The file was modified osgi/adapter/pom.xml (diff)
The file was modified hk2/pom.xml (diff)
The file was modified osgi/pom.xml (diff)
The file was modified hk2-configuration/persistence/property-file/pom.xml (diff)
The file was modified hk2-configuration/hk2-integration/pom.xml (diff)
The file was modified hk2-testing/jersey/pom.xml (diff)
The file was modified hk2-metadata-generator/test1/pom.xml (diff)
The file was modified osgi/adapter-tests/pom.xml (diff)
The file was modified hk2-configuration/persistence/hk2-xml/hk2-json/pom.xml (diff)
The file was modified examples/custom-resolver/pom.xml (diff)
The file was modified hk2-metadata-generator/pom.xml (diff)
The file was modified hk2-runlevel/pom.xml (diff)
The file was modified external/pom.xml (diff)
The file was modified examples/configuration/pom.xml (diff)
The file was modified hk2-testing/hk2-testng/pom.xml (diff)
The file was modified hk2-testing/hk2-locator-no-proxies/pom.xml (diff)
The file was modified examples/caching/pom.xml (diff)
The file was modified examples/caching/runner/pom.xml (diff)
The file was modified hk2-testing/interceptor-events/pom.xml (diff)
The file was modified hk2-jmx/pom.xml (diff)
The file was modified osgi/adapter-tests/no-hk2-bundle/pom.xml (diff)
The file was modified hk2-core/pom.xml (diff)
The file was modified class-model/pom.xml (diff)
The file was modified hk2-testing/hk2-junitrunner/pom.xml (diff)
The file was modified hk2-locator/pom.xml (diff)
The file was modified osgi/adapter-tests/faux-sdp-bundle/pom.xml (diff)
The file was modified hk2-configuration/persistence/hk2-xml/main/pom.xml (diff)
The file was modified osgi/adapter-tests/contract-bundle/pom.xml (diff)
The file was modified spring-bridge/pom.xml (diff)
The file was modified examples/security-lockdown/alice/pom.xml (diff)
The file was modified examples/security-lockdown/pom.xml (diff)
The file was modified hk2-configuration/persistence/hk2-xml/hk2-pbuf/pom.xml (diff)
The file was modified hk2-testing/hk2-runlevel-extras/pom.xml (diff)
The file was modified examples/security-lockdown/mallory/pom.xml (diff)
The file was modified osgi/adapter-tests/sdp-management-bundle/pom.xml (diff)
The file was modified hk2-api/pom.xml (diff)
The file was modified hk2-configuration/persistence/pom.xml (diff)
The file was modified examples/configuration/webserver/pom.xml (diff)
The file was modified hk2-configuration/pom.xml (diff)
The file was modified examples/security-lockdown/system/pom.xml (diff)
The file was modified guice-bridge/pom.xml (diff)
The file was modified hk2-testing/hk2-locator-no-proxies2/pom.xml (diff)
The file was modified hk2-testing/hk2-mockito/pom.xml (diff)
The file was modified examples/operations/pom.xml (diff)
The file was modified external/aopalliance/pom.xml (diff)
The file was modified hk2-utils/pom.xml (diff)
The file was modified examples/events/pom.xml (diff)
The file was modified pom.xml (diff)
The file was modified osgi/adapter-tests/test-module-startup/pom.xml (diff)
The file was modified hk2-testing/jersey/jersey-guice/pom.xml (diff)
The file was modified hk2-testing/hk2-locator-extras/pom.xml (diff)
The file was modified hk2-configuration/manager/pom.xml (diff)
The file was modified hk2-configuration/persistence/hk2-xml/pom.xml (diff)
The file was modified examples/events/threaded/pom.xml (diff)
The file was modified examples/configuration/xml/pom.xml (diff)
The file was modified hk2-configuration/persistence/hk2-xml/schema/pom.xml (diff)
The file was modified examples/caching/system/pom.xml (diff)
The file was modified hk2-configuration/persistence/hk2-xml/test1/pom.xml (diff)
The file was modified bom/pom.xml (diff)
The file was modified hk2-testing/di-tck/pom.xml (diff)
The file was modified osgi/adapter-tests/osgi-adapter-test/pom.xml (diff)
The file was modified javadocs/pom.xml (diff)
Commit e986c7ed97cad4cfa59a6549877d05083944c5f8 by Andrew Pielage
Update OSGi Enterprise to 7.0.0

Signed-off-by: Andrew Pielage <pandrex247@hotmail.com>
The file was modified class-model/pom.xml (diff)
The file was modified pom.xml (diff)
Commit f9a23358233c1a7553828a563b3aea48f4fa3f07 by Andrew Pielage
Update OSGi Enterprise to 7.0.0

Signed-off-by: Andrew Pielage <pandrex247@hotmail.com>
The file was modified class-model/pom.xml (diff)
The file was modified pom.xml (diff)
Commit b7a71e40aa1d1c0e88f2ae1ab2b81bad6919056c by Jorge Bescos
Merge pull request #963 from jbescos/reentrantlock

Replace synchronized by ReentrantLock

Signed-off-by: Jorge Bescos Gascon <jorge.bescos.gascon@oracle.com>
The file was modified hk2-extras/src/main/java/org/glassfish/hk2/extras/hk2bridge/internal/CrossOverDescriptor.java (diff)
The file was modified hk2-utils/src/main/java/org/glassfish/hk2/utilities/general/ValidatorUtilities.java (diff)
The file was modified hk2-utils/src/main/java/org/glassfish/hk2/utilities/cache/internal/LRUCacheCheapRead.java (diff)
The file was modified hk2-configuration/persistence/hk2-xml/main/src/main/java/org/glassfish/hk2/xml/internal/alt/papi/ArrayTypeAltClassImpl.java (diff)
The file was modified hk2-locator/src/main/java/org/jvnet/hk2/internal/SystemDescriptor.java (diff)
The file was modified hk2-api/src/main/java/org/glassfish/hk2/internal/ServiceLocatorFactoryImpl.java (diff)
The file was modified hk2-configuration/persistence/property-file/src/main/java/org/glassfish/hk2/configuration/persistence/properties/PropertyFileBean.java (diff)
The file was modified hk2-locator/src/main/java/org/jvnet/hk2/internal/DynamicConfigurationImpl.java (diff)
The file was modified hk2-extras/src/main/java/org/glassfish/hk2/extras/operation/internal/OperationHandleImpl.java (diff)
The file was modified hk2-core/src/main/java/com/sun/enterprise/module/common_impl/AbstractModulesRegistryImpl.java (diff)
The file was modified class-model/src/main/java/org/glassfish/hk2/classmodel/reflect/impl/ClassModelImpl.java (diff)
The file was modified hk2-configuration/persistence/hk2-xml/main/src/main/java/org/glassfish/hk2/xml/internal/alt/clazz/AnnotationAltAnnotationImpl.java (diff)
The file was modified hk2-core/src/main/java/com/sun/enterprise/module/impl/ModuleClassLoader.java (diff)
The file was modified hk2-core/src/main/java/com/sun/enterprise/module/common_impl/DirectoryBasedRepository.java (diff)
The file was modified class-model/src/main/java/org/glassfish/hk2/classmodel/reflect/impl/TypesImpl.java (diff)
The file was modified hk2-core/src/main/java/com/sun/enterprise/module/impl/ClassLoaderProxy.java (diff)
The file was modified hk2-extras/src/main/java/org/glassfish/hk2/extras/operation/OperationContext.java (diff)
The file was modified hk2-configuration/manager/src/main/java/org/glassfish/hk2/configuration/hub/internal/InstanceImpl.java (diff)
The file was modified class-model/src/main/java/org/glassfish/hk2/classmodel/reflect/impl/ParameterizedInterfaceModelImpl.java (diff)
The file was modified class-model/src/test/java/org/glassfish/hk2/classmodel/reflect/test/ClassModelTestsUtils.java (diff)
The file was modified hk2-locator/src/main/java/org/jvnet/hk2/internal/IndexedListData.java (diff)
The file was modified hk2-configuration/persistence/hk2-xml/main/src/main/java/org/glassfish/hk2/xml/internal/alt/papi/TypeElementAltClassImpl.java (diff)
The file was modified class-model/src/main/java/org/glassfish/hk2/classmodel/reflect/impl/TypesCtr.java (diff)
The file was modified hk2-extras/src/main/java/org/glassfish/hk2/extras/operation/internal/OperationManagerImpl.java (diff)
The file was modified class-model/src/main/java/org/glassfish/hk2/classmodel/reflect/impl/ExtensibleTypeImpl.java (diff)
The file was modified class-model/src/main/java/org/glassfish/hk2/classmodel/reflect/ParsingContext.java (diff)
The file was modified hk2-configuration/manager/src/main/java/org/glassfish/hk2/configuration/hub/internal/BeanDatabaseImpl.java (diff)
The file was modified hk2-runlevel/src/main/java/org/glassfish/hk2/runlevel/internal/CurrentTaskFuture.java (diff)
The file was modified hk2-configuration/hk2-integration/src/main/java/org/glassfish/hk2/configuration/internal/DelegatingNamedActiveDescriptor.java (diff)
The file was modified hk2-locator/src/main/java/org/jvnet/hk2/internal/SingletonContext.java (diff)
The file was modified hk2-configuration/persistence/hk2-xml/main/src/main/java/org/glassfish/hk2/xml/internal/alt/clazz/ClassAltClassImpl.java (diff)
The file was modified hk2-locator/src/main/java/org/jvnet/hk2/internal/ServiceLocatorImpl.java (diff)
The file was modified hk2-configuration/manager/src/test/java/org/glassfish/hk2/configuration/hub/test/AbstractCountingListener.java (diff)
The file was modified hk2-api/src/main/java/org/glassfish/hk2/utilities/BuilderHelper.java (diff)
The file was modified hk2-api/src/main/java/org/glassfish/hk2/api/MultiException.java (diff)
The file was modified hk2-configuration/manager/src/main/java/org/glassfish/hk2/configuration/hub/internal/WriteableBeanDatabaseImpl.java (diff)
The file was modified hk2-utils/src/main/java/org/glassfish/hk2/utilities/cache/LRUHybridCache.java (diff)
The file was modified hk2-configuration/persistence/hk2-xml/main/src/main/java/org/glassfish/hk2/xml/jaxb/internal/BaseHK2JAXBBean.java (diff)
The file was modified hk2-api/src/main/java/org/glassfish/hk2/utilities/ImmediateContext.java (diff)
The file was modified hk2-locator/src/main/java/org/jvnet/hk2/internal/PerLocatorUtilities.java (diff)
The file was modified hk2-locator/src/main/java/org/jvnet/hk2/internal/Utilities.java (diff)
The file was modified hk2-configuration/persistence/hk2-xml/main/src/main/java/org/glassfish/hk2/xml/internal/alt/clazz/MethodAltMethodImpl.java (diff)
The file was modified hk2-extras/src/main/java/org/glassfish/hk2/extras/operation/internal/SingleOperationManager.java (diff)
The file was modified class-model/src/main/java/org/glassfish/hk2/classmodel/reflect/Parser.java (diff)
The file was modified hk2-configuration/persistence/hk2-xml/main/src/main/java/org/glassfish/hk2/xml/internal/UnkeyedDiff.java (diff)
The file was modified class-model/src/main/java/org/glassfish/hk2/classmodel/reflect/impl/AnnotatedElementImpl.java (diff)
The file was modified hk2-utils/src/main/java/org/glassfish/hk2/utilities/general/internal/WeakHashClockImpl.java (diff)
The file was modified hk2-configuration/persistence/hk2-xml/main/src/main/java/org/glassfish/hk2/xml/internal/ParentedModel.java (diff)
The file was modified hk2-locator/src/main/java/org/jvnet/hk2/internal/InstantiationServiceImpl.java (diff)
The file was modified hk2-core/src/main/java/com/sun/enterprise/module/impl/ModuleImpl.java (diff)
The file was modified hk2-api/src/main/java/org/glassfish/hk2/utilities/AliasDescriptor.java (diff)
The file was modified hk2-configuration/hk2-integration/src/main/java/org/glassfish/hk2/configuration/internal/ConfiguredByInjectionResolver.java (diff)
The file was modified class-model/src/main/java/org/glassfish/hk2/classmodel/reflect/impl/TypeProxy.java (diff)
The file was modified hk2-configuration/persistence/property-file/src/main/java/org/glassfish/hk2/configuration/persistence/properties/internal/PropertyFileHandleImpl.java (diff)
The file was modified hk2-locator/src/main/java/org/jvnet/hk2/internal/ServiceHandleImpl.java (diff)
The file was modified hk2-core/src/main/java/com/sun/enterprise/module/impl/HK2Factory.java (diff)
The file was modified hk2-configuration/manager/src/main/java/org/glassfish/hk2/configuration/hub/internal/TypeImpl.java (diff)
The file was modified hk2-core/src/main/java/com/sun/enterprise/module/ModuleMetadata.java (diff)
The file was modified examples/operations/src/main/java/org/glassfish/examples/operations/application/internal/BankingServiceImpl.java (diff)
The file was modified hk2-configuration/persistence/hk2-xml/main/src/main/java/org/glassfish/hk2/xml/internal/ChildDataModel.java (diff)
The file was modified hk2-configuration/hk2-integration/src/main/java/org/glassfish/hk2/configuration/internal/ConfiguredByContext.java (diff)
The file was modified hk2-locator/src/main/java/org/jvnet/hk2/internal/ProxyUtilities.java (diff)
The file was modified hk2-utils/src/main/java/org/glassfish/hk2/utilities/cache/internal/WeakCARCacheImpl.java (diff)
The file was modified hk2-configuration/hk2-integration/src/main/java/org/glassfish/hk2/configuration/internal/ConfigurationListener.java (diff)
The file was modified hk2-configuration/manager/src/main/java/org/glassfish/hk2/configuration/hub/internal/WriteableTypeImpl.java (diff)
The file was modified hk2-configuration/persistence/hk2-xml/main/src/main/java/org/glassfish/hk2/xml/internal/alt/papi/ElementAltMethodImpl.java (diff)
The file was modified hk2-api/src/main/java/org/glassfish/hk2/utilities/DescriptorImpl.java (diff)
The file was modified class-model/src/main/java/org/glassfish/hk2/classmodel/reflect/impl/TypeImpl.java (diff)
The file was modified hk2-configuration/manager/src/main/java/org/glassfish/hk2/configuration/hub/internal/HubImpl.java (diff)
The file was modified spring-bridge/src/main/java/org/jvnet/hk2/spring/bridge/api/SpringScopeImpl.java (diff)
The file was modified hk2-configuration/persistence/hk2-xml/main/src/main/java/org/glassfish/hk2/xml/internal/alt/papi/AnnotationMirrorAltAnnotationImpl.java (diff)
The file was modified hk2-configuration/persistence/hk2-xml/main/src/main/java/org/glassfish/hk2/xml/internal/JAUtilities.java (diff)
The file was modified hk2-core/src/main/java/com/sun/enterprise/module/common_impl/AbstractRepositoryImpl.java (diff)
The file was modified hk2-configuration/persistence/hk2-xml/main/src/main/java/org/glassfish/hk2/xml/internal/ModelImpl.java (diff)
The file was modified hk2-configuration/persistence/hk2-xml/hk2-pbuf/src/main/java/org/glassfish/hk2/pbuf/internal/PBufParser.java (diff)
The file was modified hk2-runlevel/src/main/java/org/glassfish/hk2/runlevel/internal/AsyncRunLevelContext.java (diff)
Commit c54e741fbd644a5d2d0f1518a580aad576211400 by Jorge Bescos
Reentrantlock additions of master

Signed-off-by: Jorge Bescos Gascon <jorge.bescos.gascon@oracle.com>
The file was modified hk2-api/src/main/java/org/glassfish/hk2/internal/ImmediateHelper.java (diff)
The file was modified osgi/adapter/src/main/java/org/jvnet/hk2/osgiadapter/ModuleDefinitionCacheSingleton.java (diff)
The file was modified osgi/adapter/src/main/java/org/jvnet/hk2/osgiadapter/OSGiObrModuleImpl.java (diff)
The file was modified hk2-utils/src/main/java/org/glassfish/hk2/utilities/general/internal/WeakHashLRUImpl.java (diff)
The file was modified hk2-extras/src/main/java/org/glassfish/hk2/extras/provides/ProvidesListener.java (diff)
The file was modified hk2-extras/src/main/java/org/glassfish/hk2/extras/hk2bridge/internal/Hk2BridgeImpl.java (diff)
The file was modified osgi/adapter/src/main/java/org/jvnet/hk2/osgiadapter/AbstractOSGiModulesRegistryImpl.java (diff)
The file was modified osgi/adapter/src/main/java/org/jvnet/hk2/osgiadapter/ObrHandler.java (diff)
The file was modified hk2-extras/src/main/java/org/glassfish/hk2/extras/provides/ProvidesDescriptor.java (diff)
The file was modified osgi/adapter/src/main/java/org/jvnet/hk2/osgiadapter/OSGiFactoryImpl.java (diff)
The file was modified osgi/adapter/src/main/java/org/jvnet/hk2/osgiadapter/OSGiModuleImpl.java (diff)
The file was modified osgi/adapter/src/main/java/org/jvnet/hk2/osgiadapter/OSGiModulesRegistryImpl.java (diff)
The file was modified hk2-extras/src/main/java/org/glassfish/hk2/extras/operation/OperationContext.java (diff)
The file was modified class-model/src/main/java/org/glassfish/hk2/classmodel/reflect/impl/EnumTypeImpl.java (diff)
The file was modified hk2-configuration/persistence/hk2-xml/main/src/main/java/org/glassfish/hk2/xml/tools/Hk2XmlGenerator.java (diff)
Commit d9a6c05ca8a956999bc542a3e56d1d34a28ca8a8 by noreply
Bump org.springframework:spring-context from 6.1.3 to 6.1.4

Bumps [org.springframework:spring-context](https://github.com/spring-projects/spring-framework) from 6.1.3 to 6.1.4.
- [Release notes](https://github.com/spring-projects/spring-framework/releases)
- [Commits](https://github.com/spring-projects/spring-framework/compare/v6.1.3...v6.1.4)

---
updated-dependencies:
- dependency-name: org.springframework:spring-context
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
The file was modified pom.xml (diff)
Commit 6d0e1900667bc96b8cc9fb5546c9ed5808a8da14 by noreply
Bump com.google.protobuf:protobuf-java from 3.25.2 to 3.25.3

Bumps [com.google.protobuf:protobuf-java](https://github.com/protocolbuffers/protobuf) from 3.25.2 to 3.25.3.
- [Release notes](https://github.com/protocolbuffers/protobuf/releases)
- [Changelog](https://github.com/protocolbuffers/protobuf/blob/main/protobuf_release.bzl)
- [Commits](https://github.com/protocolbuffers/protobuf/compare/v3.25.2...v3.25.3)

---
updated-dependencies:
- dependency-name: com.google.protobuf:protobuf-java
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
The file was modified pom.xml (diff)
Commit a0677811f7ffe1d2fbc0b751509c04c8d5bd4d08 by noreply
Bump org.apache.maven.plugins:maven-shade-plugin from 3.5.1 to 3.5.2

Bumps [org.apache.maven.plugins:maven-shade-plugin](https://github.com/apache/maven-shade-plugin) from 3.5.1 to 3.5.2.
- [Release notes](https://github.com/apache/maven-shade-plugin/releases)
- [Commits](https://github.com/apache/maven-shade-plugin/compare/maven-shade-plugin-3.5.1...maven-shade-plugin-3.5.2)

---
updated-dependencies:
- dependency-name: org.apache.maven.plugins:maven-shade-plugin
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
The file was modified pom.xml (diff)
Commit 83aa52dd61aebbd20c38bf4d4c61449a1470ed59 by noreply
Bump org.mockito:mockito-core from 5.10.0 to 5.11.0

Bumps [org.mockito:mockito-core](https://github.com/mockito/mockito) from 5.10.0 to 5.11.0.
- [Release notes](https://github.com/mockito/mockito/releases)
- [Commits](https://github.com/mockito/mockito/compare/v5.10.0...v5.11.0)

---
updated-dependencies:
- dependency-name: org.mockito:mockito-core
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
The file was modified hk2-testing/hk2-mockito/pom.xml (diff)
Commit 3f19e5d77b069f12ac12f315950056c76423ea1c by arjan tijms
Fix merge error

Signed-off-by: Arjan Tijms <arjan.tijms@omnifish.ee>
The file was modified osgi/adapter/src/main/java/org/jvnet/hk2/osgiadapter/OSGiModuleImpl.java (diff)