You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by jb...@apache.org on 2020/08/18 10:10:30 UTC
[karaf] branch master updated: [KARAF-6815] Upgrade to
maven-bundle-plugin 5.1.1
This is an automated email from the ASF dual-hosted git repository.
jbonofre pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/karaf.git
The following commit(s) were added to refs/heads/master by this push:
new f6620e6 [KARAF-6815] Upgrade to maven-bundle-plugin 5.1.1
new d6f4bc7 Merge pull request #1154 from jbonofre/KARAF-6815
f6620e6 is described below
commit f6620e6d843d6b81a0ee571f5582a848407c5586
Author: jbonofre <jb...@apache.org>
AuthorDate: Mon Aug 17 09:47:52 2020 +0200
[KARAF-6815] Upgrade to maven-bundle-plugin 5.1.1
---
pom.xml | 2 +-
tooling/karaf-maven-plugin/pom.xml | 9 +++++++++
2 files changed, 10 insertions(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index f34d129..e77ce82 100644
--- a/pom.xml
+++ b/pom.xml
@@ -200,7 +200,7 @@
<felix.httplite.version>0.1.6</felix.httplite.version>
<felix.http.version>4.0.20</felix.http.version>
<felix.inventory.version>1.0.6</felix.inventory.version>
- <felix.plugin.version>4.2.1</felix.plugin.version>
+ <felix.plugin.version>5.1.1</felix.plugin.version>
<felix.utils.version>1.11.2</felix.utils.version>
<felix.webconsole.version>4.5.4</felix.webconsole.version>
<felix.webconsole.api.version>3.3.0</felix.webconsole.api.version>
diff --git a/tooling/karaf-maven-plugin/pom.xml b/tooling/karaf-maven-plugin/pom.xml
index 7f5f326..4b07966 100644
--- a/tooling/karaf-maven-plugin/pom.xml
+++ b/tooling/karaf-maven-plugin/pom.xml
@@ -134,9 +134,18 @@
<groupId>org.osgi</groupId>
<artifactId>org.osgi.core</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-archiver</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-archiver</artifactId>
+ <version>2.6</version>
+ </dependency>
+ <dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-archiver</artifactId>
<version>3.6.0</version>