svn commit: r1584261 - in /lucene/dev/branches/branch_4x: ./ lucene/ lucene/tools/ lucene/tools/src/java/org/apache/lucene/dependencies/GetMavenDependenciesTask.java

[sa...@apache.org]

Author: sarowe
Date: Thu Apr  3 05:35:24 2014
New Revision: 1584261

URL: http://svn.apache.org/r1584261
Log:
SOLR-5920: Maven config: restrict conversion of module names containing 'analysis-' to 'analyzers-' to those not preceded by 'solr-' (merged trunk r1584260)

Modified:
    lucene/dev/branches/branch_4x/   (props changed)
    lucene/dev/branches/branch_4x/lucene/   (props changed)
    lucene/dev/branches/branch_4x/lucene/tools/   (props changed)
    lucene/dev/branches/branch_4x/lucene/tools/src/java/org/apache/lucene/dependencies/GetMavenDependenciesTask.java

Modified: lucene/dev/branches/branch_4x/lucene/tools/src/java/org/apache/lucene/dependencies/GetMavenDependenciesTask.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/tools/src/java/org/apache/lucene/dependencies/GetMavenDependenciesTask.java?rev=1584261&r1=1584260&r2=1584261&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/tools/src/java/org/apache/lucene/dependencies/GetMavenDependenciesTask.java (original)
+++ lucene/dev/branches/branch_4x/lucene/tools/src/java/org/apache/lucene/dependencies/GetMavenDependenciesTask.java Thu Apr  3 05:35:24 2014
@@ -152,7 +152,7 @@ public class GetMavenDependenciesTask ex
   }
 
   public void setVerbose(boolean verbose) {
-    verboseLevel = (verbose ? Project.MSG_INFO : Project.MSG_VERBOSE);
+    verboseLevel = (verbose ? Project.MSG_VERBOSE : Project.MSG_INFO);
   }
 
   public void setCentralizedVersionsFile(File file) {
@@ -614,7 +614,7 @@ public class GetMavenDependenciesTask ex
       // Pattern.compile("(lucene|solr)/build/(.*)/classes/java");
       String artifact = matcher.group(2);
       artifact = artifact.replace('/', '-');
-      artifact = artifact.replace("analysis-", "analyzers-");
+      artifact = artifact.replace("(?<!solr-)analysis-", "analyzers-");
       if ("lucene".equals(matcher.group(1))) {
         artifactId.append("lucene-");
       }