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 2019/05/04 04:56:08 UTC
[karaf] branch master updated: Updating plexus
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 82a87ab Updating plexus
new 79062bb Merge pull request #824 from coheigea/plexus
82a87ab is described below
commit 82a87ab17c092b8db3212d7af2b3a3250ec311fc
Author: Colm O hEigeartaigh <co...@apache.org>
AuthorDate: Wed May 1 16:14:20 2019 +0100
Updating plexus
---
examples/karaf-websocket-example/pom.xml | 4 ++--
pom.xml | 1 +
tooling/karaf-maven-plugin/pom.xml | 3 +--
tooling/karaf-services-maven-plugin/pom.xml | 2 +-
4 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/examples/karaf-websocket-example/pom.xml b/examples/karaf-websocket-example/pom.xml
index baf153b..f862357 100644
--- a/examples/karaf-websocket-example/pom.xml
+++ b/examples/karaf-websocket-example/pom.xml
@@ -36,7 +36,7 @@
<dependency>
<groupId>org.eclipse.jetty.websocket</groupId>
<artifactId>websocket-servlet</artifactId>
- <version>9.4.11.v20180605</version>
+ <version>${jetty.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
@@ -66,4 +66,4 @@
</plugins>
</build>
-</project>
\ No newline at end of file
+</project>
diff --git a/pom.xml b/pom.xml
index da0500e..6840345 100644
--- a/pom.xml
+++ b/pom.xml
@@ -295,6 +295,7 @@
<pax.transx.version>0.4.3</pax.transx.version>
<portlet-api.version>2.0</portlet-api.version>
+ <plexus-utils.version>3.0.24</plexus-utils.version>
<slf4j.version>1.7.12</slf4j.version>
<spring.osgi.version>1.2.1</spring.osgi.version>
diff --git a/tooling/karaf-maven-plugin/pom.xml b/tooling/karaf-maven-plugin/pom.xml
index c33f18d..2a95856 100644
--- a/tooling/karaf-maven-plugin/pom.xml
+++ b/tooling/karaf-maven-plugin/pom.xml
@@ -40,7 +40,6 @@
<jacoco-class-line-covered-ratio>0.00</jacoco-class-line-covered-ratio>
<jacoco-class-instruction-covered-ratio>0.00</jacoco-class-instruction-covered-ratio>
<jacoco-class-missed-count-maximum>1</jacoco-class-missed-count-maximum>
- <plexus-utils.version>3.0.24</plexus-utils.version>
</properties>
<dependencies>
@@ -136,7 +135,7 @@
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-archiver</artifactId>
- <version>3.5</version>
+ <version>3.6.0</version>
</dependency>
<dependency>
<groupId>org.apache.felix</groupId>
diff --git a/tooling/karaf-services-maven-plugin/pom.xml b/tooling/karaf-services-maven-plugin/pom.xml
index 6efc2a5..7371b8d 100644
--- a/tooling/karaf-services-maven-plugin/pom.xml
+++ b/tooling/karaf-services-maven-plugin/pom.xml
@@ -107,7 +107,7 @@
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-utils</artifactId>
- <version>3.0</version>
+ <version>${plexus-utils.version}</version>
</dependency>
<dependency>
<groupId>org.apache.felix</groupId>