github-mirrors/DependencyCheck
1
0
Fork 0
mirror of https://github.com/ysoftdevs/DependencyCheck.git synced 2026-03-12 21:25:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

No more separate proxy configuration for Central search. Renamed everything to do with Solr to Central.

Browse Source 
Former-commit-id: 4bcee86abf4415bfafc386d10018d9fcb2f6cec4
This commit is contained in:
Will Stranathan
2014-11-09 21:07:26 -05:00
parent c3bf6aa3f8 17d7d47b9a
commit b57ef7291f
7 changed files with 36 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
dependency-check-core/src/test/java/org/owasp/dependencycheck/data/central/CentralSearchTest.java
View File

@@ -22,9 +22,9 @@ public class CentralSearchTest extends BaseTest {
@Before
public void setUp() throws Exception {
String solrUrl = Settings.getString(Settings.KEYS.ANALYZER_SOLR_URL);
LOGGER.fine(solrUrl);
searcher = new CentralSearch(new URL(solrUrl));
String centralUrl = Settings.getString(Settings.KEYS.ANALYZER_CENTRAL_URL);
LOGGER.fine(centralUrl);
searcher = new CentralSearch(new URL(centralUrl));
}
@Test(expected = IllegalArgumentException.class)
@@ -54,7 +54,7 @@ public class CentralSearchTest extends BaseTest {
searcher.searchSha1("AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA");
}
// This test should give us multiple results back from Solr
// This test should give us multiple results back from Central
@Test
public void testMultipleReturns() throws Exception {
List<MavenArtifact> ma = searcher.searchSha1("94A9CE681A42D0352B3AD22659F67835E560D107");

6
dependency-check-core/src/test/resources/dependencycheck.properties
View File

@@ -61,7 +61,5 @@ analyzer.nexus.url=https://repository.sonatype.org/service/local/
analyzer.nexus.proxy=true
# the URL for searching search.maven.org for SHA-1 and whether it's enabled
analyzer.solr.enabled=true
analyzer.solr.url=http://search.maven.org/solrsearch/select
# If set to true, the proxy will still ONLY be used if the proxy properties (proxy.url, proxy.port)
# are configured
analyzer.central.enabled=true
analyzer.central.url=http://search.maven.org/solrsearch/select