You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@felix.apache.org by cz...@apache.org on 2020/03/04 07:54:30 UTC

[felix-dev] branch master updated: Update dependencies to newer versions

This is an automated email from the ASF dual-hosted git repository.

cziegeler pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/felix-dev.git


The following commit(s) were added to refs/heads/master by this push:
     new a1af08c  Update dependencies to newer versions
a1af08c is described below

commit a1af08c04e927f29718253f828baf2d4b82b8b65
Author: Carsten Ziegeler <cz...@apache.org>
AuthorDate: Wed Mar 4 08:54:02 2020 +0100

    Update dependencies to newer versions
---
 http/cometd/pom.xml     | 6 +++++-
 http/whiteboard/pom.xml | 2 +-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/http/cometd/pom.xml b/http/cometd/pom.xml
index e754640..f40fa49 100644
--- a/http/cometd/pom.xml
+++ b/http/cometd/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.felix</groupId>
         <artifactId>org.apache.felix.http.parent</artifactId>
-        <version>9</version>
+        <version>12</version>
         <relativePath>../parent/pom.xml</relativePath>
     </parent>
 
@@ -39,6 +39,8 @@
 
     <properties>
         <felix.java.version>8</felix.java.version>
+        <jetty.version>9.4.26.v20200117</jetty.version>
+        <cometd.version>3.0.8</cometd.version>    
     </properties>
 
     <build>
@@ -93,6 +95,8 @@
         <dependency>
             <groupId>org.osgi</groupId>
             <artifactId>osgi.cmpn</artifactId>
+            <version>6.0.0</version>
+            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>javax.servlet</groupId>
diff --git a/http/whiteboard/pom.xml b/http/whiteboard/pom.xml
index 3bd3df2..fdaec97 100644
--- a/http/whiteboard/pom.xml
+++ b/http/whiteboard/pom.xml
@@ -107,7 +107,7 @@
         <dependency>
             <groupId>commons-collections</groupId>
             <artifactId>commons-collections</artifactId>
-            <version>3.2.1</version>
+            <version>3.2.2</version>
             <scope>test</scope>
         </dependency>
     </dependencies>