You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by dr...@apache.org on 2017/04/10 11:04:13 UTC
[3/5] brooklyn-server git commit: Address comments
Address comments
- parameterise version numbers
- remove stale TODO comment
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/490e5b24
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/490e5b24
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/490e5b24
Branch: refs/heads/master
Commit: 490e5b240c2544257f3c904e8c9304586c611e11
Parents: d36a01a
Author: Guglielmo Nigri <gu...@cloudsoftcorp.com>
Authored: Thu Feb 16 15:14:28 2017 +0100
Committer: Guglielmo Nigri <gu...@cloudsoftcorp.com>
Committed: Tue Mar 28 18:12:52 2017 +0200
----------------------------------------------------------------------
karaf/features/src/main/feature/feature.xml | 5 ++---
karaf/itests/pom.xml | 10 +---------
karaf/pom.xml | 12 ++++++++----
3 files changed, 11 insertions(+), 16 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/490e5b24/karaf/features/src/main/feature/feature.xml
----------------------------------------------------------------------
diff --git a/karaf/features/src/main/feature/feature.xml b/karaf/features/src/main/feature/feature.xml
index 1834691..bbd4167 100644
--- a/karaf/features/src/main/feature/feature.xml
+++ b/karaf/features/src/main/feature/feature.xml
@@ -259,9 +259,8 @@
https://github.com/square/okhttp/issues/2243
https://github.com/square/okhttp/pull/2246
-->
- <!-- TODO use ServiceMix bundle for okhttp when dependency on okio is fixed there -->
- <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.okhttp/2.2.0_2</bundle>
- <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.okio/1.2.0_1</bundle>
+ <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.okhttp/${okhttp.bundle.version}</bundle>
+ <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.okio/${okio.bundle.version}</bundle>
<bundle dependency="true">mvn:org.apache.jclouds.driver/jclouds-okhttp/${jclouds.version}</bundle>
<bundle dependency="true">mvn:org.apache.jclouds.driver/jclouds-sshj/${jclouds.version}</bundle>
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/490e5b24/karaf/itests/pom.xml
----------------------------------------------------------------------
diff --git a/karaf/itests/pom.xml b/karaf/itests/pom.xml
index c83c1e6..410a169 100644
--- a/karaf/itests/pom.xml
+++ b/karaf/itests/pom.xml
@@ -30,14 +30,6 @@
<artifactId>brooklyn-features-itests</artifactId>
<name>Brooklyn Karaf Tests</name>
- <properties>
- <osgi.version>6.0.0</osgi.version>
- <pax.exam.version>4.9.1</pax.exam.version>
- <pax-url.version>2.5.2</pax-url.version>
- <servlet.api.version>3.1.0</servlet.api.version>
- <validation.api.version>1.1.0.Final</validation.api.version>
- </properties>
-
<dependencies>
<dependency>
<groupId>org.apache.brooklyn</groupId>
@@ -106,7 +98,7 @@
<plugin>
<groupId>org.apache.servicemix.tooling</groupId>
<artifactId>depends-maven-plugin</artifactId>
- <version>1.3</version>
+ <version>${maven.depends.plugin.version}</version>
<executions>
<execution>
<id>generate-depends-file</id>
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/490e5b24/karaf/pom.xml
----------------------------------------------------------------------
diff --git a/karaf/pom.xml b/karaf/pom.xml
index 607b27a..727f032 100644
--- a/karaf/pom.xml
+++ b/karaf/pom.xml
@@ -34,25 +34,29 @@
<properties>
+ <osgi.version>6.0.0</osgi.version>
<org.osgi.compendium.version>5.0.0</org.osgi.compendium.version> <!-- duplicate in brooklyn-dist/dist-karaf/pom.xml -->
-
+
<lifecycle-mapping-plugin.version>1.0.0</lifecycle-mapping-plugin.version>
<!-- pax-exam -->
- <pax.exam.version>4.7.0</pax.exam.version>
- <pax.url.version>2.4.3</pax.url.version>
+ <pax.exam.version>4.9.1</pax.exam.version>
+ <pax.url.version>2.5.2</pax.url.version>
<tinybundles.version>1.0.0</tinybundles.version>
<!-- feature repositories -->
<servicemix.version>6.0.0</servicemix.version>
<reflections.bundle.version>0.9.9_1</reflections.bundle.version> <!-- see reflections.version -->
-
<maven.buildhelper.plugin.version>1.10</maven.buildhelper.plugin.version>
<maven.resources.plugin.version>3.0.1</maven.resources.plugin.version>
+ <maven.depends.plugin.version>1.3</maven.depends.plugin.version>
<maven.compiler.source>${java.version}</maven.compiler.source>
<maven.compiler.target>${java.version}</maven.compiler.target>
+
+ <okhttp.bundle.version>2.2.0_2</okhttp.bundle.version>
+ <okio.bundle.version>1.2.0_1</okio.bundle.version>
</properties>
<modules>