brooklyn-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hadr...@apache.org
Subject [1/4] incubator-brooklyn git commit: Fix failing integration tests.
Date Fri, 27 Nov 2015 21:56:07 GMT
Repository: incubator-brooklyn
Updated Branches:
  refs/heads/master 1337affeb -> fdbc28338


Fix failing integration tests.


Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/9e179c27
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/9e179c27
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/9e179c27

Branch: refs/heads/master
Commit: 9e179c27db5b3225f12ea5bc4703ba51bd7fe309
Parents: b03f77e
Author: Ɓukasz Dywicki <luke@code-house.org>
Authored: Mon Nov 9 17:48:05 2015 +0100
Committer: Ciprian Ciubotariu <cheepeero@gmx.net>
Committed: Fri Nov 27 20:12:58 2015 +0200

----------------------------------------------------------------------
 karaf/itest/pom.xml | 6 ++++++
 karaf/pom.xml       | 2 +-
 pom.xml             | 1 +
 3 files changed, 8 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/9e179c27/karaf/itest/pom.xml
----------------------------------------------------------------------
diff --git a/karaf/itest/pom.xml b/karaf/itest/pom.xml
index f9f8319..7e10b1b 100644
--- a/karaf/itest/pom.xml
+++ b/karaf/itest/pom.xml
@@ -153,6 +153,12 @@
             <type>zip</type>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-jta_1.1_spec</artifactId>
+            <version>${geronimo-jta_1.1_spec.version}</version>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
 
     <build>

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/9e179c27/karaf/pom.xml
----------------------------------------------------------------------
diff --git a/karaf/pom.xml b/karaf/pom.xml
index f703864..f7768ba 100644
--- a/karaf/pom.xml
+++ b/karaf/pom.xml
@@ -54,7 +54,7 @@
     <module>features</module>
     <module>apache-brooklyn</module>
     <module>commands</module>
-    <!-- module>itest</module -->
+    <module>itest</module>
   </modules>
   
   <dependencyManagement>

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/9e179c27/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index d3563e0..c053053 100644
--- a/pom.xml
+++ b/pom.xml
@@ -135,6 +135,7 @@
         <maven-war-plugin.version>2.4</maven-war-plugin.version>
         <validation-api.version>1.1.0.Final</validation-api.version>
         <geronimo-jms_1.1_spec.version>1.1.1</geronimo-jms_1.1_spec.version>
+        <geronimo-jta_1.1_spec.version>1.1.1</geronimo-jta_1.1_spec.version>
         <sleepycat-je.version>5.0.34</sleepycat-je.version>
         <org.marre.smsj.version>1.0.0-20051126</org.marre.smsj.version>
         <mysql-connector-java.version>5.1.18</mysql-connector-java.version>


Mime
View raw message