diff --git a/integration-tests/.gitignore b/integration-tests/.gitignore new file mode 100644 index 000000000..bcfe27ba7 --- /dev/null +++ b/integration-tests/.gitignore @@ -0,0 +1,12 @@ +*.iml +target/ +.idea/ +*~ +/openmrs-sdk.bat + +*.class + +/.settings +/.project +/.classpath +.DS_Store \ No newline at end of file diff --git a/integration-tests/pom.xml b/integration-tests/pom.xml new file mode 100644 index 000000000..582e7a6c4 --- /dev/null +++ b/integration-tests/pom.xml @@ -0,0 +1,50 @@ + + + 4.0.0 + + + org.openmrs.maven + openmrs-sdk + 6.1.0-SNAPSHOT + + + openmrs-sdk-integration-tests + + OpenMRS SDK Integration Tests + Set of integration tests for OpenMRS SDK Maven Plugin + https://wiki.openmrs.org/display/docs/OpenMRS+SDK + + + + + org.openmrs.maven.plugins + openmrs-sdk-maven-plugin + ${project.parent.version} + + + + org.apache.maven.shared + maven-verifier + test + + + junit + junit + test + + + org.hamcrest + hamcrest-core + test + + + org.hamcrest + hamcrest-library + test + + + org.semver4j + semver4j + + + diff --git a/maven-plugin/src/test/java/org/openmrs/maven/plugins/AbstractSdkIT.java b/integration-tests/src/test/java/org/openmrs/maven/plugins/AbstractSdkIntegrationTest.java similarity index 99% rename from maven-plugin/src/test/java/org/openmrs/maven/plugins/AbstractSdkIT.java rename to integration-tests/src/test/java/org/openmrs/maven/plugins/AbstractSdkIntegrationTest.java index a9f8bbeac..5a81f35a6 100644 --- a/maven-plugin/src/test/java/org/openmrs/maven/plugins/AbstractSdkIT.java +++ b/integration-tests/src/test/java/org/openmrs/maven/plugins/AbstractSdkIntegrationTest.java @@ -1,6 +1,7 @@ package org.openmrs.maven.plugins; import org.apache.commons.io.FileUtils; +import org.apache.commons.io.IOUtils; import org.apache.commons.lang.StringUtils; import org.apache.maven.it.VerificationException; import org.apache.maven.it.Verifier; @@ -47,7 +48,7 @@ @RunWith(BlockJUnit4ClassRunner.class) -public abstract class AbstractSdkIT { +public abstract class AbstractSdkIntegrationTest { /** * contains name of directory in project's target dir, where integration tests are conducted diff --git a/maven-plugin/src/test/java/org/openmrs/maven/plugins/AddDependencyIT.java b/integration-tests/src/test/java/org/openmrs/maven/plugins/AddDependencyTest.java similarity index 97% rename from maven-plugin/src/test/java/org/openmrs/maven/plugins/AddDependencyIT.java rename to integration-tests/src/test/java/org/openmrs/maven/plugins/AddDependencyTest.java index de67c1b01..dd6292432 100644 --- a/maven-plugin/src/test/java/org/openmrs/maven/plugins/AddDependencyIT.java +++ b/integration-tests/src/test/java/org/openmrs/maven/plugins/AddDependencyTest.java @@ -4,11 +4,13 @@ import org.openmrs.maven.plugins.model.DistroProperties; import org.openmrs.maven.plugins.utility.DistroHelper; +import java.io.File; + import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; -public class AddDependencyIT extends AbstractSdkIT { +public class AddDependencyTest extends AbstractSdkIntegrationTest { @Test public void shouldAddOmodDependency() throws Exception { diff --git a/maven-plugin/src/test/java/org/openmrs/maven/plugins/AddExclusionIT.java b/integration-tests/src/test/java/org/openmrs/maven/plugins/AddExclusionIntegrationTest.java similarity index 98% rename from maven-plugin/src/test/java/org/openmrs/maven/plugins/AddExclusionIT.java rename to integration-tests/src/test/java/org/openmrs/maven/plugins/AddExclusionIntegrationTest.java index 5fb02863e..003c08cf0 100644 --- a/maven-plugin/src/test/java/org/openmrs/maven/plugins/AddExclusionIT.java +++ b/integration-tests/src/test/java/org/openmrs/maven/plugins/AddExclusionIntegrationTest.java @@ -12,7 +12,7 @@ import static org.junit.Assert.assertNull; import static org.junit.Assert.assertTrue; -public class AddExclusionIT extends AbstractSdkIT { +public class AddExclusionIntegrationTest extends AbstractSdkIntegrationTest { public DistroProperties getDistroProperties() { return DistroHelper.getDistroPropertiesFromFile(distroFile); diff --git a/maven-plugin/src/test/java/org/openmrs/maven/plugins/BuildDistroIT.java b/integration-tests/src/test/java/org/openmrs/maven/plugins/BuildDistroIntegrationTest.java similarity index 98% rename from maven-plugin/src/test/java/org/openmrs/maven/plugins/BuildDistroIT.java rename to integration-tests/src/test/java/org/openmrs/maven/plugins/BuildDistroIntegrationTest.java index 56d2f8de4..b95b681ff 100644 --- a/maven-plugin/src/test/java/org/openmrs/maven/plugins/BuildDistroIT.java +++ b/integration-tests/src/test/java/org/openmrs/maven/plugins/BuildDistroIntegrationTest.java @@ -2,7 +2,7 @@ import org.junit.Test; -public class BuildDistroIT extends AbstractSdkIT { +public class BuildDistroIntegrationTest extends AbstractSdkIntegrationTest { @Test public void testBuildDistroFromDistroFile() throws Exception { diff --git a/maven-plugin/src/test/java/org/openmrs/maven/plugins/BuildIT.java b/integration-tests/src/test/java/org/openmrs/maven/plugins/BuildIntegrationTest.java similarity index 96% rename from maven-plugin/src/test/java/org/openmrs/maven/plugins/BuildIT.java rename to integration-tests/src/test/java/org/openmrs/maven/plugins/BuildIntegrationTest.java index aecce120e..b879d1abc 100644 --- a/maven-plugin/src/test/java/org/openmrs/maven/plugins/BuildIT.java +++ b/integration-tests/src/test/java/org/openmrs/maven/plugins/BuildIntegrationTest.java @@ -8,7 +8,7 @@ import java.io.File; -public class BuildIT extends AbstractSdkIT { +public class BuildIntegrationTest extends AbstractSdkIntegrationTest { private String serverId; diff --git a/maven-plugin/src/test/java/org/openmrs/maven/plugins/CloneIT.java b/integration-tests/src/test/java/org/openmrs/maven/plugins/CloneIntegrationTest.java similarity index 95% rename from maven-plugin/src/test/java/org/openmrs/maven/plugins/CloneIT.java rename to integration-tests/src/test/java/org/openmrs/maven/plugins/CloneIntegrationTest.java index 3ba86dc7e..f65e41bfa 100644 --- a/maven-plugin/src/test/java/org/openmrs/maven/plugins/CloneIT.java +++ b/integration-tests/src/test/java/org/openmrs/maven/plugins/CloneIntegrationTest.java @@ -11,7 +11,7 @@ import static org.hamcrest.CoreMatchers.hasItem; import static org.hamcrest.MatcherAssert.assertThat; -public class CloneIT extends AbstractSdkIT { +public class CloneIntegrationTest extends AbstractSdkIntegrationTest { @Test public void clone_shouldCloneRepository() throws Exception { diff --git a/maven-plugin/src/test/java/org/openmrs/maven/plugins/CreateProjectIT.java b/integration-tests/src/test/java/org/openmrs/maven/plugins/CreateProjectIntegrationTest.java similarity index 98% rename from maven-plugin/src/test/java/org/openmrs/maven/plugins/CreateProjectIT.java rename to integration-tests/src/test/java/org/openmrs/maven/plugins/CreateProjectIntegrationTest.java index 9112f5fa4..974ff87f5 100644 --- a/maven-plugin/src/test/java/org/openmrs/maven/plugins/CreateProjectIT.java +++ b/integration-tests/src/test/java/org/openmrs/maven/plugins/CreateProjectIntegrationTest.java @@ -5,7 +5,7 @@ import org.junit.Before; import org.junit.Test; -public class CreateProjectIT extends AbstractSdkIT { +public class CreateProjectIntegrationTest extends AbstractSdkIntegrationTest { Model model; diff --git a/maven-plugin/src/test/java/org/openmrs/maven/plugins/DeployIT.java b/integration-tests/src/test/java/org/openmrs/maven/plugins/DeployIntegrationTest.java similarity index 98% rename from maven-plugin/src/test/java/org/openmrs/maven/plugins/DeployIT.java rename to integration-tests/src/test/java/org/openmrs/maven/plugins/DeployIntegrationTest.java index cb87c0c7d..69bedf426 100644 --- a/maven-plugin/src/test/java/org/openmrs/maven/plugins/DeployIT.java +++ b/integration-tests/src/test/java/org/openmrs/maven/plugins/DeployIntegrationTest.java @@ -1,5 +1,6 @@ package org.openmrs.maven.plugins; +import org.junit.After; import org.junit.Before; import org.junit.Test; import org.openmrs.maven.plugins.model.Artifact; @@ -15,7 +16,7 @@ import static org.openmrs.maven.plugins.SdkMatchers.hasUserOwa; import static org.openmrs.maven.plugins.SdkMatchers.serverHasVersion; -public class DeployIT extends AbstractSdkIT { +public class DeployIntegrationTest extends AbstractSdkIntegrationTest { private static String testServerId; diff --git a/maven-plugin/src/test/java/org/openmrs/maven/plugins/FetchIT.java b/integration-tests/src/test/java/org/openmrs/maven/plugins/FetchIntegrationTest.java similarity index 97% rename from maven-plugin/src/test/java/org/openmrs/maven/plugins/FetchIT.java rename to integration-tests/src/test/java/org/openmrs/maven/plugins/FetchIntegrationTest.java index 6829dc2e8..c7c17a0ee 100644 --- a/maven-plugin/src/test/java/org/openmrs/maven/plugins/FetchIT.java +++ b/integration-tests/src/test/java/org/openmrs/maven/plugins/FetchIntegrationTest.java @@ -5,7 +5,7 @@ import java.io.File; -public class FetchIT extends AbstractSdkIT { +public class FetchIntegrationTest extends AbstractSdkIntegrationTest{ private final static String FETCH_DIRECTORY_NAME = "fetch"; diff --git a/maven-plugin/src/test/java/org/openmrs/maven/plugins/PullIT.java b/integration-tests/src/test/java/org/openmrs/maven/plugins/PullIntegrationTest.java similarity index 97% rename from maven-plugin/src/test/java/org/openmrs/maven/plugins/PullIT.java rename to integration-tests/src/test/java/org/openmrs/maven/plugins/PullIntegrationTest.java index 602a0dda7..cb8b0239b 100644 --- a/maven-plugin/src/test/java/org/openmrs/maven/plugins/PullIT.java +++ b/integration-tests/src/test/java/org/openmrs/maven/plugins/PullIntegrationTest.java @@ -11,7 +11,7 @@ import java.io.File; -public class PullIT extends AbstractSdkIT { +public class PullIntegrationTest extends AbstractSdkIntegrationTest { private static final String OPENMRS_MODULE_IDGEN = "openmrs-module-idgen"; private static final String PULL_GOAL = "pull"; diff --git a/maven-plugin/src/test/java/org/openmrs/maven/plugins/RemoveDependencyIT.java b/integration-tests/src/test/java/org/openmrs/maven/plugins/RemoveDependencyTest.java similarity index 93% rename from maven-plugin/src/test/java/org/openmrs/maven/plugins/RemoveDependencyIT.java rename to integration-tests/src/test/java/org/openmrs/maven/plugins/RemoveDependencyTest.java index 56006bb86..ff914ec0b 100644 --- a/maven-plugin/src/test/java/org/openmrs/maven/plugins/RemoveDependencyIT.java +++ b/integration-tests/src/test/java/org/openmrs/maven/plugins/RemoveDependencyTest.java @@ -8,7 +8,7 @@ import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; -public class RemoveDependencyIT extends AbstractSdkIT { +public class RemoveDependencyTest extends AbstractSdkIntegrationTest { @Test public void shouldRemoveExistingDependency() throws Exception { diff --git a/maven-plugin/src/test/java/org/openmrs/maven/plugins/ResetIT.java b/integration-tests/src/test/java/org/openmrs/maven/plugins/ResetIntegrationTest.java similarity index 69% rename from maven-plugin/src/test/java/org/openmrs/maven/plugins/ResetIT.java rename to integration-tests/src/test/java/org/openmrs/maven/plugins/ResetIntegrationTest.java index 8a9f34e5f..5604dc245 100644 --- a/maven-plugin/src/test/java/org/openmrs/maven/plugins/ResetIT.java +++ b/integration-tests/src/test/java/org/openmrs/maven/plugins/ResetIntegrationTest.java @@ -1,10 +1,17 @@ package org.openmrs.maven.plugins; +import static org.hamcrest.CoreMatchers.containsString; import static org.hamcrest.MatcherAssert.assertThat; +import java.nio.charset.StandardCharsets; +import java.nio.file.Path; +import java.nio.file.Paths; +import java.util.UUID; + +import org.apache.commons.io.FileUtils; import org.junit.Test; -public class ResetIT extends AbstractSdkIT { +public class ResetIntegrationTest extends AbstractSdkIntegrationTest { @Test public void reset_shouldResetExistingServer() throws Exception { diff --git a/maven-plugin/src/test/java/org/openmrs/maven/plugins/SdkMatchers.java b/integration-tests/src/test/java/org/openmrs/maven/plugins/SdkMatchers.java similarity index 100% rename from maven-plugin/src/test/java/org/openmrs/maven/plugins/SdkMatchers.java rename to integration-tests/src/test/java/org/openmrs/maven/plugins/SdkMatchers.java diff --git a/maven-plugin/src/test/java/org/openmrs/maven/plugins/SetupIT.java b/integration-tests/src/test/java/org/openmrs/maven/plugins/SetupIntegrationTest.java similarity index 99% rename from maven-plugin/src/test/java/org/openmrs/maven/plugins/SetupIT.java rename to integration-tests/src/test/java/org/openmrs/maven/plugins/SetupIntegrationTest.java index 3ff1751c1..2e0954d69 100644 --- a/maven-plugin/src/test/java/org/openmrs/maven/plugins/SetupIT.java +++ b/integration-tests/src/test/java/org/openmrs/maven/plugins/SetupIntegrationTest.java @@ -27,7 +27,7 @@ import static org.openmrs.maven.plugins.SdkMatchers.serverHasDebugPort; import static org.openmrs.maven.plugins.SdkMatchers.serverHasVersion; -public class SetupIT extends AbstractSdkIT { +public class SetupIntegrationTest extends AbstractSdkIntegrationTest { @Test public void setup_shouldInstallRefapp2_3_1() throws Exception{ diff --git a/maven-plugin/src/test/resources/integration-test/buildIT/app/css/test.css b/integration-tests/src/test/resources/integration-test/buildIT/app/css/test.css similarity index 100% rename from maven-plugin/src/test/resources/integration-test/buildIT/app/css/test.css rename to integration-tests/src/test/resources/integration-test/buildIT/app/css/test.css diff --git a/maven-plugin/src/test/resources/integration-test/buildIT/app/index.html b/integration-tests/src/test/resources/integration-test/buildIT/app/index.html similarity index 100% rename from maven-plugin/src/test/resources/integration-test/buildIT/app/index.html rename to integration-tests/src/test/resources/integration-test/buildIT/app/index.html diff --git a/maven-plugin/src/test/resources/integration-test/buildIT/app/js/main/main.component.js b/integration-tests/src/test/resources/integration-test/buildIT/app/js/main/main.component.js similarity index 100% rename from maven-plugin/src/test/resources/integration-test/buildIT/app/js/main/main.component.js rename to integration-tests/src/test/resources/integration-test/buildIT/app/js/main/main.component.js diff --git a/maven-plugin/src/test/resources/integration-test/buildIT/app/js/main/main.controller.js b/integration-tests/src/test/resources/integration-test/buildIT/app/js/main/main.controller.js similarity index 100% rename from maven-plugin/src/test/resources/integration-test/buildIT/app/js/main/main.controller.js rename to integration-tests/src/test/resources/integration-test/buildIT/app/js/main/main.controller.js diff --git a/maven-plugin/src/test/resources/integration-test/buildIT/app/js/main/main.html b/integration-tests/src/test/resources/integration-test/buildIT/app/js/main/main.html similarity index 100% rename from maven-plugin/src/test/resources/integration-test/buildIT/app/js/main/main.html rename to integration-tests/src/test/resources/integration-test/buildIT/app/js/main/main.html diff --git a/maven-plugin/src/test/resources/integration-test/buildIT/app/js/main/main.js b/integration-tests/src/test/resources/integration-test/buildIT/app/js/main/main.js similarity index 100% rename from maven-plugin/src/test/resources/integration-test/buildIT/app/js/main/main.js rename to integration-tests/src/test/resources/integration-test/buildIT/app/js/main/main.js diff --git a/maven-plugin/src/test/resources/integration-test/buildIT/app/js/test.js b/integration-tests/src/test/resources/integration-test/buildIT/app/js/test.js similarity index 100% rename from maven-plugin/src/test/resources/integration-test/buildIT/app/js/test.js rename to integration-tests/src/test/resources/integration-test/buildIT/app/js/test.js diff --git a/maven-plugin/src/test/resources/integration-test/buildIT/app/manifest.webapp b/integration-tests/src/test/resources/integration-test/buildIT/app/manifest.webapp similarity index 100% rename from maven-plugin/src/test/resources/integration-test/buildIT/app/manifest.webapp rename to integration-tests/src/test/resources/integration-test/buildIT/app/manifest.webapp diff --git a/maven-plugin/src/test/resources/integration-test/buildIT/config.json b/integration-tests/src/test/resources/integration-test/buildIT/config.json similarity index 100% rename from maven-plugin/src/test/resources/integration-test/buildIT/config.json rename to integration-tests/src/test/resources/integration-test/buildIT/config.json diff --git a/maven-plugin/src/test/resources/integration-test/buildIT/module1/api/pom.xml b/integration-tests/src/test/resources/integration-test/buildIT/module1/api/pom.xml similarity index 100% rename from maven-plugin/src/test/resources/integration-test/buildIT/module1/api/pom.xml rename to integration-tests/src/test/resources/integration-test/buildIT/module1/api/pom.xml diff --git a/maven-plugin/src/test/resources/integration-test/buildIT/module1/api/src/main/java/org/openmrs/module/module1/module1Activator.java b/integration-tests/src/test/resources/integration-test/buildIT/module1/api/src/main/java/org/openmrs/module/module1/module1Activator.java similarity index 100% rename from maven-plugin/src/test/resources/integration-test/buildIT/module1/api/src/main/java/org/openmrs/module/module1/module1Activator.java rename to integration-tests/src/test/resources/integration-test/buildIT/module1/api/src/main/java/org/openmrs/module/module1/module1Activator.java diff --git a/maven-plugin/src/test/resources/integration-test/buildIT/module1/api/src/main/resources/messages.properties b/integration-tests/src/test/resources/integration-test/buildIT/module1/api/src/main/resources/messages.properties similarity index 100% rename from maven-plugin/src/test/resources/integration-test/buildIT/module1/api/src/main/resources/messages.properties rename to integration-tests/src/test/resources/integration-test/buildIT/module1/api/src/main/resources/messages.properties diff --git a/maven-plugin/src/test/resources/integration-test/buildIT/module1/api/src/main/resources/messages_es.properties b/integration-tests/src/test/resources/integration-test/buildIT/module1/api/src/main/resources/messages_es.properties similarity index 100% rename from maven-plugin/src/test/resources/integration-test/buildIT/module1/api/src/main/resources/messages_es.properties rename to integration-tests/src/test/resources/integration-test/buildIT/module1/api/src/main/resources/messages_es.properties diff --git a/maven-plugin/src/test/resources/integration-test/buildIT/module1/api/src/main/resources/messages_fr.properties b/integration-tests/src/test/resources/integration-test/buildIT/module1/api/src/main/resources/messages_fr.properties similarity index 100% rename from maven-plugin/src/test/resources/integration-test/buildIT/module1/api/src/main/resources/messages_fr.properties rename to integration-tests/src/test/resources/integration-test/buildIT/module1/api/src/main/resources/messages_fr.properties diff --git a/maven-plugin/src/test/resources/integration-test/buildIT/module1/api/src/main/resources/moduleApplicationContext.xml b/integration-tests/src/test/resources/integration-test/buildIT/module1/api/src/main/resources/moduleApplicationContext.xml similarity index 100% rename from maven-plugin/src/test/resources/integration-test/buildIT/module1/api/src/main/resources/moduleApplicationContext.xml rename to integration-tests/src/test/resources/integration-test/buildIT/module1/api/src/main/resources/moduleApplicationContext.xml diff --git a/maven-plugin/src/test/resources/integration-test/buildIT/module1/omod/pom.xml b/integration-tests/src/test/resources/integration-test/buildIT/module1/omod/pom.xml similarity index 100% rename from maven-plugin/src/test/resources/integration-test/buildIT/module1/omod/pom.xml rename to integration-tests/src/test/resources/integration-test/buildIT/module1/omod/pom.xml diff --git a/maven-plugin/src/test/resources/integration-test/buildIT/module1/omod/src/main/resources/config.xml b/integration-tests/src/test/resources/integration-test/buildIT/module1/omod/src/main/resources/config.xml similarity index 100% rename from maven-plugin/src/test/resources/integration-test/buildIT/module1/omod/src/main/resources/config.xml rename to integration-tests/src/test/resources/integration-test/buildIT/module1/omod/src/main/resources/config.xml diff --git a/maven-plugin/src/test/resources/integration-test/buildIT/module1/omod/src/main/resources/webModuleApplicationContext.xml b/integration-tests/src/test/resources/integration-test/buildIT/module1/omod/src/main/resources/webModuleApplicationContext.xml similarity index 100% rename from maven-plugin/src/test/resources/integration-test/buildIT/module1/omod/src/main/resources/webModuleApplicationContext.xml rename to integration-tests/src/test/resources/integration-test/buildIT/module1/omod/src/main/resources/webModuleApplicationContext.xml diff --git a/maven-plugin/src/test/resources/integration-test/buildIT/module1/pom.xml b/integration-tests/src/test/resources/integration-test/buildIT/module1/pom.xml similarity index 100% rename from maven-plugin/src/test/resources/integration-test/buildIT/module1/pom.xml rename to integration-tests/src/test/resources/integration-test/buildIT/module1/pom.xml diff --git a/maven-plugin/src/test/resources/integration-test/buildIT/module2/api/pom.xml b/integration-tests/src/test/resources/integration-test/buildIT/module2/api/pom.xml similarity index 100% rename from maven-plugin/src/test/resources/integration-test/buildIT/module2/api/pom.xml rename to integration-tests/src/test/resources/integration-test/buildIT/module2/api/pom.xml diff --git a/maven-plugin/src/test/resources/integration-test/buildIT/module2/api/src/main/java/org/openmrs/module/module2/module2Activator.java b/integration-tests/src/test/resources/integration-test/buildIT/module2/api/src/main/java/org/openmrs/module/module2/module2Activator.java similarity index 100% rename from maven-plugin/src/test/resources/integration-test/buildIT/module2/api/src/main/java/org/openmrs/module/module2/module2Activator.java rename to integration-tests/src/test/resources/integration-test/buildIT/module2/api/src/main/java/org/openmrs/module/module2/module2Activator.java diff --git a/maven-plugin/src/test/resources/integration-test/buildIT/module2/api/src/main/resources/messages.properties b/integration-tests/src/test/resources/integration-test/buildIT/module2/api/src/main/resources/messages.properties similarity index 100% rename from maven-plugin/src/test/resources/integration-test/buildIT/module2/api/src/main/resources/messages.properties rename to integration-tests/src/test/resources/integration-test/buildIT/module2/api/src/main/resources/messages.properties diff --git a/maven-plugin/src/test/resources/integration-test/buildIT/module2/api/src/main/resources/messages_es.properties b/integration-tests/src/test/resources/integration-test/buildIT/module2/api/src/main/resources/messages_es.properties similarity index 100% rename from maven-plugin/src/test/resources/integration-test/buildIT/module2/api/src/main/resources/messages_es.properties rename to integration-tests/src/test/resources/integration-test/buildIT/module2/api/src/main/resources/messages_es.properties diff --git a/maven-plugin/src/test/resources/integration-test/buildIT/module2/api/src/main/resources/messages_fr.properties b/integration-tests/src/test/resources/integration-test/buildIT/module2/api/src/main/resources/messages_fr.properties similarity index 100% rename from maven-plugin/src/test/resources/integration-test/buildIT/module2/api/src/main/resources/messages_fr.properties rename to integration-tests/src/test/resources/integration-test/buildIT/module2/api/src/main/resources/messages_fr.properties diff --git a/maven-plugin/src/test/resources/integration-test/buildIT/module2/api/src/main/resources/moduleApplicationContext.xml b/integration-tests/src/test/resources/integration-test/buildIT/module2/api/src/main/resources/moduleApplicationContext.xml similarity index 100% rename from maven-plugin/src/test/resources/integration-test/buildIT/module2/api/src/main/resources/moduleApplicationContext.xml rename to integration-tests/src/test/resources/integration-test/buildIT/module2/api/src/main/resources/moduleApplicationContext.xml diff --git a/maven-plugin/src/test/resources/integration-test/buildIT/module2/omod/pom.xml b/integration-tests/src/test/resources/integration-test/buildIT/module2/omod/pom.xml similarity index 100% rename from maven-plugin/src/test/resources/integration-test/buildIT/module2/omod/pom.xml rename to integration-tests/src/test/resources/integration-test/buildIT/module2/omod/pom.xml diff --git a/maven-plugin/src/test/resources/integration-test/buildIT/module2/omod/src/main/resources/config.xml b/integration-tests/src/test/resources/integration-test/buildIT/module2/omod/src/main/resources/config.xml similarity index 100% rename from maven-plugin/src/test/resources/integration-test/buildIT/module2/omod/src/main/resources/config.xml rename to integration-tests/src/test/resources/integration-test/buildIT/module2/omod/src/main/resources/config.xml diff --git a/maven-plugin/src/test/resources/integration-test/buildIT/module2/omod/src/main/resources/webModuleApplicationContext.xml b/integration-tests/src/test/resources/integration-test/buildIT/module2/omod/src/main/resources/webModuleApplicationContext.xml similarity index 100% rename from maven-plugin/src/test/resources/integration-test/buildIT/module2/omod/src/main/resources/webModuleApplicationContext.xml rename to integration-tests/src/test/resources/integration-test/buildIT/module2/omod/src/main/resources/webModuleApplicationContext.xml diff --git a/maven-plugin/src/test/resources/integration-test/buildIT/module2/pom.xml b/integration-tests/src/test/resources/integration-test/buildIT/module2/pom.xml similarity index 100% rename from maven-plugin/src/test/resources/integration-test/buildIT/module2/pom.xml rename to integration-tests/src/test/resources/integration-test/buildIT/module2/pom.xml diff --git a/maven-plugin/src/test/resources/integration-test/buildIT/package.json b/integration-tests/src/test/resources/integration-test/buildIT/package.json similarity index 100% rename from maven-plugin/src/test/resources/integration-test/buildIT/package.json rename to integration-tests/src/test/resources/integration-test/buildIT/package.json diff --git a/maven-plugin/src/test/resources/integration-test/buildIT/pom.xml b/integration-tests/src/test/resources/integration-test/buildIT/pom.xml similarity index 100% rename from maven-plugin/src/test/resources/integration-test/buildIT/pom.xml rename to integration-tests/src/test/resources/integration-test/buildIT/pom.xml diff --git a/maven-plugin/src/test/resources/integration-test/buildIT/sdk-stats.properties b/integration-tests/src/test/resources/integration-test/buildIT/sdk-stats.properties similarity index 100% rename from maven-plugin/src/test/resources/integration-test/buildIT/sdk-stats.properties rename to integration-tests/src/test/resources/integration-test/buildIT/sdk-stats.properties diff --git a/maven-plugin/src/test/resources/integration-test/buildIT/webpack.config.js b/integration-tests/src/test/resources/integration-test/buildIT/webpack.config.js similarity index 100% rename from maven-plugin/src/test/resources/integration-test/buildIT/webpack.config.js rename to integration-tests/src/test/resources/integration-test/buildIT/webpack.config.js diff --git a/maven-plugin/src/test/resources/integration-test/openmrs-distro-parent-as-distro.properties b/integration-tests/src/test/resources/integration-test/openmrs-distro-parent-as-distro.properties similarity index 100% rename from maven-plugin/src/test/resources/integration-test/openmrs-distro-parent-as-distro.properties rename to integration-tests/src/test/resources/integration-test/openmrs-distro-parent-as-distro.properties diff --git a/maven-plugin/src/test/resources/integration-test/openmrs-distro-parent-as-parent.properties b/integration-tests/src/test/resources/integration-test/openmrs-distro-parent-as-parent.properties similarity index 100% rename from maven-plugin/src/test/resources/integration-test/openmrs-distro-parent-as-parent.properties rename to integration-tests/src/test/resources/integration-test/openmrs-distro-parent-as-parent.properties diff --git a/maven-plugin/src/test/resources/integration-test/openmrs-distro-spa-artifacts.properties b/integration-tests/src/test/resources/integration-test/openmrs-distro-spa-artifacts.properties similarity index 100% rename from maven-plugin/src/test/resources/integration-test/openmrs-distro-spa-artifacts.properties rename to integration-tests/src/test/resources/integration-test/openmrs-distro-spa-artifacts.properties diff --git a/maven-plugin/src/test/resources/integration-test/openmrs-distro-spa-build.properties b/integration-tests/src/test/resources/integration-test/openmrs-distro-spa-build.properties similarity index 100% rename from maven-plugin/src/test/resources/integration-test/openmrs-distro-spa-build.properties rename to integration-tests/src/test/resources/integration-test/openmrs-distro-spa-build.properties diff --git a/maven-plugin/src/test/resources/integration-test/openmrs-distro.properties b/integration-tests/src/test/resources/integration-test/openmrs-distro.properties similarity index 100% rename from maven-plugin/src/test/resources/integration-test/openmrs-distro.properties rename to integration-tests/src/test/resources/integration-test/openmrs-distro.properties diff --git a/maven-plugin/src/test/resources/integration-test/pom.xml b/integration-tests/src/test/resources/integration-test/pom.xml similarity index 100% rename from maven-plugin/src/test/resources/integration-test/pom.xml rename to integration-tests/src/test/resources/integration-test/pom.xml diff --git a/pom.xml b/pom.xml index 075485a5c..ad36cdc90 100644 --- a/pom.xml +++ b/pom.xml @@ -22,6 +22,7 @@ tomcat7-maven-plugin tomcat9-maven-plugin maven-plugin + integration-tests @@ -529,10 +530,6 @@ maven-gpg-plugin 3.1.0 - org.apache.maven.plugins maven-surefire-plugin @@ -546,31 +543,6 @@ - - - integration-tests - - - - org.apache.maven.plugins - maven-failsafe-plugin - 3.1.2 - - - - integration-test - verify - - - - - - - release @@ -578,7 +550,7 @@ org.apache.maven.plugins maven-source-plugin - 3.2.1 + 3.3.0 attach-sources @@ -591,7 +563,7 @@ org.apache.maven.plugins maven-javadoc-plugin - 3.4.1 + 3.5.0 attach-javadocs