You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by ri...@apache.org on 2017/04/11 20:23:28 UTC
[1/3] brooklyn-server git commit: Fix
FeatureInstallationTest#testBrooklynLocationsJcloudsFeature
Repository: brooklyn-server
Updated Branches:
refs/heads/master 688567409 -> a9662dff0
Fix FeatureInstallationTest#testBrooklynLocationsJcloudsFeature
It needs to find `brooklyn-locations-jclouds` bundles, so make sure they
are in the `target/features-repo`
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/afcaa462
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/afcaa462
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/afcaa462
Branch: refs/heads/master
Commit: afcaa46287382ab46c5bfc997f71894bdd4c808e
Parents: 6885674
Author: Aled Sage <al...@gmail.com>
Authored: Tue Apr 11 20:30:18 2017 +0100
Committer: Aled Sage <al...@gmail.com>
Committed: Tue Apr 11 20:30:18 2017 +0100
----------------------------------------------------------------------
karaf/itests/pom.xml | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/afcaa462/karaf/itests/pom.xml
----------------------------------------------------------------------
diff --git a/karaf/itests/pom.xml b/karaf/itests/pom.xml
index 4ae4f8c..6ce50b1 100644
--- a/karaf/itests/pom.xml
+++ b/karaf/itests/pom.xml
@@ -148,6 +148,7 @@
<configuration>
<features>
<feature>brooklyn-core</feature>
+ <feature>brooklyn-locations-jclouds</feature>
</features>
<descriptors>
<descriptor>file:${project.build.directory}/features.xml</descriptor>
[2/3] brooklyn-server git commit: Fix FeatureInstallationTest’s features-repo
Posted by ri...@apache.org.
Fix FeatureInstallationTest\u2019s features-repo
\u201c@releases\u201d is not a valid option - it creates an empty directory with
the suffix \u201c@releases\u201d if the artefacts can\u2019t be found in the other
repos (e.g. in ~/.m2/repository).
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/f5025641
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/f5025641
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/f5025641
Branch: refs/heads/master
Commit: f50256418d2f4c9d0a9e82048a6035afb50b3b1c
Parents: afcaa46
Author: Aled Sage <al...@gmail.com>
Authored: Tue Apr 11 20:31:34 2017 +0100
Committer: Aled Sage <al...@gmail.com>
Committed: Tue Apr 11 20:31:34 2017 +0100
----------------------------------------------------------------------
.../org/apache/brooklyn/karaf/itests/FeatureInstallationTest.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/f5025641/karaf/itests/src/test/java/org/apache/brooklyn/karaf/itests/FeatureInstallationTest.java
----------------------------------------------------------------------
diff --git a/karaf/itests/src/test/java/org/apache/brooklyn/karaf/itests/FeatureInstallationTest.java b/karaf/itests/src/test/java/org/apache/brooklyn/karaf/itests/FeatureInstallationTest.java
index 7749ff4..a9cf63e 100644
--- a/karaf/itests/src/test/java/org/apache/brooklyn/karaf/itests/FeatureInstallationTest.java
+++ b/karaf/itests/src/test/java/org/apache/brooklyn/karaf/itests/FeatureInstallationTest.java
@@ -76,7 +76,7 @@ public class FeatureInstallationTest extends TestBase {
editConfigurationFileExtend(
"etc/org.ops4j.pax.url.mvn.cfg",
"org.ops4j.pax.url.mvn.repositories",
- "file:"+System.getProperty("features.repo")+"@id=local@snapshots@releases"),
+ "file:"+System.getProperty("features.repo")+"@id=local@snapshots"),
logLevel(LogLevelOption.LogLevel.INFO),
};
}
[3/3] brooklyn-server git commit: Merge and close #629
Posted by ri...@apache.org.
Merge and close #629
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/a9662dff
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/a9662dff
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/a9662dff
Branch: refs/heads/master
Commit: a9662dff0a9cf7db0f635e9da45d287c0ba22b2d
Parents: 6885674 f502564
Author: Richard Downer <ri...@apache.org>
Authored: Tue Apr 11 21:22:23 2017 +0100
Committer: Richard Downer <ri...@apache.org>
Committed: Tue Apr 11 21:22:23 2017 +0100
----------------------------------------------------------------------
karaf/itests/pom.xml | 1 +
.../org/apache/brooklyn/karaf/itests/FeatureInstallationTest.java | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------