Index: modules/dnet-download-service/trunk/src/test/java/DownloadWorkerTest.java
===================================================================
--- modules/dnet-download-service/trunk/src/test/java/DownloadWorkerTest.java (revision 45347)
+++ modules/dnet-download-service/trunk/src/test/java/DownloadWorkerTest.java (revision 45348)
@@ -7,12 +7,13 @@
import eu.dnetlib.data.objectstore.modular.ObjectStoreRecord;
import eu.dnetlib.data.objectstore.modular.connector.ObjectStore;
import eu.dnetlib.data.objectstore.rmi.Protocols;
-import org.bouncycastle.jce.provider.BouncyCastleProvider;
+
import org.junit.Before;
+import org.junit.Ignore;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.Mock;
-import org.mockito.runners.MockitoJUnitRunner;
+import org.mockito.junit.MockitoJUnitRunner;
import static org.junit.Assert.assertEquals;
import static org.mockito.Matchers.any;
@@ -31,8 +32,8 @@
@Before
public void prepare() throws Exception{
- Security.insertProviderAt(new BouncyCastleProvider(),1);
- System.setProperty("https.protocols", "TLSv1,TLSv1.1,TLSv1.2");
+ //Security.insertProviderAt(new BouncyCastleProvider(),1);
+ //System.setProperty("https.protocols", "TLSv1,TLSv1.1,TLSv1.2");
reportMap = new DownloadReportMap();
when(objectStore.feedObjectRecord(any(ObjectStoreRecord.class))).thenReturn("OK");
@@ -47,6 +48,7 @@
});
}
+ @Ignore
@Test
public void testSSL(){
String url = "https://econstor.eu/bitstream/10419/45606/1/658945068.pdf";
Index: modules/dnet-download-service/trunk/src/main/java/eu/dnetlib/data/download/DownloadServiceImpl.java
===================================================================
--- modules/dnet-download-service/trunk/src/main/java/eu/dnetlib/data/download/DownloadServiceImpl.java (revision 45347)
+++ modules/dnet-download-service/trunk/src/main/java/eu/dnetlib/data/download/DownloadServiceImpl.java (revision 45348)
@@ -19,7 +19,6 @@
import eu.dnetlib.enabling.tools.blackboard.NotificationHandler;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.bouncycastle.jce.provider.BouncyCastleProvider;
import org.springframework.beans.factory.annotation.Required;
import org.springframework.beans.factory.annotation.Value;
@@ -102,8 +101,8 @@
}
}).start();
}
- Security.insertProviderAt(new BouncyCastleProvider(),1);
- System.setProperty("https.protocols", httpsProtocols);
+ //Security.insertProviderAt(new BouncyCastleProvider(),1);
+ //System.setProperty("https.protocols", httpsProtocols);
}
private void disableSslVerification() {
Index: modules/dnet-download-service/trunk/pom.xml
===================================================================
--- modules/dnet-download-service/trunk/pom.xml (revision 45347)
+++ modules/dnet-download-service/trunk/pom.xml (revision 45348)
@@ -3,7 +3,7 @@
eu.dnetlib
dnet45-parent
1.0.0-SNAPSHOT
-
+
4.0.0
eu.dnetlib
@@ -10,7 +10,7 @@
dnet-download-service
2.2.1-SNAPSHOT
- scm:svn:https://svn.driver.research-infrastructures.eu/driver/dnet45/modules/dnet-download-service/trunk
+ scm:svn:https://svn.driver.research-infrastructures.eu/driver/dnet45/modules/dnet-download-service/trunk
@@ -17,7 +17,7 @@
eu.dnetlib
dnet-download-service-rmi
[1.0.0,2.0.0)
-
+
eu.dnetlib
cnr-service-common
@@ -28,13 +28,7 @@
dnet-modular-objectstore-service
[4.0.0,5.0.0)
-
- org.bouncycastle
- bcprov-jdk15on
- 1.55
-
-
junit
junit
${junit.version}
@@ -42,11 +36,9 @@
org.mockito
- mockito-core
- ${mockito.version}
+ mockito-core
+ ${mockito.version}
test
-
-