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-dist.git
commit 0c103fa391df0dfbc32c7cf5117b76bee698196f Author: Alex Heneveld <[email protected]> AuthorDate: Wed Nov 10 22:16:09 2021 +0000 exclude unwrapped eddsa and sshj, since now we wrap them in brooklyn --- karaf/features/src/main/feature/feature.xml | 3 +- .../resources/etc/org.apache.karaf.features.xml | 13 +-- .../main/resources/resources/etc/custom.properties | 93 ---------------------- 3 files changed, 8 insertions(+), 101 deletions(-) diff --git a/karaf/features/src/main/feature/feature.xml b/karaf/features/src/main/feature/feature.xml index 4517095..f187e2e 100644 --- a/karaf/features/src/main/feature/feature.xml +++ b/karaf/features/src/main/feature/feature.xml @@ -46,8 +46,7 @@ <feature>service</feature> <feature>system</feature> - <!-- load BouncyCastle/eddsa early, to avoid refreshing of org.apache.sshd.core later --> - <bundle dependency="true">mvn:net.i2p.crypto/eddsa/${eddsa.version}</bundle> + <!-- load BouncyCastle early, to avoid refreshing of org.apache.sshd.core later --> <bundle dependency="true">mvn:org.bouncycastle/bcprov-ext-jdk15on/${bouncycastle.version}</bundle> <bundle dependency="true">mvn:org.bouncycastle/bcpkix-jdk15on/${bouncycastle.version}</bundle> </feature> diff --git a/karaf/features/src/main/filtered-resources/resources/etc/org.apache.karaf.features.xml b/karaf/features/src/main/filtered-resources/resources/etc/org.apache.karaf.features.xml index 96acbbc..e147bc5 100644 --- a/karaf/features/src/main/filtered-resources/resources/etc/org.apache.karaf.features.xml +++ b/karaf/features/src/main/filtered-resources/resources/etc/org.apache.karaf.features.xml @@ -70,10 +70,11 @@ replacement="mvn:org.bouncycastle/bcprov-ext-jdk15on/${bouncycastle.version}" /> <bundle originalUri="mvn:org.bouncycastle/bcpkix-jdk15on/[1.51,${bouncycastle.version}]" replacement="mvn:org.bouncycastle/bcpkix-jdk15on/${bouncycastle.version}" /> - <bundle originalUri="mvn:net.i2p.crypto/eddsa/[0.1.0,${eddsa.version}]" - replacement="mvn:net.i2p.crypto/eddsa/${eddsa.version}" /> - <bundle originalUri="mvn:com.hierynomus/sshj/[0.20.0,${sshj.version}]" - replacement="mvn:com.hierynomus/sshj/${sshj.version}" /> + <!-- now we wrap these so blacklist entirely --> +<!-- <bundle originalUri="mvn:net.i2p.crypto/eddsa/[0.1.0,${eddsa.version}]"--> +<!-- replacement="mvn:net.i2p.crypto/eddsa/${eddsa.version}" />--> +<!-- <bundle originalUri="mvn:com.hierynomus/sshj/[0.20.0,${sshj.version}]"--> +<!-- replacement="mvn:com.hierynomus/sshj/${sshj.version}" />--> <!-- Lower versions of these pulled in by cxf-jackson and possibly others --> @@ -192,8 +193,8 @@ <bundle>mvn:org.bouncycastle/bcprov-jdk15on/[1.51,${bouncycastle.version})</bundle> <bundle>mvn:org.bouncycastle/bcprov-ext-jdk15on/[1.51,${bouncycastle.version})</bundle> <bundle>mvn:org.bouncycastle/bcpkix-jdk15on/[1.51,${bouncycastle.version})</bundle> - <bundle>mvn:net.i2p.crypto/eddsa/[0.1.0,${eddsa.version})</bundle> - <bundle>mvn:com.hierynomus/sshj/[0.20.0,${sshj.version})</bundle> + <bundle>mvn:net.i2p.crypto/eddsa/[0.1.0,999]</bundle> + <bundle>mvn:com.hierynomus/sshj/[0.20.0,999]</bundle> <bundle>mvn:org.yaml/snakeyaml/[1,${snakeyaml.version})</bundle> <bundle>mvn:com.fasterxml.jackson.jaxrs/jackson-jaxrs-base/[2.10,${fasterxml.jackson.version})</bundle> <bundle>mvn:com.fasterxml.jackson.jaxrs/jackson-jaxrs-json-provider/[2.10,${fasterxml.jackson.version})</bundle> diff --git a/karaf/features/src/main/resources/resources/etc/custom.properties b/karaf/features/src/main/resources/resources/etc/custom.properties index c9eb3e0..4ac5545 100644 --- a/karaf/features/src/main/resources/resources/etc/custom.properties +++ b/karaf/features/src/main/resources/resources/etc/custom.properties @@ -218,96 +218,3 @@ jre-1.8= \ org.xml.sax.helpers, \ com.sun.nio.sctp -# brooklyn used 4.4.0 at the time of osgification, which differs from karaf's bundled felix version -#karaf.framework.felix=mvn\:org.apache.felix/org.apache.felix.framework/${felix.framework.version} - -#karaf.systemBundlesStartLevel=50 -# -#org.osgi.framework.bootdelegation=org.apache.karaf.jaas.boot,!com.sun.xml.messaging.saaj.*,!com.sun.xml.internal.bind.*,sun.*,com.sun.*,javax.transaction,javax.transaction.*,org.apache.xalan.processor,org.apache.xpath.jaxp,org.apache.xml.dtm.ref,org.apache.xerces.jaxp.datatype,org.apache.xerces.stax,org.apache.xerces.parsers,org.apache.xerces.jaxp,org.apache.xerces.jaxp.validation,org.apache.xerces.dom -# -#org.osgi.framework.system.packages.extra = \ -# org.apache.karaf.branding, \ -# com.sun.org.apache.xalan.internal.xsltc.trax, \ -# com.sun.org.apache.xerces.internal.dom, \ -# com.sun.org.apache.xerces.internal.jaxp, \ -# com.sun.org.apache.xerces.internal.xni, \ -# com.sun.jndi.ldap, \ -# org.apache.xalan.extensions; version="2.7.1", \ -# org.apache.xalan.xsltc.compiler; version="2.7.1", \ -# org.apache.xalan.xsltc.cmdline.getopt; version="2.7.1", \ -# org.apache.xalan.xsltc.util; version="2.7.1", \ -# org.apache.xalan.transformer; version="2.7.1", \ -# org.apache.xalan.xsltc.trax; version="2.7.1", \ -# org.apache.xalan.processor; version="2.7.1", \ -# org.apache.xalan.lib; version="2.7.1", \ -# org.apache.xalan.trace; version="2.7.1", \ -# org.apache.xalan.xsltc.compiler.util; version="2.7.1", \ -# org.apache.xalan.templates; version="2.7.1", \ -# org.apache.xalan.xsltc; version="2.7.1", \ -# org.apache.xalan.xsltc.runtime; version="2.7.1", \ -# org.apache.xalan; version="2.7.1", \ -# org.apache.xalan.xslt; version="2.7.1", \ -# org.apache.xalan.lib.sql; version="2.7.1", \ -# org.apache.xalan.xsltc.runtime.output; version="2.7.1", \ -# org.apache.xalan.xsltc.dom; version="2.7.1", \ -# org.apache.xalan.client; version="2.7.1", \ -# org.apache.xalan.xsltc.cmdline; version="2.7.1", \ -# org.apache.xalan.serialize; version="2.7.1", \ -# org.apache.xalan.res; version="2.7.1", \ -# org.apache.xml.dtm.ref; version="2.7.1", \ -# org.apache.xml.dtm; version="2.7.1", \ -# org.apache.xml.dtm.ref.sax2dtm; version="2.7.1", \ -# org.apache.xml.dtm.ref.dom2dtm; version="2.7.1", \ -# org.apache.xml.res; version="2.7.1", \ -# org.apache.xml.serializer.dom3; version="2.7.1", \ -# org.apache.xml.serializer; version="2.7.1", \ -# org.apache.xml.serializer.utils; version="2.7.1", \ -# org.apache.xml.utils.res; version="2.7.1", \ -# org.apache.xml.utils; version="2.7.1", \ -# org.apache.xpath.functions; version="2.7.1", \ -# org.apache.xpath.jaxp; version="2.7.1", \ -# org.apache.xpath.patterns; version="2.7.1", \ -# org.apache.xpath.objects; version="2.7.1", \ -# org.apache.xpath.res; version="2.7.1", \ -# org.apache.xpath; version="2.7.1", \ -# org.apache.xpath.axes; version="2.7.1", \ -# org.apache.xpath.compiler; version="2.7.1", \ -# org.apache.xpath.operations; version="2.7.1", \ -# org.apache.xpath.domapi; version="2.7.1", \ -# org.apache.html.dom; version="2.11.0", \ -# org.apache.wml.dom; version="2.11.0", \ -# org.apache.wml; version="2.11.0", \ -# org.apache.xerces.parsers; version="2.11.0", \ -# org.apache.xerces.impl.dtd.models; version="2.11.0", \ -# org.apache.xerces.xni.parser; version="2.11.0", \ -# org.apache.xerces.impl.dv.xs; version="2.11.0", \ -# org.apache.xerces.impl.xs.traversers; version="2.11.0", \ -# org.apache.xerces.util; version="2.11.0", \ -# org.apache.xerces.impl.dtd; version="2.11.0", \ -# org.apache.xerces.jaxp.validation; version="2.11.0", \ -# org.apache.xerces.dom3.as; version="2.11.0", \ -# org.apache.xerces.impl.dv; version="2.11.0", \ -# org.apache.xerces.jaxp; version="2.11.0", \ -# org.apache.xerces.jaxp.datatype; version="2.11.0", \ -# org.apache.xerces.impl.xpath.regex; version="2.11.0", \ -# org.apache.xerces.xni; version="2.11.0", \ -# org.apache.xerces.impl.msg; version="2.11.0", \ -# org.apache.xerces.impl.dv.util; version="2.11.0", \ -# org.apache.xerces.impl.xs.util; version="2.11.0", \ -# org.apache.xerces.dom; version="2.11.0", \ -# org.apache.xerces.dom.events; version="2.11.0", \ -# org.apache.xerces.impl.xs.opti; version="2.11.0", \ -# org.apache.xerces.impl; version="2.11.0", \ -# org.apache.xerces.xs; version="2.11.0", \ -# org.apache.xerces.impl.io; version="2.11.0", \ -# org.apache.xerces.xpointer; version="2.11.0", \ -# org.apache.xerces.impl.dv.dtd; version="2.11.0", \ -# org.apache.xerces.xinclude; version="2.11.0", \ -# org.apache.xerces.impl.xpath; version="2.11.0", \ -# org.apache.xerces.xs.datatypes; version="2.11.0", \ -# org.apache.xerces.impl.xs.identity; version="2.11.0", \ -# org.apache.xerces.impl.xs.models; version="2.11.0", \ -# org.apache.xerces.xni.grammars; version="2.11.0", \ -# org.apache.xerces.impl.xs; version="2.11.0", \ -# org.apache.xerces.impl.validation; version="2.11.0", \ -# org.apache.xml.serialize; version="2.11.0" \ No newline at end of file
