Skip to content
[Jenkins]Jenkins
log in
Success

Changes

Summary

  1. Reentrantlock additions of master (details)
  2. Bump org.apache.maven.plugins:maven-shade-plugin from 3.5.1 to 3.5.2 (details)
  3. Bump org.mockito:mockito-core from 5.10.0 to 5.11.0 (details)
  4. Fix merge error (details)
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-utils/src/main/java/org/glassfish/hk2/utilities/general/internal/WeakHashLRUImpl.java (diff)
The file was modified osgi/adapter/src/main/java/org/jvnet/hk2/osgiadapter/ObrHandler.java (diff)
The file was modified osgi/adapter/src/main/java/org/jvnet/hk2/osgiadapter/OSGiModuleImpl.java (diff)
The file was modified hk2-configuration/persistence/hk2-xml/main/src/main/java/org/glassfish/hk2/xml/tools/Hk2XmlGenerator.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-extras/src/main/java/org/glassfish/hk2/extras/hk2bridge/internal/Hk2BridgeImpl.java (diff)
The file was modified hk2-extras/src/main/java/org/glassfish/hk2/extras/provides/ProvidesListener.java (diff)
The file was modified osgi/adapter/src/main/java/org/jvnet/hk2/osgiadapter/AbstractOSGiModulesRegistryImpl.java (diff)
The file was modified hk2-extras/src/main/java/org/glassfish/hk2/extras/operation/OperationContext.java (diff)
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/OSGiObrModuleImpl.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/ModuleDefinitionCacheSingleton.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/OSGiModulesRegistryImpl.java (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)