This is an automated email from the ASF dual-hosted git repository. alien11689 pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/aries.git
commit 9c106b99ee8c87c668cebdf40b347118289eedfd Merge: 34a551089 fed8dc6ea Author: Dominik Przybysz <[email protected]> AuthorDate: Fri May 9 22:55:14 2025 +0200 Merge pull request #663 from apache/remove-usage-of-deprecated-junit-3-api [MAINTENANCE] Remove usage of deprecated junit 3 api .../blueprint/plugin/model/BlueprintTest.java | 9 +- .../impl/SecurityAnnoationParserTest.java | 25 +- .../aries/blueprint/AbstractBlueprintTest.java | 4 +- .../apache/aries/blueprint/BeanLoadingTest.java | 6 + .../apache/aries/blueprint/ExtPlaceholderTest.java | 4 + .../aries/blueprint/NonStandardSettersTest.java | 3 + .../org/apache/aries/blueprint/NullProxyTest.java | 6 + .../org/apache/aries/blueprint/ParserTest.java | 14 +- .../org/apache/aries/blueprint/ReferencesTest.java | 18 +- .../org/apache/aries/blueprint/WiringTest.java | 148 +++---- .../container/AggregateConverterTest.java | 59 ++- .../aries/blueprint/container/BPQuiesceTest.java | 2 +- .../blueprint/container/DampingPolicyTest.java | 7 +- .../aries/blueprint/container/GenericTypeTest.java | 14 +- .../blueprint/container/LifecyclePolicyTest.java | 18 +- .../blueprint/utils/DynamicCollectionTest.java | 18 +- .../aries/blueprint/utils/HeaderParserTest.java | 17 +- .../extender/SpringXsdVersionResolverTest.java | 6 +- .../aries/blueprint/itests/FragmentTest.java | 6 +- .../FragmentTestBundleBlueprintAttribute.java | 6 +- .../blueprint/itests/QuiesceBlueprintTest.java | 35 +- .../aries/blueprint/itests/TestReferences.java | 4 +- .../itests/cm/CmPropertyPlaceholderTest.java | 4 +- .../org/apache/aries/ant/taskdefs/EsaTaskTest.java | 65 +-- .../apache/aries/jmx/framework/FrameworkTest.java | 230 +++++----- .../aries/jmx/framework/PackageStateTest.java | 24 +- .../jmx/permissionadmin/PermissionAdminTest.java | 29 +- .../apache/aries/jmx/useradmin/UserAdminTest.java | 114 ++--- .../aries/jmx/framework/ServiceStateMBeanTest.java | 3 +- .../wiring/BundleWiringStateMBeanTest.java | 47 +- .../jmx/test/blueprint/BlueprintMBeanTest.java | 1 - .../AbstractListenerComponentValidator.java | 2 +- .../blueprint/framework/MapEntryValidator.java | 2 +- .../test/blueprint/framework/ServiceValidator.java | 2 +- .../aries/jmx/whiteboard/MBeanHolderTest.java | 9 +- .../whiteboard/integration/MBeanServerTest.java | 6 +- .../jmx/whiteboard/integration/MBeanTest.java | 10 +- .../integration/helper/IntegrationTestBase.java | 15 +- .../org/apache/aries/jndi/InitialContextTest.java | 3 +- .../aries/jndi/url/ServiceRegistryContextTest.java | 492 ++++++++++----------- proxy/proxy-impl/pom.xml | 1 + .../aries/blueprint/proxy/AbstractProxyTest.java | 38 +- .../blueprint/proxy/InterfaceProxyingTest.java | 14 +- .../blueprint/proxy/WovenProxyGeneratorTest.java | 32 +- proxy/proxy-itests/pom.xml | 1 + .../org/apache/aries/spifly/HeaderParserTest.java | 12 +- .../ClientWeavingHookGenericCapabilityTest.java | 103 ++--- .../dynamic/ClientWeavingHookOSGi43Test.java | 14 +- .../spifly/dynamic/ClientWeavingHookTest.java | 96 ++-- .../aries/spifly/statictool/ConsumerTest.java | 27 +- .../apache/aries/spifly/statictool/MainTest.java | 8 +- .../aries/spifly/statictool/RequirementTest.java | 29 +- subsystem/subsystem-core/pom.xml | 4 +- .../subsystem/core/archive/Aries1453Test.java | 8 +- ...ndleRequiredExecutionEnvironmentHeaderTest.java | 9 +- .../core/archive/FragmentHostHeaderTest.java | 29 +- .../subsystem/core/archive/GenericHeaderTest.java | 29 +- .../subsystem/core/internal/LocationTest.java | 41 +- .../apache/aries/subsystem/itests/FeatureTest.java | 47 +- .../subsystem/itests/ServiceDependencyTest.java | 63 ++- .../modelling/utils/DeployedBundlesTest.java | 163 ++----- .../utils/PackageRequirementMergerTest.java | 60 ++- .../org/apache/aries/unittest/mocks/Skeleton.java | 8 +- transaction/transaction-blueprint/pom.xml | 4 +- .../aries/transaction/ComponentTxDataTest.java | 7 +- .../apache/aries/transaction/TranStrategyTest.java | 79 +--- .../itests/AbstractIntegrationTest.java | 7 +- .../aries/transaction/itests/NotSupportedTest.java | 2 +- .../aries/transaction/itests/RequiresNewTest.java | 2 +- .../aries/transaction/itests/RollbackOnTest.java | 11 +- .../transaction/internal/LogConversionTest.java | 19 +- .../org/apache/aries/util/VersionRangeTest.java | 38 +- .../aries/util/filesystem/FileSystemTest.java | 9 +- .../apache/aries/util/filesystem/IOUtilsTest.java | 14 +- .../java/org/apache/aries/util/log/LoggerTest.java | 46 +- .../util/manifest/ManifestHeaderProcessorTest.java | 32 +- .../aries/versioning/tests/FilterResultsTest.java | 14 +- .../aries/web/converter/impl/WabConverterTest.java | 13 +- 78 files changed, 1189 insertions(+), 1431 deletions(-)
