Attempt to fix itest failures by addressing dependency version missM…

…atches.
rhq-project · Oct 3, 2014 · 109f4f3 · 109f4f3
1 parent 63511b8
commit 109f4f3
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/modules/enterprise/server/itests-2/pom.xml b/modules/enterprise/server/itests-2/pom.xml
@@ -95,6 +95,8 @@
     <!-- FOR RHQ TESTING -->
     <system-properties>
         <property name="project.version" value="${project.version}"/>
+        <property name="rhq-core-client-api.version" value="${rhq-core-client-api.version}"/>
+        <property name="rhq-platform-plugin.version" value="${rhq-platform-plugin.version}"/>
         <property name="rhq.server.content.filesystem" value="${jboss.unzip.location}/standalone/data/packagebits" />
         <property name="jboss.socket.binding.port-offset" value="${jboss.socket.binding.port-offset}" />
         <property name="hibernate.dialect" value="${rhq.test.ds.hibernate-dialect}" />

diff --git a/...rprise/server/itests-2/src/test/java/org/rhq/enterprise/server/test/AbstractEJB3Test.java b/...rprise/server/itests-2/src/test/java/org/rhq/enterprise/server/test/AbstractEJB3Test.java
@@ -327,6 +327,8 @@ protected static EnterpriseArchive getBaseDeployment() {
 
         // create test ear by starting with rhq.ear and thinning it
         String projectVersion = System.getProperty("project.version");
+        String rhqCoreClientApiVersion = System.getProperty("rhq-core-client-api.version");
+        String rhqPlatformPluginVersion = System.getProperty("rhq-platform-plugin.version");
         MavenResolverSystem earResolver = Resolvers.use(MavenResolverSystem.class);
         // this must be named rhq.ear because the "rhq" portion is used in the jndi names
         earResolver.offline();
@@ -374,7 +376,10 @@ protected static EnterpriseArchive getBaseDeployment() {
         thirdPartyDeps.add("org.liquibase:liquibase-core");
         thirdPartyDeps.add("org.powermock:powermock-api-mockito");
         thirdPartyDeps.add("org.rhq.helpers:perftest-support:" + projectVersion);
-        thirdPartyDeps.add("org.rhq:rhq-core-client-api:jar:tests:" + projectVersion);
+        //        thirdPartyDeps.add("org.rhq:rhq-core-client-api:jar:tests:" + projectVersion);
+        thirdPartyDeps.add("org.rhq:rhq-core-client-api:jar:tests:" + rhqCoreClientApiVersion);
+        thirdPartyDeps.add("org.rhq:rhq-platform-plugin:jar:tests:" + rhqPlatformPluginVersion);
+
         thirdPartyDeps.add("org.rhq:test-utils:" + projectVersion);
 
         MavenResolverSystem resolver = Maven.resolver();