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:50:20 UTC
svn commit: r1482644 - in /lucene/dev/branches/branch_4x: ./ dev-tools/
dev-tools/maven/lucene/replicator/ lucene/ lucene/licenses/
Author: sarowe
Date: Tue May 14 23:50:19 2013
New Revision: 1482644
URL: http://svn.apache.org/r1482644
Log:
LUCENE-4975: replicator module: make validate-maven-dependencies succeed (merged trunk r1482640 and r1482641)
Added:
lucene/dev/branches/branch_4x/lucene/licenses/javax.servlet-3.0.0.v201112011016.jar.sha1
- copied unchanged from r1482640, lucene/dev/trunk/lucene/licenses/javax.servlet-3.0.0.v201112011016.jar.sha1
Removed:
lucene/dev/branches/branch_4x/lucene/licenses/javax.servlet-api-LICENSE-CDDL.txt
lucene/dev/branches/branch_4x/lucene/licenses/javax.servlet-api-NOTICE.txt
Modified:
lucene/dev/branches/branch_4x/ (props changed)
lucene/dev/branches/branch_4x/dev-tools/ (props changed)
lucene/dev/branches/branch_4x/dev-tools/maven/lucene/replicator/pom.xml.template
lucene/dev/branches/branch_4x/lucene/ (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)
Modified: lucene/dev/branches/branch_4x/dev-tools/maven/lucene/replicator/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/dev-tools/maven/lucene/replicator/pom.xml.template?rev=1482644&r1=1482643&r2=1482644&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/dev-tools/maven/lucene/replicator/pom.xml.template (original)
+++ lucene/dev/branches/branch_4x/dev-tools/maven/lucene/replicator/pom.xml.template Tue May 14 23:50:19 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/branches/branch_4x/lucene/build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/build.xml?rev=1482644&r1=1482643&r2=1482644&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/build.xml (original)
+++ lucene/dev/branches/branch_4x/lucene/build.xml Tue May 14 23:50:19 2013
@@ -41,7 +41,6 @@
excludes="build/**,site/**,tools/**,**/lib/*servlet-api*.jar"
/>
-
<!-- ================================================================== -->
<!-- Prepares the build directory -->
<!-- ================================================================== -->
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=1482644&r1=1482643&r2=1482644&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/common-build.xml (original)
+++ lucene/dev/branches/branch_4x/lucene/common-build.xml Tue May 14 23:50:19 2013
@@ -1417,7 +1417,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">
@@ -1444,6 +1444,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>