You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by sj...@apache.org on 2016/12/09 12:35:39 UTC
[1/2] brooklyn-dist git commit: Upgrade karaf-maven-plugin to avoid
double User-Agent bug
Repository: brooklyn-dist
Updated Branches:
refs/heads/master 834197ce6 -> dfcd43aea
Upgrade karaf-maven-plugin to avoid double User-Agent bug
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-dist/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-dist/commit/80f0a403
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-dist/tree/80f0a403
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-dist/diff/80f0a403
Branch: refs/heads/master
Commit: 80f0a40323fc779f54ac0a4895a12ed775cd7c6f
Parents: 8aea0d9
Author: Svetoslav Neykov <sv...@cloudsoftcorp.com>
Authored: Mon Dec 5 09:42:56 2016 +0200
Committer: Svetoslav Neykov <sv...@cloudsoftcorp.com>
Committed: Mon Dec 5 16:04:51 2016 +0200
----------------------------------------------------------------------
karaf/apache-brooklyn/pom.xml | 2 +-
karaf/features/pom.xml | 2 +-
karaf/pom.xml | 5 +++++
3 files changed, 7 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/brooklyn-dist/blob/80f0a403/karaf/apache-brooklyn/pom.xml
----------------------------------------------------------------------
diff --git a/karaf/apache-brooklyn/pom.xml b/karaf/apache-brooklyn/pom.xml
index 7f1f1d8..c766a29 100755
--- a/karaf/apache-brooklyn/pom.xml
+++ b/karaf/apache-brooklyn/pom.xml
@@ -120,7 +120,7 @@
<plugin>
<groupId>org.apache.karaf.tooling</groupId>
<artifactId>karaf-maven-plugin</artifactId>
- <version>${karaf.version}</version>
+ <version>${karaf.plugin.version}</version>
<extensions>true</extensions>
<configuration>
<installedFeatures>
http://git-wip-us.apache.org/repos/asf/brooklyn-dist/blob/80f0a403/karaf/features/pom.xml
----------------------------------------------------------------------
diff --git a/karaf/features/pom.xml b/karaf/features/pom.xml
index c085c6f..0c876b6 100644
--- a/karaf/features/pom.xml
+++ b/karaf/features/pom.xml
@@ -38,7 +38,7 @@
<plugin>
<groupId>org.apache.karaf.tooling</groupId>
<artifactId>karaf-maven-plugin</artifactId>
- <version>${karaf.version}</version>
+ <version>${karaf.plugin.version}</version>
<extensions>true</extensions>
</plugin>
</plugins>
http://git-wip-us.apache.org/repos/asf/brooklyn-dist/blob/80f0a403/karaf/pom.xml
----------------------------------------------------------------------
diff --git a/karaf/pom.xml b/karaf/pom.xml
index 3f62861..125713b 100644
--- a/karaf/pom.xml
+++ b/karaf/pom.xml
@@ -40,6 +40,11 @@
<properties>
<!-- TODO: duplicates in brooklyn-server/karaf/pom.xml -->
<karaf.version>4.0.4</karaf.version>
+ <!--
+ Fixes double User-Agent issue leading to split Nexus repo.
+ Caused by karaf-maven-plugin depending on wagon-http 2.8 having the bug.
+ -->
+ <karaf.plugin.version>4.0.6</karaf.plugin.version>
<logback.version>1.0.7</logback.version>
<org.osgi.core.version>6.0.0</org.osgi.core.version>
<geronimo-jta_1.1_spec.version>1.1.1</geronimo-jta_1.1_spec.version>
[2/2] brooklyn-dist git commit: This closes #66
Posted by sj...@apache.org.
This closes #66
Upgrade karaf-maven-plugin to avoid double User-Agent bug
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-dist/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-dist/commit/dfcd43ae
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-dist/tree/dfcd43ae
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-dist/diff/dfcd43ae
Branch: refs/heads/master
Commit: dfcd43aea46a48599d82be5eba74d3f0ef495d84
Parents: 834197c 80f0a40
Author: Sam Corbett <sa...@cloudsoftcorp.com>
Authored: Fri Dec 9 12:35:24 2016 +0000
Committer: Sam Corbett <sa...@cloudsoftcorp.com>
Committed: Fri Dec 9 12:35:24 2016 +0000
----------------------------------------------------------------------
karaf/apache-brooklyn/pom.xml | 2 +-
karaf/features/pom.xml | 2 +-
karaf/pom.xml | 5 +++++
3 files changed, 7 insertions(+), 2 deletions(-)
----------------------------------------------------------------------