You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by sa...@apache.org on 2013/05/15 01:29:04 UTC
svn commit: r1482640 - in /lucene/dev/trunk:
dev-tools/maven/lucene/replicator/ lucene/ lucene/licenses/
Author: sarowe
Date: Tue May 14 23:29:03 2013
New Revision: 1482640
URL: http://svn.apache.org/r1482640
Log:
LUCENE-4975: replicator module: make validate-maven-dependencies succeed
Added:
lucene/dev/trunk/lucene/licenses/javax.servlet-3.0.0.v201112011016.jar.sha1 (with props)
Removed:
lucene/dev/trunk/lucene/licenses/javax.servlet-api-LICENSE-CDDL.txt
lucene/dev/trunk/lucene/licenses/javax.servlet-api-NOTICE.txt
Modified:
lucene/dev/trunk/dev-tools/maven/lucene/replicator/pom.xml.template
lucene/dev/trunk/lucene/build.xml
lucene/dev/trunk/lucene/common-build.xml
Modified: lucene/dev/trunk/dev-tools/maven/lucene/replicator/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/dev-tools/maven/lucene/replicator/pom.xml.template?rev=1482640&r1=1482639&r2=1482640&view=diff
==============================================================================
--- lucene/dev/trunk/dev-tools/maven/lucene/replicator/pom.xml.template (original)
+++ lucene/dev/trunk/dev-tools/maven/lucene/replicator/pom.xml.template Tue May 14 23:29:03 2013
@@ -76,6 +76,12 @@
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-servlet</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-security</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
Modified: lucene/dev/trunk/lucene/build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/build.xml?rev=1482640&r1=1482639&r2=1482640&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/build.xml (original)
+++ lucene/dev/trunk/lucene/build.xml Tue May 14 23:29:03 2013
@@ -41,7 +41,7 @@
excludes="build/**,site/**,tools/**,**/lib/*servlet-api*.jar"
/>
-
+<target name="valll" depends="-validate-maven-dependencies"/>
<!-- ================================================================== -->
<!-- Prepares the build directory -->
<!-- ================================================================== -->
Modified: lucene/dev/trunk/lucene/common-build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/common-build.xml?rev=1482640&r1=1482639&r2=1482640&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/common-build.xml (original)
+++ lucene/dev/trunk/lucene/common-build.xml Tue May 14 23:29:03 2013
@@ -1414,7 +1414,7 @@ ${tests-output}/junit4-*.suites - pe
</sequential>
</target>
- <target name="-validate-maven-dependencies.init">
+ <target name="-validate-maven-dependencies.init" depends="filter-pom-templates">
<!-- find the correct pom.xml path and assigns it to property pom.xml -->
<property name="top.level.dir" location="${common.dir}/.."/>
<pathconvert property="maven.pom.xml">
@@ -1441,6 +1441,11 @@ ${tests-output}/junit4-*.suites - pe
<target name="-validate-maven-dependencies" depends="-validate-maven-dependencies.init">
<m2-validate-dependencies pom.xml="${maven.pom.xml}" licenseDirectory="${license.dir}">
+ <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" />
+ </additional-filters>
<excludes>
<rsel:name name="**/lucene-*-${maven.version.glob}.jar" handledirsep="true"/>
</excludes>
Added: lucene/dev/trunk/lucene/licenses/javax.servlet-3.0.0.v201112011016.jar.sha1
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/licenses/javax.servlet-3.0.0.v201112011016.jar.sha1?rev=1482640&view=auto
==============================================================================
--- lucene/dev/trunk/lucene/licenses/javax.servlet-3.0.0.v201112011016.jar.sha1 (added)
+++ lucene/dev/trunk/lucene/licenses/javax.servlet-3.0.0.v201112011016.jar.sha1 Tue May 14 23:29:03 2013
@@ -0,0 +1 @@
+0aaaa85845fb5c59da00193f06b8e5278d8bf3f8