You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by jb...@apache.org on 2019/11/27 20:03:22 UTC
[brooklyn-server] branch master updated: Bumps karaf version to
4.2.7 (latest)
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/brooklyn-server.git
The following commit(s) were added to refs/heads/master by this push:
new c4b8dbc Bumps karaf version to 4.2.7 (latest)
new 02732b8 Merge pull request #1068 from nakomis/bump-karaf-version
c4b8dbc is described below
commit c4b8dbc60698828bd78a38315b4877ecc3829de2
Author: Martin Harris <ma...@cloudsoftcorp.com>
AuthorDate: Wed Nov 27 16:00:00 2019 +0000
Bumps karaf version to 4.2.7 (latest)
---
api/pom.xml | 1 +
pom.xml | 8 ++++----
rest/rest-resources/pom.xml | 12 ++++++++++++
utils/common/pom.xml | 1 +
4 files changed, 18 insertions(+), 4 deletions(-)
diff --git a/api/pom.xml b/api/pom.xml
index 0d8db30..63bd7ec 100644
--- a/api/pom.xml
+++ b/api/pom.xml
@@ -44,6 +44,7 @@
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.core</artifactId>
+ <version>${org.osgi.core.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
diff --git a/pom.xml b/pom.xml
index 4e87d29..396bd41 100644
--- a/pom.xml
+++ b/pom.xml
@@ -168,12 +168,12 @@
<kubernetes-client.version>1.4.27</kubernetes-client.version>
<!-- Dependencies shipped with vanilla karaf; update these when we update the karaf version -->
- <karaf.version>4.2.2</karaf.version>
+ <karaf.version>4.2.7</karaf.version>
<karaf.plugin.version>${karaf.version}</karaf.plugin.version>
- <jetty.version>9.4.14.v20181114</jetty.version>
+ <jetty.version>9.4.20.v20190813</jetty.version>
<commons-collections.version>3.2.2</commons-collections.version>
- <pax-web.version>7.2.5</pax-web.version>
- <jaxb-api.version>2.3.0</jaxb-api.version>
+ <pax-web.version>7.2.11</pax-web.version>
+ <jaxb-api.version>2.3.2</jaxb-api.version>
<!-- Transitive dependencies, declared explicitly to avoid version mismatch -->
<jna.version>4.1.0</jna.version>
diff --git a/rest/rest-resources/pom.xml b/rest/rest-resources/pom.xml
index b7eebc5..de08210 100644
--- a/rest/rest-resources/pom.xml
+++ b/rest/rest-resources/pom.xml
@@ -107,6 +107,12 @@
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-http</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-io</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
@@ -182,6 +188,12 @@
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-transports-http-jetty</artifactId>
<scope>test</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-io</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
diff --git a/utils/common/pom.xml b/utils/common/pom.xml
index 302fa3a..ba4865b 100644
--- a/utils/common/pom.xml
+++ b/utils/common/pom.xml
@@ -114,6 +114,7 @@
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.core</artifactId>
+ <version>${org.osgi.core.version}</version>
</dependency>
<dependency>
<groupId>org.assertj</groupId>