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 2021/11/13 11:14:18 UTC
[brooklyn-dist] branch master updated (bfa134e -> 50b6ef4)
This is an automated email from the ASF dual-hosted git repository.
heneveld pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/brooklyn-dist.git.
from bfa134e Revert "tidy up features / essential deps"
new 9faae1e slight reorg of feature defs - use essential deps feature
new 0c103fa exclude unwrapped eddsa and sshj, since now we wrap them in brooklyn
new 8738ba0 rejig all's pom so that dependents get better ordering of dependencies
new 278adb8 remove weird excludes in osgi instructions for downstream projects
new 0aea854 move a few more bundles to be loaded earlier
new 4c29451 add more deps earlier in feature -- makes it start with no refreshes!
new 50b6ef4 This closes #179
The 7 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
all/pom.xml | 12 ++-
downstream-parent/pom.xml | 20 +----
karaf/features/src/main/feature/feature.xml | 30 ++++---
.../resources/etc/org.apache.karaf.features.xml | 13 +--
.../main/resources/resources/etc/custom.properties | 93 ----------------------
5 files changed, 34 insertions(+), 134 deletions(-)
[brooklyn-dist] 01/07: slight reorg of feature defs - use essential deps feature
Posted by he...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
heneveld pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/brooklyn-dist.git
commit 9faae1e078bbb62f2808baea580f1dcf0041ed5c
Author: Alex Heneveld <al...@cloudsoftcorp.com>
AuthorDate: Wed Nov 10 12:41:28 2021 +0000
slight reorg of feature defs - use essential deps feature
---
karaf/features/src/main/feature/feature.xml | 17 +++++++++--------
1 file changed, 9 insertions(+), 8 deletions(-)
diff --git a/karaf/features/src/main/feature/feature.xml b/karaf/features/src/main/feature/feature.xml
index 51cf55b..4517095 100644
--- a/karaf/features/src/main/feature/feature.xml
+++ b/karaf/features/src/main/feature/feature.xml
@@ -55,16 +55,15 @@
<feature name="brooklyn-startup-features" version="${project.version}" description="Bundles to load early">
<!-- this might not be needed as a separate feature anymore; the load order has changed -->
+ <!-- use jakarta not servicemix -->
+ <bundle dependency="true">mvn:com.sun.activation/jakarta.activation/${jakarta.activation.version}</bundle>
<!-- <bundle dependency="true">mvn:org.apache.servicemix.specs.activation-api-1.1</bundle>-->
<!-- <bundle dependency="true">mvn:org.apache.servicemix.specs.activation-api-1.1/2.9.0</bundle>-->
- <bundle dependency="true">mvn:com.sun.activation/jakarta.activation/${jakarta.activation.version}</bundle>
+
<!-- Register javax.mail along with pax-logging-service so it doesn't get refreshed later -->
<bundle dependency="true">mvn:javax.mail/mail/${javax.mail.version}</bundle>
- </feature>
- <feature name="brooklyn-guava-optional-deps" version="${project.version}" description="Guava dependencies to avoid refreshing the bundle">
- <!-- Register javax.annotation (coming from cxf-jaxrs) before guava so it doesn't get rewired when it sees it -->
- <bundle>mvn:jakarta.annotation/jakarta.annotation-api/${jakarta.annotation-api.version}</bundle>
+ <bundle dependency="true">mvn:jakarta.annotation/jakarta.annotation-api/${jakarta.annotation-api.version}</bundle>
</feature>
<feature name="brooklyn-config" version="${project.version}">
@@ -88,11 +87,13 @@
</configfile>
</feature>
- <feature name="brooklyn-headless" version="${project.version}" description="All Brooklyn bundles witht the exception of the launcher">
+ <feature name="brooklyn-headless" version="${project.version}" description="All Brooklyn bundles with the exception of the launcher and actual ui+rest">
+ <feature prerequisite="true">brooklyn-startup-features</feature>
+ <feature prerequisite="true">brooklyn-standard-karaf</feature>
<feature prerequisite="true">brooklyn-config</feature>
<feature prerequisite="true">brooklyn-catalog</feature>
- <feature prerequisite="true">brooklyn-standard-karaf</feature>
- <feature prerequisite="true">brooklyn-guava-optional-deps</feature>
+ <feature prerequisite="true">brooklyn-essential-deps</feature>
+
<feature>brooklyn-core</feature>
<feature>brooklyn-locations-jclouds</feature>
<feature>brooklyn-commands</feature>
[brooklyn-dist] 05/07: move a few more bundles to be loaded earlier
Posted by he...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
heneveld pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/brooklyn-dist.git
commit 0aea854a969cdd7d96d2e33a0e341239f982d133
Author: Alex Heneveld <al...@cloudsoftcorp.com>
AuthorDate: Fri Nov 12 15:56:57 2021 +0000
move a few more bundles to be loaded earlier
will hopefully cut down on refreshes, esp sshd.osgi
---
karaf/features/src/main/feature/feature.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/karaf/features/src/main/feature/feature.xml b/karaf/features/src/main/feature/feature.xml
index f187e2e..4881b1c 100644
--- a/karaf/features/src/main/feature/feature.xml
+++ b/karaf/features/src/main/feature/feature.xml
@@ -88,10 +88,10 @@
<feature name="brooklyn-headless" version="${project.version}" description="All Brooklyn bundles with the exception of the launcher and actual ui+rest">
<feature prerequisite="true">brooklyn-startup-features</feature>
+ <feature prerequisite="true">brooklyn-essential-deps</feature>
<feature prerequisite="true">brooklyn-standard-karaf</feature>
<feature prerequisite="true">brooklyn-config</feature>
<feature prerequisite="true">brooklyn-catalog</feature>
- <feature prerequisite="true">brooklyn-essential-deps</feature>
<feature>brooklyn-core</feature>
<feature>brooklyn-locations-jclouds</feature>
[brooklyn-dist] 07/07: This closes #179
Posted by he...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
heneveld pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/brooklyn-dist.git
commit 50b6ef4ec2db51bb387b9bc1acee707d3467c9dc
Merge: bfa134e 4c29451
Author: Alex Heneveld <al...@cloudsoftcorp.com>
AuthorDate: Sat Nov 13 11:14:13 2021 +0000
This closes #179
all/pom.xml | 12 ++-
downstream-parent/pom.xml | 20 +----
karaf/features/src/main/feature/feature.xml | 30 ++++---
.../resources/etc/org.apache.karaf.features.xml | 13 +--
.../main/resources/resources/etc/custom.properties | 93 ----------------------
5 files changed, 34 insertions(+), 134 deletions(-)
[brooklyn-dist] 06/07: add more deps earlier in feature -- makes it start with no refreshes!
Posted by he...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
heneveld pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/brooklyn-dist.git
commit 4c2945171b9200d73fe9c90870517ed42d1921c0
Author: Alex Heneveld <al...@cloudsoftcorp.com>
AuthorDate: Sat Nov 13 09:08:30 2021 +0000
add more deps earlier in feature -- makes it start with no refreshes!
---
karaf/features/src/main/feature/feature.xml | 12 ++++++++----
1 file changed, 8 insertions(+), 4 deletions(-)
diff --git a/karaf/features/src/main/feature/feature.xml b/karaf/features/src/main/feature/feature.xml
index 4881b1c..adae39e 100644
--- a/karaf/features/src/main/feature/feature.xml
+++ b/karaf/features/src/main/feature/feature.xml
@@ -25,15 +25,23 @@
<feature name="brooklyn-standard-karaf" version="${project.version}" description="Karaf standard feature with RMI excluded">
<feature>wrap</feature>
+
+ <bundle start-level="9">mvn:org.apache.geronimo.specs/geronimo-osgi-registry/1.1</bundle> <!-- from cxf but triggers jetty restart so load early -->
+ <feature>brooklyn-jsgui-prereqs</feature> <!-- provides jetty for pax-web-core which we want, and much more which doesn't hurt -->
+ <feature>pax-web-core</feature> <!-- provides objectweb 8.0.1 for aries-proxy -->
+ <feature>aries-proxy</feature> <!-- seems confused about objectweb; feature declares 9.0 but bundle wires optionally to 8.0.1 -->
+
<feature>aries-blueprint</feature>
<feature>shell</feature>
<feature>shell-compat</feature>
<feature>feature</feature>
<feature>jaas</feature>
<feature>ssh</feature>
+
<!-- Don't load the feature as it opens ports protected by the default credentials -->
<!-- Could alternatively reconfigure the feature to use more restricted realm, but we don't use this functionality anyway. -->
<!-- feature>management</feature -->
+
<feature>bundle</feature>
<feature>config</feature>
<feature>deployer</feature>
@@ -45,10 +53,6 @@
<feature>package</feature>
<feature>service</feature>
<feature>system</feature>
-
- <!-- load BouncyCastle early, to avoid refreshing of org.apache.sshd.core later -->
- <bundle dependency="true">mvn:org.bouncycastle/bcprov-ext-jdk15on/${bouncycastle.version}</bundle>
- <bundle dependency="true">mvn:org.bouncycastle/bcpkix-jdk15on/${bouncycastle.version}</bundle>
</feature>
<feature name="brooklyn-startup-features" version="${project.version}" description="Bundles to load early">
[brooklyn-dist] 04/07: remove weird excludes in osgi instructions for downstream projects
Posted by he...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
heneveld pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/brooklyn-dist.git
commit 278adb893db32fd054a70bdc84ecc5f90bc95d33
Author: Alex Heneveld <al...@cloudsoftcorp.com>
AuthorDate: Thu Nov 11 09:39:10 2021 +0000
remove weird excludes in osgi instructions for downstream projects
---
downstream-parent/pom.xml | 20 ++------------------
1 file changed, 2 insertions(+), 18 deletions(-)
diff --git a/downstream-parent/pom.xml b/downstream-parent/pom.xml
index 921f285..4ae4f08 100644
--- a/downstream-parent/pom.xml
+++ b/downstream-parent/pom.xml
@@ -463,26 +463,10 @@
<configuration>
<supportedProjectTypes>
<supportedProjectType>jar</supportedProjectType>
+ <supportedProjectType>bundle</supportedProjectType>
</supportedProjectTypes>
<instructions>
- <!--
- Exclude packages used by Brooklyn that are not OSGi bundles. Including any
- of the below may cause bundles to fail to load into the catalogue with
- messages like "Unable to resolve 150.0: missing requirement [150.0]
- osgi.wiring.package; (osgi.wiring.package=com.maxmind.geoip2)".
- -->
- <Import-Package>
- !com.maxmind.geoip2.*,
- !io.airlift.command.*,
- !io.cloudsoft.winrm4j.*,
- !javax.inject.*,
- !org.apache.felix.framework.*,
- !org.osgi.jmx,
- !org.python.*,
- !org.reflections.*,
- !org.w3c.tidy.*,
- *
- </Import-Package>
+ <!-- previously many packages were excluded from import-package; that seems wrong, however -->
<!--
Brooklyn-Feature prefix triggers inclusion of the project's metadata in the
server's features list.
[brooklyn-dist] 02/07: exclude unwrapped eddsa and sshj, since now we wrap them in brooklyn
Posted by he...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
heneveld pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/brooklyn-dist.git
commit 0c103fa391df0dfbc32c7cf5117b76bee698196f
Author: Alex Heneveld <al...@cloudsoftcorp.com>
AuthorDate: Wed Nov 10 22:16:09 2021 +0000
exclude unwrapped eddsa and sshj, since now we wrap them in brooklyn
---
karaf/features/src/main/feature/feature.xml | 3 +-
.../resources/etc/org.apache.karaf.features.xml | 13 +--
.../main/resources/resources/etc/custom.properties | 93 ----------------------
3 files changed, 8 insertions(+), 101 deletions(-)
diff --git a/karaf/features/src/main/feature/feature.xml b/karaf/features/src/main/feature/feature.xml
index 4517095..f187e2e 100644
--- a/karaf/features/src/main/feature/feature.xml
+++ b/karaf/features/src/main/feature/feature.xml
@@ -46,8 +46,7 @@
<feature>service</feature>
<feature>system</feature>
- <!-- load BouncyCastle/eddsa early, to avoid refreshing of org.apache.sshd.core later -->
- <bundle dependency="true">mvn:net.i2p.crypto/eddsa/${eddsa.version}</bundle>
+ <!-- load BouncyCastle early, to avoid refreshing of org.apache.sshd.core later -->
<bundle dependency="true">mvn:org.bouncycastle/bcprov-ext-jdk15on/${bouncycastle.version}</bundle>
<bundle dependency="true">mvn:org.bouncycastle/bcpkix-jdk15on/${bouncycastle.version}</bundle>
</feature>
diff --git a/karaf/features/src/main/filtered-resources/resources/etc/org.apache.karaf.features.xml b/karaf/features/src/main/filtered-resources/resources/etc/org.apache.karaf.features.xml
index 96acbbc..e147bc5 100644
--- a/karaf/features/src/main/filtered-resources/resources/etc/org.apache.karaf.features.xml
+++ b/karaf/features/src/main/filtered-resources/resources/etc/org.apache.karaf.features.xml
@@ -70,10 +70,11 @@
replacement="mvn:org.bouncycastle/bcprov-ext-jdk15on/${bouncycastle.version}" />
<bundle originalUri="mvn:org.bouncycastle/bcpkix-jdk15on/[1.51,${bouncycastle.version}]"
replacement="mvn:org.bouncycastle/bcpkix-jdk15on/${bouncycastle.version}" />
- <bundle originalUri="mvn:net.i2p.crypto/eddsa/[0.1.0,${eddsa.version}]"
- replacement="mvn:net.i2p.crypto/eddsa/${eddsa.version}" />
- <bundle originalUri="mvn:com.hierynomus/sshj/[0.20.0,${sshj.version}]"
- replacement="mvn:com.hierynomus/sshj/${sshj.version}" />
+ <!-- now we wrap these so blacklist entirely -->
+<!-- <bundle originalUri="mvn:net.i2p.crypto/eddsa/[0.1.0,${eddsa.version}]"-->
+<!-- replacement="mvn:net.i2p.crypto/eddsa/${eddsa.version}" />-->
+<!-- <bundle originalUri="mvn:com.hierynomus/sshj/[0.20.0,${sshj.version}]"-->
+<!-- replacement="mvn:com.hierynomus/sshj/${sshj.version}" />-->
<!-- Lower versions of these pulled in by cxf-jackson and possibly others -->
@@ -192,8 +193,8 @@
<bundle>mvn:org.bouncycastle/bcprov-jdk15on/[1.51,${bouncycastle.version})</bundle>
<bundle>mvn:org.bouncycastle/bcprov-ext-jdk15on/[1.51,${bouncycastle.version})</bundle>
<bundle>mvn:org.bouncycastle/bcpkix-jdk15on/[1.51,${bouncycastle.version})</bundle>
- <bundle>mvn:net.i2p.crypto/eddsa/[0.1.0,${eddsa.version})</bundle>
- <bundle>mvn:com.hierynomus/sshj/[0.20.0,${sshj.version})</bundle>
+ <bundle>mvn:net.i2p.crypto/eddsa/[0.1.0,999]</bundle>
+ <bundle>mvn:com.hierynomus/sshj/[0.20.0,999]</bundle>
<bundle>mvn:org.yaml/snakeyaml/[1,${snakeyaml.version})</bundle>
<bundle>mvn:com.fasterxml.jackson.jaxrs/jackson-jaxrs-base/[2.10,${fasterxml.jackson.version})</bundle>
<bundle>mvn:com.fasterxml.jackson.jaxrs/jackson-jaxrs-json-provider/[2.10,${fasterxml.jackson.version})</bundle>
diff --git a/karaf/features/src/main/resources/resources/etc/custom.properties b/karaf/features/src/main/resources/resources/etc/custom.properties
index c9eb3e0..4ac5545 100644
--- a/karaf/features/src/main/resources/resources/etc/custom.properties
+++ b/karaf/features/src/main/resources/resources/etc/custom.properties
@@ -218,96 +218,3 @@ jre-1.8= \
org.xml.sax.helpers, \
com.sun.nio.sctp
-# brooklyn used 4.4.0 at the time of osgification, which differs from karaf's bundled felix version
-#karaf.framework.felix=mvn\:org.apache.felix/org.apache.felix.framework/${felix.framework.version}
-
-#karaf.systemBundlesStartLevel=50
-#
-#org.osgi.framework.bootdelegation=org.apache.karaf.jaas.boot,!com.sun.xml.messaging.saaj.*,!com.sun.xml.internal.bind.*,sun.*,com.sun.*,javax.transaction,javax.transaction.*,org.apache.xalan.processor,org.apache.xpath.jaxp,org.apache.xml.dtm.ref,org.apache.xerces.jaxp.datatype,org.apache.xerces.stax,org.apache.xerces.parsers,org.apache.xerces.jaxp,org.apache.xerces.jaxp.validation,org.apache.xerces.dom
-#
-#org.osgi.framework.system.packages.extra = \
-# org.apache.karaf.branding, \
-# com.sun.org.apache.xalan.internal.xsltc.trax, \
-# com.sun.org.apache.xerces.internal.dom, \
-# com.sun.org.apache.xerces.internal.jaxp, \
-# com.sun.org.apache.xerces.internal.xni, \
-# com.sun.jndi.ldap, \
-# org.apache.xalan.extensions; version="2.7.1", \
-# org.apache.xalan.xsltc.compiler; version="2.7.1", \
-# org.apache.xalan.xsltc.cmdline.getopt; version="2.7.1", \
-# org.apache.xalan.xsltc.util; version="2.7.1", \
-# org.apache.xalan.transformer; version="2.7.1", \
-# org.apache.xalan.xsltc.trax; version="2.7.1", \
-# org.apache.xalan.processor; version="2.7.1", \
-# org.apache.xalan.lib; version="2.7.1", \
-# org.apache.xalan.trace; version="2.7.1", \
-# org.apache.xalan.xsltc.compiler.util; version="2.7.1", \
-# org.apache.xalan.templates; version="2.7.1", \
-# org.apache.xalan.xsltc; version="2.7.1", \
-# org.apache.xalan.xsltc.runtime; version="2.7.1", \
-# org.apache.xalan; version="2.7.1", \
-# org.apache.xalan.xslt; version="2.7.1", \
-# org.apache.xalan.lib.sql; version="2.7.1", \
-# org.apache.xalan.xsltc.runtime.output; version="2.7.1", \
-# org.apache.xalan.xsltc.dom; version="2.7.1", \
-# org.apache.xalan.client; version="2.7.1", \
-# org.apache.xalan.xsltc.cmdline; version="2.7.1", \
-# org.apache.xalan.serialize; version="2.7.1", \
-# org.apache.xalan.res; version="2.7.1", \
-# org.apache.xml.dtm.ref; version="2.7.1", \
-# org.apache.xml.dtm; version="2.7.1", \
-# org.apache.xml.dtm.ref.sax2dtm; version="2.7.1", \
-# org.apache.xml.dtm.ref.dom2dtm; version="2.7.1", \
-# org.apache.xml.res; version="2.7.1", \
-# org.apache.xml.serializer.dom3; version="2.7.1", \
-# org.apache.xml.serializer; version="2.7.1", \
-# org.apache.xml.serializer.utils; version="2.7.1", \
-# org.apache.xml.utils.res; version="2.7.1", \
-# org.apache.xml.utils; version="2.7.1", \
-# org.apache.xpath.functions; version="2.7.1", \
-# org.apache.xpath.jaxp; version="2.7.1", \
-# org.apache.xpath.patterns; version="2.7.1", \
-# org.apache.xpath.objects; version="2.7.1", \
-# org.apache.xpath.res; version="2.7.1", \
-# org.apache.xpath; version="2.7.1", \
-# org.apache.xpath.axes; version="2.7.1", \
-# org.apache.xpath.compiler; version="2.7.1", \
-# org.apache.xpath.operations; version="2.7.1", \
-# org.apache.xpath.domapi; version="2.7.1", \
-# org.apache.html.dom; version="2.11.0", \
-# org.apache.wml.dom; version="2.11.0", \
-# org.apache.wml; version="2.11.0", \
-# org.apache.xerces.parsers; version="2.11.0", \
-# org.apache.xerces.impl.dtd.models; version="2.11.0", \
-# org.apache.xerces.xni.parser; version="2.11.0", \
-# org.apache.xerces.impl.dv.xs; version="2.11.0", \
-# org.apache.xerces.impl.xs.traversers; version="2.11.0", \
-# org.apache.xerces.util; version="2.11.0", \
-# org.apache.xerces.impl.dtd; version="2.11.0", \
-# org.apache.xerces.jaxp.validation; version="2.11.0", \
-# org.apache.xerces.dom3.as; version="2.11.0", \
-# org.apache.xerces.impl.dv; version="2.11.0", \
-# org.apache.xerces.jaxp; version="2.11.0", \
-# org.apache.xerces.jaxp.datatype; version="2.11.0", \
-# org.apache.xerces.impl.xpath.regex; version="2.11.0", \
-# org.apache.xerces.xni; version="2.11.0", \
-# org.apache.xerces.impl.msg; version="2.11.0", \
-# org.apache.xerces.impl.dv.util; version="2.11.0", \
-# org.apache.xerces.impl.xs.util; version="2.11.0", \
-# org.apache.xerces.dom; version="2.11.0", \
-# org.apache.xerces.dom.events; version="2.11.0", \
-# org.apache.xerces.impl.xs.opti; version="2.11.0", \
-# org.apache.xerces.impl; version="2.11.0", \
-# org.apache.xerces.xs; version="2.11.0", \
-# org.apache.xerces.impl.io; version="2.11.0", \
-# org.apache.xerces.xpointer; version="2.11.0", \
-# org.apache.xerces.impl.dv.dtd; version="2.11.0", \
-# org.apache.xerces.xinclude; version="2.11.0", \
-# org.apache.xerces.impl.xpath; version="2.11.0", \
-# org.apache.xerces.xs.datatypes; version="2.11.0", \
-# org.apache.xerces.impl.xs.identity; version="2.11.0", \
-# org.apache.xerces.impl.xs.models; version="2.11.0", \
-# org.apache.xerces.xni.grammars; version="2.11.0", \
-# org.apache.xerces.impl.xs; version="2.11.0", \
-# org.apache.xerces.impl.validation; version="2.11.0", \
-# org.apache.xml.serialize; version="2.11.0"
\ No newline at end of file
[brooklyn-dist] 03/07: rejig all's pom so that dependents get better ordering of dependencies
Posted by he...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
heneveld pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/brooklyn-dist.git
commit 8738ba0514a2ab297320a8f365f1357d163d0089
Author: Alex Heneveld <al...@cloudsoftcorp.com>
AuthorDate: Thu Nov 11 09:38:21 2021 +0000
rejig all's pom so that dependents get better ordering of dependencies
in particular prefer util-common's javax.annotation from jakarta,
over findbugs via guava
---
all/pom.xml | 12 ++++++++----
1 file changed, 8 insertions(+), 4 deletions(-)
diff --git a/all/pom.xml b/all/pom.xml
index 42c624f..0f9d3ff 100644
--- a/all/pom.xml
+++ b/all/pom.xml
@@ -43,10 +43,15 @@
maven projects see the same versions we include via osgi, at least that is the intention! -->
<dependency>
- <groupId>com.google.guava</groupId>
- <artifactId>guava</artifactId>
+ <groupId>org.apache.brooklyn</groupId>
+ <artifactId>brooklyn-utils-common</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.brooklyn</groupId>
+ <artifactId>brooklyn-core</artifactId>
+ <version>${project.version}</version>
</dependency>
-
<dependency>
<groupId>org.apache.brooklyn</groupId>
<artifactId>brooklyn-launcher</artifactId>
@@ -64,7 +69,6 @@
<artifactId>camp-server</artifactId>
<version>${project.version}</version>
</dependency>
-
<dependency>
<groupId>org.apache.brooklyn</groupId>
<artifactId>brooklyn-policy</artifactId>