Merge pull request #245 from menakaj/master

Enabling Integration tests in parent pom
8 years ago · bfc3882592
parent fc28a2b7d0 370ed5fd98
commit bfc3882592
13 changed files with 18 additions and 14 deletions
--- a/modules/integration/pom.xml
+++ b/modules/integration/pom.xml
@ -23,7 +23,7 @@
    <parent>
        <groupId>org.wso2.iot</groupId>
        <artifactId>wso2iot-parent</artifactId>
-        <version>3.0.1-SNAPSHOT</version>
+        <version>3.0.0-SNAPSHOT</version>
        <relativePath>../../pom.xml</relativePath>
    </parent>

--- a/modules/integration/tests-artifacts/pom.xml
+++ b/modules/integration/tests-artifacts/pom.xml
@ -22,7 +22,7 @@
    <parent>
        <groupId>org.wso2.iot</groupId>
        <artifactId>wso2iot-integration</artifactId>
-        <version>3.0.1-SNAPSHOT</version>
+        <version>3.0.0-SNAPSHOT</version>
        <relativePath>../pom.xml</relativePath>
    </parent>

--- a/modules/integration/tests-common/admin-clients/pom.xml
+++ b/modules/integration/tests-common/admin-clients/pom.xml
@ -22,7 +22,7 @@
    <parent>
        <groupId>org.wso2.iot</groupId>
        <artifactId>tests-common</artifactId>
-        <version>3.0.1-SNAPSHOT</version>
+        <version>3.0.0-SNAPSHOT</version>
        <relativePath>../pom.xml</relativePath>
    </parent>

--- a/modules/integration/tests-common/integration-test-utils/pom.xml
+++ b/modules/integration/tests-common/integration-test-utils/pom.xml
@ -22,7 +22,7 @@
    <parent>
        <groupId>org.wso2.iot</groupId>
        <artifactId>tests-common</artifactId>
-        <version>3.0.1-SNAPSHOT</version>
+        <version>3.0.0-SNAPSHOT</version>
        <relativePath>../pom.xml</relativePath>
    </parent>

--- a/modules/integration/tests-common/pom.xml
+++ b/modules/integration/tests-common/pom.xml
@ -21,7 +21,7 @@
    <parent>
        <groupId>org.wso2.iot</groupId>
        <artifactId>wso2iot-integration</artifactId>
-        <version>3.0.1-SNAPSHOT</version>
+        <version>3.0.0-SNAPSHOT</version>
        <relativePath>../pom.xml</relativePath>
    </parent>

--- a/modules/integration/tests-common/ui-pages/pom.xml
+++ b/modules/integration/tests-common/ui-pages/pom.xml
@ -24,7 +24,7 @@
    <parent>
        <groupId>org.wso2.iot</groupId>
        <artifactId>tests-common</artifactId>
-        <version>3.0.1-SNAPSHOT</version>
+        <version>3.0.0-SNAPSHOT</version>
        <relativePath>../pom.xml</relativePath>
    </parent>

--- a/modules/integration/tests-common/web-ui-pages/pom.xml
+++ b/modules/integration/tests-common/web-ui-pages/pom.xml
@ -24,7 +24,7 @@
    <parent>
        <groupId>org.wso2.iot</groupId>
        <artifactId>tests-common</artifactId>
-        <version>3.0.1-SNAPSHOT</version>
+        <version>3.0.0-SNAPSHOT</version>
        <relativePath>../pom.xml</relativePath>
    </parent>

--- a/modules/integration/tests-integration-old/pom.xml
+++ b/modules/integration/tests-integration-old/pom.xml
@ -23,7 +23,7 @@
    <parent>
        <groupId>org.wso2.iot</groupId>
        <artifactId>wso2iot-integration</artifactId>
-        <version>3.0.1-SNAPSHOT</version>
+        <version>3.0.0-SNAPSHOT</version>
        <relativePath>../pom.xml</relativePath>
    </parent>

--- a/modules/integration/tests-integration/pom.xml
+++ b/modules/integration/tests-integration/pom.xml
@ -23,7 +23,7 @@
    <parent>
        <groupId>org.wso2.iot</groupId>
        <artifactId>wso2iot-integration</artifactId>
-        <version>3.0.1-SNAPSHOT</version>
+        <version>3.0.0-SNAPSHOT</version>
        <relativePath>../pom.xml</relativePath>
    </parent>

--- a/modules/integration/tests-iot-web-ui/pom.xml
+++ b/modules/integration/tests-iot-web-ui/pom.xml
@ -22,7 +22,7 @@
    <parent>
        <groupId>org.wso2.iot</groupId>
        <artifactId>wso2iot-integration</artifactId>
-        <version>3.0.1-SNAPSHOT</version>
+        <version>3.0.0-SNAPSHOT</version>
        <relativePath>../pom.xml</relativePath>
    </parent>

@ -48,9 +48,9 @@
                        <suiteXmlFile>src/test/resources/testng.xml</suiteXmlFile>
                    </suiteXmlFiles>

+                    <skipTests>${skipTests}</skipTests>

                    <systemProperties>
-                        <skipTests>true</skipTests>
                        <property>
                            <name>maven.test.haltafterfailure</name>
                            <value>false</value>
@ -267,5 +267,8 @@
        </dependency>
    </dependencies>

+    <properties>
+        <skipTests>true</skipTests>
+    </properties>

 </project>
--- a/modules/integration/tests-platform/pom.xml
+++ b/modules/integration/tests-platform/pom.xml
@ -21,7 +21,7 @@
    <parent>
        <groupId>org.wso2.iot</groupId>
        <artifactId>wso2iot-integration</artifactId>
-        <version>3.0.1-SNAPSHOT</version>
+        <version>3.0.0-SNAPSHOT</version>
        <relativePath>../pom.xml</relativePath>
    </parent>

--- a/modules/integration/tests-ui-integration/pom.xml
+++ b/modules/integration/tests-ui-integration/pom.xml
@ -22,7 +22,7 @@
    <parent>
        <groupId>org.wso2.iot</groupId>
        <artifactId>wso2iot-integration</artifactId>
-        <version>3.0.1-SNAPSHOT</version>
+        <version>3.0.0-SNAPSHOT</version>
        <relativePath>../pom.xml</relativePath>
    </parent>

--- a/pom.xml
+++ b/pom.xml
@ -39,6 +39,7 @@
        <module>modules/core</module>
        <module>modules/analytics</module>
        <module>modules/distribution</module>
+        <module>modules/integration</module>
    </modules>

    <dependencyManagement>
@ -1104,7 +1105,7 @@
                        <artifactId>selenium-android-driver</artifactId>
                    </exclusion>
                </exclusions>
-                <scope>test</scope>
+                <scope>compile</scope>
            </dependency>
            <dependency>
                <groupId>com.opera</groupId>