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