Apache
/
lucene
mirror of https://github.com/apache/lucene.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

SOLR-5950: Maven config: make the org.slf4j:slf4j-api dependency transitive (i.e., not optional) in all modules in which it's a dependency, including solrj, except for the WAR, where it will remain optional. 

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1584473 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Steven Rowe 2014-04-03 23:49:08 +00:00
parent 02804f67aa
commit 3df0ae45f6
2 changed files with 36 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
lucene/tools/src/java/org/apache/lucene/dependencies/GetMavenDependenciesTask.java
View File

@ -92,17 +92,19 @@ public class GetMavenDependenciesTask extends Task {
private static final Properties allProperties = new Properties(); private static final Properties allProperties = new Properties();
private static final Set<String> modulesWithSeparateCompileAndTestPOMs = new HashSet<>(); private static final Set<String> modulesWithSeparateCompileAndTestPOMs = new HashSet<>();
private static final Set<String> optionalExternalDependencies = new HashSet<>(); private static final Set<String> globalOptionalExternalDependencies = new HashSet<>();
private static final Map<String,Set<String>> perModuleOptionalExternalDependencies = new HashMap<>();
static { static {
// Add modules here that have split compile and test POMs // Add modules here that have split compile and test POMs
// - they need compile-scope deps to also be test-scope deps. // - they need compile-scope deps to also be test-scope deps.
modulesWithSeparateCompileAndTestPOMs.addAll modulesWithSeparateCompileAndTestPOMs.addAll
(Arrays.asList("lucene-core", "lucene-codecs", "solr-core", "solr-solrj")); (Arrays.asList("lucene-core", "lucene-codecs", "solr-core", "solr-solrj"));
// Add external dependencies here that should be optional (i.e., not invoke Maven's transitive dep mechanism). // Add external dependencies here that should be optional for all modules
// (i.e., not invoke Maven's transitive dependency mechanism).
// Format is "groupId:artifactId" // Format is "groupId:artifactId"
optionalExternalDependencies.addAll(Arrays.asList globalOptionalExternalDependencies.addAll(Arrays.asList
("org.slf4j:jcl-over-slf4j", "org.slf4j:jul-to-slf4j", "org.slf4j:slf4j-api", "org.slf4j:slf4j-log4j12")); ("org.slf4j:jcl-over-slf4j", "org.slf4j:jul-to-slf4j", "org.slf4j:slf4j-log4j12"));
} }
private final XPath xpath = XPathFactory.newInstance().newXPath(); private final XPath xpath = XPathFactory.newInstance().newXPath();
@ -241,7 +243,7 @@ public class GetMavenDependenciesTask extends Task {
} catch (BuildException e) { } catch (BuildException e) {
throw e; throw e;
} catch (Exception e) { } catch (Exception e) {
throw new BuildException("Exception reading file " + ivyXmlFile.getPath(), e); throw new BuildException("Exception reading file " + ivyXmlFile.getPath() + ": " + e, e);
} }
} }
addSharedExternalDependencies(); addSharedExternalDependencies();
@ -257,10 +259,10 @@ public class GetMavenDependenciesTask extends Task {
// Delay adding shared compile-scope dependencies until after all have been processed, // Delay adding shared compile-scope dependencies until after all have been processed,
// so dependency sharing is limited to a depth of one. // so dependency sharing is limited to a depth of one.
Map<String,SortedSet<ExternalDependency>> sharedDependencies = new HashMap<>(); Map<String,SortedSet<ExternalDependency>> sharedDependencies = new HashMap<>();
for (String artifactId : interModuleExternalCompileScopeDependencies.keySet()) { for (String module : interModuleExternalCompileScopeDependencies.keySet()) {
TreeSet<ExternalDependency> deps = new TreeSet<>(); TreeSet<ExternalDependency> deps = new TreeSet<>();
sharedDependencies.put(artifactId, deps); sharedDependencies.put(module, deps);
Set<String> moduleDependencies = interModuleExternalCompileScopeDependencies.get(artifactId); Set<String> moduleDependencies = interModuleExternalCompileScopeDependencies.get(module);
if (null != moduleDependencies) { if (null != moduleDependencies) {
for (String otherArtifactId : moduleDependencies) { for (String otherArtifactId : moduleDependencies) {
SortedSet<ExternalDependency> otherExtDeps = allExternalDependencies.get(otherArtifactId); SortedSet<ExternalDependency> otherExtDeps = allExternalDependencies.get(otherArtifactId);
@ -274,13 +276,13 @@ public class GetMavenDependenciesTask extends Task {
} }
} }
} }
for (String artifactId : interModuleExternalTestScopeDependencies.keySet()) { for (String module : interModuleExternalTestScopeDependencies.keySet()) {
SortedSet<ExternalDependency> deps = sharedDependencies.get(artifactId); SortedSet<ExternalDependency> deps = sharedDependencies.get(module);
if (null == deps) { if (null == deps) {
deps = new TreeSet<>(); deps = new TreeSet<>();
sharedDependencies.put(artifactId, deps); sharedDependencies.put(module, deps);
} }
Set<String> moduleDependencies = interModuleExternalTestScopeDependencies.get(artifactId); Set<String> moduleDependencies = interModuleExternalTestScopeDependencies.get(module);
if (null != moduleDependencies) { if (null != moduleDependencies) {
for (String otherArtifactId : moduleDependencies) { for (String otherArtifactId : moduleDependencies) {
int testScopePos = otherArtifactId.indexOf(":test"); int testScopePos = otherArtifactId.indexOf(":test");
@ -294,8 +296,8 @@ public class GetMavenDependenciesTask extends Task {
for (ExternalDependency otherDep : otherExtDeps) { for (ExternalDependency otherDep : otherExtDeps) {
if (otherDep.isTestDependency == isTestScope) { if (otherDep.isTestDependency == isTestScope) {
if ( ! deps.contains(otherDep) if ( ! deps.contains(otherDep)
&& ( null == allExternalDependencies.get(artifactId) && ( null == allExternalDependencies.get(module)
|| ! allExternalDependencies.get(artifactId).contains(otherDep))) { || ! allExternalDependencies.get(module).contains(otherDep))) {
// Add test-scope clone only if it's not already a compile-scope dependency. // Add test-scope clone only if it's not already a compile-scope dependency.
ExternalDependency otherDepTestScope = new ExternalDependency ExternalDependency otherDepTestScope = new ExternalDependency
(otherDep.groupId, otherDep.artifactId, otherDep.classifier, true, otherDep.isOptional); (otherDep.groupId, otherDep.artifactId, otherDep.classifier, true, otherDep.isOptional);
@ -307,13 +309,21 @@ public class GetMavenDependenciesTask extends Task {
} }
} }
} }
for (String artifactId : sharedDependencies.keySet()) { for (String module : sharedDependencies.keySet()) {
SortedSet<ExternalDependency> deps = allExternalDependencies.get(artifactId); SortedSet<ExternalDependency> deps = allExternalDependencies.get(module);
if (null == deps) { if (null == deps) {
deps = new TreeSet<>(); deps = new TreeSet<>();
allExternalDependencies.put(artifactId, deps); allExternalDependencies.put(module, deps);
}
for (ExternalDependency dep : sharedDependencies.get(module)) {
String dependencyCoordinate = dep.groupId + ":" + dep.artifactId;
if (globalOptionalExternalDependencies.contains(dependencyCoordinate)
|| (perModuleOptionalExternalDependencies.containsKey(module)
&& perModuleOptionalExternalDependencies.get(module).contains(dependencyCoordinate))) {
dep = new ExternalDependency(dep.groupId, dep.artifactId, dep.classifier, dep.isTestDependency, true);
}
deps.add(dep);
} }
deps.addAll(sharedDependencies.get(artifactId));
} }
} }
@ -671,7 +681,9 @@ public class GetMavenDependenciesTask extends Task {
} }
String conf = dependency.getAttribute("conf"); String conf = dependency.getAttribute("conf");
boolean confContainsTest = conf.contains("test"); boolean confContainsTest = conf.contains("test");
boolean isOptional = optionalExternalDependencies.contains(dependencyCoordinate); boolean isOptional = globalOptionalExternalDependencies.contains(dependencyCoordinate)
|| ( perModuleOptionalExternalDependencies.containsKey(module)
&& perModuleOptionalExternalDependencies.get(module).contains(dependencyCoordinate));
SortedSet<ExternalDependency> deps = allExternalDependencies.get(module); SortedSet<ExternalDependency> deps = allExternalDependencies.get(module);
if (null == deps) { if (null == deps) {
deps = new TreeSet<>(); deps = new TreeSet<>();

5
solr/CHANGES.txt
View File

@ -188,6 +188,11 @@ Bug Fixes
* SOLR-5951: Fixed SolrDispatchFilter to throw useful exception on startup if * SOLR-5951: Fixed SolrDispatchFilter to throw useful exception on startup if
SLF4j logging jars are missing. (Uwe Schindler, Hossman, Shawn Heisey) SLF4j logging jars are missing. (Uwe Schindler, Hossman, Shawn Heisey)
* SOLR-5950: Maven config: make the org.slf4j:slf4j-api dependency transitive
(i.e., not optional) in all modules in which it's a dependency, including
solrj, except for the WAR, where it will remain optional.
(Uwe Schindler, Steve Rowe)
Optimizations Optimizations
---------------------- ----------------------
* SOLR-1880: Distributed Search skips GET_FIELDS stage if EXECUTE_QUERY * SOLR-1880: Distributed Search skips GET_FIELDS stage if EXECUTE_QUERY