This is an automated email from the ASF dual-hosted git repository. sseifert pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-testing-osgi-mock.git
from 415311c [maven-release-plugin] prepare for next development iteration new 771ed60 SLING-12284 Update to Parent 60, Java 11 Minimum Version new 5cb6429 SLING-12284 apply spotless code formatting The 2 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: .sling-module.json | 5 + core/pom.xml | 12 +- .../testing/mock/osgi/ComponentContextBuilder.java | 3 +- .../testing/mock/osgi/DictionaryCollector.java | 27 +- .../sling/testing/mock/osgi/ManifestScanner.java | 12 +- .../sling/testing/mock/osgi/MapMergeUtil.java | 22 +- .../apache/sling/testing/mock/osgi/MapUtil.java | 12 +- .../sling/testing/mock/osgi/MatchAllFilter.java | 1 - .../apache/sling/testing/mock/osgi/MockBundle.java | 23 +- .../sling/testing/mock/osgi/MockBundleContext.java | 192 +++++---- .../testing/mock/osgi/MockComponentContext.java | 13 +- .../sling/testing/mock/osgi/MockConfiguration.java | 147 +++---- .../testing/mock/osgi/MockConfigurationAdmin.java | 8 +- .../sling/testing/mock/osgi/MockEventAdmin.java | 54 +-- .../sling/testing/mock/osgi/MockLogService.java | 57 ++- .../apache/sling/testing/mock/osgi/MockOsgi.java | 187 ++++++--- .../testing/mock/osgi/MockServiceReference.java | 9 +- .../testing/mock/osgi/MockServiceRegistration.java | 23 +- .../testing/mock/osgi/NoScrMetadataException.java | 1 - .../sling/testing/mock/osgi/OsgiMetadataUtil.java | 89 ++--- .../sling/testing/mock/osgi/OsgiServiceUtil.java | 344 +++++++++------- .../mock/osgi/ReferenceViolationException.java | 1 - .../AbstractConfigTypeReflectionProvider.java | 18 +- .../osgi/config/AnnotationReflectionProvider.java | 9 +- .../mock/osgi/config/AnnotationTypedConfig.java | 14 +- .../mock/osgi/config/ComponentPropertyParser.java | 51 +-- .../mock/osgi/config/ConfigAnnotationUtil.java | 69 ++-- .../mock/osgi/config/ConfigTypeContext.java | 43 +- .../osgi/config/InterfaceReflectionProvider.java | 4 +- .../SingleElementAnnotationReflectionProvider.java | 13 +- .../mock/osgi/config/annotations/AutoConfig.java | 4 +- .../osgi/config/annotations/ConfigCollection.java | 7 +- .../mock/osgi/config/annotations/SetConfig.java | 4 +- .../mock/osgi/config/annotations/TypedConfig.java | 1 - .../mock/osgi/context/AbstractContextPlugin.java | 1 - .../testing/mock/osgi/context/ContextCallback.java | 1 - .../testing/mock/osgi/context/ContextPlugin.java | 1 - .../testing/mock/osgi/context/ContextPlugins.java | 59 ++- .../testing/mock/osgi/context/OsgiContextImpl.java | 45 ++- .../testing/mock/osgi/ManifestScannerTest.java | 5 +- .../sling/testing/mock/osgi/MapUtilTest.java | 11 +- ...eferencesOsgiR6ComponentServiceObjectsTest.java | 4 +- ...ckBundleContextDynamicReferencesOsgiR6Test.java | 77 ++-- .../MockBundleContextDynamicReferencesTest.java | 46 ++- ...ckBundleContextServiceVsSuperinterfaceTest.java | 15 +- ...ctionComponentServiceObjectsReferencesTest.java | 4 +- ...icGreedyConstructorInjectionReferencesTest.java | 50 ++- ...ockBundleContextStaticGreedyReferencesTest.java | 59 +-- ...BundleContextStaticGreedySelfReferenceTest.java | 14 +- .../testing/mock/osgi/MockBundleContextTest.java | 71 ++-- .../sling/testing/mock/osgi/MockBundleTest.java | 12 +- .../mock/osgi/MockComponentContextTest.java | 16 +- .../mock/osgi/MockConfigurationAdminTest.java | 71 ++-- .../testing/mock/osgi/MockEventAdminTest.java | 35 +- .../testing/mock/osgi/MockLogServiceTest.java | 1 - .../mock/osgi/MockServiceReferenceTest.java | 15 +- .../mock/osgi/MockServiceReferencesSortTest.java | 44 ++- .../testing/mock/osgi/OsgiMetadataUtilTest.java | 17 +- .../testing/mock/osgi/OsgiServiceRegisterTest.java | 9 +- .../OsgiServiceUtilActivateDeactivateTest.java | 29 +- .../mock/osgi/OsgiServiceUtilBindUnbindTest.java | 22 +- .../testing/mock/osgi/OsgiServiceUtilTest.java | 80 ++-- .../AbstractConfigTypeReflectionProviderTest.java | 33 +- .../osgi/config/AnnotationTypedConfigTest.java | 38 +- .../osgi/config/ComponentPropertyParserTest.java | 307 +++++++++------ .../mock/osgi/config/ConfigAnnotationUtilTest.java | 301 +++++++------- .../osgi/config/ConfigTypeContextImplTest.java | 284 ++++++-------- .../config/annotations/ConfigCollectionTest.java | 64 +-- .../mock/osgi/context/ContextPluginsTest.java | 16 +- .../mock/osgi/context/OsgiContextImplTest.java | 41 +- .../sling/testing/mock/osgi/junit/OsgiContext.java | 5 +- .../mock/osgi/junit/OsgiContextBuilder.java | 20 +- junit4/pom.xml | 8 +- .../testing/mock/osgi/junit/ConfigCollector.java | 32 +- .../sling/testing/mock/osgi/junit/OsgiContext.java | 5 +- .../mock/osgi/junit/OsgiContextBuilder.java | 16 +- .../mock/osgi/junit/ConfigCollectorTest.java | 41 +- .../testing/mock/osgi/junit/OsgiContextTest.java | 19 +- junit5/pom.xml | 38 +- .../mock/osgi/junit5/CollectConfigTypes.java | 4 +- .../mock/osgi/junit5/ConfigCollectionImpl.java | 33 +- .../osgi/junit5/OsgiConfigParametersExtension.java | 123 +++--- .../osgi/junit5/OsgiConfigParametersStore.java | 15 +- .../testing/mock/osgi/junit5/OsgiContext.java | 1 - .../mock/osgi/junit5/OsgiContextBuilder.java | 13 +- .../mock/osgi/junit5/OsgiContextExtension.java | 22 +- .../testing/mock/osgi/junit5/OsgiContextStore.java | 4 +- .../mock/osgi/junit5/ConfigCollectionImplTest.java | 60 +-- .../junit5/OsgiConfigParametersExtensionTest.java | 436 ++++++++++----------- .../osgi/junit5/OsgiConfigParametersStoreTest.java | 12 +- .../junit5/OsgiContextMemberInstantiatedTest.java | 7 +- .../junit5/OsgiContextMemberSuperClassTest.java | 7 +- .../mock/osgi/junit5/OsgiContextMemberTest.java | 7 +- .../mock/osgi/junit5/OsgiContextPluginTest.java | 7 +- .../testing/mock/osgi/junit5/OsgiContextTest.java | 7 +- parent/pom.xml | 162 ++++---- pom.xml | 18 +- relocate/pom.xml | 4 +- test-services/pom.xml | 12 +- .../osgi/testsvc/osgicontextimpl/MyComponent.java | 1 - .../osgi/testsvc/osgicontextimpl/MyService.java | 3 +- .../osgi/testsvc/osgiserviceutil/DictionaryTo.java | 5 +- .../testsvc/osgiserviceutil/RankedService.java | 1 - .../testsvc/osgiserviceutil/RankedServiceFive.java | 3 +- .../testsvc/osgiserviceutil/RankedServiceTen.java | 3 +- .../osgi/testsvc/osgiserviceutil/Service2.java | 2 +- .../osgi/testsvc/osgiserviceutil/Service3.java | 49 ++- .../testsvc/osgiserviceutil/Service3OsgiR6.java | 1 - .../Service3OsgiR6ComponentServiceObjectsImpl.java | 52 ++- .../osgiserviceutil/Service3OsgiR6Impl.java | 46 ++- .../Service3OsgiR8OptionalFieldImpl.java | 4 +- .../osgiserviceutil/Service3StaticGreedy.java | 1 - ...ructorInjectionComponentServiceObjectsImpl.java | 40 +- ...rvice3StaticGreedyConstructorInjectionImpl.java | 38 +- .../osgiserviceutil/Service3StaticGreedyImpl.java | 56 ++- .../osgi/testsvc/osgiserviceutil/Service4.java | 9 +- .../osgi/testsvc/osgiserviceutil/Service5.java | 3 +- .../Service6VolatileMultipleReferences.java | 3 +- .../Service7ServiceVsSuperInterface.java | 36 +- .../testsvc/osgiserviceutil/ServiceFactory1.java | 4 +- .../osgiserviceutil/ServiceInterface3Impl.java | 6 +- .../ServiceInterface3ImplSelfReferencing.java | 4 +- .../testsvc/osgiserviceutil/ServiceInterface5.java | 1 - .../activatedeactivate/Service1.java | 1 - .../activatedeactivate/Service1Constructor.java | 1 - .../activatedeactivate/Service2.java | 1 - .../activatedeactivate/Service2Constructor.java | 1 - .../activatedeactivate/Service3.java | 5 +- .../activatedeactivate/Service3Constructor.java | 5 +- .../activatedeactivate/Service4.java | 3 +- .../activatedeactivate/Service4Constructor.java | 3 +- .../activatedeactivate/Service5.java | 1 - .../activatedeactivate/Service5Constructor.java | 1 - .../activatedeactivate/Service6.java | 7 +- .../activatedeactivate/Service6Constructor.java | 8 +- .../activatedeactivate/Service7.java | 5 +- .../activatedeactivate/Service7Constructor.java | 5 +- .../activatedeactivate/Service8.java | 3 +- .../activatedeactivate/Service9.java | 27 +- .../activatedeactivate/Service9Super1.java | 1 - .../activatedeactivate/ServiceConfig.java | 1 - .../ServiceReferenceInConstructor.java | 1 - .../ServiceWithDefaultValuesConfig.java | 3 +- .../ServiceWithDefaultValuesConstructor.java | 1 - .../osgiserviceutil/bindunbind/Service1.java | 11 +- .../osgiserviceutil/bindunbind/Service2.java | 11 +- .../osgiserviceutil/bindunbind/Service3.java | 16 +- .../osgiserviceutil/bindunbind/Service4.java | 24 +- .../osgiserviceutil/bindunbind/Service5.java | 34 +- 149 files changed, 2718 insertions(+), 2348 deletions(-) create mode 100644 .sling-module.json