From b449d3df60106543aefe25a829a81d3bf7f01f04 Mon Sep 17 00:00:00 2001 From: Steven Rowe Date: Thu, 31 Oct 2013 22:52:32 +0000 Subject: [PATCH] LUCENE-5217: Relax internal dependency jar regex to allow Jenkins to succeed when version contains a date/time stamp git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1537748 13f79535-47bb-0310-9956-ffa450edef68 --- .../apache/lucene/dependencies/GetMavenDependenciesTask.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/lucene/tools/src/java/org/apache/lucene/dependencies/GetMavenDependenciesTask.java b/lucene/tools/src/java/org/apache/lucene/dependencies/GetMavenDependenciesTask.java index 52d4d05ae1d..17c88d2074b 100644 --- a/lucene/tools/src/java/org/apache/lucene/dependencies/GetMavenDependenciesTask.java +++ b/lucene/tools/src/java/org/apache/lucene/dependencies/GetMavenDependenciesTask.java @@ -80,9 +80,10 @@ public class GetMavenDependenciesTask extends Task { // lucene/build/core/classes/java private static final Pattern COMPILATION_OUTPUT_DIRECTORY_PATTERN = Pattern.compile("(lucene|solr)/build/(?:contrib/)?(.*)/classes/(?:java|test)"); - // lucene/build/analysis/common/lucene-analyzers-common-5.0-SNAPSHOT.jar + // Local: lucene/build/analysis/common/lucene-analyzers-common-5.0-SNAPSHOT.jar + // Jenkins: lucene/build/analysis/common/lucene-analyzers-common-5.0-2013-10-31_18-52-24.jar private static final Pattern INTERNAL_JAR_PATTERN - = Pattern.compile(".*(lucene|solr)([^/]*?)-(?:\\d\\.)+\\d(?:-SNAPSHOT)?\\.jar"); + = Pattern.compile(".*(lucene|solr)([^/]*?)-\\d[-._\\d]*(?:-SNAPSHOT)?\\.jar"); private static final Pattern PROPERTY_REFERENCE_PATTERN = Pattern.compile("\\$\\{([^}]+)\\}"); private static final String UNWANTED_INTERNAL_DEPENDENCIES = "/(?:test-)?lib/|test-framework/classes/java|/test-files|/resources";