[sshj] fix test failure

gil gil at fedoraproject.org
Sun Apr 6 02:15:49 UTC 2014


commit d2507c536a6be962a059d907d2435291d8cb2431
Author: gil <puntogil at libero.it>
Date:   Sun Apr 6 04:15:33 2014 +0200

    fix test failure

 sshj-0.8.1-port-to-bouncycastle-1.50.patch |    5 ++---
 sshj.spec                                  |    3 +++
 2 files changed, 5 insertions(+), 3 deletions(-)
---
diff --git a/sshj-0.8.1-port-to-bouncycastle-1.50.patch b/sshj-0.8.1-port-to-bouncycastle-1.50.patch
index f6ef7da..0951ddf 100644
--- a/sshj-0.8.1-port-to-bouncycastle-1.50.patch
+++ b/sshj-0.8.1-port-to-bouncycastle-1.50.patch
@@ -1,7 +1,7 @@
 diff -Nru sshj-0.8.1/pom.xml sshj-0.8.1-msrb/pom.xml
 --- sshj-0.8.1/pom.xml	2012-07-08 15:55:22.000000000 +0200
-+++ sshj-0.8.1-msrb/pom.xml	2014-04-06 03:31:54.504838462 +0200
-@@ -41,8 +41,14 @@
++++ sshj-0.8.1-msrb/pom.xml	2014-04-06 04:07:24.338791306 +0200
+@@ -41,8 +41,13 @@
          </dependency>
          <dependency>
              <groupId>org.bouncycastle</groupId>
@@ -9,7 +9,6 @@ diff -Nru sshj-0.8.1/pom.xml sshj-0.8.1-msrb/pom.xml
 -            <version>1.46</version>
 +            <artifactId>bcpkix-jdk15on</artifactId>
 +            <version>1.50</version>
-+            <scope>provided</scope>
 +        </dependency>
 +        <dependency>
 +            <groupId>org.bouncycastle</groupId>
diff --git a/sshj.spec b/sshj.spec
index 1077bef..8663fa3 100644
--- a/sshj.spec
+++ b/sshj.spec
@@ -47,6 +47,9 @@ This package contains javadoc for %{name}.
 # SmokeTest.setUp:37 ? NoClassDefFound org/apache/mina/core/service/IoHandler
 %pom_add_dep org.apache.mina:mina-core::test
 
+# NoClassDefFound org/bouncycastle/openssl/PEMReader apache sshd
+rm -r src/test/java/net/schmizz/sshj/SmokeTest.java
+
 # Some classes moved from JUnit to hamcrest
 sed -i -e 's/org.junit.internal.matchers/org.hamcrest.core/' src/test/java/net/schmizz/sshj/transport/verification/OpenSSHKnownHostsTest.java
 %mvn_file :%{name} %{name}


More information about the scm-commits mailing list