You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by us...@apache.org on 2012/03/08 00:13:14 UTC
svn commit: r1298200 - in /lucene/dev/branches/branch_3x: ./ lucene/
lucene/tools/custom-tasks.xml solr/ solr/build.xml
Author: uschindler
Date: Wed Mar 7 23:13:14 2012
New Revision: 1298200
URL: http://svn.apache.org/viewvc?rev=1298200&view=rev
Log:
Merged revision(s) 1298198 from lucene/dev/trunk:
SOLR-3204: fix license-check problem #2 (move solr-specific rules to solr)
Modified:
lucene/dev/branches/branch_3x/ (props changed)
lucene/dev/branches/branch_3x/lucene/ (props changed)
lucene/dev/branches/branch_3x/lucene/tools/custom-tasks.xml
lucene/dev/branches/branch_3x/solr/ (props changed)
lucene/dev/branches/branch_3x/solr/build.xml
Modified: lucene/dev/branches/branch_3x/lucene/tools/custom-tasks.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/lucene/tools/custom-tasks.xml?rev=1298200&r1=1298199&r2=1298200&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/lucene/tools/custom-tasks.xml (original)
+++ lucene/dev/branches/branch_3x/lucene/tools/custom-tasks.xml Wed Mar 7 23:13:14 2012
@@ -45,9 +45,6 @@
<!-- Non-typical version patterns. -->
<additional-filters />
<replaceregex pattern="/xercesImpl([^/]+)$" replace="/xercesImpl" flags="gi" />
- <replaceregex pattern="/apache-solr-commons-csv-([^/]+)$" replace="/apache-solr-commons-csv" flags="gi" />
- <replaceregex pattern="/(bcmail|bcprov)-([^/]+)$" replace="/\1" flags="gi" />
- <replaceregex pattern="/slf4j-([^/]+)$" replace="/slf4j" flags="gi" />
<!-- Typical version patterns. -->
<replaceregex pattern="\-(r)?([0-9\-\_\.])+(b(eta)?([0-9\-\.])*)?$" replace="" flags="gi" />
Modified: lucene/dev/branches/branch_3x/solr/build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/build.xml?rev=1298200&r1=1298199&r2=1298200&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/build.xml (original)
+++ lucene/dev/branches/branch_3x/solr/build.xml Wed Mar 7 23:13:14 2012
@@ -185,7 +185,6 @@
<exclude name="example/work/**" />
</additional-excludes>
<additional-filters>
- <replaceregex pattern="/apache-solr-commons-csv([^/]+)$" replace="/apache-solr-commons-csv" flags="gi" />
<replaceregex pattern="/hppc([^/]+)$" replace="/hppc" flags="gi" />
<replaceregex pattern="/langdetect([^/]+)$" replace="/langdetect" flags="gi" />
<replaceregex pattern="/geronimo-stax([^/]+)$" replace="/geronimo-stax" flags="gi" />
@@ -193,6 +192,9 @@
<replaceregex pattern="/jetty-6([^/]+)$" replace="/jetty" flags="gi" />
<replaceregex pattern="/jsp-2.1-glassfish([^/]+)$" replace="/jsp-2.1-glassfish" flags="gi" />
<replaceregex pattern="/jsp-api-2.1-glassfish([^/]+)$" replace="/jsp-api-2.1-glassfish" flags="gi" />
+ <replaceregex pattern="/apache-solr-commons-csv-([^/]+)$" replace="/apache-solr-commons-csv" flags="gi" />
+ <replaceregex pattern="/slf4j-([^/]+)$" replace="/slf4j" flags="gi" />
+ <replaceregex pattern="/(bcmail|bcprov)-([^/]+)$" replace="/\1" flags="gi" />
</additional-filters>
</license-check-macro>
</target>