You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by sv...@apache.org on 2016/12/05 07:43:08 UTC

brooklyn-dist git commit: Upgrade karaf-maven-plugin to avoid double User-Agent bug

Repository: brooklyn-dist
Updated Branches:
  refs/heads/0.10.0 58d51ff6e -> 09a1ca89c


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/09a1ca89
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-dist/tree/09a1ca89
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-dist/diff/09a1ca89

Branch: refs/heads/0.10.0
Commit: 09a1ca89cd7d5a468438025d7f2121ec7c52ffc6
Parents: 58d51ff
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 09:42:56 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/09a1ca89/karaf/apache-brooklyn/pom.xml
----------------------------------------------------------------------
diff --git a/karaf/apache-brooklyn/pom.xml b/karaf/apache-brooklyn/pom.xml
index 7d8cac5..50d77f6 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/09a1ca89/karaf/features/pom.xml
----------------------------------------------------------------------
diff --git a/karaf/features/pom.xml b/karaf/features/pom.xml
index f01caef..0b533a1 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/09a1ca89/karaf/pom.xml
----------------------------------------------------------------------
diff --git a/karaf/pom.xml b/karaf/pom.xml
index 0aac28d..adf1751 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>