You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by he...@apache.org on 2015/10/28 01:56:25 UTC
[01/12] incubator-brooklyn git commit: Ignore testCompile phase in
Eclipse so the Groovy plugin is not required
Repository: incubator-brooklyn
Updated Branches:
refs/heads/master aef4da8a0 -> 86dbfbf49
Ignore testCompile phase in Eclipse so the Groovy plugin is not required
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/56a9eb8b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/56a9eb8b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/56a9eb8b
Branch: refs/heads/master
Commit: 56a9eb8b76f0e8c67169fe4c2372e0486aba5f8f
Parents: 25e1c31
Author: Svetoslav Neykov <sv...@cloudsoftcorp.com>
Authored: Mon Oct 26 16:11:57 2015 +0200
Committer: Svetoslav Neykov <sv...@cloudsoftcorp.com>
Committed: Mon Oct 26 16:45:52 2015 +0200
----------------------------------------------------------------------
core/pom.xml | 29 +++++++++++++++++++++++++++++
usage/downstream-parent/pom.xml | 1 +
2 files changed, 30 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/56a9eb8b/core/pom.xml
----------------------------------------------------------------------
diff --git a/core/pom.xml b/core/pom.xml
index 1a0e04b..af3d7b1 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -265,5 +265,34 @@
</dependencies>
</plugin>
</plugins>
+ <pluginManagement>
+ <plugins>
+ <!--This plugin's configuration is used to store Eclipse m2e settings only. It has no influence on the Maven build itself.-->
+ <plugin>
+ <groupId>org.eclipse.m2e</groupId>
+ <artifactId>lifecycle-mapping</artifactId>
+ <version>1.0.0</version>
+ <configuration>
+ <lifecycleMappingMetadata>
+ <pluginExecutions>
+ <pluginExecution>
+ <pluginExecutionFilter>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <versionRange>[3.3,)</versionRange>
+ <goals>
+ <goal>testCompile</goal>
+ </goals>
+ </pluginExecutionFilter>
+ <action>
+ <ignore></ignore>
+ </action>
+ </pluginExecution>
+ </pluginExecutions>
+ </lifecycleMappingMetadata>
+ </configuration>
+ </plugin>
+ </plugins>
+ </pluginManagement>
</build>
</project>
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/56a9eb8b/usage/downstream-parent/pom.xml
----------------------------------------------------------------------
diff --git a/usage/downstream-parent/pom.xml b/usage/downstream-parent/pom.xml
index 974f367..be889de 100644
--- a/usage/downstream-parent/pom.xml
+++ b/usage/downstream-parent/pom.xml
@@ -62,6 +62,7 @@
<jersey.version>1.18.1</jersey.version>
<httpclient.version>4.4.1</httpclient.version>
<commons-lang3.version>3.1</commons-lang3.version>
+ <groovy.version>2.3.4</groovy.version> <!-- Version supported by https://github.com/groovy/groovy-eclipse/wiki/Groovy-Eclipse-2.9.0-Release-Notes -->
<jsr305.version>2.0.1</jsr305.version>
<snakeyaml.version>1.11</snakeyaml.version>
</properties>
[07/12] incubator-brooklyn git commit: [BROOKLYN-183] Re-add deleted
interfaces with deprecated annotation
Posted by he...@apache.org.
[BROOKLYN-183] Re-add deleted interfaces with deprecated annotation
Implemented in terms of newer classes and/or functions during OSGification.
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/a145b55c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/a145b55c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/a145b55c
Branch: refs/heads/master
Commit: a145b55c9edff4776fb807467a75eb8c43904d8e
Parents: a929b7b
Author: Ciprian Ciubotariu <ch...@gmx.net>
Authored: Tue Oct 27 22:29:14 2015 +0200
Committer: Ciprian Ciubotariu <ch...@gmx.net>
Committed: Tue Oct 27 22:29:14 2015 +0200
----------------------------------------------------------------------
.../core/mgmt/persist/XmlMementoSerializer.java | 4 +-
.../apache/brooklyn/util/core/osgi/Osgis.java | 66 +++++++++++++++++++-
2 files changed, 65 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a145b55c/core/src/main/java/org/apache/brooklyn/core/mgmt/persist/XmlMementoSerializer.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/brooklyn/core/mgmt/persist/XmlMementoSerializer.java b/core/src/main/java/org/apache/brooklyn/core/mgmt/persist/XmlMementoSerializer.java
index 6e1ac65..3d2ecef 100644
--- a/core/src/main/java/org/apache/brooklyn/core/mgmt/persist/XmlMementoSerializer.java
+++ b/core/src/main/java/org/apache/brooklyn/core/mgmt/persist/XmlMementoSerializer.java
@@ -352,7 +352,7 @@ public class XmlMementoSerializer<T> extends XmlSerializer<T> implements Memento
// Perhaps context.getRequiredType(); can be used instead?
// Other users of xstream (e.g. jenkinsci) manually check for resoved-to and class attributes
// for compatibility with older versions of xstream
- public static Class readClassType(HierarchicalStreamReader reader, Mapper mapper) {
+ private static Class readClassType(HierarchicalStreamReader reader, Mapper mapper) {
String classAttribute = readClassAttribute(reader, mapper);
Class type;
if (classAttribute == null) {
@@ -363,7 +363,7 @@ public class XmlMementoSerializer<T> extends XmlSerializer<T> implements Memento
return type;
}
- public static String readClassAttribute(HierarchicalStreamReader reader, Mapper mapper) {
+ private static String readClassAttribute(HierarchicalStreamReader reader, Mapper mapper) {
String attributeName = mapper.aliasForSystemAttribute("resolves-to");
String classAttribute = attributeName == null ? null : reader.getAttribute(attributeName);
if (classAttribute == null) {
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a145b55c/core/src/main/java/org/apache/brooklyn/util/core/osgi/Osgis.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/brooklyn/util/core/osgi/Osgis.java b/core/src/main/java/org/apache/brooklyn/util/core/osgi/Osgis.java
index f3603d8..006604d 100644
--- a/core/src/main/java/org/apache/brooklyn/util/core/osgi/Osgis.java
+++ b/core/src/main/java/org/apache/brooklyn/util/core/osgi/Osgis.java
@@ -51,12 +51,15 @@ import org.apache.brooklyn.util.stream.Streams;
import org.apache.brooklyn.util.text.Strings;
import com.google.common.annotations.Beta;
+import com.google.common.base.Function;
import com.google.common.base.Joiner;
import com.google.common.base.Predicate;
import com.google.common.base.Predicates;
+import java.util.Map;
import org.apache.brooklyn.util.osgi.OsgiUtils;
import org.osgi.framework.FrameworkUtil;
import org.osgi.framework.ServiceReference;
+import org.osgi.framework.launch.FrameworkFactory;
/**
* utilities for working with osgi.
@@ -71,7 +74,23 @@ public class Osgis {
private static final String EXTENSION_PROTOCOL = "system";
private static final Set<String> SYSTEM_BUNDLES = MutableSet.of();
-
+ /** @deprecated since 0.9.0, replaced with {@link org.apache.brooklyn.util.osgi.VersionedName} */
+ @Deprecated
+ public static class VersionedName extends org.apache.brooklyn.util.osgi.VersionedName {
+
+ private VersionedName(org.apache.brooklyn.util.osgi.VersionedName src) {
+ super(src.getSymbolicName(), src.getVersion());
+ }
+
+ public VersionedName(Bundle b) {
+ super(b);
+ }
+
+ public VersionedName(String symbolicName, Version version) {
+ super(symbolicName, version);
+ }
+ }
+
public static class BundleFinder {
protected final Framework framework;
protected String symbolicName;
@@ -98,14 +117,14 @@ public class Osgis {
if (Strings.isBlank(symbolicNameOptionallyWithVersion))
return this;
- Maybe<VersionedName> nv = OsgiUtils.parseOsgiIdentifier(symbolicNameOptionallyWithVersion);
+ Maybe<org.apache.brooklyn.util.osgi.VersionedName> nv = OsgiUtils.parseOsgiIdentifier(symbolicNameOptionallyWithVersion);
if (nv.isAbsent())
throw new IllegalArgumentException("Cannot parse symbolic-name:version string '"+symbolicNameOptionallyWithVersion+"'");
return id(nv.get());
}
- private BundleFinder id(VersionedName nv) {
+ private BundleFinder id(org.apache.brooklyn.util.osgi.VersionedName nv) {
symbolicName(nv.getSymbolicName());
if (nv.getVersion() != null) {
version(nv.getVersion().toString());
@@ -277,6 +296,18 @@ public class Osgis {
return bundleFinder(framework).symbolicName(symbolicName).version(Predicates.equalTo(version)).findUnique();
}
+ /** @deprecated since 0.9.0, replaced by {@link EmbeddedFelixFramework#newFrameworkFactory() */
+ @Deprecated
+ public static FrameworkFactory newFrameworkFactory() {
+ return EmbeddedFelixFramework.newFrameworkFactory();
+ }
+
+ /** @deprecated since 0.9.0, replaced by {@link #getFramework(java.lang.String, boolean) } */
+ @Deprecated
+ public static Framework newFrameworkStarted(String felixCacheDir, boolean clean, Map<?,?> extraStartupConfig) {
+ return getFramework(felixCacheDir, clean);
+ }
+
/**
* Provides an OSGI framework.
*
@@ -329,6 +360,18 @@ public class Osgis {
return FrameworkUtil.getBundle(Framework.class) != null;
}
+ /** @deprecated since 0.9.0, replaced with {@link OsgiUtils#getVersionedId(org.osgi.framework.Bundle) } */
+ @Deprecated
+ public static String getVersionedId(Bundle b) {
+ return OsgiUtils.getVersionedId(b);
+ }
+
+ /** @deprecated since 0.9.0, replaced with {@link OsgiUtils#getVersionedId(java.util.jar.Manifest) } */
+ @Deprecated
+ public static String getVersionedId(Manifest manifest) {
+ return OsgiUtils.getVersionedId(manifest);
+ }
+
/**
* Installs a bundle from the given URL, doing a check if already installed, and
* using the {@link ResourceUtils} loader for this project (brooklyn core)
@@ -425,4 +468,21 @@ public class Osgis {
EXTENSION_PROTOCOL.equals(Urls.getProtocol(location));
}
+ /** @deprecated since 0.9.0, replaced with {@link OsgiUtils#parseOsgiIdentifier(java.lang.String) } */
+ @Deprecated
+ public static Maybe<VersionedName> parseOsgiIdentifier(String symbolicNameOptionalWithVersion) {
+ final Maybe<org.apache.brooklyn.util.osgi.VersionedName> original = OsgiUtils.parseOsgiIdentifier(symbolicNameOptionalWithVersion);
+ return original.transform(new Function<org.apache.brooklyn.util.osgi.VersionedName, VersionedName>() {
+ @Override
+ public VersionedName apply(org.apache.brooklyn.util.osgi.VersionedName input) {
+ return new VersionedName(input);
+ }
+ });
+ }
+
+ /** @deprecated since 0.9.0, replaced with {@link org.apache.brooklyn.rt.felix.ManifestHelper} */
+ @Deprecated
+ public static class ManifestHelper extends org.apache.brooklyn.rt.felix.ManifestHelper {
+
+ }
}
[11/12] incubator-brooklyn git commit: This closes #992
Posted by he...@apache.org.
This closes #992
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/ace8c406
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/ace8c406
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/ace8c406
Branch: refs/heads/master
Commit: ace8c4067e77c551ee58c861a3e3ba2862b22189
Parents: aef4da8 2aaf125
Author: Alex Heneveld <al...@cloudsoftcorp.com>
Authored: Wed Oct 28 00:53:16 2015 +0000
Committer: Alex Heneveld <al...@cloudsoftcorp.com>
Committed: Wed Oct 28 00:53:16 2015 +0000
----------------------------------------------------------------------
.../core/mgmt/persist/XmlMementoSerializer.java | 4 +-
.../apache/brooklyn/util/core/osgi/Osgis.java | 66 +++++++++++++++++++-
karaf/commands/pom.xml | 5 ++
.../apache/brooklyn/karaf/commands/Catalog.java | 2 +
karaf/itest/pom.xml | 3 +-
.../java/org/apache/brooklyn/AssemblyTest.java | 31 +++++----
karaf/pom.xml | 6 +-
7 files changed, 96 insertions(+), 21 deletions(-)
----------------------------------------------------------------------
[08/12] incubator-brooklyn git commit: [BROOKLYN-183] Annotate
karaf-command with @Beta
Posted by he...@apache.org.
[BROOKLYN-183] Annotate karaf-command with @Beta
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/21a3857d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/21a3857d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/21a3857d
Branch: refs/heads/master
Commit: 21a3857d77b8f22a9601413f55ea913db9c76f20
Parents: a145b55
Author: Ciprian Ciubotariu <ch...@gmx.net>
Authored: Tue Oct 27 22:30:37 2015 +0200
Committer: Ciprian Ciubotariu <ch...@gmx.net>
Committed: Tue Oct 27 22:30:37 2015 +0200
----------------------------------------------------------------------
karaf/commands/pom.xml | 5 +++++
.../main/java/org/apache/brooklyn/karaf/commands/Catalog.java | 2 ++
2 files changed, 7 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/21a3857d/karaf/commands/pom.xml
----------------------------------------------------------------------
diff --git a/karaf/commands/pom.xml b/karaf/commands/pom.xml
index f3c60e6..1f59219 100644
--- a/karaf/commands/pom.xml
+++ b/karaf/commands/pom.xml
@@ -55,6 +55,11 @@
<scope>provided</scope>
</dependency>
+ <dependency>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
+ <version>${guava.version}</version>
+ </dependency>
</dependencies>
<build>
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/21a3857d/karaf/commands/src/main/java/org/apache/brooklyn/karaf/commands/Catalog.java
----------------------------------------------------------------------
diff --git a/karaf/commands/src/main/java/org/apache/brooklyn/karaf/commands/Catalog.java b/karaf/commands/src/main/java/org/apache/brooklyn/karaf/commands/Catalog.java
index 406df8f..762672b 100644
--- a/karaf/commands/src/main/java/org/apache/brooklyn/karaf/commands/Catalog.java
+++ b/karaf/commands/src/main/java/org/apache/brooklyn/karaf/commands/Catalog.java
@@ -18,12 +18,14 @@
*/
package org.apache.brooklyn.karaf.commands;
+import com.google.common.annotations.Beta;
import org.apache.karaf.shell.api.action.Action;
import org.apache.karaf.shell.api.action.Argument;
import org.apache.karaf.shell.api.action.Command;
import org.apache.karaf.shell.api.action.Option;
import org.apache.karaf.shell.api.action.lifecycle.Service;
+@Beta
@Command(scope = "brooklyn", name = "catalog", description = "Manage the local brooklyn catalog")
@Service
public class Catalog implements Action {
[10/12] incubator-brooklyn git commit: [BROOKLYN-183] Fix
brooklyn-itest compilation
Posted by he...@apache.org.
[BROOKLYN-183] Fix brooklyn-itest compilation
Running tests still fails.
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/2aaf1251
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/2aaf1251
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/2aaf1251
Branch: refs/heads/master
Commit: 2aaf125107757f6861a44421d8515fe0faad9761
Parents: dc6e5aa
Author: Ciprian Ciubotariu <ch...@gmx.net>
Authored: Wed Oct 28 00:25:56 2015 +0200
Committer: Ciprian Ciubotariu <ch...@gmx.net>
Committed: Wed Oct 28 00:25:56 2015 +0200
----------------------------------------------------------------------
.../test/java/org/apache/brooklyn/AssemblyTest.java | 15 +++++++++++++--
1 file changed, 13 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2aaf1251/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 180d4d2..ad67105 100644
--- a/karaf/itest/src/test/java/org/apache/brooklyn/AssemblyTest.java
+++ b/karaf/itest/src/test/java/org/apache/brooklyn/AssemblyTest.java
@@ -19,6 +19,7 @@
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;
@@ -37,18 +38,20 @@ import org.apache.karaf.features.FeaturesService;
import org.ops4j.pax.exam.Configuration;
import org.ops4j.pax.exam.Option;
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.
*/
-@RunWith(PaxExam.class)
+@Listeners(PaxExam.class)
@ExamReactorStrategy(PerClass.class)
public class AssemblyTest {
@@ -75,10 +78,18 @@ public class AssemblyTest {
configureConsole().ignoreLocalConsole(),
logLevel(LogLevel.INFO),
keepRuntimeFolder(),
- features(karafStandardFeaturesRepository(), "eventadmin")
+ features(karafStandardFeaturesRepository(), "eventadmin"),
+ addTestNGBundle()
};
}
+ private static MavenArtifactProvisionOption addTestNGBundle() {
+ return mavenBundle()
+ .groupId("org.testng")
+ .artifactId("testng")
+ .version(asInProject());
+ }
+
private static MavenArtifactUrlReference brooklynKarafDist() {
return maven()
.groupId("org.apache.brooklyn")
[06/12] incubator-brooklyn git commit: [BROOKLYN-183] Temporarily
brooklyn-itest module
Posted by he...@apache.org.
[BROOKLYN-183] Temporarily brooklyn-itest module
Breaks the build when maven is run with custom local repo location.
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/a929b7b4
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/a929b7b4
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/a929b7b4
Branch: refs/heads/master
Commit: a929b7b4cd9a3d68318fef24bb2d239999b23d58
Parents: af6cbb9
Author: Ciprian Ciubotariu <ch...@gmx.net>
Authored: Tue Oct 27 22:27:56 2015 +0200
Committer: Ciprian Ciubotariu <ch...@gmx.net>
Committed: Tue Oct 27 22:27:56 2015 +0200
----------------------------------------------------------------------
karaf/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a929b7b4/karaf/pom.xml
----------------------------------------------------------------------
diff --git a/karaf/pom.xml b/karaf/pom.xml
index c865aab..99ff41d 100644
--- a/karaf/pom.xml
+++ b/karaf/pom.xml
@@ -50,7 +50,7 @@
<module>features</module>
<module>apache-brooklyn</module>
<module>commands</module>
- <module>itest</module>
+ <!-- module>itest</module -->
</modules>
<dependencyManagement>
[02/12] incubator-brooklyn git commit: Upgrade groovy compiler to
latest release
Posted by he...@apache.org.
Upgrade groovy compiler to latest release
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/e030bb31
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/e030bb31
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/e030bb31
Branch: refs/heads/master
Commit: e030bb31a600ad7ecf0c8c921ca73b75ab287459
Parents: 56a9eb8
Author: Svetoslav Neykov <sv...@cloudsoftcorp.com>
Authored: Mon Oct 26 16:26:30 2015 +0200
Committer: Svetoslav Neykov <sv...@cloudsoftcorp.com>
Committed: Mon Oct 26 16:46:39 2015 +0200
----------------------------------------------------------------------
core/pom.xml | 4 ++--
parent/pom.xml | 2 +-
usage/downstream-parent/pom.xml | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/e030bb31/core/pom.xml
----------------------------------------------------------------------
diff --git a/core/pom.xml b/core/pom.xml
index af3d7b1..4cfc7f7 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -255,12 +255,12 @@
<dependency>
<groupId>org.codehaus.groovy</groupId>
<artifactId>groovy-eclipse-compiler</artifactId>
- <version>2.9.0-01</version>
+ <version>2.9.1-01</version>
</dependency>
<dependency>
<groupId>org.codehaus.groovy</groupId>
<artifactId>groovy-eclipse-batch</artifactId>
- <version>2.3.4-01</version>
+ <version>2.4.3-01</version>
</dependency>
</dependencies>
</plugin>
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/e030bb31/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index 42ec0b1..f8c889d 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -82,7 +82,7 @@
<jersey.version>1.18.1</jersey.version>
<httpclient.version>4.4.1</httpclient.version>
<commons-lang3.version>3.1</commons-lang3.version>
- <groovy.version>2.3.4</groovy.version> <!-- Version supported by https://github.com/groovy/groovy-eclipse/wiki/Groovy-Eclipse-2.9.0-Release-Notes -->
+ <groovy.version>2.3.7</groovy.version> <!-- Version supported by https://github.com/groovy/groovy-eclipse/wiki/Groovy-Eclipse-2.9.1-Release-Notes -->
<jsr305.version>2.0.1</jsr305.version>
<snakeyaml.version>1.11</snakeyaml.version>
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/e030bb31/usage/downstream-parent/pom.xml
----------------------------------------------------------------------
diff --git a/usage/downstream-parent/pom.xml b/usage/downstream-parent/pom.xml
index be889de..9ce2329 100644
--- a/usage/downstream-parent/pom.xml
+++ b/usage/downstream-parent/pom.xml
@@ -62,7 +62,7 @@
<jersey.version>1.18.1</jersey.version>
<httpclient.version>4.4.1</httpclient.version>
<commons-lang3.version>3.1</commons-lang3.version>
- <groovy.version>2.3.4</groovy.version> <!-- Version supported by https://github.com/groovy/groovy-eclipse/wiki/Groovy-Eclipse-2.9.0-Release-Notes -->
+ <groovy.version>2.3.7</groovy.version> <!-- Version supported by https://github.com/groovy/groovy-eclipse/wiki/Groovy-Eclipse-2.9.1-Release-Notes -->
<jsr305.version>2.0.1</jsr305.version>
<snakeyaml.version>1.11</snakeyaml.version>
</properties>
[03/12] incubator-brooklyn git commit: Update docs to reflect that
Groovy plugin is no longer needed in Eclipse
Posted by he...@apache.org.
Update docs to reflect that Groovy plugin is no longer needed in Eclipse
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/a24e58e7
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/a24e58e7
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/a24e58e7
Branch: refs/heads/master
Commit: a24e58e7c89bf12bf5b4da54b5c9b7a842cf6fea
Parents: e030bb3
Author: Svetoslav Neykov <sv...@cloudsoftcorp.com>
Authored: Mon Oct 26 17:07:58 2015 +0200
Committer: Svetoslav Neykov <sv...@cloudsoftcorp.com>
Committed: Mon Oct 26 17:07:58 2015 +0200
----------------------------------------------------------------------
docs/guide/dev/env/ide/eclipse.include.md | 13 ++-----
docs/guide/dev/env/ide/index.md | 48 ++++++++++----------------
2 files changed, 21 insertions(+), 40 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a24e58e7/docs/guide/dev/env/ide/eclipse.include.md
----------------------------------------------------------------------
diff --git a/docs/guide/dev/env/ide/eclipse.include.md b/docs/guide/dev/env/ide/eclipse.include.md
index 76fe927..1b663d1 100644
--- a/docs/guide/dev/env/ide/eclipse.include.md
+++ b/docs/guide/dev/env/ide/eclipse.include.md
@@ -1,13 +1,6 @@
-
-- Maven Plugin: m2e from [download.eclipse.org/technology/m2e/releases](http://download.eclipse.org/technology/m2e/releases), or for kepler [http://download.eclipse.org/releases/kepler](http://download.eclipse.org/releases/kepler)
- (typically bundled with Eclipse or available in the default update site set)
-
-- Git Plugin: egit from [download.eclipse.org/egit/updates](http://download.eclipse.org/egit/updates)
- (typically bundled with Eclipse or available in the default update site set)
-
-- Groovy Plugin: GRECLIPSE from
- [dist.springsource.org/release/GRECLIPSE/e4.3/](http://dist.springsource.org/release/GRECLIPSE/e4.3/);
- Be sure to include Groovy 2.3.4 compiler support and Maven-Eclipse (m2e) support.
+- Groovy Plugin: GRECLIPSE from
+ [dist.springsource.org/snapshot/GRECLIPSE/e4.5/](http://dist.springsource.org/snapshot/GRECLIPSE/e4.5/);
+ Be sure to include Groovy 2.3 compiler support and Maven-Eclipse (m2e) support.
More details including download sites for other versions can be found at the [Groovy Eclipse Plugin site](http://groovy.codehaus.org/Eclipse+Plugin).
- TestNG Plugin: beust TestNG from [beust.com/eclipse](http://beust.com/eclipse)
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a24e58e7/docs/guide/dev/env/ide/index.md
----------------------------------------------------------------------
diff --git a/docs/guide/dev/env/ide/index.md b/docs/guide/dev/env/ide/index.md
index d833251..826db28 100644
--- a/docs/guide/dev/env/ide/index.md
+++ b/docs/guide/dev/env/ide/index.md
@@ -4,7 +4,7 @@ title: IDE Setup
toc: /guide/toc.json
---
-Gone are the days when IDE integration always just works... Maven and Eclipse fight,
+Gone are the days when IDE integration always just works... Maven and Eclipse fight,
neither quite gets along perfectly with Groovy,
git branch switches (sooo nice) can be slow, etc etc.
@@ -13,40 +13,39 @@ making it much easier to run tests and debug.
As a general tip, don't always trust the IDE to build correctly; if you hit a snag,
do a command-line ``mvn clean install`` (optionally with ``-DskipTests``)
-then refresh the project.
+then refresh the project.
See instructions below for specific IDEs.
## Eclipse
-If you're an Eclipse user, you'll probably want the Maven (m2e) plugin
-and the Groovy Eclipse plugin (used for testing and examples primarily).
-You may also want Git and TestNG plugins.
+The default Eclipse downloads already include all of the plugins needed for
+working with the Brooklyn project. Optionally you can install the
+Groovy and TestNG plugins, but they are not required for building the project.
You can install these using Help -> Install New Software, or from the Eclipse Marketplace:
{% readj eclipse.include.md %}
-As of this writing, Eclipse 4.2 and Eclipse 4.3 are commonly used,
-and the codebase can be imported (Import -> Existing Maven Projects)
+As of this writing, Eclipse 4.5 and Eclipse 4.4 are commonly used,
+and the codebase can be imported (Import -> Existing Maven Projects)
and successfully built and run inside an IDE.
However there are quirks, and mileage may vary.
If you encounter issues, the following hints may be helpful:
-* If you attempt to import projects before the plugins are installed, you may encounter errors such as
- '``No marketplace entries found to handle maven-compiler-plugin:2.3.2:compile in Eclipse``',
- and the projects will not be recognized as java projects. If you do, simply cancel the import
- (or delete the imported projects if they have been imported) and install the plugins as described above.
- If you have installed plugins from alternative locations, remove them and re-install them from the locations
- specified above.
+* If m2e reports import problems, it is usually okay (even good) to mark all to "Resolve All Later".
+ The build-helper connector is useful if you're prompted for it, but
+ do *not* install the Tycho OSGi configurator (this causes show-stopping IAE's, and we don't need Eclipse to make bundles anyway).
+ You can manually mark as permanently ignored certain errors;
+ this updates the pom.xml (and should be current).
* A quick command-line build (`mvn clean install -DskipTests`) followed by a workspace refresh
can be useful to re-populate files which need to be copied to `target/`
-
+
* m2e likes to put `excluding="**"` on `resources` directories; if you're seeing funny missing files
(things like not resolving jclouds/aws-ec2 locations or missing WARs), try building clean install
- from the command-line then doing Maven -> Update Project (clean uses a maven-replacer-plugin to fix
+ from the command-line then doing Maven -> Update Project (clean uses a maven-replacer-plugin to fix
`.classpath`s).
Alternatively you can go through and remove these manually in Eclipse (Build Path -> Configure)
or the filesystem, or use
@@ -56,12 +55,6 @@ If you encounter issues, the following hints may be helpful:
% find . -name .classpath -exec sed -i.bak 's/[ ]*..cluding="[\*\/]*\(\.java\)*"//g' {} \;
{% endhighlight %}
-* If m2e reports import problems, it is usually okay (even good) to mark all to "Resolve All Later".
- The build-helper connector is useful if you're prompted for it, but
- do *not* install the Tycho OSGi configurator (this causes show-stopping IAE's, and we don't need Eclipse to make bundles anyway).
- You can manually mark as permanently ignored certain errors;
- this updates the pom.xml (and should be current).
-
* You may need to ensure ``src/main/{java,resources}`` is created in each project dir,
if (older versions) complain about missing directories,
and the same for ``src/test/{java,resources}`` *if* there are tests (``src/test`` exists):
@@ -70,13 +63,8 @@ If you encounter issues, the following hints may be helpful:
find . \( -path "*/src/main" -or -path "*/src/test" \) -exec echo {} \; -exec mkdir -p {}/{java,resources} \;
{% endhighlight %}
-* You may need to add the groovy nature (or even java nature) to projects;
- with some maven-eclipse plugins this works fine,
- but for others (older ones) you may need to handcraft these
- (either right-click the project in the Package Explorer and choose Configure,
- or edit the ``.project`` manually adding it to the project properties).
-
-If the pain starts to be too much, come find us on IRC #brooklyncentral or [elsewhere]({{site.path.website}}/community/) and we can hopefully share our pearls.
+If the pain starts to be too much, come find us on IRC #brooklyncentral or
+[elsewhere]({{site.path.website}}/community/) and we can hopefully share our pearls.
(And if you have a tip we haven't mentioned please let us know that too!)
@@ -84,7 +72,7 @@ If the pain starts to be too much, come find us on IRC #brooklyncentral or [else
## IntelliJ IDEA
To develop or debug Brooklyn in IntelliJ, you will need to ensure that the Groovy and TestNG plugins are installed
-via the IntelliJ IDEA | Preferences | Plugins menu. Once installed, you can open Brooklyn from the root folder,
+via the IntelliJ IDEA | Preferences | Plugins menu. Once installed, you can open Brooklyn from the root folder,
(e.g. ``~/myfiles/brooklyn``) which will automatically open the subprojects.
Brooklyn has informally standardized on arranging `import` statements as per Eclipse's default configuration.
@@ -115,5 +103,5 @@ to the Maven Runner by clicking on the Maven Settings icon in the Maven Projects
When running at the command line you can enable remote connections so that one can attach a debugger to the Java process:
Run Java with the following on the command line or in JAVA_OPTS: ``-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=5005``
-To debug a brooklyn instance that has been run with the above JAVA_OPTS, create a remote build configuration (IntelliJ -
+To debug a brooklyn instance that has been run with the above JAVA_OPTS, create a remote build configuration (IntelliJ -
Run | Edit Configurations | + | Remote) with the default options, ensuring the port matches the address specified in JAVA_OPTS.
[04/12] incubator-brooklyn git commit: Add a tip to disable "Build
Automatically" in Eclipse
Posted by he...@apache.org.
Add a tip to disable "Build Automatically" in Eclipse
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/bd69f04f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/bd69f04f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/bd69f04f
Branch: refs/heads/master
Commit: bd69f04ff940f0a46fcafb53fe48fee315896759
Parents: a24e58e
Author: Svetoslav Neykov <sv...@cloudsoftcorp.com>
Authored: Mon Oct 26 17:46:06 2015 +0200
Committer: Svetoslav Neykov <sv...@cloudsoftcorp.com>
Committed: Mon Oct 26 17:46:06 2015 +0200
----------------------------------------------------------------------
docs/guide/dev/env/ide/index.md | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/bd69f04f/docs/guide/dev/env/ide/index.md
----------------------------------------------------------------------
diff --git a/docs/guide/dev/env/ide/index.md b/docs/guide/dev/env/ide/index.md
index 826db28..60ad11d 100644
--- a/docs/guide/dev/env/ide/index.md
+++ b/docs/guide/dev/env/ide/index.md
@@ -30,7 +30,8 @@ You can install these using Help -> Install New Software, or from the Eclipse Ma
As of this writing, Eclipse 4.5 and Eclipse 4.4 are commonly used,
and the codebase can be imported (Import -> Existing Maven Projects)
and successfully built and run inside an IDE.
-However there are quirks, and mileage may vary.
+However there are quirks, and mileage may vary. Disable ``Build Automatically``
+from the ``Project`` menu if the IDE is slow to respond.
If you encounter issues, the following hints may be helpful:
[05/12] incubator-brooklyn git commit: [BROOKLYN-183] Bump to
karaf-4.0.2
Posted by he...@apache.org.
[BROOKLYN-183] Bump to karaf-4.0.2
Fixes the apache-brooklyn (karaf assembly) build problem when the local
maven repo is set to a custom location.
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/af6cbb9c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/af6cbb9c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/af6cbb9c
Branch: refs/heads/master
Commit: af6cbb9c9b9f37d9eea315501a1c4c84df4332dd
Parents: c6273b8
Author: Ciprian Ciubotariu <ch...@gmx.net>
Authored: Tue Oct 27 18:54:19 2015 +0200
Committer: Ciprian Ciubotariu <ch...@gmx.net>
Committed: Tue Oct 27 18:54:19 2015 +0200
----------------------------------------------------------------------
karaf/pom.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/af6cbb9c/karaf/pom.xml
----------------------------------------------------------------------
diff --git a/karaf/pom.xml b/karaf/pom.xml
index 9417336..c865aab 100644
--- a/karaf/pom.xml
+++ b/karaf/pom.xml
@@ -30,7 +30,7 @@
<packaging>pom</packaging>
<properties>
- <karaf.version>4.0.1</karaf.version>
+ <karaf.version>4.0.2</karaf.version>
<org.osgi.core.version>6.0.0</org.osgi.core.version>
<org.osgi.compendium.version>5.0.0</org.osgi.compendium.version>
@@ -140,4 +140,4 @@
</snapshots>
</repository>
</repositories>
-</project>
\ No newline at end of file
+</project>
[09/12] incubator-brooklyn git commit: [BROOKLYN-183] Drop junit deps
from brooklyn-itest
Posted by he...@apache.org.
[BROOKLYN-183] Drop junit deps from brooklyn-itest
Won't compile right now, but brooklyn-itest is disabled at the moment.
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/dc6e5aaa
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/dc6e5aaa
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/dc6e5aaa
Branch: refs/heads/master
Commit: dc6e5aaa93ee1628c8eac2a033724b50fb1c5556
Parents: 21a3857
Author: Ciprian Ciubotariu <ch...@gmx.net>
Authored: Tue Oct 27 22:31:09 2015 +0200
Committer: Ciprian Ciubotariu <ch...@gmx.net>
Committed: Tue Oct 27 22:31:09 2015 +0200
----------------------------------------------------------------------
karaf/itest/pom.xml | 3 +--
.../test/java/org/apache/brooklyn/AssemblyTest.java | 16 +++++++---------
2 files changed, 8 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/dc6e5aaa/karaf/itest/pom.xml
----------------------------------------------------------------------
diff --git a/karaf/itest/pom.xml b/karaf/itest/pom.xml
index 2055f44..f9f8319 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-junit4</artifactId>
+ <artifactId>pax-exam-testng</artifactId>
<version>${pax.exam.version}</version>
<scope>test</scope>
</dependency>
@@ -153,7 +153,6 @@
<type>zip</type>
<scope>test</scope>
</dependency>
-
</dependencies>
<build>
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/dc6e5aaa/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 ea620ab..180d4d2 100644
--- a/karaf/itest/src/test/java/org/apache/brooklyn/AssemblyTest.java
+++ b/karaf/itest/src/test/java/org/apache/brooklyn/AssemblyTest.java
@@ -18,9 +18,6 @@
*/
package org.apache.brooklyn;
-import static org.hamcrest.CoreMatchers.is;
-import static org.hamcrest.CoreMatchers.notNullValue;
-import static org.junit.Assert.assertThat;
import static org.ops4j.pax.exam.CoreOptions.maven;
import static org.ops4j.pax.exam.karaf.options.KarafDistributionOption.configureConsole;
import static org.ops4j.pax.exam.karaf.options.KarafDistributionOption.features;
@@ -28,6 +25,8 @@ import static org.ops4j.pax.exam.karaf.options.KarafDistributionOption.karafDist
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,17 +34,16 @@ import javax.inject.Inject;
import org.apache.karaf.features.BootFinished;
import org.apache.karaf.features.FeaturesService;
-import org.junit.Test;
-import org.junit.runner.RunWith;
import org.ops4j.pax.exam.Configuration;
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.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.Test;
/**
* Tests the apache-brooklyn karaf runtime assembly.
@@ -100,18 +98,18 @@ public class AssemblyTest {
@Test
public void shouldHaveBundleContext() {
- assertThat(bc, is(notNullValue()));
+ assertNotNull(bc);
}
@Test
public void checkEventFeature() throws Exception {
- assertThat(featuresService.isInstalled(featuresService.getFeature("eventadmin")), is(true));
+ assertTrue(featuresService.isInstalled(featuresService.getFeature("eventadmin")));
}
@Test
public void checkBrooklynCoreFeature() throws Exception {
featuresService.installFeature("brooklyn-core");
- assertThat(featuresService.isInstalled(featuresService.getFeature("brooklyn-core")), is(true));
+ assertTrue(featuresService.isInstalled(featuresService.getFeature("brooklyn-core")));
}
}
[12/12] incubator-brooklyn git commit: This closes #989
Posted by he...@apache.org.
This closes #989
Conflicts:
parent/pom.xml -- versions moved to root pom in master, while groovy version and comment version bumped; easily resolved
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/86dbfbf4
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/86dbfbf4
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/86dbfbf4
Branch: refs/heads/master
Commit: 86dbfbf499e478b239136d992e32d6a35c11e9b7
Parents: ace8c40 bd69f04
Author: Alex Heneveld <al...@cloudsoftcorp.com>
Authored: Wed Oct 28 00:55:34 2015 +0000
Committer: Alex Heneveld <al...@cloudsoftcorp.com>
Committed: Wed Oct 28 00:55:34 2015 +0000
----------------------------------------------------------------------
core/pom.xml | 33 ++++++++++++++++-
docs/guide/dev/env/ide/eclipse.include.md | 13 ++-----
docs/guide/dev/env/ide/index.md | 51 ++++++++++----------------
pom.xml | 2 +-
usage/downstream-parent/pom.xml | 1 +
5 files changed, 56 insertions(+), 44 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/86dbfbf4/core/pom.xml
----------------------------------------------------------------------
diff --cc core/pom.xml
index aafc73e,4cfc7f7..12f01d9
--- a/core/pom.xml
+++ b/core/pom.xml
@@@ -270,24 -264,35 +270,53 @@@
</dependency>
</dependencies>
</plugin>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <configuration>
+ <supportedProjectTypes>
+ <supportedProjectType>jar</supportedProjectType>
+ </supportedProjectTypes>
+ <instructions>
+ <Export-Package>brooklyn.*,org.apache.brooklyn.*</Export-Package>
+ <Import-Package>
+ !org.apache.brooklyn.rt.felix,
+ *
+ </Import-Package>
+ <Implementation-SHA-1>${buildNumber}</Implementation-SHA-1>
+ <Implementation-Branch>${scmBranch}</Implementation-Branch>
+ </instructions>
+ </configuration>
+ </plugin>
</plugins>
+ <pluginManagement>
+ <plugins>
+ <!--This plugin's configuration is used to store Eclipse m2e settings only. It has no influence on the Maven build itself.-->
+ <plugin>
+ <groupId>org.eclipse.m2e</groupId>
+ <artifactId>lifecycle-mapping</artifactId>
+ <version>1.0.0</version>
+ <configuration>
+ <lifecycleMappingMetadata>
+ <pluginExecutions>
+ <pluginExecution>
+ <pluginExecutionFilter>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <versionRange>[3.3,)</versionRange>
+ <goals>
+ <goal>testCompile</goal>
+ </goals>
+ </pluginExecutionFilter>
+ <action>
+ <ignore></ignore>
+ </action>
+ </pluginExecution>
+ </pluginExecutions>
+ </lifecycleMappingMetadata>
+ </configuration>
+ </plugin>
+ </plugins>
+ </pluginManagement>
</build>
</project>
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/86dbfbf4/pom.xml
----------------------------------------------------------------------
diff --cc pom.xml
index 804b9e3,8e4c265..5624c80
--- a/pom.xml
+++ b/pom.xml
@@@ -78,116 -76,7 +78,116 @@@
<java.version>1.7</java.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
- <brooklyn.version>0.9.0-SNAPSHOT</brooklyn.version> <!-- BROOKLYN_VERSION -->
+
+ <!-- Testing -->
+ <cobertura.plugin.version>2.7</cobertura.plugin.version>
+ <surefire.version>2.18.1</surefire.version>
+ <plantuml.version>6121</plantuml.version>
+ <ant.version>1.8.4</ant.version>
+ <includedTestGroups />
+ <excludedTestGroups>Integration,Acceptance,Live,WIP</excludedTestGroups>
+ <surefire.failIfNoSpecifiedTests>false</surefire.failIfNoSpecifiedTests>
+
+ <!-- Dependencies -->
+ <jclouds.groupId>org.apache.jclouds</jclouds.groupId> <!-- JCLOUDS_GROUPID_VERSION -->
+
+ <!-- These dependencies also appear in usage/downstream-parent/pom.xml -
+ - please synchronise versions between these two pom files -->
+ <jclouds.version>1.9.1</jclouds.version> <!-- JCLOUDS_VERSION -->
+ <logback.version>1.0.7</logback.version>
+ <slf4j.version>1.6.6</slf4j.version> <!-- used for java.util.logging jul-to-slf4j interception -->
+ <guava.version>17.0</guava.version>
+ <xstream.version>1.4.7</xstream.version>
+ <jackson.version>1.9.13</jackson.version> <!-- codehaus jackson, used by brooklyn rest server -->
+ <fasterxml.jackson.version>2.4.2</fasterxml.jackson.version> <!-- more recent jackson, but not compatible with old annotations! -->
+ <jersey.version>1.18.1</jersey.version>
+ <httpclient.version>4.4.1</httpclient.version>
+ <commons-lang3.version>3.1</commons-lang3.version>
- <groovy.version>2.3.4</groovy.version> <!-- Version supported by https://github.com/groovy/groovy-eclipse/wiki/Groovy-Eclipse-2.9.0-Release-Notes -->
++ <groovy.version>2.3.7</groovy.version> <!-- Version supported by https://github.com/groovy/groovy-eclipse/wiki/Groovy-Eclipse-2.9.1-Release-Notes -->
+ <jsr305.version>2.0.1</jsr305.version>
+ <snakeyaml.version>1.11</snakeyaml.version>
+
+ <!-- Ordinary dependencies -->
+ <testng.version>6.8.8</testng.version>
+ <mockito.version>1.10.8</mockito.version>
+ <swagger.version>1.0.1</swagger.version>
+ <jansi.version>1.2.1</jansi.version>
+ <gson.version>2.3</gson.version>
+ <ivy.version>2.2.0</ivy.version>
+ <mx4j.version>3.0.1</mx4j.version>
+ <bouncycastle.version>1.49</bouncycastle.version>
+ <sshj.version>0.8.1</sshj.version>
+ <felix.framework.version>4.4.0</felix.framework.version>
+ <reflections.version>0.9.9-RC1</reflections.version>
+ <jetty.version>8.1.17.v20150415</jetty.version>
+ <airline.version>0.6</airline.version>
+ <mockwebserver.version>20121111</mockwebserver.version>
+ <freemarker.version>2.3.22</freemarker.version>
+ <commons-io.version>2.4</commons-io.version>
+ <hazelcast.version>3.0</hazelcast.version>
+ <jsonPath.version>2.0.0</jsonPath.version>
+ <commons-compress.version>1.4</commons-compress.version>
+ <qpid.version>0.20</qpid.version>
+ <mongodb.version>3.0.3</mongodb.version>
+ <riak.version>1.4.0</riak.version>
+ <maven-war-plugin.version>2.4</maven-war-plugin.version>
+ <validation-api.version>1.0.0.GA</validation-api.version>
+ <geronimo-jms_1.1_spec.version>1.1.1</geronimo-jms_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>
+ <hadoop.version>1.0.2</hadoop.version>
+ <commons-cli.version>1.2</commons-cli.version>
+ <postgresql.version>9.1-901.jdbc4</postgresql.version>
+ <activemq.version>5.10.0</activemq.version>
+ <rabbitmq-version>2.8.7</rabbitmq-version>
+ <kafka.version>0.8.2.1</kafka.version>
+ <storm.version>0.8.2</storm.version>
+ <redis.version>1.5.2</redis.version>
+ <astyanax.version>1.56.24</astyanax.version>
+ <jcouchdb.version>0.11.0-1</jcouchdb.version>
+ <solr.version>4.7.0</solr.version>
+ <jtidy.version>r8-20060801</jtidy.version>
+ <opendmk_jmxremote_optional_jar.version>1.0-b01-ea</opendmk_jmxremote_optional_jar.version>
+ <resteasy.version>3.0.8.Final</resteasy.version>
+ <maven-dependency-plugin.version>2.8</maven-dependency-plugin.version>
+ <jopt.version>4.3</jopt.version>
+ <concurrentlinkedhashmap.version>1.0_jdk5</concurrentlinkedhashmap.version>
+ <maven-replacer-plugin.version>1.5.2</maven-replacer-plugin.version>
+ <nodejs-maven-plugin.version>1.0.3</nodejs-maven-plugin.version>
+ <nodejs-maven-binaries.version>0.10.25</nodejs-maven-binaries.version>
+ <jasmine-maven-plugin.version>1.3.1.5</jasmine-maven-plugin.version>
+ <requirejs-maven-plugin.version>2.0.0</requirejs-maven-plugin.version>
+ <maven-antrun-plugin.version>1.7</maven-antrun-plugin.version>
+ <jetty-orbit-javax-servlet.version>3.0.0.v201112011016</jetty-orbit-javax-servlet.version>
+ <jcommander.version>1.27</jcommander.version>
+ <xml-apis.version>1.0.b2</xml-apis.version>
+ <jsr250-api.version>1.0</jsr250-api.version>
+ <guice.version>3.0</guice.version>
+ <javax-inject.version>1</javax-inject.version>
+ <aopalliance.version>1.0</aopalliance.version>
+ <commons-configuration.version>1.7</commons-configuration.version>
+ <commons-lang.version>2.4</commons-lang.version>
+ <hamcrest.version>1.1</hamcrest.version>
+ <jsr311-api.version>1.1.1</jsr311-api.version>
+ <maxmind.version>0.8.1</maxmind.version>
+ <jna.version>4.0.0</jna.version>
+ <winrm4j.version>0.1.0</winrm4j.version>
+ <coverage.target>${working.dir}</coverage.target>
+
+ <!-- Transitive dependencies, declared explicitly to avoid version mismatch -->
+ <clojure.version>1.4.0</clojure.version>
+ <zookeeper.version>3.3.4</zookeeper.version>
+ <ring-core.version>1.1.5</ring-core.version>
+ <clj-time.version>0.4.1</clj-time.version>
+ <commons-codec.version>1.9</commons-codec.version>
+ <log4j.version>1.2.17</log4j.version>
+ <commons-logging.version>1.2</commons-logging.version>
+ <jline.version>2.12</jline.version>
+ <jsonSmart.version>2.1.1</jsonSmart.version>
+ <minidev.asm.version>1.0.2</minidev.asm.version>
+
+ <!-- Compilation -->
</properties>
<modules>