You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by he...@apache.org on 2019/02/12 11:43:20 UTC
[brooklyn-server] branch master updated (eff9e87 -> dd7aa86)
This is an automated email from the ASF dual-hosted git repository.
heneveld pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/brooklyn-server.git.
from eff9e87 This closes #1038
new c442325 [Security] Bump commons-compress from 1.4 to 1.18
new ab3016e Remove redundant bundle dependency org.tukaani:xz
new fa6c3f1 This closes #1041
new 8f6c871 Use servicemix bundle of xstream at runtime
new dd7aa86 This closes #1043
The 5 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
karaf/features/src/main/feature/feature.xml | 3 +--
pom.xml | 8 +++++++-
2 files changed, 8 insertions(+), 3 deletions(-)
[brooklyn-server] 04/05: Use servicemix bundle of xstream at runtime
Posted by he...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
heneveld pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/brooklyn-server.git
commit 8f6c8717749c5033eb0d996ffc51ff4a6132e5f9
Author: Paul Campbell <pc...@kemitix.net>
AuthorDate: Tue Feb 12 11:17:34 2019 +0000
Use servicemix bundle of xstream at runtime
The updated xstream includes dependencies on libraries that are not
OSGi bundles. This servicemix repackaging, includes these libraries
within the bundle.
---
karaf/features/src/main/feature/feature.xml | 2 +-
pom.xml | 6 ++++++
2 files changed, 7 insertions(+), 1 deletion(-)
diff --git a/karaf/features/src/main/feature/feature.xml b/karaf/features/src/main/feature/feature.xml
index e163c7e..933a9d2 100644
--- a/karaf/features/src/main/feature/feature.xml
+++ b/karaf/features/src/main/feature/feature.xml
@@ -155,7 +155,7 @@
<bundle dependency="true">mvn:org.eclipse.jetty/jetty-server/${jetty.version}</bundle>
<bundle dependency="true">mvn:org.ops4j.pax.web/pax-web-spi/${pax-web.version}</bundle>
<bundle dependency="true">mvn:org.apache.geronimo.specs/geronimo-ws-metadata_2.0_spec/${geronimo-ws-metadata_2.0_spec.version}</bundle>
- <bundle dependency="true">mvn:com.thoughtworks.xstream/xstream/${xstream.version}</bundle>
+ <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xstream/${xstream.servicemix.version}</bundle>
<bundle dependency="true">mvn:org.freemarker/freemarker/${freemarker.version}</bundle>
<bundle dependency="true">mvn:com.hierynomus/sshj/${sshj.version}</bundle>
<bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jzlib/1.1.3_2</bundle> <!-- jzlib version is 1.1.3, but bundle is 1.1.3_2 -->
diff --git a/pom.xml b/pom.xml
index ce4f2b1..73fb35a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -112,7 +112,13 @@
For example jclouds and jackson-datatype-guava both depend on guava [16,20).
-->
<guava-swagger.version>18.0</guava-swagger.version>
+
+ <!-- xstream -->
<xstream.version>1.4.11.1</xstream.version>
+ <!-- xstream has dependencies that are not OSGi bundles, the servicemix repackage version embeds them -->
+ <!-- note the servicemix suffix when upgrading xstream -->
+ <xstream.servicemix.version>${xstream.version}_1</xstream.servicemix.version>
+
<xpp3.servicemix.version>1.1.4c_7</xpp3.servicemix.version>
<kxml2.servicemix.version>2.3.0_3</kxml2.servicemix.version>
<!-- double-check downstream projects before changing jackson version -->
[brooklyn-server] 02/05: Remove redundant bundle dependency
org.tukaani:xz
Posted by he...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
heneveld pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/brooklyn-server.git
commit ab3016eff835903a6e57762e119d31145513b1aa
Author: Paul Campbell <pc...@kemitix.net>
AuthorDate: Mon Feb 11 16:54:59 2019 +0000
Remove redundant bundle dependency org.tukaani:xz
When commons-compress is upgraded to 1.18, it no longer has a
transitive dependency upon org.tukaani:xz.
---
karaf/features/src/main/feature/feature.xml | 1 -
1 file changed, 1 deletion(-)
diff --git a/karaf/features/src/main/feature/feature.xml b/karaf/features/src/main/feature/feature.xml
index e163c7e..c7739d9 100644
--- a/karaf/features/src/main/feature/feature.xml
+++ b/karaf/features/src/main/feature/feature.xml
@@ -187,7 +187,6 @@
<feature>brooklyn-utils-common</feature>
<bundle dependency="true">mvn:org.apache.commons/commons-compress/${commons-compress.version}</bundle>
- <bundle dependency="true">wrap:mvn:org.tukaani/xz/${commons-compress.version}</bundle>
<bundle dependency="true">mvn:org.apache.commons/commons-lang3/${commons-lang3.version}</bundle>
</feature>
[brooklyn-server] 05/05: This closes #1043
Posted by he...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
heneveld pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/brooklyn-server.git
commit dd7aa86fd86f91b58a7962d8c4756f3a805d6dfc
Merge: fa6c3f1 8f6c871
Author: Alex Heneveld <al...@cloudsoftcorp.com>
AuthorDate: Tue Feb 12 11:39:30 2019 +0000
This closes #1043
karaf/features/src/main/feature/feature.xml | 2 +-
pom.xml | 6 ++++++
2 files changed, 7 insertions(+), 1 deletion(-)
[brooklyn-server] 03/05: This closes #1041
Posted by he...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
heneveld pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/brooklyn-server.git
commit fa6c3f128800bc682af6b92bef9e7f409bf0b8de
Merge: eff9e87 ab3016e
Author: Alex Heneveld <al...@cloudsoftcorp.com>
AuthorDate: Tue Feb 12 10:59:34 2019 +0000
This closes #1041
karaf/features/src/main/feature/feature.xml | 1 -
pom.xml | 2 +-
2 files changed, 1 insertion(+), 2 deletions(-)
[brooklyn-server] 01/05: [Security] Bump commons-compress from 1.4
to 1.18
Posted by he...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
heneveld pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/brooklyn-server.git
commit c4423254442a11b31e34107db4f3ee7eec486cd3
Author: dependabot[bot] <su...@dependabot.com>
AuthorDate: Fri Feb 1 12:27:40 2019 +0000
[Security] Bump commons-compress from 1.4 to 1.18
Bumps commons-compress from 1.4 to 1.18. **This update includes security fixes.**
Signed-off-by: dependabot[bot] <su...@dependabot.com>
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 49aec73..10ceb42 100644
--- a/pom.xml
+++ b/pom.xml
@@ -138,7 +138,7 @@
<freemarker.version>2.3.25-incubating</freemarker.version>
<commons-io.version>2.4</commons-io.version>
<jsonPath.version>2.4.0</jsonPath.version>
- <commons-compress.version>1.4</commons-compress.version>
+ <commons-compress.version>1.18</commons-compress.version>
<validation-api.version>1.1.0.Final</validation-api.version>
<geronimo-jms_1.1_spec.version>1.1.1</geronimo-jms_1.1_spec.version>
<geronimo-jta_1.1_spec.version>1.1.1</geronimo-jta_1.1_spec.version>