From 5c53fcf857f3eb32d378962f4276ea73d708e4b2 Mon Sep 17 00:00:00 2001 From: "Determe, Sebastien (sd378r)" Date: Mon, 2 Oct 2017 13:09:14 +0200 Subject: Fix the arquillian framework Arquillian framework was broken due to bad dependency used during ITS Change-Id: I2c865b429af45511d778d11d77a16704b49fdef6 Issue-ID: SO-171 Signed-off-by: Determe, Sebastien (sd378r) --- packages/arquillian-unit-tests/pom.xml | 771 ++++++++++----------- .../src/test/resources/arquillian.xml | 2 +- 2 files changed, 372 insertions(+), 401 deletions(-) (limited to 'packages/arquillian-unit-tests') diff --git a/packages/arquillian-unit-tests/pom.xml b/packages/arquillian-unit-tests/pom.xml index a557f56f46..257e34b69a 100644 --- a/packages/arquillian-unit-tests/pom.xml +++ b/packages/arquillian-unit-tests/pom.xml @@ -1,336 +1,307 @@ - 4.0.0 - - org.openecomp.so - packages - 1.1.0-SNAPSHOT - - - org.openecomp.so.packages - Arquillian Unit Testing on MSO - arquillian-unit-tests - - jar - - - - default-tests - - true - - - **/IntegrationTestsSuite.java - jboss-as - ${project.version} - - - - - - - - - - org.jboss.arquillian - arquillian-bom - 1.1.11.Final - import - pom - - - - org.jboss.spec - jboss-javaee-6.0 - 3.0.2.Final - pom - import - - - - - - - - - - - - - org.jboss.marshalling - jboss-marshalling - 1.3.16.GA - test - - - - org.jboss.arquillian.junit - arquillian-junit-container - test - - - - - - - org.wildfly.arquillian - wildfly-arquillian-container-remote - 1.1.0.Final - test - - - - org.jboss.remoting - jboss-remoting - 4.0.9.Final - test - - - - org.jboss.logging - jboss-logging - 3.2.1.Final - test - - - - org.jboss.arquillian.protocol - arquillian-protocol-servlet - test - - - - org.jboss.shrinkwrap.resolver - shrinkwrap-resolver-bom - 2.1.0-alpha-1 - runtime - pom - - - - - org.arquillian.cube - arquillian-cube-openshift-parent - 1.0.0.Alpha15 - pom - test - - - org.arquillian.cube - arquillian-cube-docker - 1.0.0.Alpha15 - test - - - - - - - - - - org.hibernate - hibernate-core - 4.2.7.SP1 - test - - - org.hibernate - hibernate-entitymanager - 4.2.7.SP1 - test - - - org.codehaus.jackson - jackson-mapper-asl - 1.9.9 - test - - - javax.validation - validation-api - 1.0.0.GA - test - - - org.jboss.as - jboss-as-ejb3 - 7.2.0.Final - test - - - - - com.smartbear.soapui - soapui - 5.1.0 - jar - test - - - thoughtworks - xstream - - - gnu.cajo - cajo - - - - - - commons-codec - commons-codec - 1.4 - jar - test - - - - org.seleniumhq.selenium - selenium-java - 2.45.0 - test - - - org.seleniumhq.selenium - selenium-firefox-driver - 2.45.0 - test - - - org.seleniumhq.selenium - selenium-server - 2.45.0 - test - - - - org.apache.httpcomponents - httpclient - - - org.apache.httpcomponents - httpcore - - - - org.openecomp.so - asdc-controller - ${project.version} - test - classes - - - - - - org.mockito - mockito-all - 1.10.19 - test - - - - org.openecomp.sdc.sdc-distribution-client - sdc-distribution-client - 1.1.6-SNAPSHOT - test - - - - org.openecomp.so - mso-catalog-db - ${project.version} - test - - - - org.apache.jmeter - ApacheJMeter_core - 2.13 - - test - - - commons-math3 - commons-math3 - - - commons-pool2 - commons-pool2 - - - - - - org.apache.jmeter - ApacheJMeter_http - 2.13 - - test - - - commons-math3 - commons-math3 - - - commons-pool2 - commons-pool2 - - - - - - org.apache.jmeter - ApacheJMeter_jdbc - 2.13 - - test - - - commons-math3 - commons-math3 - - - commons-pool2 - commons-pool2 - - - - - - - - - arquillian-tests - - - org.codehaus.groovy.maven - gmaven-plugin - - - generate-resources - - execute - - + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + 4.0.0 + + org.openecomp.so + packages + 1.1.0-SNAPSHOT + + + org.openecomp.so.packages + Arquillian Unit Testing on MSO + arquillian-unit-tests + + jar + + + + default-tests + + true + + + **/IntegrationTestsSuite.java + jboss-as + ${project.version} + + + + + + + + + + org.jboss.arquillian + arquillian-bom + 1.1.13.Final + import + pom + + + + org.jboss.spec + jboss-javaee-6.0 + 3.0.2.Final + pom + import + + + + + + + + + + + + + org.jboss.marshalling + jboss-marshalling + 1.3.16.GA + test + + + + org.jboss.arquillian.junit + arquillian-junit-container + test + + + + + org.wildfly.arquillian + wildfly-arquillian-container-remote + 1.1.0.Final + test + + + + org.jboss.remoting + jboss-remoting + 4.0.9.Final + test + + + + org.jboss.logging + jboss-logging + 3.2.1.Final + test + + + + org.jboss.arquillian.protocol + arquillian-protocol-servlet + test + + + + org.jboss.shrinkwrap.resolver + shrinkwrap-resolver-impl-maven + 2.2.6 + test + + + + + org.arquillian.cube + arquillian-cube-docker + 1.9.0 + test + + + + + + + org.hibernate + hibernate-core + 4.2.7.SP1 + test + + + org.hibernate + hibernate-entitymanager + 4.2.7.SP1 + test + + + + javax.validation + validation-api + 1.0.0.GA + test + + + org.jboss.as + jboss-as-ejb3 + 7.2.0.Final + test + + + + + com.smartbear.soapui + soapui + 5.1.0 + jar + test + + + thoughtworks + xstream + + + gnu.cajo + cajo + + + + + + commons-codec + commons-codec + 1.4 + jar + test + + + + org.seleniumhq.selenium + selenium-java + 2.45.0 + test + + + org.seleniumhq.selenium + selenium-firefox-driver + 2.45.0 + test + + + org.seleniumhq.selenium + selenium-server + 2.45.0 + test + + + + org.apache.httpcomponents + httpclient + + + org.apache.httpcomponents + httpcore + + + + org.openecomp.so + asdc-controller + ${project.version} + test + classes + + + + com.fasterxml.jackson.core + jackson-core + test + 2.8.7 + + + + org.mockito + mockito-all + 1.10.19 + test + + + + org.openecomp.sdc.sdc-distribution-client + sdc-distribution-client + 1.1.6-SNAPSHOT + test + + + + org.openecomp.so + mso-catalog-db + ${project.version} + test + + + + org.apache.jmeter + ApacheJMeter_core + 2.13 + + test + + + commons-math3 + commons-math3 + + + commons-pool2 + commons-pool2 + + + + + + org.apache.jmeter + ApacheJMeter_http + 2.13 + + test + + + commons-math3 + commons-math3 + + + commons-pool2 + commons-pool2 + + + + + + org.apache.jmeter + ApacheJMeter_jdbc + 2.13 + + test + + + commons-math3 + commons-math3 + + + commons-pool2 + commons-pool2 + + + + + + + + + arquillian-tests + + + org.codehaus.groovy.maven + gmaven-plugin + + + generate-resources + + execute + + if ( project.properties['docker.host'] != null ) { project.properties['docker.host.truncated']=project.properties['docker.host'].replaceFirst("^(http://|https://)",""); @@ -348,73 +319,73 @@ project.properties['mso.version']=project.properties['mso.project.version']; } - - - - - - - - org.codehaus.mojo - wagon-maven-plugin - 1.0 - - - download-mariadb-connector - pre-integration-test - - download-single - - - http://central.maven.org/ - maven2/org/mariadb/jdbc/mariadb-java-client/1.5.4/mariadb-java-client-1.5.4.jar - ${project.build.directory}/mariadb-connector - - - - - - org.apache.maven.plugins - maven-failsafe-plugin - 2.16 - - - - - integration-test - verify - - - 1 - - - - - - - ${container-to-start} - ${project.build.directory} - ${docker.host} - ${docker.host.truncated} - ${mso.version} - - ${project.build.directory}/surefire-reports - true - - ${it-suite-to-execute} - - - - - - org.apache.maven.plugins - maven-surefire-plugin - - - true - - - - + + + + + + + + org.codehaus.mojo + wagon-maven-plugin + 1.0 + + + download-mariadb-connector + pre-integration-test + + download-single + + + http://central.maven.org/ + maven2/org/mariadb/jdbc/mariadb-java-client/1.5.4/mariadb-java-client-1.5.4.jar + ${project.build.directory}/mariadb-connector + + + + + + org.apache.maven.plugins + maven-failsafe-plugin + 2.16 + + + + + integration-test + verify + + + 1 + + + + + + + ${container-to-start} + ${project.build.directory} + ${docker.host} + ${docker.host.truncated} + ${mso.version} + + ${project.build.directory}/surefire-reports + true + + ${it-suite-to-execute} + + + + + + org.apache.maven.plugins + maven-surefire-plugin + + + true + + + + diff --git a/packages/arquillian-unit-tests/src/test/resources/arquillian.xml b/packages/arquillian-unit-tests/src/test/resources/arquillian.xml index 7377d16729..649b3083fb 100644 --- a/packages/arquillian-unit-tests/src/test/resources/arquillian.xml +++ b/packages/arquillian-unit-tests/src/test/resources/arquillian.xml @@ -12,7 +12,7 @@ - 1.23 + 1.24 ${docker.url} CUBE -- cgit 1.2.3-korg