lucene-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sar...@apache.org
Subject svn commit: r1482853 - in /lucene/dev/branches/branch_4x: ./ lucene/ lucene/licenses/ lucene/replicator/
Date Wed, 15 May 2013 14:05:21 GMT
Author: sarowe
Date: Wed May 15 14:05:20 2013
New Revision: 1482853

URL: http://svn.apache.org/r1482853
Log:
LUCENE-4975: replicator module: don't rename javax.servlet-*.jar to servlet-api-*.jar (merged
trunk r1482839)

Added:
    lucene/dev/branches/branch_4x/lucene/licenses/javax.servlet-3.0.0.v201112011016.jar.sha1
      - copied unchanged from r1482839, lucene/dev/trunk/lucene/licenses/javax.servlet-3.0.0.v201112011016.jar.sha1
    lucene/dev/branches/branch_4x/lucene/licenses/javax.servlet-LICENSE-CDDL.txt
      - copied unchanged from r1482839, lucene/dev/trunk/lucene/licenses/javax.servlet-LICENSE-CDDL.txt
    lucene/dev/branches/branch_4x/lucene/licenses/javax.servlet-NOTICE.txt
      - copied unchanged from r1482839, lucene/dev/trunk/lucene/licenses/javax.servlet-NOTICE.txt
Removed:
    lucene/dev/branches/branch_4x/lucene/licenses/servlet-api-3.0.jar.sha1
Modified:
    lucene/dev/branches/branch_4x/   (props changed)
    lucene/dev/branches/branch_4x/lucene/   (props changed)
    lucene/dev/branches/branch_4x/lucene/NOTICE.txt   (contents, props changed)
    lucene/dev/branches/branch_4x/lucene/build.xml   (contents, props changed)
    lucene/dev/branches/branch_4x/lucene/common-build.xml   (contents, props changed)
    lucene/dev/branches/branch_4x/lucene/licenses/   (props changed)
    lucene/dev/branches/branch_4x/lucene/replicator/   (props changed)
    lucene/dev/branches/branch_4x/lucene/replicator/build.xml

Modified: lucene/dev/branches/branch_4x/lucene/NOTICE.txt
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/NOTICE.txt?rev=1482853&r1=1482852&r2=1482853&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/NOTICE.txt (original)
+++ lucene/dev/branches/branch_4x/lucene/NOTICE.txt Wed May 15 14:05:20 2013
@@ -104,8 +104,8 @@ LGPL and Creative Commons ShareAlike.
 Morfologic includes data from BSD-licensed dictionary of Polish (SGJP)
 (http://sgjp.pl/morfeusz/)
 
-Servlet-api.jar is under the CDDL license, the original source
-code for this can be found at http://www.eclipse.org/jetty/downloads.php
+Servlet-api.jar and javax.servlet-*.jar are under the CDDL license, the original 
+source code for this can be found at http://www.eclipse.org/jetty/downloads.php
 
 ===========================================================================
 Kuromoji Japanese Morphological Analyzer - Apache Lucene Integration

Modified: lucene/dev/branches/branch_4x/lucene/build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/build.xml?rev=1482853&r1=1482852&r2=1482853&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/build.xml (original)
+++ lucene/dev/branches/branch_4x/lucene/build.xml Wed May 15 14:05:20 2013
@@ -163,6 +163,7 @@
       <additional-filters>
         <replaceregex pattern="jetty([^/]+)$" replace="jetty" flags="gi" />
         <replaceregex pattern="slf4j-([^/]+)$" replace="slf4j" flags="gi" />
+        <replaceregex pattern="javax\.servlet([^/]+)$" replace="javax.servlet" flags="gi"
/>
         <replaceregex pattern="(bcmail|bcprov)-([^/]+)$" replace="\1" flags="gi" />
       </additional-filters>
     </license-check-macro>

Modified: lucene/dev/branches/branch_4x/lucene/common-build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/common-build.xml?rev=1482853&r1=1482852&r2=1482853&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/common-build.xml (original)
+++ lucene/dev/branches/branch_4x/lucene/common-build.xml Wed May 15 14:05:20 2013
@@ -1447,7 +1447,7 @@ ${tests-output}/junit4-*.suites     - pe
       <additional-filters>
         <replaceregex pattern="jetty([^/]+)$" replace="jetty" flags="gi" />
         <replaceregex pattern="slf4j-([^/]+)$" replace="slf4j" flags="gi" />
-        <replaceregex pattern="javax\.servlet-([^/]+)$" replace="servlet-api" flags="gi"
/>
+        <replaceregex pattern="javax\.servlet([^/]+)$" replace="javax.servlet" flags="gi"
/>
       </additional-filters>
       <excludes>
         <rsel:name name="**/lucene-*-${maven.version.glob}.jar" handledirsep="true"/>

Modified: lucene/dev/branches/branch_4x/lucene/replicator/build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/replicator/build.xml?rev=1482853&r1=1482852&r2=1482853&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/replicator/build.xml (original)
+++ lucene/dev/branches/branch_4x/lucene/replicator/build.xml Wed May 15 14:05:20 2013
@@ -31,8 +31,8 @@
 
 	<target name="resolve" depends="common.resolve">
 		<sequential>
-	    <!-- servlet-api.jar -->
-	    <ivy:retrieve conf="servlet" log="download-only" type="orbit" pattern="lib/servlet-api-3.0.jar"/>
+	    <!-- javax.servlet jar -->
+	    <ivy:retrieve conf="servlet" log="download-only" type="orbit"/>
 		</sequential>
 	</target>
 



Mime
View raw message