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 2021/11/13 11:14:17 UTC
[brooklyn-server] 21/28: fix jzlib version reference (don't overwrite parent)
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 757f4de2cc8fcf297dda2ae5549db96cde01f9cd
Author: Alex Heneveld <al...@cloudsoftcorp.com>
AuthorDate: Wed Nov 10 17:59:16 2021 +0000
fix jzlib version reference (don't overwrite parent)
---
karaf/features/pom.xml | 2 --
karaf/features/src/main/feature/feature.xml | 2 +-
2 files changed, 1 insertion(+), 3 deletions(-)
diff --git a/karaf/features/pom.xml b/karaf/features/pom.xml
index 80a8d6a..9b4e901 100755
--- a/karaf/features/pom.xml
+++ b/karaf/features/pom.xml
@@ -36,8 +36,6 @@
<jsch.bundle.version>${jsch.version}_1</jsch.bundle.version>
<jsch.agentproxy.version>0.0.9</jsch.agentproxy.version>
<jsch.agentproxy.bundle.version>${jsch.agentproxy.version}_1</jsch.agentproxy.bundle.version>
- <jzlib.version>1.0.7</jzlib.version>
- <jzlib.bundle.version>${jzlib.version}_1</jzlib.bundle.version>
</properties>
<build>
diff --git a/karaf/features/src/main/feature/feature.xml b/karaf/features/src/main/feature/feature.xml
index e9fd2cd..9dfe5ca 100644
--- a/karaf/features/src/main/feature/feature.xml
+++ b/karaf/features/src/main/feature/feature.xml
@@ -312,7 +312,7 @@
<bundle dependency='true'>mvn:com.jcraft/jsch.agentproxy.connector-factory/${jsch.agentproxy.version}</bundle>
<bundle dependency='true'>mvn:com.jcraft/jsch.agentproxy.usocket-nc/${jsch.agentproxy.version}</bundle>
<bundle dependency='true'>mvn:com.jcraft/jsch.agentproxy.sshagent/${jsch.agentproxy.version}</bundle>
- <bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jzlib/${jzlib.bundle.version}</bundle>
+ <bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jzlib/${jzlib.version}</bundle>
<bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jsch-agentproxy-sshj/${jsch.agentproxy.bundle.version}</bundle>
<!-- upstream dependencies, maybe not needed -->