chore(qa/engine-it): only support h2 and postgresql for engine-it

- remove all database configuration except h2 and postgresql used for engine-it from all pom.xml's - remove all database configuration except h2 and postgresql from all application server runtime configs - remove all additional files required to database configuration except h2 and postgresql related to #CAM-7412
camunda · Feb 10, 2017 · 3b39721 · 3b39721
1 parent 76bf116
commit 3b39721
Show file tree

Hide file tree

Showing 39 changed files with 5 additions and 1,008 deletions.
diff --git a/README.md b/README.md
@@ -81,7 +81,7 @@ Add the following lines to it:
 </activeProfiles>
 ```
 
-Apache Maven 3 and Java JDK 6 or 7 are prerequisites for building camunda BPM platform. Once you have setup Java and Maven, run
+Apache Maven 3 and Java JDK 6/7/8 are prerequisites for building camunda BPM platform. Once you have setup Java and Maven, run
 
 ```
 mvn clean install
@@ -105,7 +105,7 @@ In order to run the integration tests, first perform a full install build. Then
 We have different maven profiles for selecting
 * *Runtime containers & environments*: jboss, tomcat, wildfly
 * *The testsuite*: engine-integration, webapps-integration
-* *The database*: h2,h2-xa,db2,db2-xa,sqlserver,sqlserver-xa,oracle,oracle-xa,postgresql,postgresql-xa,mysql,mysql-xa (XA is only supported on JBoss / Wildfly atm)
+* *The database*: h2,h2-xa,db2,sqlserver,oracle,postgresql,postgresql-xa,mysql (Only h2 / postgresql is supported in engine-integration tests)
 
 In order to configure the build, compose the profiles for runtime container, testsuite, database. Example:
 
@@ -128,7 +128,7 @@ mvn clean install -Pengine-integration,jboss,postgresql,postgresql-xa
 You can select multiple testsuites but only a single database and a single runtime container. This is valid:
 
 ```
-mvn clean install -Pengine-integration,webapps-integration,tomcat,db2
+mvn clean install -Pengine-integration,webapps-integration,tomcat,postgresql
 ```
 
 There is a special profile for JBoss Application Server:

diff --git a/database/pom.xml b/database/pom.xml
@@ -154,8 +154,6 @@
  <database.type>db2</database.type>
  <database.driver>com.ibm.db2.jcc.DB2Driver</database.driver>
  <database.datasource.class>com.ibm.db2.jcc.DB2SimpleDataSource</database.datasource.class>
- <jboss.datasource.filename>db2-ds.xml</jboss.datasource.filename>
- <hibernate.dialect>org.hibernate.dialect.DB2Dialect</hibernate.dialect>
  </properties>
 
  <dependencies>
@@ -166,13 +164,6 @@
  </dependency>
  </dependencies>
  </profile>
- <profile>
- <id>db2-xa</id>
- <properties>
- <database.datasource.class>com.ibm.db2.jcc.DB2XADataSource</database.datasource.class>
- <jboss.datasource.filename>db2-xa-ds.xml</jboss.datasource.filename>
- </properties>
- </profile>
  <profile>
  <id>db2-105</id>
  <properties>
@@ -245,8 +236,6 @@
  <database.type>mariadb</database.type>
  <database.driver>org.mariadb.jdbc.Driver</database.driver>
  <database.datasource.class>org.mariadb.jdbc.MySQLDataSource</database.datasource.class>
- <jboss.datasource.filename>mariadb-ds.xml</jboss.datasource.filename>
- <hibernate.dialect>org.hibernate.dialect.MySQL5InnoDBDialect</hibernate.dialect>
  </properties>
 
  <dependencies>
@@ -257,13 +246,6 @@
  </dependency>
  </dependencies>
  </profile>
- <profile>
- <id>mariadb-xa</id>
- <properties>
- <database.datasource.class>org.mariadb.jdbc.MySQLDataSource</database.datasource.class>
- <jboss.datasource.filename>mariadb-xa-ds.xml</jboss.datasource.filename>
- </properties>
- </profile>
  <profile>
  <id>mariadb-galera</id>
  <properties>
@@ -277,8 +259,6 @@
  <database.type>mysql</database.type>
  <database.driver>com.mysql.jdbc.Driver</database.driver>
  <database.datasource.class>com.mysql.jdbc.jdbc2.optional.MysqlDataSource</database.datasource.class>
- <jboss.datasource.filename>mysql-ds.xml</jboss.datasource.filename>
- <hibernate.dialect>org.hibernate.dialect.MySQL5InnoDBDialect</hibernate.dialect>
  </properties>
 
  <dependencies>
@@ -289,35 +269,17 @@
  </dependency>
  </dependencies>
  </profile>
- <profile>
- <id>mysql-xa</id>
- <properties>
- <database.datasource.class>com.mysql.jdbc.jdbc2.optional.MysqlXADataSource</database.datasource.class>
- <jboss.datasource.filename>mysql-xa-ds.xml</jboss.datasource.filename>
- </properties>
- </profile>
 
  <profile>
  <id>oracle</id>
  <properties>
  <database.type>oracle</database.type>
  <database.driver>oracle.jdbc.OracleDriver</database.driver>
  <database.datasource.class>oracle.jdbc.pool.OracleDataSource</database.datasource.class>
- <jboss.datasource.filename>oracle-ds.xml</jboss.datasource.filename>
- </properties>
- </profile>
- <profile>
- <id>oracle-xa</id>
- <properties>
- <database.datasource.class>oracle.jdbc.xa.client.OracleXADataSource</database.datasource.class>
- <jboss.datasource.filename>oracle-xa-ds.xml</jboss.datasource.filename>
  </properties>
  </profile>
  <profile>
  <id>oracle-10</id>
- <properties>
- <hibernate.dialect>org.hibernate.dialect.Oracle10gDialect</hibernate.dialect>
- </properties>
  <dependencies>
  <dependency>
  <groupId>com.oracle.jdbc</groupId>
@@ -330,7 +292,6 @@
  <id>oracle-11</id>
  <properties>
  <version.oracle>${version.oracle-11}</version.oracle>
- <hibernate.dialect>org.hibernate.dialect.Oracle10gDialect</hibernate.dialect>
  </properties>
  <dependencies>
  <dependency>
@@ -344,7 +305,6 @@
  <id>oracle-12</id>
  <properties>
  <version.oracle>${version.oracle-12}</version.oracle>
- <hibernate.dialect>org.hibernate.dialect.Oracle10gDialect</hibernate.dialect>
  </properties>
  <dependencies>
  <dependency>
@@ -387,8 +347,6 @@
  <database.type>mssql</database.type>
  <database.driver>com.microsoft.sqlserver.jdbc.SQLServerDriver</database.driver>
  <database.datasource.class>com.microsoft.sqlserver.jdbc.SQLServerDataSource</database.datasource.class>
- <jboss.datasource.filename>sqlserver-ds.xml</jboss.datasource.filename>
- <hibernate.dialect>org.hibernate.dialect.SQLServer2008Dialect</hibernate.dialect>
  </properties>
 
  <dependencies>
@@ -399,13 +357,6 @@
  </dependency>
  </dependencies>
  </profile>
- <profile>
- <id>sqlserver-xa</id>
- <properties>
- <database.datasource.class>com.microsoft.sqlserver.jdbc.SQLServerXADataSource</database.datasource.class>
- <jboss.datasource.filename>sqlserver-xa-ds.xml</jboss.datasource.filename>
- </properties>
- </profile>
  </profiles>
 
 </project>
diff --git a/qa/README.md b/qa/README.md
@@ -9,7 +9,7 @@ In order to run the integration tests, first perform a full install build. Then
 We have different maven profiles for selecting
 * *Runtime containers & environments*: jboss, tomcat, wildfly
 * *The testsuite*: engine-integration, webapps-integration
-* *The database*: h2,h2-xa,db2,db2-xa,sqlserver,sqlserver-xa,oracle,oracle-xa,postgresql,postgresql-xa,mysql,mysql-xa (XA is only supported on JBoss / Wildfly atm)
+* *The database*: h2,h2-xa,postgresql,postgresql-xa (XA is only supported on JBoss / Wildfly atm)
 
 In order to configure the build, compose the profiles for runtime container, testsuite, database. Example:
 
@@ -32,10 +32,9 @@ mvn clean install -Pengine-integration,jboss,postgresql,postgresql-xa
 You can select multiple testsuites but only a single database and a single runtime container. This is valid:
 
 ```
-mvn clean install -Pengine-integration,webapps-integration,tomcat,db2
+mvn clean install -Pengine-integration,webapps-integration,tomcat,postgresql
 ```
 
 There is a special profile for JBoss Application Server:
 
 * Domain mode: `mvn clean install -Pengine-integration,h2,jboss-domain`
-
diff --git a/qa/jboss7-runtime/pom.xml b/qa/jboss7-runtime/pom.xml
@@ -30,31 +30,6 @@
  database drivers
  we deploy all and only activate one with a *-ds.xml database deployment
  -->
- <dependency>
- <groupId>org.mariadb.jdbc</groupId>
- <artifactId>mariadb-java-client</artifactId>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>mysql</groupId>
- <artifactId>mysql-connector-java</artifactId>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>com.ibm.db2.jcc</groupId>
- <artifactId>db2jcc4</artifactId>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>com.oracle.jdbc</groupId>
- <artifactId>ojdbc6</artifactId>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>com.microsoft.sqlserver</groupId>
- <artifactId>sqljdbc4</artifactId>
- <scope>runtime</scope>
- </dependency>
  <dependency>
  <groupId>org.postgresql</groupId>
  <artifactId>postgresql</artifactId>
@@ -230,13 +205,8 @@
  <replace dir="${jboss.runtime.location}/modules">
  <include name="**/module.xml" />
  <replacefilter token="@project.version@" value="${project.version}" />
- <replacefilter token="@version.db2@" value="${version.db2}" />
  <replacefilter token="@version.h2@" value="${version.h2}" />
- <replacefilter token="@version.mariadb@" value="${version.mariadb}" />
- <replacefilter token="@version.mysql@" value="${version.mysql}" />
- <replacefilter token="@version.oracle@" value="${version.oracle}" />
  <replacefilter token="@version.postgresql@" value="${version.postgresql}" />
- <replacefilter token="@version.sqlserver@" value="${version.sqlserver}" />
  </replace>
 
  </target>
@@ -339,13 +309,8 @@
  <replace dir="${jboss.runtime.location}/modules">
  <include name="**/module.xml" />
  <replacefilter token="@project.version@" value="${project.version}" />
- <replacefilter token="@version.db2@" value="${version.db2}" />
  <replacefilter token="@version.h2@" value="${version.h2}" />
- <replacefilter token="@version.mariadb@" value="${version.mariadb}" />
- <replacefilter token="@version.mysql@" value="${version.mysql}" />
- <replacefilter token="@version.oracle@" value="${version.oracle}" />
  <replacefilter token="@version.postgresql@" value="${version.postgresql}" />
- <replacefilter token="@version.sqlserver@" value="${version.sqlserver}" />
  </replace>
 
  </target>

diff --git a/qa/jboss7-runtime/src/main/common/modules/com/ibm/db2/jcc/db2jcc4/main/module.xml b/qa/jboss7-runtime/src/main/common/modules/com/ibm/db2/jcc/db2jcc4/main/module.xml
diff --git a/qa/jboss7-runtime/src/main/common/modules/com/microsoft/sqlserver/sqljdbc4/main/module.xml b/qa/jboss7-runtime/src/main/common/modules/com/microsoft/sqlserver/sqljdbc4/main/module.xml
diff --git a/qa/jboss7-runtime/src/main/common/modules/com/oracle/jdbc/ojdbc6/main/module.xml b/qa/jboss7-runtime/src/main/common/modules/com/oracle/jdbc/ojdbc6/main/module.xml
diff --git a/qa/jboss7-runtime/src/main/common/modules/mysql/mysql-connector-java/main/module.xml b/qa/jboss7-runtime/src/main/common/modules/mysql/mysql-connector-java/main/module.xml
diff --git a/...oss7-runtime/src/main/common/modules/org/mariadb/jdbc/mariadb-java-client/main/module.xml b/...oss7-runtime/src/main/common/modules/org/mariadb/jdbc/mariadb-java-client/main/module.xml
diff --git a/qa/jboss7-runtime/src/main/common/standalone/configuration/standalone.xml b/qa/jboss7-runtime/src/main/common/standalone/configuration/standalone.xml
@@ -103,21 +103,6 @@
  <driver name="h2" module="com.h2database.h2">
  <xa-datasource-class>org.h2.jdbcx.JdbcDataSource</xa-datasource-class>
  </driver>
- <driver name="db2" module="com.ibm.db2.jcc.db2jcc4">
- <xa-datasource-class>com.ibm.db2.jcc.DB2XADataSource</xa-datasource-class>
- </driver>
- <driver name="com.microsoft.sqlserver" module="com.microsoft.sqlserver.sqljdbc4">
- <xa-datasource-class>com.microsoft.sqlserver.jdbc.SQLServerXADataSource</xa-datasource-class>
- </driver>
- <driver name="org.mariadb" module="org.mariadb.jdbc.mariadb-java-client">
- <xa-datasource-class>org.mariadb.jdbc.MySQLDataSource</xa-datasource-class>
- </driver>
- <driver name="com.mysql" module="mysql.mysql-connector-java">
- <xa-datasource-class>com.mysql.jdbc.jdbc2.optional.MysqlXADataSource</xa-datasource-class>
- </driver>
- <driver name="com.oracle.jdbc.ojdbc6" module="com.oracle.jdbc.ojdbc6">
- <xa-datasource-class>oracle.jdbc.xa.client.OracleXADataSource</xa-datasource-class>
- </driver>
  <driver name="postgresql" module="org.postgresql.postgresql">
  <xa-datasource-class>org.postgresql.xa.PGXADataSource</xa-datasource-class>
  </driver>

diff --git a/qa/jboss7-runtime/src/main/common/standalone/deployments/db2-ds.xml b/qa/jboss7-runtime/src/main/common/standalone/deployments/db2-ds.xml