From aafb9942a3fe69e4e08a755526e46708b637e079 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20Nelas?= Date: Thu, 12 Jan 2017 14:26:59 +0000 Subject: [PATCH 1/3] converts bouncycastle OSGi dep from Import-Bundle to Import-Package Import-Bundle is generally discouraged by OSGi best practices. See http://stackoverflow.com/questions/1865819/when-should-i-use-import-package-and-when-should-i-use-require-bundle for more info. --- build.gradle | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/build.gradle b/build.gradle index f6d61f344..68bcbabf8 100644 --- a/build.gradle +++ b/build.gradle @@ -82,15 +82,16 @@ jar { // please see http://bnd.bndtools.org/chapters/390-wrapping.html instruction "Bundle-Description", "SSHv2 library for Java" instruction "Bundle-License", "http://www.apache.org/licenses/LICENSE-2.0.txt" - instruction "Import-Package", \ - "com.jcraft.jzlib*;version=\"[1.1,2)\";resolution:=optional", \ - "!com.hierynomus.sshj.*", "!net.schmizz.*", \ - "!net.i2p.crypto.eddsa.math", \ - "*" - instruction "Require-Bundle", \ - "bcprov;bundle-version=\"$bouncycastleVersion\";resolution:=optional", \ - "bcprov;bundle-version=\"$bouncycastleVersion\";resolution:=optional" - instruction "Export-Package", "com.hierynomus.sshj.*", "net.schmizz.*" + instruction "Import-Package", "!net.schmizz.*" + instruction "Import-Package", "javax.crypto*" + instruction "Import-Package", "!net.i2p.crypto.eddsa.math" + instruction "Import-Package", "net.i2p*" + instruction "Import-Package", "com.jcraft.jzlib*;version=\"[1.1,2)\";resolution:=optional" + instruction "Import-Package", "org.slf4j*;version=\"[1.7,5)\"" + instruction "Import-Package", "org.bouncycastle*;resolution:=optional" + instruction "Import-Package", "org.bouncycastle.jce.provider;resolution:=optional" + instruction "Import-Package", "*" + instruction "Export-Package", "net.schmizz.*" } } From 66d4b34eba39661116339c012495787ec846351b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20Nelas?= Date: Thu, 12 Jan 2017 14:37:02 +0000 Subject: [PATCH 2/3] re-adding Export-Package of com.hierynomus.sshj.* --- build.gradle | 1 + 1 file changed, 1 insertion(+) diff --git a/build.gradle b/build.gradle index 68bcbabf8..70343d141 100644 --- a/build.gradle +++ b/build.gradle @@ -91,6 +91,7 @@ jar { instruction "Import-Package", "org.bouncycastle*;resolution:=optional" instruction "Import-Package", "org.bouncycastle.jce.provider;resolution:=optional" instruction "Import-Package", "*" + instruction "Export-Package", "com.hierynomus.sshj.*" instruction "Export-Package", "net.schmizz.*" } } From fbee0b395631413282db7a3102b496c9e525ad24 Mon Sep 17 00:00:00 2001 From: Jeroen van Erp Date: Mon, 23 Jan 2017 22:56:23 +0100 Subject: [PATCH 3/3] Update build.gradle --- build.gradle | 1 + 1 file changed, 1 insertion(+) diff --git a/build.gradle b/build.gradle index 5e4edc193..844c6becd 100644 --- a/build.gradle +++ b/build.gradle @@ -83,6 +83,7 @@ jar { instruction "Bundle-Description", "SSHv2 library for Java" instruction "Bundle-License", "http://www.apache.org/licenses/LICENSE-2.0.txt" instruction "Import-Package", "!net.schmizz.*" + instruction "Import-Package", "!com.hierynomus.sshj.*" instruction "Import-Package", "javax.crypto*" instruction "Import-Package", "!net.i2p.crypto.eddsa.math" instruction "Import-Package", "net.i2p*"