This is an automated email from the ASF dual-hosted git repository. sseifert pushed a commit to branch feature/SLING-7803-junit5 in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-testing-sling-mock.git
commit 72976bc610ad6ed705fd469469524a354a33c3f9 Author: sseifert <[email protected]> AuthorDate: Mon Aug 6 14:08:15 2018 +0200 SLING-7803 prepare module splitup --- .gitignore | 2 +- pom.xml => core/pom.xml | 13 +- .../testing/mock/sling/MockAdapterManagerImpl.java | 0 .../mock/sling/MockDynamicClassLoaderManager.java | 0 .../mock/sling/MockJcrResourceResolverAdapter.java | 0 .../testing/mock/sling/MockJcrSlingRepository.java | 0 .../sling/MockNoneResourceResolverAdapter.java | 0 .../apache/sling/testing/mock/sling/MockSling.java | 0 .../testing/mock/sling/MockSlingScriptHelper.java | 0 .../mock/sling/NodeTypeDefinitionScanner.java | 0 .../sling/testing/mock/sling/NodeTypeMode.java | 0 .../sling/RRMockMockResourceResolverAdapter.java | 0 .../sling/ResourceResolverFactoryInitializer.java | 0 .../testing/mock/sling/ResourceResolverType.java | 0 .../sling/ThreadsafeMockAdapterManagerWrapper.java | 0 .../testing/mock/sling/builder/ContentBuilder.java | 0 .../testing/mock/sling/builder/package-info.java | 0 .../context/ContextResourceResolverFactory.java | 0 .../sling/context/ModelAdapterFactoryUtil.java | 0 .../mock/sling/context/SlingContextImpl.java | 0 .../testing/mock/sling/context/UniqueRoot.java | 0 .../testing/mock/sling/context/package-info.java | 0 .../testing/mock/sling/junit/SlingContext.java | 0 .../mock/sling/junit/SlingContextBuilder.java | 0 .../mock/sling/junit/SlingContextCallback.java | 0 .../testing/mock/sling/junit/package-info.java | 0 .../testing/mock/sling/loader/ContentLoader.java | 0 .../mock/sling/loader/LoaderContentHandler.java | 0 .../testing/mock/sling/loader/package-info.java | 0 .../sling/testing/mock/sling/package-info.java | 0 .../mock/sling/services/MockMimeTypeService.java | 0 .../sling/services/MockSlingSettingService.java | 0 .../testing/mock/sling/services/package-info.java | 0 .../mock/sling/servlet/MockHttpSession.java | 0 .../servlet/MockRequestDispatcherFactory.java | 0 .../mock/sling/servlet/MockRequestPathInfo.java | 0 .../mock/sling/servlet/MockServletContext.java | 0 .../sling/servlet/MockSlingHttpServletRequest.java | 0 .../servlet/MockSlingHttpServletResponse.java | 0 .../testing/mock/sling/servlet/package-info.java | 0 .../sling/spi/ResourceResolverTypeAdapter.java | 0 .../sling/testing/mock/sling/spi/package-info.java | 0 .../mock/sling/MockJcrSlingRepositoryTest.java | 0 .../mock/sling/MockSlingScriptHelperTest.java | 0 .../mock/sling/NodeTypeDefinitionScannerTest.java | 0 .../mock/sling/builder/ContentBuilderTest.java | 0 .../AbstractModelAdapterFactoryUtilTest.java | 0 .../context/AbstractSlingContextImplTest.java | 0 .../ModelAdapterFactoryUtilClassesTest.java | 0 .../ModelAdapterFactoryUtilPackagesTest.java | 0 .../sling/context/NoResourceResolverTypeTest.java | 0 .../context/NoSlingModelsRegistrationTest.java | 0 .../sling/context/models/OsgiServiceModel.java | 0 .../context/models/RequestAttributeModel.java | 0 .../sling/context/models/ServiceInterface.java | 0 .../sling/context/models/ServiceInterfaceImpl.java | 0 .../modelsautoreg/ClasspathRegisteredModel.java | 0 .../jcrmock/context/SlingContextImplTest.java | 0 .../loader/ContentLoaderAutoCommitTest.java | 0 .../jcrmock/loader/ContentLoaderBinaryTest.java | 0 .../jcrmock/loader/ContentLoaderJsonDamTest.java | 0 .../jcrmock/loader/ContentLoaderJsonTest.java | 0 .../sling/jcrmock/resource/FindResourcesTest.java | 0 .../sling/jcrmock/resource/JcrNamespaceTest.java | 0 .../jcrmock/resource/JcrResourceResolverTest.java | 0 .../resource/MultipleResourceResolverTest.java | 0 .../resource/SlingCrudResourceResolverTest.java | 0 .../sling/jcrmock/resource/UniqueRootTest.java | 0 .../sling/junit/SlingContextDefaultRRTypeTest.java | 0 .../testing/mock/sling/junit/SlingContextTest.java | 0 .../AbstractContentLoaderAutoCommitTest.java | 0 .../loader/AbstractContentLoaderBinaryTest.java | 0 .../loader/AbstractContentLoaderJsonDamTest.java | 0 .../loader/AbstractContentLoaderJsonTest.java | 0 .../sling/resource/AbstractJcrNamespaceTest.java | 0 .../resource/AbstractJcrResourceResolverTest.java | 0 .../AbstractMultipleResourceResolverTest.java | 0 .../AbstractSlingCrudResourceResolverTest.java | 0 .../sling/resource/AbstractUniqueRootTest.java | 0 .../sling/rrmock/context/SlingContextImplTest.java | 0 .../rrmock/loader/ContentLoaderAutoCommitTest.java | 0 .../rrmock/loader/ContentLoaderBinaryTest.java | 0 .../rrmock/loader/ContentLoaderJsonDamTest.java | 0 .../sling/rrmock/loader/ContentLoaderJsonTest.java | 0 .../resource/MultipleResourceResolverTest.java | 0 .../resource/SlingCrudResourceResolverTest.java | 0 .../mock/sling/rrmock/resource/UniqueRootTest.java | 0 .../sling/services/MockMimeTypeServiceTest.java | 0 .../services/MockSlingSettingServiceTest.java | 0 .../mock/sling/servlet/MockHttpSessionTest.java | 0 .../servlet/MockSlingHttpServletRequestTest.java | 0 .../servlet/MockSlingHttpServletResponseTest.java | 0 .../src}/test/resources/META-INF/MANIFEST.MF | 0 .../test/resources/SLING-INF/nodetypes/app.cnd | 0 .../resources/json-import-samples/SLING-4362.json | 0 .../resources/json-import-samples/content.json | 0 .../test/resources/json-import-samples/dam.json | 0 {src => core/src}/test/resources/sample-image.gif | Bin junit4/pom.xml | 53 ++++ junit5/pom.xml | 53 ++++ pom.xml | 301 +-------------------- relocate/pom.xml | 43 +++ 102 files changed, 163 insertions(+), 302 deletions(-) diff --git a/.gitignore b/.gitignore index 5b783ed..7fa4d65 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,4 @@ -/target +target .idea .classpath .metadata diff --git a/pom.xml b/core/pom.xml similarity index 95% copy from pom.xml copy to core/pom.xml index 00b5b1d..52d3ac8 100644 --- a/pom.xml +++ b/core/pom.xml @@ -27,20 +27,13 @@ <relativePath /> </parent> - <artifactId>org.apache.sling.testing.sling-mock</artifactId> + <artifactId>org.apache.sling.testing.sling-mock.core</artifactId> <version>2.3.0-SNAPSHOT</version> <packaging>bundle</packaging> - <name>Apache Sling Testing Sling Mock</name> + <name>Apache Sling Testing Sling Mock Core</name> <description>Mock implementation of selected Sling APIs.</description> - <scm> - <connection>scm:git:https://gitbox.apache.org/repos/asf/sling-org-apache-sling-testing-sling-mock.git</connection> - <developerConnection>scm:git:https://gitbox.apache.org/repos/asf/sling-org-apache-sling-testing-sling-mock.git</developerConnection> - <url>https://gitbox.apache.org/repos/asf?p=sling-org-apache-sling-testing-sling-mock.git</url> - <tag>HEAD</tag> - </scm> - <dependencies> <dependency> @@ -51,7 +44,7 @@ <dependency> <groupId>org.apache.sling</groupId> - <artifactId>org.apache.sling.testing.osgi-mock</artifactId> + <artifactId>org.apache.sling.testing.osgi-mock.core</artifactId> <version>2.4.0-SNAPSHOT</version> <scope>compile</scope> </dependency> diff --git a/src/main/java/org/apache/sling/testing/mock/sling/MockAdapterManagerImpl.java b/core/src/main/java/org/apache/sling/testing/mock/sling/MockAdapterManagerImpl.java similarity index 100% rename from src/main/java/org/apache/sling/testing/mock/sling/MockAdapterManagerImpl.java rename to core/src/main/java/org/apache/sling/testing/mock/sling/MockAdapterManagerImpl.java diff --git a/src/main/java/org/apache/sling/testing/mock/sling/MockDynamicClassLoaderManager.java b/core/src/main/java/org/apache/sling/testing/mock/sling/MockDynamicClassLoaderManager.java similarity index 100% rename from src/main/java/org/apache/sling/testing/mock/sling/MockDynamicClassLoaderManager.java rename to core/src/main/java/org/apache/sling/testing/mock/sling/MockDynamicClassLoaderManager.java diff --git a/src/main/java/org/apache/sling/testing/mock/sling/MockJcrResourceResolverAdapter.java b/core/src/main/java/org/apache/sling/testing/mock/sling/MockJcrResourceResolverAdapter.java similarity index 100% rename from src/main/java/org/apache/sling/testing/mock/sling/MockJcrResourceResolverAdapter.java rename to core/src/main/java/org/apache/sling/testing/mock/sling/MockJcrResourceResolverAdapter.java diff --git a/src/main/java/org/apache/sling/testing/mock/sling/MockJcrSlingRepository.java b/core/src/main/java/org/apache/sling/testing/mock/sling/MockJcrSlingRepository.java similarity index 100% rename from src/main/java/org/apache/sling/testing/mock/sling/MockJcrSlingRepository.java rename to core/src/main/java/org/apache/sling/testing/mock/sling/MockJcrSlingRepository.java diff --git a/src/main/java/org/apache/sling/testing/mock/sling/MockNoneResourceResolverAdapter.java b/core/src/main/java/org/apache/sling/testing/mock/sling/MockNoneResourceResolverAdapter.java similarity index 100% rename from src/main/java/org/apache/sling/testing/mock/sling/MockNoneResourceResolverAdapter.java rename to core/src/main/java/org/apache/sling/testing/mock/sling/MockNoneResourceResolverAdapter.java diff --git a/src/main/java/org/apache/sling/testing/mock/sling/MockSling.java b/core/src/main/java/org/apache/sling/testing/mock/sling/MockSling.java similarity index 100% rename from src/main/java/org/apache/sling/testing/mock/sling/MockSling.java rename to core/src/main/java/org/apache/sling/testing/mock/sling/MockSling.java diff --git a/src/main/java/org/apache/sling/testing/mock/sling/MockSlingScriptHelper.java b/core/src/main/java/org/apache/sling/testing/mock/sling/MockSlingScriptHelper.java similarity index 100% rename from src/main/java/org/apache/sling/testing/mock/sling/MockSlingScriptHelper.java rename to core/src/main/java/org/apache/sling/testing/mock/sling/MockSlingScriptHelper.java diff --git a/src/main/java/org/apache/sling/testing/mock/sling/NodeTypeDefinitionScanner.java b/core/src/main/java/org/apache/sling/testing/mock/sling/NodeTypeDefinitionScanner.java similarity index 100% rename from src/main/java/org/apache/sling/testing/mock/sling/NodeTypeDefinitionScanner.java rename to core/src/main/java/org/apache/sling/testing/mock/sling/NodeTypeDefinitionScanner.java diff --git a/src/main/java/org/apache/sling/testing/mock/sling/NodeTypeMode.java b/core/src/main/java/org/apache/sling/testing/mock/sling/NodeTypeMode.java similarity index 100% rename from src/main/java/org/apache/sling/testing/mock/sling/NodeTypeMode.java rename to core/src/main/java/org/apache/sling/testing/mock/sling/NodeTypeMode.java diff --git a/src/main/java/org/apache/sling/testing/mock/sling/RRMockMockResourceResolverAdapter.java b/core/src/main/java/org/apache/sling/testing/mock/sling/RRMockMockResourceResolverAdapter.java similarity index 100% rename from src/main/java/org/apache/sling/testing/mock/sling/RRMockMockResourceResolverAdapter.java rename to core/src/main/java/org/apache/sling/testing/mock/sling/RRMockMockResourceResolverAdapter.java diff --git a/src/main/java/org/apache/sling/testing/mock/sling/ResourceResolverFactoryInitializer.java b/core/src/main/java/org/apache/sling/testing/mock/sling/ResourceResolverFactoryInitializer.java similarity index 100% rename from src/main/java/org/apache/sling/testing/mock/sling/ResourceResolverFactoryInitializer.java rename to core/src/main/java/org/apache/sling/testing/mock/sling/ResourceResolverFactoryInitializer.java diff --git a/src/main/java/org/apache/sling/testing/mock/sling/ResourceResolverType.java b/core/src/main/java/org/apache/sling/testing/mock/sling/ResourceResolverType.java similarity index 100% rename from src/main/java/org/apache/sling/testing/mock/sling/ResourceResolverType.java rename to core/src/main/java/org/apache/sling/testing/mock/sling/ResourceResolverType.java diff --git a/src/main/java/org/apache/sling/testing/mock/sling/ThreadsafeMockAdapterManagerWrapper.java b/core/src/main/java/org/apache/sling/testing/mock/sling/ThreadsafeMockAdapterManagerWrapper.java similarity index 100% rename from src/main/java/org/apache/sling/testing/mock/sling/ThreadsafeMockAdapterManagerWrapper.java rename to core/src/main/java/org/apache/sling/testing/mock/sling/ThreadsafeMockAdapterManagerWrapper.java diff --git a/src/main/java/org/apache/sling/testing/mock/sling/builder/ContentBuilder.java b/core/src/main/java/org/apache/sling/testing/mock/sling/builder/ContentBuilder.java similarity index 100% rename from src/main/java/org/apache/sling/testing/mock/sling/builder/ContentBuilder.java rename to core/src/main/java/org/apache/sling/testing/mock/sling/builder/ContentBuilder.java diff --git a/src/main/java/org/apache/sling/testing/mock/sling/builder/package-info.java b/core/src/main/java/org/apache/sling/testing/mock/sling/builder/package-info.java similarity index 100% rename from src/main/java/org/apache/sling/testing/mock/sling/builder/package-info.java rename to core/src/main/java/org/apache/sling/testing/mock/sling/builder/package-info.java diff --git a/src/main/java/org/apache/sling/testing/mock/sling/context/ContextResourceResolverFactory.java b/core/src/main/java/org/apache/sling/testing/mock/sling/context/ContextResourceResolverFactory.java similarity index 100% rename from src/main/java/org/apache/sling/testing/mock/sling/context/ContextResourceResolverFactory.java rename to core/src/main/java/org/apache/sling/testing/mock/sling/context/ContextResourceResolverFactory.java diff --git a/src/main/java/org/apache/sling/testing/mock/sling/context/ModelAdapterFactoryUtil.java b/core/src/main/java/org/apache/sling/testing/mock/sling/context/ModelAdapterFactoryUtil.java similarity index 100% rename from src/main/java/org/apache/sling/testing/mock/sling/context/ModelAdapterFactoryUtil.java rename to core/src/main/java/org/apache/sling/testing/mock/sling/context/ModelAdapterFactoryUtil.java diff --git a/src/main/java/org/apache/sling/testing/mock/sling/context/SlingContextImpl.java b/core/src/main/java/org/apache/sling/testing/mock/sling/context/SlingContextImpl.java similarity index 100% rename from src/main/java/org/apache/sling/testing/mock/sling/context/SlingContextImpl.java rename to core/src/main/java/org/apache/sling/testing/mock/sling/context/SlingContextImpl.java diff --git a/src/main/java/org/apache/sling/testing/mock/sling/context/UniqueRoot.java b/core/src/main/java/org/apache/sling/testing/mock/sling/context/UniqueRoot.java similarity index 100% rename from src/main/java/org/apache/sling/testing/mock/sling/context/UniqueRoot.java rename to core/src/main/java/org/apache/sling/testing/mock/sling/context/UniqueRoot.java diff --git a/src/main/java/org/apache/sling/testing/mock/sling/context/package-info.java b/core/src/main/java/org/apache/sling/testing/mock/sling/context/package-info.java similarity index 100% rename from src/main/java/org/apache/sling/testing/mock/sling/context/package-info.java rename to core/src/main/java/org/apache/sling/testing/mock/sling/context/package-info.java diff --git a/src/main/java/org/apache/sling/testing/mock/sling/junit/SlingContext.java b/core/src/main/java/org/apache/sling/testing/mock/sling/junit/SlingContext.java similarity index 100% rename from src/main/java/org/apache/sling/testing/mock/sling/junit/SlingContext.java rename to core/src/main/java/org/apache/sling/testing/mock/sling/junit/SlingContext.java diff --git a/src/main/java/org/apache/sling/testing/mock/sling/junit/SlingContextBuilder.java b/core/src/main/java/org/apache/sling/testing/mock/sling/junit/SlingContextBuilder.java similarity index 100% rename from src/main/java/org/apache/sling/testing/mock/sling/junit/SlingContextBuilder.java rename to core/src/main/java/org/apache/sling/testing/mock/sling/junit/SlingContextBuilder.java diff --git a/src/main/java/org/apache/sling/testing/mock/sling/junit/SlingContextCallback.java b/core/src/main/java/org/apache/sling/testing/mock/sling/junit/SlingContextCallback.java similarity index 100% rename from src/main/java/org/apache/sling/testing/mock/sling/junit/SlingContextCallback.java rename to core/src/main/java/org/apache/sling/testing/mock/sling/junit/SlingContextCallback.java diff --git a/src/main/java/org/apache/sling/testing/mock/sling/junit/package-info.java b/core/src/main/java/org/apache/sling/testing/mock/sling/junit/package-info.java similarity index 100% rename from src/main/java/org/apache/sling/testing/mock/sling/junit/package-info.java rename to core/src/main/java/org/apache/sling/testing/mock/sling/junit/package-info.java diff --git a/src/main/java/org/apache/sling/testing/mock/sling/loader/ContentLoader.java b/core/src/main/java/org/apache/sling/testing/mock/sling/loader/ContentLoader.java similarity index 100% rename from src/main/java/org/apache/sling/testing/mock/sling/loader/ContentLoader.java rename to core/src/main/java/org/apache/sling/testing/mock/sling/loader/ContentLoader.java diff --git a/src/main/java/org/apache/sling/testing/mock/sling/loader/LoaderContentHandler.java b/core/src/main/java/org/apache/sling/testing/mock/sling/loader/LoaderContentHandler.java similarity index 100% rename from src/main/java/org/apache/sling/testing/mock/sling/loader/LoaderContentHandler.java rename to core/src/main/java/org/apache/sling/testing/mock/sling/loader/LoaderContentHandler.java diff --git a/src/main/java/org/apache/sling/testing/mock/sling/loader/package-info.java b/core/src/main/java/org/apache/sling/testing/mock/sling/loader/package-info.java similarity index 100% rename from src/main/java/org/apache/sling/testing/mock/sling/loader/package-info.java rename to core/src/main/java/org/apache/sling/testing/mock/sling/loader/package-info.java diff --git a/src/main/java/org/apache/sling/testing/mock/sling/package-info.java b/core/src/main/java/org/apache/sling/testing/mock/sling/package-info.java similarity index 100% rename from src/main/java/org/apache/sling/testing/mock/sling/package-info.java rename to core/src/main/java/org/apache/sling/testing/mock/sling/package-info.java diff --git a/src/main/java/org/apache/sling/testing/mock/sling/services/MockMimeTypeService.java b/core/src/main/java/org/apache/sling/testing/mock/sling/services/MockMimeTypeService.java similarity index 100% rename from src/main/java/org/apache/sling/testing/mock/sling/services/MockMimeTypeService.java rename to core/src/main/java/org/apache/sling/testing/mock/sling/services/MockMimeTypeService.java diff --git a/src/main/java/org/apache/sling/testing/mock/sling/services/MockSlingSettingService.java b/core/src/main/java/org/apache/sling/testing/mock/sling/services/MockSlingSettingService.java similarity index 100% rename from src/main/java/org/apache/sling/testing/mock/sling/services/MockSlingSettingService.java rename to core/src/main/java/org/apache/sling/testing/mock/sling/services/MockSlingSettingService.java diff --git a/src/main/java/org/apache/sling/testing/mock/sling/services/package-info.java b/core/src/main/java/org/apache/sling/testing/mock/sling/services/package-info.java similarity index 100% rename from src/main/java/org/apache/sling/testing/mock/sling/services/package-info.java rename to core/src/main/java/org/apache/sling/testing/mock/sling/services/package-info.java diff --git a/src/main/java/org/apache/sling/testing/mock/sling/servlet/MockHttpSession.java b/core/src/main/java/org/apache/sling/testing/mock/sling/servlet/MockHttpSession.java similarity index 100% rename from src/main/java/org/apache/sling/testing/mock/sling/servlet/MockHttpSession.java rename to core/src/main/java/org/apache/sling/testing/mock/sling/servlet/MockHttpSession.java diff --git a/src/main/java/org/apache/sling/testing/mock/sling/servlet/MockRequestDispatcherFactory.java b/core/src/main/java/org/apache/sling/testing/mock/sling/servlet/MockRequestDispatcherFactory.java similarity index 100% rename from src/main/java/org/apache/sling/testing/mock/sling/servlet/MockRequestDispatcherFactory.java rename to core/src/main/java/org/apache/sling/testing/mock/sling/servlet/MockRequestDispatcherFactory.java diff --git a/src/main/java/org/apache/sling/testing/mock/sling/servlet/MockRequestPathInfo.java b/core/src/main/java/org/apache/sling/testing/mock/sling/servlet/MockRequestPathInfo.java similarity index 100% rename from src/main/java/org/apache/sling/testing/mock/sling/servlet/MockRequestPathInfo.java rename to core/src/main/java/org/apache/sling/testing/mock/sling/servlet/MockRequestPathInfo.java diff --git a/src/main/java/org/apache/sling/testing/mock/sling/servlet/MockServletContext.java b/core/src/main/java/org/apache/sling/testing/mock/sling/servlet/MockServletContext.java similarity index 100% rename from src/main/java/org/apache/sling/testing/mock/sling/servlet/MockServletContext.java rename to core/src/main/java/org/apache/sling/testing/mock/sling/servlet/MockServletContext.java diff --git a/src/main/java/org/apache/sling/testing/mock/sling/servlet/MockSlingHttpServletRequest.java b/core/src/main/java/org/apache/sling/testing/mock/sling/servlet/MockSlingHttpServletRequest.java similarity index 100% rename from src/main/java/org/apache/sling/testing/mock/sling/servlet/MockSlingHttpServletRequest.java rename to core/src/main/java/org/apache/sling/testing/mock/sling/servlet/MockSlingHttpServletRequest.java diff --git a/src/main/java/org/apache/sling/testing/mock/sling/servlet/MockSlingHttpServletResponse.java b/core/src/main/java/org/apache/sling/testing/mock/sling/servlet/MockSlingHttpServletResponse.java similarity index 100% rename from src/main/java/org/apache/sling/testing/mock/sling/servlet/MockSlingHttpServletResponse.java rename to core/src/main/java/org/apache/sling/testing/mock/sling/servlet/MockSlingHttpServletResponse.java diff --git a/src/main/java/org/apache/sling/testing/mock/sling/servlet/package-info.java b/core/src/main/java/org/apache/sling/testing/mock/sling/servlet/package-info.java similarity index 100% rename from src/main/java/org/apache/sling/testing/mock/sling/servlet/package-info.java rename to core/src/main/java/org/apache/sling/testing/mock/sling/servlet/package-info.java diff --git a/src/main/java/org/apache/sling/testing/mock/sling/spi/ResourceResolverTypeAdapter.java b/core/src/main/java/org/apache/sling/testing/mock/sling/spi/ResourceResolverTypeAdapter.java similarity index 100% rename from src/main/java/org/apache/sling/testing/mock/sling/spi/ResourceResolverTypeAdapter.java rename to core/src/main/java/org/apache/sling/testing/mock/sling/spi/ResourceResolverTypeAdapter.java diff --git a/src/main/java/org/apache/sling/testing/mock/sling/spi/package-info.java b/core/src/main/java/org/apache/sling/testing/mock/sling/spi/package-info.java similarity index 100% rename from src/main/java/org/apache/sling/testing/mock/sling/spi/package-info.java rename to core/src/main/java/org/apache/sling/testing/mock/sling/spi/package-info.java diff --git a/src/test/java/org/apache/sling/testing/mock/sling/MockJcrSlingRepositoryTest.java b/core/src/test/java/org/apache/sling/testing/mock/sling/MockJcrSlingRepositoryTest.java similarity index 100% rename from src/test/java/org/apache/sling/testing/mock/sling/MockJcrSlingRepositoryTest.java rename to core/src/test/java/org/apache/sling/testing/mock/sling/MockJcrSlingRepositoryTest.java diff --git a/src/test/java/org/apache/sling/testing/mock/sling/MockSlingScriptHelperTest.java b/core/src/test/java/org/apache/sling/testing/mock/sling/MockSlingScriptHelperTest.java similarity index 100% rename from src/test/java/org/apache/sling/testing/mock/sling/MockSlingScriptHelperTest.java rename to core/src/test/java/org/apache/sling/testing/mock/sling/MockSlingScriptHelperTest.java diff --git a/src/test/java/org/apache/sling/testing/mock/sling/NodeTypeDefinitionScannerTest.java b/core/src/test/java/org/apache/sling/testing/mock/sling/NodeTypeDefinitionScannerTest.java similarity index 100% rename from src/test/java/org/apache/sling/testing/mock/sling/NodeTypeDefinitionScannerTest.java rename to core/src/test/java/org/apache/sling/testing/mock/sling/NodeTypeDefinitionScannerTest.java diff --git a/src/test/java/org/apache/sling/testing/mock/sling/builder/ContentBuilderTest.java b/core/src/test/java/org/apache/sling/testing/mock/sling/builder/ContentBuilderTest.java similarity index 100% rename from src/test/java/org/apache/sling/testing/mock/sling/builder/ContentBuilderTest.java rename to core/src/test/java/org/apache/sling/testing/mock/sling/builder/ContentBuilderTest.java diff --git a/src/test/java/org/apache/sling/testing/mock/sling/context/AbstractModelAdapterFactoryUtilTest.java b/core/src/test/java/org/apache/sling/testing/mock/sling/context/AbstractModelAdapterFactoryUtilTest.java similarity index 100% rename from src/test/java/org/apache/sling/testing/mock/sling/context/AbstractModelAdapterFactoryUtilTest.java rename to core/src/test/java/org/apache/sling/testing/mock/sling/context/AbstractModelAdapterFactoryUtilTest.java diff --git a/src/test/java/org/apache/sling/testing/mock/sling/context/AbstractSlingContextImplTest.java b/core/src/test/java/org/apache/sling/testing/mock/sling/context/AbstractSlingContextImplTest.java similarity index 100% rename from src/test/java/org/apache/sling/testing/mock/sling/context/AbstractSlingContextImplTest.java rename to core/src/test/java/org/apache/sling/testing/mock/sling/context/AbstractSlingContextImplTest.java diff --git a/src/test/java/org/apache/sling/testing/mock/sling/context/ModelAdapterFactoryUtilClassesTest.java b/core/src/test/java/org/apache/sling/testing/mock/sling/context/ModelAdapterFactoryUtilClassesTest.java similarity index 100% rename from src/test/java/org/apache/sling/testing/mock/sling/context/ModelAdapterFactoryUtilClassesTest.java rename to core/src/test/java/org/apache/sling/testing/mock/sling/context/ModelAdapterFactoryUtilClassesTest.java diff --git a/src/test/java/org/apache/sling/testing/mock/sling/context/ModelAdapterFactoryUtilPackagesTest.java b/core/src/test/java/org/apache/sling/testing/mock/sling/context/ModelAdapterFactoryUtilPackagesTest.java similarity index 100% rename from src/test/java/org/apache/sling/testing/mock/sling/context/ModelAdapterFactoryUtilPackagesTest.java rename to core/src/test/java/org/apache/sling/testing/mock/sling/context/ModelAdapterFactoryUtilPackagesTest.java diff --git a/src/test/java/org/apache/sling/testing/mock/sling/context/NoResourceResolverTypeTest.java b/core/src/test/java/org/apache/sling/testing/mock/sling/context/NoResourceResolverTypeTest.java similarity index 100% rename from src/test/java/org/apache/sling/testing/mock/sling/context/NoResourceResolverTypeTest.java rename to core/src/test/java/org/apache/sling/testing/mock/sling/context/NoResourceResolverTypeTest.java diff --git a/src/test/java/org/apache/sling/testing/mock/sling/context/NoSlingModelsRegistrationTest.java b/core/src/test/java/org/apache/sling/testing/mock/sling/context/NoSlingModelsRegistrationTest.java similarity index 100% rename from src/test/java/org/apache/sling/testing/mock/sling/context/NoSlingModelsRegistrationTest.java rename to core/src/test/java/org/apache/sling/testing/mock/sling/context/NoSlingModelsRegistrationTest.java diff --git a/src/test/java/org/apache/sling/testing/mock/sling/context/models/OsgiServiceModel.java b/core/src/test/java/org/apache/sling/testing/mock/sling/context/models/OsgiServiceModel.java similarity index 100% rename from src/test/java/org/apache/sling/testing/mock/sling/context/models/OsgiServiceModel.java rename to core/src/test/java/org/apache/sling/testing/mock/sling/context/models/OsgiServiceModel.java diff --git a/src/test/java/org/apache/sling/testing/mock/sling/context/models/RequestAttributeModel.java b/core/src/test/java/org/apache/sling/testing/mock/sling/context/models/RequestAttributeModel.java similarity index 100% rename from src/test/java/org/apache/sling/testing/mock/sling/context/models/RequestAttributeModel.java rename to core/src/test/java/org/apache/sling/testing/mock/sling/context/models/RequestAttributeModel.java diff --git a/src/test/java/org/apache/sling/testing/mock/sling/context/models/ServiceInterface.java b/core/src/test/java/org/apache/sling/testing/mock/sling/context/models/ServiceInterface.java similarity index 100% rename from src/test/java/org/apache/sling/testing/mock/sling/context/models/ServiceInterface.java rename to core/src/test/java/org/apache/sling/testing/mock/sling/context/models/ServiceInterface.java diff --git a/src/test/java/org/apache/sling/testing/mock/sling/context/models/ServiceInterfaceImpl.java b/core/src/test/java/org/apache/sling/testing/mock/sling/context/models/ServiceInterfaceImpl.java similarity index 100% rename from src/test/java/org/apache/sling/testing/mock/sling/context/models/ServiceInterfaceImpl.java rename to core/src/test/java/org/apache/sling/testing/mock/sling/context/models/ServiceInterfaceImpl.java diff --git a/src/test/java/org/apache/sling/testing/mock/sling/context/modelsautoreg/ClasspathRegisteredModel.java b/core/src/test/java/org/apache/sling/testing/mock/sling/context/modelsautoreg/ClasspathRegisteredModel.java similarity index 100% rename from src/test/java/org/apache/sling/testing/mock/sling/context/modelsautoreg/ClasspathRegisteredModel.java rename to core/src/test/java/org/apache/sling/testing/mock/sling/context/modelsautoreg/ClasspathRegisteredModel.java diff --git a/src/test/java/org/apache/sling/testing/mock/sling/jcrmock/context/SlingContextImplTest.java b/core/src/test/java/org/apache/sling/testing/mock/sling/jcrmock/context/SlingContextImplTest.java similarity index 100% rename from src/test/java/org/apache/sling/testing/mock/sling/jcrmock/context/SlingContextImplTest.java rename to core/src/test/java/org/apache/sling/testing/mock/sling/jcrmock/context/SlingContextImplTest.java diff --git a/src/test/java/org/apache/sling/testing/mock/sling/jcrmock/loader/ContentLoaderAutoCommitTest.java b/core/src/test/java/org/apache/sling/testing/mock/sling/jcrmock/loader/ContentLoaderAutoCommitTest.java similarity index 100% rename from src/test/java/org/apache/sling/testing/mock/sling/jcrmock/loader/ContentLoaderAutoCommitTest.java rename to core/src/test/java/org/apache/sling/testing/mock/sling/jcrmock/loader/ContentLoaderAutoCommitTest.java diff --git a/src/test/java/org/apache/sling/testing/mock/sling/jcrmock/loader/ContentLoaderBinaryTest.java b/core/src/test/java/org/apache/sling/testing/mock/sling/jcrmock/loader/ContentLoaderBinaryTest.java similarity index 100% rename from src/test/java/org/apache/sling/testing/mock/sling/jcrmock/loader/ContentLoaderBinaryTest.java rename to core/src/test/java/org/apache/sling/testing/mock/sling/jcrmock/loader/ContentLoaderBinaryTest.java diff --git a/src/test/java/org/apache/sling/testing/mock/sling/jcrmock/loader/ContentLoaderJsonDamTest.java b/core/src/test/java/org/apache/sling/testing/mock/sling/jcrmock/loader/ContentLoaderJsonDamTest.java similarity index 100% rename from src/test/java/org/apache/sling/testing/mock/sling/jcrmock/loader/ContentLoaderJsonDamTest.java rename to core/src/test/java/org/apache/sling/testing/mock/sling/jcrmock/loader/ContentLoaderJsonDamTest.java diff --git a/src/test/java/org/apache/sling/testing/mock/sling/jcrmock/loader/ContentLoaderJsonTest.java b/core/src/test/java/org/apache/sling/testing/mock/sling/jcrmock/loader/ContentLoaderJsonTest.java similarity index 100% rename from src/test/java/org/apache/sling/testing/mock/sling/jcrmock/loader/ContentLoaderJsonTest.java rename to core/src/test/java/org/apache/sling/testing/mock/sling/jcrmock/loader/ContentLoaderJsonTest.java diff --git a/src/test/java/org/apache/sling/testing/mock/sling/jcrmock/resource/FindResourcesTest.java b/core/src/test/java/org/apache/sling/testing/mock/sling/jcrmock/resource/FindResourcesTest.java similarity index 100% rename from src/test/java/org/apache/sling/testing/mock/sling/jcrmock/resource/FindResourcesTest.java rename to core/src/test/java/org/apache/sling/testing/mock/sling/jcrmock/resource/FindResourcesTest.java diff --git a/src/test/java/org/apache/sling/testing/mock/sling/jcrmock/resource/JcrNamespaceTest.java b/core/src/test/java/org/apache/sling/testing/mock/sling/jcrmock/resource/JcrNamespaceTest.java similarity index 100% rename from src/test/java/org/apache/sling/testing/mock/sling/jcrmock/resource/JcrNamespaceTest.java rename to core/src/test/java/org/apache/sling/testing/mock/sling/jcrmock/resource/JcrNamespaceTest.java diff --git a/src/test/java/org/apache/sling/testing/mock/sling/jcrmock/resource/JcrResourceResolverTest.java b/core/src/test/java/org/apache/sling/testing/mock/sling/jcrmock/resource/JcrResourceResolverTest.java similarity index 100% rename from src/test/java/org/apache/sling/testing/mock/sling/jcrmock/resource/JcrResourceResolverTest.java rename to core/src/test/java/org/apache/sling/testing/mock/sling/jcrmock/resource/JcrResourceResolverTest.java diff --git a/src/test/java/org/apache/sling/testing/mock/sling/jcrmock/resource/MultipleResourceResolverTest.java b/core/src/test/java/org/apache/sling/testing/mock/sling/jcrmock/resource/MultipleResourceResolverTest.java similarity index 100% rename from src/test/java/org/apache/sling/testing/mock/sling/jcrmock/resource/MultipleResourceResolverTest.java rename to core/src/test/java/org/apache/sling/testing/mock/sling/jcrmock/resource/MultipleResourceResolverTest.java diff --git a/src/test/java/org/apache/sling/testing/mock/sling/jcrmock/resource/SlingCrudResourceResolverTest.java b/core/src/test/java/org/apache/sling/testing/mock/sling/jcrmock/resource/SlingCrudResourceResolverTest.java similarity index 100% rename from src/test/java/org/apache/sling/testing/mock/sling/jcrmock/resource/SlingCrudResourceResolverTest.java rename to core/src/test/java/org/apache/sling/testing/mock/sling/jcrmock/resource/SlingCrudResourceResolverTest.java diff --git a/src/test/java/org/apache/sling/testing/mock/sling/jcrmock/resource/UniqueRootTest.java b/core/src/test/java/org/apache/sling/testing/mock/sling/jcrmock/resource/UniqueRootTest.java similarity index 100% rename from src/test/java/org/apache/sling/testing/mock/sling/jcrmock/resource/UniqueRootTest.java rename to core/src/test/java/org/apache/sling/testing/mock/sling/jcrmock/resource/UniqueRootTest.java diff --git a/src/test/java/org/apache/sling/testing/mock/sling/junit/SlingContextDefaultRRTypeTest.java b/core/src/test/java/org/apache/sling/testing/mock/sling/junit/SlingContextDefaultRRTypeTest.java similarity index 100% rename from src/test/java/org/apache/sling/testing/mock/sling/junit/SlingContextDefaultRRTypeTest.java rename to core/src/test/java/org/apache/sling/testing/mock/sling/junit/SlingContextDefaultRRTypeTest.java diff --git a/src/test/java/org/apache/sling/testing/mock/sling/junit/SlingContextTest.java b/core/src/test/java/org/apache/sling/testing/mock/sling/junit/SlingContextTest.java similarity index 100% rename from src/test/java/org/apache/sling/testing/mock/sling/junit/SlingContextTest.java rename to core/src/test/java/org/apache/sling/testing/mock/sling/junit/SlingContextTest.java diff --git a/src/test/java/org/apache/sling/testing/mock/sling/loader/AbstractContentLoaderAutoCommitTest.java b/core/src/test/java/org/apache/sling/testing/mock/sling/loader/AbstractContentLoaderAutoCommitTest.java similarity index 100% rename from src/test/java/org/apache/sling/testing/mock/sling/loader/AbstractContentLoaderAutoCommitTest.java rename to core/src/test/java/org/apache/sling/testing/mock/sling/loader/AbstractContentLoaderAutoCommitTest.java diff --git a/src/test/java/org/apache/sling/testing/mock/sling/loader/AbstractContentLoaderBinaryTest.java b/core/src/test/java/org/apache/sling/testing/mock/sling/loader/AbstractContentLoaderBinaryTest.java similarity index 100% rename from src/test/java/org/apache/sling/testing/mock/sling/loader/AbstractContentLoaderBinaryTest.java rename to core/src/test/java/org/apache/sling/testing/mock/sling/loader/AbstractContentLoaderBinaryTest.java diff --git a/src/test/java/org/apache/sling/testing/mock/sling/loader/AbstractContentLoaderJsonDamTest.java b/core/src/test/java/org/apache/sling/testing/mock/sling/loader/AbstractContentLoaderJsonDamTest.java similarity index 100% rename from src/test/java/org/apache/sling/testing/mock/sling/loader/AbstractContentLoaderJsonDamTest.java rename to core/src/test/java/org/apache/sling/testing/mock/sling/loader/AbstractContentLoaderJsonDamTest.java diff --git a/src/test/java/org/apache/sling/testing/mock/sling/loader/AbstractContentLoaderJsonTest.java b/core/src/test/java/org/apache/sling/testing/mock/sling/loader/AbstractContentLoaderJsonTest.java similarity index 100% rename from src/test/java/org/apache/sling/testing/mock/sling/loader/AbstractContentLoaderJsonTest.java rename to core/src/test/java/org/apache/sling/testing/mock/sling/loader/AbstractContentLoaderJsonTest.java diff --git a/src/test/java/org/apache/sling/testing/mock/sling/resource/AbstractJcrNamespaceTest.java b/core/src/test/java/org/apache/sling/testing/mock/sling/resource/AbstractJcrNamespaceTest.java similarity index 100% rename from src/test/java/org/apache/sling/testing/mock/sling/resource/AbstractJcrNamespaceTest.java rename to core/src/test/java/org/apache/sling/testing/mock/sling/resource/AbstractJcrNamespaceTest.java diff --git a/src/test/java/org/apache/sling/testing/mock/sling/resource/AbstractJcrResourceResolverTest.java b/core/src/test/java/org/apache/sling/testing/mock/sling/resource/AbstractJcrResourceResolverTest.java similarity index 100% rename from src/test/java/org/apache/sling/testing/mock/sling/resource/AbstractJcrResourceResolverTest.java rename to core/src/test/java/org/apache/sling/testing/mock/sling/resource/AbstractJcrResourceResolverTest.java diff --git a/src/test/java/org/apache/sling/testing/mock/sling/resource/AbstractMultipleResourceResolverTest.java b/core/src/test/java/org/apache/sling/testing/mock/sling/resource/AbstractMultipleResourceResolverTest.java similarity index 100% rename from src/test/java/org/apache/sling/testing/mock/sling/resource/AbstractMultipleResourceResolverTest.java rename to core/src/test/java/org/apache/sling/testing/mock/sling/resource/AbstractMultipleResourceResolverTest.java diff --git a/src/test/java/org/apache/sling/testing/mock/sling/resource/AbstractSlingCrudResourceResolverTest.java b/core/src/test/java/org/apache/sling/testing/mock/sling/resource/AbstractSlingCrudResourceResolverTest.java similarity index 100% rename from src/test/java/org/apache/sling/testing/mock/sling/resource/AbstractSlingCrudResourceResolverTest.java rename to core/src/test/java/org/apache/sling/testing/mock/sling/resource/AbstractSlingCrudResourceResolverTest.java diff --git a/src/test/java/org/apache/sling/testing/mock/sling/resource/AbstractUniqueRootTest.java b/core/src/test/java/org/apache/sling/testing/mock/sling/resource/AbstractUniqueRootTest.java similarity index 100% rename from src/test/java/org/apache/sling/testing/mock/sling/resource/AbstractUniqueRootTest.java rename to core/src/test/java/org/apache/sling/testing/mock/sling/resource/AbstractUniqueRootTest.java diff --git a/src/test/java/org/apache/sling/testing/mock/sling/rrmock/context/SlingContextImplTest.java b/core/src/test/java/org/apache/sling/testing/mock/sling/rrmock/context/SlingContextImplTest.java similarity index 100% rename from src/test/java/org/apache/sling/testing/mock/sling/rrmock/context/SlingContextImplTest.java rename to core/src/test/java/org/apache/sling/testing/mock/sling/rrmock/context/SlingContextImplTest.java diff --git a/src/test/java/org/apache/sling/testing/mock/sling/rrmock/loader/ContentLoaderAutoCommitTest.java b/core/src/test/java/org/apache/sling/testing/mock/sling/rrmock/loader/ContentLoaderAutoCommitTest.java similarity index 100% rename from src/test/java/org/apache/sling/testing/mock/sling/rrmock/loader/ContentLoaderAutoCommitTest.java rename to core/src/test/java/org/apache/sling/testing/mock/sling/rrmock/loader/ContentLoaderAutoCommitTest.java diff --git a/src/test/java/org/apache/sling/testing/mock/sling/rrmock/loader/ContentLoaderBinaryTest.java b/core/src/test/java/org/apache/sling/testing/mock/sling/rrmock/loader/ContentLoaderBinaryTest.java similarity index 100% rename from src/test/java/org/apache/sling/testing/mock/sling/rrmock/loader/ContentLoaderBinaryTest.java rename to core/src/test/java/org/apache/sling/testing/mock/sling/rrmock/loader/ContentLoaderBinaryTest.java diff --git a/src/test/java/org/apache/sling/testing/mock/sling/rrmock/loader/ContentLoaderJsonDamTest.java b/core/src/test/java/org/apache/sling/testing/mock/sling/rrmock/loader/ContentLoaderJsonDamTest.java similarity index 100% rename from src/test/java/org/apache/sling/testing/mock/sling/rrmock/loader/ContentLoaderJsonDamTest.java rename to core/src/test/java/org/apache/sling/testing/mock/sling/rrmock/loader/ContentLoaderJsonDamTest.java diff --git a/src/test/java/org/apache/sling/testing/mock/sling/rrmock/loader/ContentLoaderJsonTest.java b/core/src/test/java/org/apache/sling/testing/mock/sling/rrmock/loader/ContentLoaderJsonTest.java similarity index 100% rename from src/test/java/org/apache/sling/testing/mock/sling/rrmock/loader/ContentLoaderJsonTest.java rename to core/src/test/java/org/apache/sling/testing/mock/sling/rrmock/loader/ContentLoaderJsonTest.java diff --git a/src/test/java/org/apache/sling/testing/mock/sling/rrmock/resource/MultipleResourceResolverTest.java b/core/src/test/java/org/apache/sling/testing/mock/sling/rrmock/resource/MultipleResourceResolverTest.java similarity index 100% rename from src/test/java/org/apache/sling/testing/mock/sling/rrmock/resource/MultipleResourceResolverTest.java rename to core/src/test/java/org/apache/sling/testing/mock/sling/rrmock/resource/MultipleResourceResolverTest.java diff --git a/src/test/java/org/apache/sling/testing/mock/sling/rrmock/resource/SlingCrudResourceResolverTest.java b/core/src/test/java/org/apache/sling/testing/mock/sling/rrmock/resource/SlingCrudResourceResolverTest.java similarity index 100% rename from src/test/java/org/apache/sling/testing/mock/sling/rrmock/resource/SlingCrudResourceResolverTest.java rename to core/src/test/java/org/apache/sling/testing/mock/sling/rrmock/resource/SlingCrudResourceResolverTest.java diff --git a/src/test/java/org/apache/sling/testing/mock/sling/rrmock/resource/UniqueRootTest.java b/core/src/test/java/org/apache/sling/testing/mock/sling/rrmock/resource/UniqueRootTest.java similarity index 100% rename from src/test/java/org/apache/sling/testing/mock/sling/rrmock/resource/UniqueRootTest.java rename to core/src/test/java/org/apache/sling/testing/mock/sling/rrmock/resource/UniqueRootTest.java diff --git a/src/test/java/org/apache/sling/testing/mock/sling/services/MockMimeTypeServiceTest.java b/core/src/test/java/org/apache/sling/testing/mock/sling/services/MockMimeTypeServiceTest.java similarity index 100% rename from src/test/java/org/apache/sling/testing/mock/sling/services/MockMimeTypeServiceTest.java rename to core/src/test/java/org/apache/sling/testing/mock/sling/services/MockMimeTypeServiceTest.java diff --git a/src/test/java/org/apache/sling/testing/mock/sling/services/MockSlingSettingServiceTest.java b/core/src/test/java/org/apache/sling/testing/mock/sling/services/MockSlingSettingServiceTest.java similarity index 100% rename from src/test/java/org/apache/sling/testing/mock/sling/services/MockSlingSettingServiceTest.java rename to core/src/test/java/org/apache/sling/testing/mock/sling/services/MockSlingSettingServiceTest.java diff --git a/src/test/java/org/apache/sling/testing/mock/sling/servlet/MockHttpSessionTest.java b/core/src/test/java/org/apache/sling/testing/mock/sling/servlet/MockHttpSessionTest.java similarity index 100% rename from src/test/java/org/apache/sling/testing/mock/sling/servlet/MockHttpSessionTest.java rename to core/src/test/java/org/apache/sling/testing/mock/sling/servlet/MockHttpSessionTest.java diff --git a/src/test/java/org/apache/sling/testing/mock/sling/servlet/MockSlingHttpServletRequestTest.java b/core/src/test/java/org/apache/sling/testing/mock/sling/servlet/MockSlingHttpServletRequestTest.java similarity index 100% rename from src/test/java/org/apache/sling/testing/mock/sling/servlet/MockSlingHttpServletRequestTest.java rename to core/src/test/java/org/apache/sling/testing/mock/sling/servlet/MockSlingHttpServletRequestTest.java diff --git a/src/test/java/org/apache/sling/testing/mock/sling/servlet/MockSlingHttpServletResponseTest.java b/core/src/test/java/org/apache/sling/testing/mock/sling/servlet/MockSlingHttpServletResponseTest.java similarity index 100% rename from src/test/java/org/apache/sling/testing/mock/sling/servlet/MockSlingHttpServletResponseTest.java rename to core/src/test/java/org/apache/sling/testing/mock/sling/servlet/MockSlingHttpServletResponseTest.java diff --git a/src/test/resources/META-INF/MANIFEST.MF b/core/src/test/resources/META-INF/MANIFEST.MF similarity index 100% rename from src/test/resources/META-INF/MANIFEST.MF rename to core/src/test/resources/META-INF/MANIFEST.MF diff --git a/src/test/resources/SLING-INF/nodetypes/app.cnd b/core/src/test/resources/SLING-INF/nodetypes/app.cnd similarity index 100% rename from src/test/resources/SLING-INF/nodetypes/app.cnd rename to core/src/test/resources/SLING-INF/nodetypes/app.cnd diff --git a/src/test/resources/json-import-samples/SLING-4362.json b/core/src/test/resources/json-import-samples/SLING-4362.json similarity index 100% rename from src/test/resources/json-import-samples/SLING-4362.json rename to core/src/test/resources/json-import-samples/SLING-4362.json diff --git a/src/test/resources/json-import-samples/content.json b/core/src/test/resources/json-import-samples/content.json similarity index 100% rename from src/test/resources/json-import-samples/content.json rename to core/src/test/resources/json-import-samples/content.json diff --git a/src/test/resources/json-import-samples/dam.json b/core/src/test/resources/json-import-samples/dam.json similarity index 100% rename from src/test/resources/json-import-samples/dam.json rename to core/src/test/resources/json-import-samples/dam.json diff --git a/src/test/resources/sample-image.gif b/core/src/test/resources/sample-image.gif similarity index 100% rename from src/test/resources/sample-image.gif rename to core/src/test/resources/sample-image.gif diff --git a/junit4/pom.xml b/junit4/pom.xml new file mode 100644 index 0000000..94c041f --- /dev/null +++ b/junit4/pom.xml @@ -0,0 +1,53 @@ +<?xml version="1.0" encoding="ISO-8859-1"?> +<!-- + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. +--> +<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> + + <modelVersion>4.0.0</modelVersion> + <parent> + <groupId>org.apache.sling</groupId> + <artifactId>sling</artifactId> + <version>34-SNAPSHOT</version> + <relativePath /> + </parent> + + <artifactId>org.apache.sling.testing.sling-mock.junit4</artifactId> + <version>2.3.0-SNAPSHOT</version> + <packaging>bundle</packaging> + + <name>Apache Sling Testing Sling Mock JUnit 4</name> + <description>Mock implementation of selected Sling APIs.</description> + + <dependencies> + + </dependencies> + + <build> + <plugins> + + <plugin> + <groupId>org.apache.felix</groupId> + <artifactId>maven-bundle-plugin</artifactId> + <extensions>true</extensions> + </plugin> + + </plugins> + </build> + +</project> diff --git a/junit5/pom.xml b/junit5/pom.xml new file mode 100644 index 0000000..fd3361b --- /dev/null +++ b/junit5/pom.xml @@ -0,0 +1,53 @@ +<?xml version="1.0" encoding="ISO-8859-1"?> +<!-- + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. +--> +<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> + + <modelVersion>4.0.0</modelVersion> + <parent> + <groupId>org.apache.sling</groupId> + <artifactId>sling</artifactId> + <version>34-SNAPSHOT</version> + <relativePath /> + </parent> + + <artifactId>org.apache.sling.testing.sling-mock.junit5</artifactId> + <version>2.3.0-SNAPSHOT</version> + <packaging>bundle</packaging> + + <name>Apache Sling Testing Sling Mock JUnit 5</name> + <description>Mock implementation of selected Sling APIs.</description> + + <dependencies> + + </dependencies> + + <build> + <plugins> + + <plugin> + <groupId>org.apache.felix</groupId> + <artifactId>maven-bundle-plugin</artifactId> + <extensions>true</extensions> + </plugin> + + </plugins> + </build> + +</project> diff --git a/pom.xml b/pom.xml index 00b5b1d..3fd1dcb 100644 --- a/pom.xml +++ b/pom.xml @@ -27,9 +27,9 @@ <relativePath /> </parent> - <artifactId>org.apache.sling.testing.sling-mock</artifactId> + <artifactId>org.apache.sling.testing.sling-mock.root</artifactId> <version>2.3.0-SNAPSHOT</version> - <packaging>bundle</packaging> + <packaging>pom</packaging> <name>Apache Sling Testing Sling Mock</name> <description>Mock implementation of selected Sling APIs.</description> @@ -38,295 +38,14 @@ <connection>scm:git:https://gitbox.apache.org/repos/asf/sling-org-apache-sling-testing-sling-mock.git</connection> <developerConnection>scm:git:https://gitbox.apache.org/repos/asf/sling-org-apache-sling-testing-sling-mock.git</developerConnection> <url>https://gitbox.apache.org/repos/asf?p=sling-org-apache-sling-testing-sling-mock.git</url> - <tag>HEAD</tag> - </scm> + <tag>HEAD</tag> + </scm> - <dependencies> - - <dependency> - <groupId>org.osgi</groupId> - <artifactId>org.osgi.annotation.versioning</artifactId> - <scope>provided</scope> - </dependency> + <modules> + <module>core</module> + <module>junit4</module> + <module>junit5</module> + <module>relocate</module> + </modules> - <dependency> - <groupId>org.apache.sling</groupId> - <artifactId>org.apache.sling.testing.osgi-mock</artifactId> - <version>2.4.0-SNAPSHOT</version> - <scope>compile</scope> - </dependency> - <dependency> - <groupId>org.apache.sling</groupId> - <artifactId>org.apache.sling.testing.jcr-mock</artifactId> - <version>1.3.5-SNAPSHOT</version> - <scope>compile</scope> - </dependency> - <dependency> - <groupId>org.apache.sling</groupId> - <artifactId>org.apache.sling.testing.resourceresolver-mock</artifactId> - <version>1.1.21-SNAPSHOT</version> - <scope>compile</scope> - </dependency> - <dependency> - <groupId>org.apache.sling</groupId> - <artifactId>org.apache.sling.servlet-helpers</artifactId> - <version>1.1.8</version> - <scope>compile</scope> - </dependency> - - <dependency> - <groupId>org.apache.sling</groupId> - <artifactId>org.apache.sling.commons.osgi</artifactId> - <version>2.4.0</version> - <scope>compile</scope> - </dependency> - - <dependency> - <groupId>org.apache.sling</groupId> - <artifactId>org.apache.sling.models.api</artifactId> - <version>1.2.2</version> - <scope>compile</scope> - </dependency> - <dependency> - <groupId>org.apache.sling</groupId> - <artifactId>org.apache.sling.models.impl</artifactId> - <version>1.2.2</version> - <scope>compile</scope> - </dependency> - - <dependency> - <groupId>org.apache.sling</groupId> - <artifactId>org.apache.sling.api</artifactId> - <version>2.11.0</version> - <scope>compile</scope> - </dependency> - <dependency> - <groupId>org.apache.sling</groupId> - <artifactId>org.apache.sling.resourceresolver</artifactId> - <version>1.4.8</version> - <scope>compile</scope> - </dependency> - <dependency> - <groupId>org.apache.sling</groupId> - <artifactId>org.apache.sling.jcr.api</artifactId> - <version>2.3.0</version> - <scope>compile</scope> - </dependency> - <dependency> - <groupId>org.apache.sling</groupId> - <artifactId>org.apache.sling.jcr.resource</artifactId> - <version>2.7.4</version> - <scope>compile</scope> - </dependency> - <dependency> - <groupId>org.apache.sling</groupId> - <artifactId>org.apache.sling.scripting.api</artifactId> - <version>2.1.8</version> - <scope>compile</scope> - </dependency> - <dependency> - <groupId>org.apache.sling</groupId> - <artifactId>org.apache.sling.scripting.core</artifactId> - <version>2.0.36</version> - <scope>compile</scope> - </dependency> - <dependency> - <groupId>org.apache.sling</groupId> - <artifactId>org.apache.sling.commons.mime</artifactId> - <version>2.1.8</version> - <scope>compile</scope> - </dependency> - <dependency> - <groupId>org.apache.sling</groupId> - <artifactId>org.apache.sling.jcr.contentparser</artifactId> - <version>1.2.4</version> - <scope>compile</scope> - </dependency> - <dependency> - <groupId>org.apache.johnzon</groupId> - <artifactId>johnzon-core</artifactId> - <version>1.0.0</version> - <scope>compile</scope> - </dependency> - <dependency> - <groupId>org.apache.sling</groupId> - <artifactId>org.apache.sling.commons.classloader</artifactId> - <version>1.3.2</version> - <scope>compile</scope> - </dependency> - <dependency> - <groupId>org.apache.sling</groupId> - <artifactId>org.apache.sling.settings</artifactId> - <version>1.3.8</version> - <scope>compile</scope> - </dependency> - <dependency> - <groupId>org.apache.sling</groupId> - <artifactId>org.apache.sling.i18n</artifactId> - <version>2.4.4</version> - <scope>compile</scope> - </dependency> - <dependency> - <groupId>org.apache.sling</groupId> - <artifactId>org.apache.sling.adapter</artifactId> - <version>2.1.6</version> - <scope>compile</scope> - </dependency> - <dependency> - <groupId>org.apache.sling</groupId> - <artifactId>org.apache.sling.resourcebuilder</artifactId> - <version>1.0.2</version> - <scope>compile</scope> - </dependency> - <dependency> - <groupId>org.apache.jackrabbit</groupId> - <artifactId>jackrabbit-api</artifactId> - <version>2.11.3</version> - <scope>compile</scope> - </dependency> - - <dependency> - <groupId>commons-collections</groupId> - <artifactId>commons-collections</artifactId> - <version>3.2.2</version> - <scope>compile</scope> - </dependency> - <dependency> - <groupId>commons-io</groupId> - <artifactId>commons-io</artifactId> - <version>2.4</version> - <scope>compile</scope> - </dependency> - <dependency> - <groupId>commons-lang</groupId> - <artifactId>commons-lang</artifactId> - <version>2.5</version> - <scope>compile</scope> - </dependency> - <dependency> - <groupId>commons-beanutils</groupId> - <artifactId>commons-beanutils</artifactId> - <version>1.8.3</version> - <scope>compile</scope> - </dependency> - - <dependency> - <groupId>javax.servlet</groupId> - <artifactId>javax.servlet-api</artifactId> - <scope>compile</scope> - </dependency> - - <dependency> - <groupId>org.apache.geronimo.specs</groupId> - <artifactId>geronimo-atinject_1.0_spec</artifactId> - <version>1.0</version> - <scope>compile</scope> - </dependency> - - <dependency> - <groupId>javax.jcr</groupId> - <artifactId>jcr</artifactId> - <scope>compile</scope> - </dependency> - - <!-- Nullability annotations --> - <dependency> - <groupId>org.jetbrains</groupId> - <artifactId>annotations</artifactId> - <scope>provided</scope> - </dependency> - - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <scope>compile</scope> - </dependency> - <dependency> - <groupId>org.mockito</groupId> - <artifactId>mockito-all</artifactId> - <version>1.9.5</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.apache.sling</groupId> - <artifactId>org.apache.sling.testing.logging-mock</artifactId> - <version>2.0.0</version> - <scope>test</scope> - </dependency> - - </dependencies> - - <build> - <plugins> - - <!-- Publish test artifact --> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-jar-plugin</artifactId> - <executions> - <execution> - <goals> - <goal>test-jar</goal> - </goals> - </execution> - </executions> - </plugin> - - <plugin> - <groupId>org.apache.felix</groupId> - <artifactId>maven-bundle-plugin</artifactId> - <extensions>true</extensions> - </plugin> - - <plugin> - <groupId>org.apache.rat</groupId> - <artifactId>apache-rat-plugin</artifactId> - <configuration> - <excludes> - <exclude>src/test/resources/**</exclude> - </excludes> - </configuration> - </plugin> - - </plugins> - </build> - - <profiles> - <profile> - <id>latest-resource-bundles</id> - <dependencies> - <dependency> - <groupId>org.apache.sling</groupId> - <artifactId>org.apache.sling.api</artifactId> - <version>2.16.2</version> - <scope>compile</scope> - </dependency> - <dependency> - <groupId>org.apache.sling</groupId> - <artifactId>org.apache.sling.resourceresolver</artifactId> - <version>1.5.22</version> - <scope>compile</scope> - </dependency> - <dependency> - <groupId>org.apache.sling</groupId> - <artifactId>org.apache.sling.jcr.resource</artifactId> - <version>3.0.0</version> - <scope>compile</scope> - </dependency> - <dependency> - <groupId>org.apache.jackrabbit</groupId> - <artifactId>jackrabbit-api</artifactId> - <version>2.13.4</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.apache.jackrabbit</groupId> - <artifactId>oak-jcr</artifactId> - <version>1.5.15</version> - <scope>provided</scope> - </dependency> - </dependencies> - </profile> - </profiles> - </project> diff --git a/relocate/pom.xml b/relocate/pom.xml new file mode 100644 index 0000000..ac2e021 --- /dev/null +++ b/relocate/pom.xml @@ -0,0 +1,43 @@ +<?xml version="1.0" encoding="ISO-8859-1"?> +<!-- + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. +--> +<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> + + <modelVersion>4.0.0</modelVersion> + <parent> + <groupId>org.apache.sling</groupId> + <artifactId>sling</artifactId> + <version>34-SNAPSHOT</version> + <relativePath /> + </parent> + + <artifactId>org.apache.sling.testing.sling-mock</artifactId> + <version>2.3.0-SNAPSHOT</version> + <packaging>pom</packaging> + + <name>Apache Sling Testing Sling Mock Relocation</name> + <description>Please use artifact 'org.apache.sling.testing.sling-mock.junit4' instead.</description> + + <distributionManagement> + <relocation> + <artifactId>org.apache.sling.testing.sling-mock.junit4</artifactId> + </relocation> + </distributionManagement> + +</project>
