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 2013/01/03 00:34:08 UTC
svn commit: r1428111 - in /lucene/dev/branches/branch_4x: ./ lucene/
lucene/analysis/ lucene/analysis/build.xml lucene/build.xml
lucene/common-build.xml solr/ solr/build.xml solr/common-build.xml
Author: uschindler
Date: Wed Jan 2 23:34:07 2013
New Revision: 1428111
URL: http://svn.apache.org/viewvc?rev=1428111&view=rev
Log:
Merged revision(s) 1428110 from lucene/dev/trunk:
Apply stricter checks on maven dependencies to fail if a different Lucene version is imported as transitive dependency
Modified:
lucene/dev/branches/branch_4x/ (props changed)
lucene/dev/branches/branch_4x/lucene/ (props changed)
lucene/dev/branches/branch_4x/lucene/analysis/ (props changed)
lucene/dev/branches/branch_4x/lucene/analysis/build.xml
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/solr/ (props changed)
lucene/dev/branches/branch_4x/solr/build.xml (contents, props changed)
lucene/dev/branches/branch_4x/solr/common-build.xml (contents, props changed)
Modified: lucene/dev/branches/branch_4x/lucene/analysis/build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/analysis/build.xml?rev=1428111&r1=1428110&r2=1428111&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/analysis/build.xml (original)
+++ lucene/dev/branches/branch_4x/lucene/analysis/build.xml Wed Jan 2 23:34:07 2013
@@ -36,7 +36,7 @@
<attribute name="target" />
<sequential>
<subant target="@{target}" inheritall="false" failonerror="true">
- <propertyset refid="uptodate.and.compiled.properties"/>
+ <propertyset refid="uptodate.and.compiled.properties"/>
<fileset dir="${analyzers.dir}" includes="*/build.xml" />
</subant>
</sequential>
@@ -46,6 +46,7 @@
<propertyref regex=".*\.uptodate$$"/>
<propertyref regex=".*\.compiled$$"/>
<propertyref regex=".*\.loaded$$"/>
+ <propertyref name="maven.version.glob"/>
</propertyset>
<target name="common">
Modified: lucene/dev/branches/branch_4x/lucene/build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/build.xml?rev=1428111&r1=1428110&r2=1428111&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/build.xml (original)
+++ lucene/dev/branches/branch_4x/lucene/build.xml Wed Jan 2 23:34:07 2013
@@ -482,7 +482,7 @@
</sequential>
</target>
- <target name="-validate-maven-dependencies" depends="compile-tools, install-maven-tasks, load-custom-tasks">
+ <target name="-validate-maven-dependencies" depends="compile-tools, install-maven-tasks, load-custom-tasks, -define-maven-version-glob">
<sequential>
<subant target="-validate-maven-dependencies" failonerror="true" inheritall="false">
<propertyset refid="uptodate.and.compiled.properties"/>
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=1428111&r1=1428110&r2=1428111&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/common-build.xml (original)
+++ lucene/dev/branches/branch_4x/lucene/common-build.xml Wed Jan 2 23:34:07 2013
@@ -246,6 +246,7 @@
<propertyref regex=".*\.uptodate$$"/>
<propertyref regex=".*\.compiled$$"/>
<propertyref regex=".*\.loaded$$"/>
+ <propertyref name="maven.version.glob"/>
<propertyref name="lucene.javadoc.url"/><!-- for Solr -->
</propertyset>
@@ -1349,6 +1350,13 @@ ${tests-output}/junit4-*.suites - pe
</m2-deploy>
</sequential>
</target>
+
+ <target name="-define-maven-version-glob" depends="resolve-groovy" unless="maven.version.glob">
+ <!-- Too stupid, that ANT cannot apply regexes to property values: -->
+ <script language="groovy" classpathref="groovy.classpath"><![CDATA[
+ project.setProperty('maven.version.glob', project.getProperty('version').replaceAll(/\-SNAPSHOT/, '-*'));
+ ]]></script>
+ </target>
<target name="-validate-maven-dependencies">
<property name="top.level.dir" location="${common.dir}/.."/>
@@ -1363,7 +1371,7 @@ ${tests-output}/junit4-*.suites - pe
</pathconvert>
<m2-validate-dependencies pom.xml="${pom.xml}" licenseDirectory="${license.dir}">
<excludes>
- <rsel:name name="**/lucene-*.jar" handledirsep="true"/>
+ <rsel:name name="**/lucene-*-${maven.version.glob}.jar" handledirsep="true"/>
</excludes>
</m2-validate-dependencies>
</target>
Modified: lucene/dev/branches/branch_4x/solr/build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/build.xml?rev=1428111&r1=1428110&r2=1428111&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/build.xml (original)
+++ lucene/dev/branches/branch_4x/solr/build.xml Wed Jan 2 23:34:07 2013
@@ -589,7 +589,7 @@
</subant>
</target>
- <target name="-validate-maven-dependencies" depends="compile-tools, install-maven-tasks, load-custom-tasks">
+ <target name="-validate-maven-dependencies" depends="compile-tools, install-maven-tasks, load-custom-tasks, -define-maven-version-glob">
<sequential>
<subant target="-validate-maven-dependencies" failonerror="true" inheritall="false">
<propertyset refid="uptodate.and.compiled.properties"/>
Modified: lucene/dev/branches/branch_4x/solr/common-build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/common-build.xml?rev=1428111&r1=1428110&r2=1428111&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/common-build.xml (original)
+++ lucene/dev/branches/branch_4x/solr/common-build.xml Wed Jan 2 23:34:07 2013
@@ -325,8 +325,8 @@
</additional-filters>
<excludes>
<rsel:or>
- <rsel:name name="**/lucene-*.jar" handledirsep="true"/>
- <rsel:name name="**/solr-*.jar" handledirsep="true"/>
+ <rsel:name name="**/lucene-*-${maven.version.glob}.jar" handledirsep="true"/>
+ <rsel:name name="**/solr-*-${maven.version.glob}.jar" handledirsep="true"/>
<!-- TODO: figure out what is going on here with servlet-apis -->
<rsel:name name="**/*servlet*.jar" handledirsep="true"/>
</rsel:or>