You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by ha...@apache.org on 2015/11/27 22:56:07 UTC
[1/4] incubator-brooklyn git commit: Fix failing integration tests.
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 <lu...@code-house.org>
Authored: Mon Nov 9 17:48:05 2015 +0100
Committer: Ciprian Ciubotariu <ch...@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>
[4/4] incubator-brooklyn git commit: This closes #1075
Posted by ha...@apache.org.
This closes #1075
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/fdbc2833
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/fdbc2833
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/fdbc2833
Branch: refs/heads/master
Commit: fdbc2833816bcbcac796124e33faa278ca9f6a9f
Parents: 1337aff 6192772
Author: Hadrian Zbarcea <ha...@apache.org>
Authored: Fri Nov 27 16:35:28 2015 -0500
Committer: Hadrian Zbarcea <ha...@apache.org>
Committed: Fri Nov 27 16:35:28 2015 -0500
----------------------------------------------------------------------
karaf/itest/pom.xml | 24 +++++++++++++++-----
.../java/org/apache/brooklyn/AssemblyTest.java | 24 +++++++-------------
karaf/pom.xml | 4 ++--
pom.xml | 1 +
4 files changed, 29 insertions(+), 24 deletions(-)
----------------------------------------------------------------------
[2/4] incubator-brooklyn git commit: [BROOKLYN-183] Move to
pax-exam-4.6.0
Posted by ha...@apache.org.
[BROOKLYN-183] Move to pax-exam-4.6.0
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/8067eed6
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/8067eed6
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/8067eed6
Branch: refs/heads/master
Commit: 8067eed65f4ddddad36668303b6abeda8b768213
Parents: 9e179c2
Author: Ciprian Ciubotariu <ch...@gmx.net>
Authored: Fri Nov 27 19:55:17 2015 +0200
Committer: Ciprian Ciubotariu <ch...@gmx.net>
Committed: Fri Nov 27 20:12:59 2015 +0200
----------------------------------------------------------------------
karaf/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/8067eed6/karaf/pom.xml
----------------------------------------------------------------------
diff --git a/karaf/pom.xml b/karaf/pom.xml
index f7768ba..5e5ab67 100644
--- a/karaf/pom.xml
+++ b/karaf/pom.xml
@@ -38,7 +38,7 @@
<lifecycle-mapping-plugin.version>1.0.0</lifecycle-mapping-plugin.version>
<!-- pax-exam -->
- <pax.exam.version>4.5.0</pax.exam.version>
+ <pax.exam.version>4.6.0</pax.exam.version>
<pax.url.version>2.4.1</pax.url.version>
<ops4j.base.version>1.5.0</ops4j.base.version>
[3/4] incubator-brooklyn git commit: [BROOKLYN-183] Use junit4 in
brooklyn-itest
Posted by ha...@apache.org.
[BROOKLYN-183] Use junit4 in brooklyn-itest
pax-exam-4.6.0 is not properly tested with test-ng, leading to obscure behavior
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/61927720
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/61927720
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/61927720
Branch: refs/heads/master
Commit: 61927720d705ff7f574ae6527790484953901c1d
Parents: 8067eed
Author: Ciprian Ciubotariu <ch...@gmx.net>
Authored: Fri Nov 27 20:00:36 2015 +0200
Committer: Ciprian Ciubotariu <ch...@gmx.net>
Committed: Fri Nov 27 20:12:59 2015 +0200
----------------------------------------------------------------------
karaf/itest/pom.xml | 18 ++++++++++-----
.../java/org/apache/brooklyn/AssemblyTest.java | 24 +++++++-------------
2 files changed, 20 insertions(+), 22 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/61927720/karaf/itest/pom.xml
----------------------------------------------------------------------
diff --git a/karaf/itest/pom.xml b/karaf/itest/pom.xml
index 7e10b1b..888727c 100644
--- a/karaf/itest/pom.xml
+++ b/karaf/itest/pom.xml
@@ -33,7 +33,7 @@
<!-- Pax Exam Dependencies -->
<dependency>
<groupId>org.ops4j.pax.exam</groupId>
- <artifactId>pax-exam-testng</artifactId>
+ <artifactId>pax-exam-junit4</artifactId>
<version>${pax.exam.version}</version>
<scope>test</scope>
</dependency>
@@ -45,6 +45,13 @@
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>4.12</version>
+ <scope>test</scope>
+ </dependency>
+
<!-- Karaf Container -->
<dependency>
<groupId>org.ops4j.pax.exam</groupId>
@@ -90,10 +97,10 @@
</dependency>
<dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-atinject_1.0_spec</artifactId>
- <version>1.0</version>
- <scope>provided</scope>
+ <groupId>javax.inject</groupId>
+ <artifactId>javax.inject</artifactId>
+ <version>1</version> <!-- TODO: version property? -->
+ <scope>test</scope>
</dependency>
<dependency>
@@ -180,7 +187,6 @@
<executions>
<execution>
<id>generate-depends-file</id>
- <phase>generate-resources</phase>
<goals>
<goal>generate-depends-file</goal>
</goals>
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/61927720/karaf/itest/src/test/java/org/apache/brooklyn/AssemblyTest.java
----------------------------------------------------------------------
diff --git a/karaf/itest/src/test/java/org/apache/brooklyn/AssemblyTest.java b/karaf/itest/src/test/java/org/apache/brooklyn/AssemblyTest.java
index ad67105..49f9ea6 100644
--- a/karaf/itest/src/test/java/org/apache/brooklyn/AssemblyTest.java
+++ b/karaf/itest/src/test/java/org/apache/brooklyn/AssemblyTest.java
@@ -19,15 +19,12 @@
package org.apache.brooklyn;
import static org.ops4j.pax.exam.CoreOptions.maven;
-import static org.ops4j.pax.exam.CoreOptions.mavenBundle;
import static org.ops4j.pax.exam.karaf.options.KarafDistributionOption.configureConsole;
import static org.ops4j.pax.exam.karaf.options.KarafDistributionOption.features;
import static org.ops4j.pax.exam.karaf.options.KarafDistributionOption.karafDistributionConfiguration;
import static org.ops4j.pax.exam.karaf.options.KarafDistributionOption.keepRuntimeFolder;
import static org.ops4j.pax.exam.karaf.options.KarafDistributionOption.logLevel;
import static org.ops4j.pax.exam.MavenUtils.asInProject;
-import static org.testng.Assert.assertNotNull;
-import static org.testng.Assert.assertTrue;
import java.io.File;
@@ -35,23 +32,25 @@ import javax.inject.Inject;
import org.apache.karaf.features.BootFinished;
import org.apache.karaf.features.FeaturesService;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+import org.junit.runner.RunWith;
+import org.junit.Test;
import org.ops4j.pax.exam.Configuration;
+import static org.ops4j.pax.exam.CoreOptions.junitBundles;
import org.ops4j.pax.exam.Option;
+import org.ops4j.pax.exam.junit.PaxExam;
import org.ops4j.pax.exam.karaf.options.LogLevelOption.LogLevel;
-import org.ops4j.pax.exam.options.MavenArtifactProvisionOption;
import org.ops4j.pax.exam.options.MavenArtifactUrlReference;
import org.ops4j.pax.exam.options.MavenUrlReference;
import org.ops4j.pax.exam.spi.reactors.ExamReactorStrategy;
import org.ops4j.pax.exam.spi.reactors.PerClass;
-import org.ops4j.pax.exam.testng.listener.PaxExam;
import org.osgi.framework.BundleContext;
-import org.testng.annotations.Listeners;
-import org.testng.annotations.Test;
/**
* Tests the apache-brooklyn karaf runtime assembly.
*/
-@Listeners(PaxExam.class)
+@RunWith(PaxExam.class)
@ExamReactorStrategy(PerClass.class)
public class AssemblyTest {
@@ -79,17 +78,10 @@ public class AssemblyTest {
logLevel(LogLevel.INFO),
keepRuntimeFolder(),
features(karafStandardFeaturesRepository(), "eventadmin"),
- addTestNGBundle()
+ junitBundles()
};
}
- private static MavenArtifactProvisionOption addTestNGBundle() {
- return mavenBundle()
- .groupId("org.testng")
- .artifactId("testng")
- .version(asInProject());
- }
-
private static MavenArtifactUrlReference brooklynKarafDist() {
return maven()
.groupId("org.apache.brooklyn")