"Fossies" - the Fresh Open Source Software Archive  

Source code changes of the file "tools/src/java/org/apache/lucene/dependencies/GetMavenDependenciesTask.java" between
lucene-7.6.0-src.tgz and lucene-7.7.0-src.tgz

About: Lucene is a Java full-text search engine (not a complete application, but rather a code library and API; java source code).

GetMavenDependenciesTask.java  (lucene-7.6.0-src.tgz):GetMavenDependenciesTask.java  (lucene-7.7.0-src.tgz)
skipping to change at line 97 skipping to change at line 97
private static final Pattern SHARED_EXTERNAL_DEPENDENCIES_PATTERN private static final Pattern SHARED_EXTERNAL_DEPENDENCIES_PATTERN
= Pattern.compile("((?:solr|lucene)/(?!test-framework).*)/((?:test-)?)lib/ "); = Pattern.compile("((?:solr|lucene)/(?!test-framework).*)/((?:test-)?)lib/ ");
private static final String DEPENDENCY_MANAGEMENT_PROPERTY = "lucene.solr.depe ndency.management"; private static final String DEPENDENCY_MANAGEMENT_PROPERTY = "lucene.solr.depe ndency.management";
private static final String IVY_USER_DIR_PROPERTY = "ivy.default.ivy.user.dir" ; private static final String IVY_USER_DIR_PROPERTY = "ivy.default.ivy.user.dir" ;
private static final Properties allProperties = new Properties(); private static final Properties allProperties = new Properties();
private static final Set<String> modulesWithSeparateCompileAndTestPOMs = new H ashSet<>(); private static final Set<String> modulesWithSeparateCompileAndTestPOMs = new H ashSet<>();
private static final Set<String> globalOptionalExternalDependencies = new Hash Set<>(); private static final Set<String> globalOptionalExternalDependencies = new Hash Set<>();
private static final Map<String,Set<String>> perModuleOptionalExternalDependen cies = new HashMap<>(); private static final Map<String,Set<String>> perModuleOptionalExternalDependen cies = new HashMap<>();
private static final Set<String> modulesWithTransitiveDependencies = new HashS et<>();
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 for all modules // Add external dependencies here that should be optional for all modules
// (i.e., not invoke Maven's transitive dependency mechanism). // (i.e., not invoke Maven's transitive dependency mechanism).
// Format is "groupId:artifactId" // Format is "groupId:artifactId"
globalOptionalExternalDependencies.addAll(Arrays.asList globalOptionalExternalDependencies.addAll(Arrays.asList
("org.slf4j:jul-to-slf4j", "org.slf4j:slf4j-log4j12")); ("org.slf4j:jul-to-slf4j", "org.slf4j:slf4j-log4j12"));
// Add modules here that should NOT have their dependencies
// excluded in the grandparent POM's dependencyManagement section,
// thus enabling their dependencies to be transitive.
modulesWithTransitiveDependencies.addAll(Arrays.asList("lucene-test-framewor
k"));
} }
private final XPath xpath = XPathFactory.newInstance().newXPath(); private final XPath xpath = XPathFactory.newInstance().newXPath();
private final SortedMap<String,SortedSet<String>> internalCompileScopeDependen cies private final SortedMap<String,SortedSet<String>> internalCompileScopeDependen cies
= new TreeMap<>(); = new TreeMap<>();
private final Set<String> nonJarDependencies = new HashSet<>(); private final Set<String> nonJarDependencies = new HashSet<>();
private final Map<String,Set<String>> dependencyClassifiers = new HashMap<>(); private final Map<String,Set<String>> dependencyClassifiers = new HashMap<>();
private final Map<String,Set<String>> interModuleExternalCompileScopeDependenc ies = new HashMap<>(); private final Map<String,Set<String>> interModuleExternalCompileScopeDependenc ies = new HashMap<>();
private final Map<String,Set<String>> interModuleExternalTestScopeDependencies = new HashMap<>(); private final Map<String,Set<String>> interModuleExternalTestScopeDependencies = new HashMap<>();
private final Map<String,SortedSet<ExternalDependency>> allExternalDependencie s private final Map<String,SortedSet<ExternalDependency>> allExternalDependencie s
skipping to change at line 896 skipping to change at line 902
} }
if (isTestDependency) { if (isTestDependency) {
builder.append(indent).append(" <scope>test</scope>\n"); builder.append(indent).append(" <scope>test</scope>\n");
} }
if (isOptional) { if (isOptional) {
builder.append(indent).append(" <optional>true</optional>\n"); builder.append(indent).append(" <optional>true</optional>\n");
} }
if (null != classifier) { if (null != classifier) {
builder.append(indent).append(" <classifier>").append(classifier).append( "</classifier>\n"); builder.append(indent).append(" <classifier>").append(classifier).append( "</classifier>\n");
} }
if (null != exclusions && ! exclusions.isEmpty()) { if ( ! modulesWithTransitiveDependencies.contains(artifactId) && null != exc lusions && ! exclusions.isEmpty()) {
builder.append(indent).append(" <exclusions>\n"); builder.append(indent).append(" <exclusions>\n");
for (String dependency : exclusions) { for (String dependency : exclusions) {
int splitPos = dependency.indexOf(':'); int splitPos = dependency.indexOf(':');
String excludedGroupId = dependency.substring(0, splitPos); String excludedGroupId = dependency.substring(0, splitPos);
String excludedArtifactId = dependency.substring(splitPos + 1); String excludedArtifactId = dependency.substring(splitPos + 1);
builder.append(indent).append(" <exclusion>\n"); builder.append(indent).append(" <exclusion>\n");
builder.append(indent).append(" <groupId>").append(excludedGroupId) .append("</groupId>\n"); builder.append(indent).append(" <groupId>").append(excludedGroupId) .append("</groupId>\n");
builder.append(indent).append(" <artifactId>").append(excludedArtif actId).append("</artifactId>\n"); builder.append(indent).append(" <artifactId>").append(excludedArtif actId).append("</artifactId>\n");
builder.append(indent).append(" </exclusion>\n"); builder.append(indent).append(" </exclusion>\n");
} }
 End of changes. 3 change blocks. 
1 lines changed or deleted 8 lines changed or added

Home  |  About  |  Features  |  All  |  Newest  |  Dox  |  Diffs  |  RSS Feeds  |  Screenshots  |  Comments  |  Imprint  |  Privacy  |  HTTP(S)