diff --git a/build.gradle b/build.gradle index 338d839..e55d393 100644 --- a/build.gradle +++ b/build.gradle @@ -8,11 +8,7 @@ buildscript { } } -ext.IDE_GRADLE = "$rootDir/gradle/ide.gradle" - apply plugin: 'io.spring.convention.root' -apply plugin: 'io.spring.convention.spring-module' -apply from: IDE_GRADLE group = 'org.springframework.data' description = 'Spring Test Framework for Apache Geode and Pivotal GemFire using Spring Data' @@ -21,18 +17,7 @@ ext.releaseBuild = version.endsWith('RELEASE') ext.snapshotBuild = version.endsWith('SNAPSHOT') ext.milestoneBuild = !(releaseBuild || snapshotBuild) +ext.IDE_GRADLE = "$rootDir/gradle/ide.gradle" + ext['apache-geode.version'] = '1.6.0' -repositories { - maven { url = "https://repo.spring.io/libs-snapshot" } -} - -dependencies { - - compile "org.springframework.data:spring-data-geode" - - compile("org.springframework.boot:spring-boot-starter-test") { - exclude group: "org.springframework.boot", module: "spring-boot-starter-logging"; - } - -} diff --git a/pom.xml b/pom.xml index 24aadf9..888d320 100644 --- a/pom.xml +++ b/pom.xml @@ -8,19 +8,24 @@ org.springframework.data.build spring-data-parent - 2.0.7.RELEASE + 2.1.0.BUILD-SNAPSHOT org.springframework.data - spring-test-data-geode + spring-test-data-geode-build 0.0.1.BUILD-SNAPSHOT - jar + pom - Spring-based Test Framework for Spring Data GemFire and Spring Data Geode + + spring-test-data-geode + spring-test-data-gemfire + + + Spring Test Framework for Apache Geode and Pivotal GemFire using Spring Data - This project introduces a new Spring Data module building on the core Spring Framework's TestContext - and is used to write both Unit and Integration Tests for Spring Data for Pivotal GemFire - as well as Spring Data for Apache Geode. + This project introduces a Spring Data module building on the Spring Framework's TestContext, + used to write both Unit and Integration Tests for Spring Data for Pivotal GemFire + as well as Spring Data for Apache Geode applications. https://github.com/jxblum/spring-data-tests-4-gemfire diff --git a/settings.gradle b/settings.gradle index 1341b96..d3a1850 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1 +1,35 @@ rootProject.name = 'spring-test-data-geode' + +FileTree buildFiles = fileTree(rootDir) { + include '**/*.gradle' + exclude '/build.gradle', 'settings.gradle', '**/gradle', 'buildSrc', '.*' +} + +String rootDirPath = rootDir.absolutePath + File.separator + +buildFiles.each { File buildFile -> + + boolean isDefaultName = 'build.gradle'.equals(buildFile.name) + + if (isDefaultName) { + + String buildFilePath = buildFile.parentFile.absolutePath + String projectPath = buildFilePath.replace(rootDirPath, '').replaceAll(File.separator, ':') + + include projectPath + } + else { + + String projectName = buildFile.name.replace('.gradle', ''); + String projectPath = ':' + projectName; + + include projectPath + + def project = findProject("${projectPath}") + + project.name = projectName + project.projectDir = buildFile.parentFile + project.buildFileName = buildFile.name + } +} + diff --git a/spring-test-data-gemfire/build.gradle b/spring-test-data-gemfire/build.gradle new file mode 100644 index 0000000..697ed1f --- /dev/null +++ b/spring-test-data-gemfire/build.gradle @@ -0,0 +1,16 @@ +apply plugin: 'io.spring.convention.spring-module' + +apply from: IDE_GRADLE + +description = "Spring Test for Pivotal GemFire" + +dependencies { + + compile(project(':spring-test-data-geode')) { + exclude group: "org.springframework.data", module: "spring-data-geode" + } + + compile "org.springframework.data:spring-data-gemfire" + +} + diff --git a/spring-test-data-gemfire/pom.xml b/spring-test-data-gemfire/pom.xml new file mode 100644 index 0000000..d4cd108 --- /dev/null +++ b/spring-test-data-gemfire/pom.xml @@ -0,0 +1,84 @@ + + + + 4.0.0 + + + org.springframework.data + spring-test-data-geode-build + 0.0.1.BUILD-SNAPSHOT + + + spring-test-data-gemfire + jar + + Spring Test Framework for Pivotal GemFire using Spring Data for Pivotal GemFire + + Module using Spring Framework's TestContext to write both Unit and Integration Tests + for Spring Data for Pivotal GemFire applications. + + https://github.com/jxblum/spring-data-tests-4-gemfire + + + + Apache License, Version 2.0 + http://www.apache.org/licenses/LICENSE-2.0 + + Copyright 2018-present the original author or authors. + + Licensed 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. + + + + + + Pivotal Software, Inc. + http://www.pivotal.io + + + + + jblum + John Blum + jblum at pivotal dot io + Pivotal Software, Inc. + http://www.spring.io + + Spring Data Engineer + Apache Geode Committer + + + + + + + org.springframework.data + spring-test-data-geode + ${project.version} + + + org.springframework.data + spring-data-geode + + + + + org.springframework.data + spring-data-gemfire + + + + diff --git a/spring-test-data-geode/build.gradle b/spring-test-data-geode/build.gradle new file mode 100644 index 0000000..f3f2e27 --- /dev/null +++ b/spring-test-data-geode/build.gradle @@ -0,0 +1,19 @@ +apply plugin: 'io.spring.convention.spring-module' + +apply from: IDE_GRADLE + +description = "Spring Test for Pivotal GemFire" + +repositories { + maven { url = "https://repo.spring.io/libs-snapshot" } +} + +dependencies { + + compile "org.springframework.data:spring-data-geode" + + compile("org.springframework.boot:spring-boot-starter-test") { + exclude group: "org.springframework.boot", module: "spring-boot-starter-logging"; + } + +} diff --git a/spring-test-data-geode/pom.xml b/spring-test-data-geode/pom.xml new file mode 100644 index 0000000..0c1febd --- /dev/null +++ b/spring-test-data-geode/pom.xml @@ -0,0 +1,73 @@ + + + + 4.0.0 + + + org.springframework.data + spring-test-data-geode-build + 0.0.1.BUILD-SNAPSHOT + + + spring-test-data-geode + jar + + Spring Test Framework for Apache Geode using Spring Data for Apache Geode + + Module using Spring Framework's TestContext to write both Unit and Integration Tests + for Spring Data for Apache Geode applications. + + https://github.com/jxblum/spring-data-tests-4-gemfire + + + + Apache License, Version 2.0 + http://www.apache.org/licenses/LICENSE-2.0 + + Copyright 2018-present the original author or authors. + + Licensed 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. + + + + + + Pivotal Software, Inc. + http://www.pivotal.io + + + + + jblum + John Blum + jblum at pivotal dot io + Pivotal Software, Inc. + http://www.spring.io + + Spring Data Engineer + Apache Geode Committer + + + + + + + org.springframework.data + spring-data-geode + + + + diff --git a/src/main/java/org/springframework/data/gemfire/tests/integration/ClientServerIntegrationTestsSupport.java b/spring-test-data-geode/src/main/java/org/springframework/data/gemfire/tests/integration/ClientServerIntegrationTestsSupport.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/tests/integration/ClientServerIntegrationTestsSupport.java rename to spring-test-data-geode/src/main/java/org/springframework/data/gemfire/tests/integration/ClientServerIntegrationTestsSupport.java diff --git a/src/main/java/org/springframework/data/gemfire/tests/mock/GemFireMockObjectsSupport.java b/spring-test-data-geode/src/main/java/org/springframework/data/gemfire/tests/mock/GemFireMockObjectsSupport.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/tests/mock/GemFireMockObjectsSupport.java rename to spring-test-data-geode/src/main/java/org/springframework/data/gemfire/tests/mock/GemFireMockObjectsSupport.java diff --git a/src/main/java/org/springframework/data/gemfire/tests/mock/MockObjectsSupport.java b/spring-test-data-geode/src/main/java/org/springframework/data/gemfire/tests/mock/MockObjectsSupport.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/tests/mock/MockObjectsSupport.java rename to spring-test-data-geode/src/main/java/org/springframework/data/gemfire/tests/mock/MockObjectsSupport.java diff --git a/src/main/java/org/springframework/data/gemfire/tests/mock/annotation/EnableGemFireMockObjects.java b/spring-test-data-geode/src/main/java/org/springframework/data/gemfire/tests/mock/annotation/EnableGemFireMockObjects.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/tests/mock/annotation/EnableGemFireMockObjects.java rename to spring-test-data-geode/src/main/java/org/springframework/data/gemfire/tests/mock/annotation/EnableGemFireMockObjects.java diff --git a/src/main/java/org/springframework/data/gemfire/tests/mock/annotation/GemFireMockObjectsConfiguration.java b/spring-test-data-geode/src/main/java/org/springframework/data/gemfire/tests/mock/annotation/GemFireMockObjectsConfiguration.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/tests/mock/annotation/GemFireMockObjectsConfiguration.java rename to spring-test-data-geode/src/main/java/org/springframework/data/gemfire/tests/mock/annotation/GemFireMockObjectsConfiguration.java diff --git a/src/main/java/org/springframework/data/gemfire/tests/mock/annotation/GemFireUnitTest.java b/spring-test-data-geode/src/main/java/org/springframework/data/gemfire/tests/mock/annotation/GemFireUnitTest.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/tests/mock/annotation/GemFireUnitTest.java rename to spring-test-data-geode/src/main/java/org/springframework/data/gemfire/tests/mock/annotation/GemFireUnitTest.java diff --git a/src/main/java/org/springframework/data/gemfire/tests/mock/config/GemFireMockObjectsBeanPostProcessor.java b/spring-test-data-geode/src/main/java/org/springframework/data/gemfire/tests/mock/config/GemFireMockObjectsBeanPostProcessor.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/tests/mock/config/GemFireMockObjectsBeanPostProcessor.java rename to spring-test-data-geode/src/main/java/org/springframework/data/gemfire/tests/mock/config/GemFireMockObjectsBeanPostProcessor.java diff --git a/src/main/java/org/springframework/data/gemfire/tests/mock/context/GemFireMockObjectsApplicationContextInitializer.java b/spring-test-data-geode/src/main/java/org/springframework/data/gemfire/tests/mock/context/GemFireMockObjectsApplicationContextInitializer.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/tests/mock/context/GemFireMockObjectsApplicationContextInitializer.java rename to spring-test-data-geode/src/main/java/org/springframework/data/gemfire/tests/mock/context/GemFireMockObjectsApplicationContextInitializer.java diff --git a/src/main/java/org/springframework/data/gemfire/tests/mock/support/MockObjectInvocationException.java b/spring-test-data-geode/src/main/java/org/springframework/data/gemfire/tests/mock/support/MockObjectInvocationException.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/tests/mock/support/MockObjectInvocationException.java rename to spring-test-data-geode/src/main/java/org/springframework/data/gemfire/tests/mock/support/MockObjectInvocationException.java diff --git a/src/main/java/org/springframework/data/gemfire/tests/mock/support/MockObjectsException.java b/spring-test-data-geode/src/main/java/org/springframework/data/gemfire/tests/mock/support/MockObjectsException.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/tests/mock/support/MockObjectsException.java rename to spring-test-data-geode/src/main/java/org/springframework/data/gemfire/tests/mock/support/MockObjectsException.java diff --git a/src/main/java/org/springframework/data/gemfire/tests/process/PidNotFoundException.java b/spring-test-data-geode/src/main/java/org/springframework/data/gemfire/tests/process/PidNotFoundException.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/tests/process/PidNotFoundException.java rename to spring-test-data-geode/src/main/java/org/springframework/data/gemfire/tests/process/PidNotFoundException.java diff --git a/src/main/java/org/springframework/data/gemfire/tests/process/ProcessConfiguration.java b/spring-test-data-geode/src/main/java/org/springframework/data/gemfire/tests/process/ProcessConfiguration.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/tests/process/ProcessConfiguration.java rename to spring-test-data-geode/src/main/java/org/springframework/data/gemfire/tests/process/ProcessConfiguration.java diff --git a/src/main/java/org/springframework/data/gemfire/tests/process/ProcessExecutor.java b/spring-test-data-geode/src/main/java/org/springframework/data/gemfire/tests/process/ProcessExecutor.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/tests/process/ProcessExecutor.java rename to spring-test-data-geode/src/main/java/org/springframework/data/gemfire/tests/process/ProcessExecutor.java diff --git a/src/main/java/org/springframework/data/gemfire/tests/process/ProcessInputStreamListener.java b/spring-test-data-geode/src/main/java/org/springframework/data/gemfire/tests/process/ProcessInputStreamListener.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/tests/process/ProcessInputStreamListener.java rename to spring-test-data-geode/src/main/java/org/springframework/data/gemfire/tests/process/ProcessInputStreamListener.java diff --git a/src/main/java/org/springframework/data/gemfire/tests/process/ProcessUtils.java b/spring-test-data-geode/src/main/java/org/springframework/data/gemfire/tests/process/ProcessUtils.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/tests/process/ProcessUtils.java rename to spring-test-data-geode/src/main/java/org/springframework/data/gemfire/tests/process/ProcessUtils.java diff --git a/src/main/java/org/springframework/data/gemfire/tests/process/ProcessWrapper.java b/spring-test-data-geode/src/main/java/org/springframework/data/gemfire/tests/process/ProcessWrapper.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/tests/process/ProcessWrapper.java rename to spring-test-data-geode/src/main/java/org/springframework/data/gemfire/tests/process/ProcessWrapper.java diff --git a/src/main/java/org/springframework/data/gemfire/tests/support/DataSourceAdapter.java b/spring-test-data-geode/src/main/java/org/springframework/data/gemfire/tests/support/DataSourceAdapter.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/tests/support/DataSourceAdapter.java rename to spring-test-data-geode/src/main/java/org/springframework/data/gemfire/tests/support/DataSourceAdapter.java diff --git a/src/main/java/org/springframework/data/gemfire/tests/support/IdentifierSequence.java b/spring-test-data-geode/src/main/java/org/springframework/data/gemfire/tests/support/IdentifierSequence.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/tests/support/IdentifierSequence.java rename to spring-test-data-geode/src/main/java/org/springframework/data/gemfire/tests/support/IdentifierSequence.java diff --git a/src/main/java/org/springframework/data/gemfire/tests/support/MapBuilder.java b/spring-test-data-geode/src/main/java/org/springframework/data/gemfire/tests/support/MapBuilder.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/tests/support/MapBuilder.java rename to spring-test-data-geode/src/main/java/org/springframework/data/gemfire/tests/support/MapBuilder.java diff --git a/src/main/java/org/springframework/data/gemfire/tests/util/FileSystemUtils.java b/spring-test-data-geode/src/main/java/org/springframework/data/gemfire/tests/util/FileSystemUtils.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/tests/util/FileSystemUtils.java rename to spring-test-data-geode/src/main/java/org/springframework/data/gemfire/tests/util/FileSystemUtils.java diff --git a/src/main/java/org/springframework/data/gemfire/tests/util/FileUtils.java b/spring-test-data-geode/src/main/java/org/springframework/data/gemfire/tests/util/FileUtils.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/tests/util/FileUtils.java rename to spring-test-data-geode/src/main/java/org/springframework/data/gemfire/tests/util/FileUtils.java diff --git a/src/main/java/org/springframework/data/gemfire/tests/util/IOUtils.java b/spring-test-data-geode/src/main/java/org/springframework/data/gemfire/tests/util/IOUtils.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/tests/util/IOUtils.java rename to spring-test-data-geode/src/main/java/org/springframework/data/gemfire/tests/util/IOUtils.java diff --git a/src/main/java/org/springframework/data/gemfire/tests/util/ObjectUtils.java b/spring-test-data-geode/src/main/java/org/springframework/data/gemfire/tests/util/ObjectUtils.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/tests/util/ObjectUtils.java rename to spring-test-data-geode/src/main/java/org/springframework/data/gemfire/tests/util/ObjectUtils.java diff --git a/src/main/java/org/springframework/data/gemfire/tests/util/SocketUtils.java b/spring-test-data-geode/src/main/java/org/springframework/data/gemfire/tests/util/SocketUtils.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/tests/util/SocketUtils.java rename to spring-test-data-geode/src/main/java/org/springframework/data/gemfire/tests/util/SocketUtils.java diff --git a/src/main/java/org/springframework/data/gemfire/tests/util/StackTraceUtils.java b/spring-test-data-geode/src/main/java/org/springframework/data/gemfire/tests/util/StackTraceUtils.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/tests/util/StackTraceUtils.java rename to spring-test-data-geode/src/main/java/org/springframework/data/gemfire/tests/util/StackTraceUtils.java diff --git a/src/main/java/org/springframework/data/gemfire/tests/util/ThreadUtils.java b/spring-test-data-geode/src/main/java/org/springframework/data/gemfire/tests/util/ThreadUtils.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/tests/util/ThreadUtils.java rename to spring-test-data-geode/src/main/java/org/springframework/data/gemfire/tests/util/ThreadUtils.java diff --git a/src/main/java/org/springframework/data/gemfire/tests/util/ThrowableUtils.java b/spring-test-data-geode/src/main/java/org/springframework/data/gemfire/tests/util/ThrowableUtils.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/tests/util/ThrowableUtils.java rename to spring-test-data-geode/src/main/java/org/springframework/data/gemfire/tests/util/ThrowableUtils.java diff --git a/src/main/java/org/springframework/data/gemfire/tests/util/ZipUtils.java b/spring-test-data-geode/src/main/java/org/springframework/data/gemfire/tests/util/ZipUtils.java similarity index 100% rename from src/main/java/org/springframework/data/gemfire/tests/util/ZipUtils.java rename to spring-test-data-geode/src/main/java/org/springframework/data/gemfire/tests/util/ZipUtils.java diff --git a/src/test/java/org/springframework/data/gemfire/MockClientCacheApplicationTest.java b/spring-test-data-geode/src/test/java/org/springframework/data/gemfire/MockClientCacheApplicationTest.java similarity index 100% rename from src/test/java/org/springframework/data/gemfire/MockClientCacheApplicationTest.java rename to spring-test-data-geode/src/test/java/org/springframework/data/gemfire/MockClientCacheApplicationTest.java