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 2014/09/05 11:42:17 UTC
svn commit: r1622666 - in /lucene/dev/trunk: ./ build.xml
dev-tools/maven/lucene/core/src/test/pom.xml.template
dev-tools/maven/pom.xml.template extra-targets.xml lucene/common-build.xml
solr/
Author: uschindler
Date: Fri Sep 5 09:42:17 2014
New Revision: 1622666
URL: http://svn.apache.org/r1622666
Log:
Pass build.properties files down to Maven (fixes bug with ASF Jenkins after restructuring the Jenkins config to use property files)
Clean property handling: it reads now consistently everywhere solely ~/lucene.build.properties, ~/build.properties, /lucene/build.properties (in this order)
Excludes were fixed
Modified:
lucene/dev/trunk/ (props changed)
lucene/dev/trunk/build.xml
lucene/dev/trunk/dev-tools/maven/lucene/core/src/test/pom.xml.template
lucene/dev/trunk/dev-tools/maven/pom.xml.template
lucene/dev/trunk/extra-targets.xml
lucene/dev/trunk/lucene/common-build.xml
lucene/dev/trunk/solr/ (props changed)
Modified: lucene/dev/trunk/build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/build.xml?rev=1622666&r1=1622665&r2=1622666&view=diff
==============================================================================
--- lucene/dev/trunk/build.xml (original)
+++ lucene/dev/trunk/build.xml Fri Sep 5 09:42:17 2014
@@ -18,11 +18,11 @@
-->
<project name="lucene-solr" default="-projecthelp" basedir=".">
- <!-- Look for property definition in various *build.properties files -->
+ <!-- Give user a chance to override without editing this file
+ (and without typing -D each time it compiles it -->
<property file="${user.home}/lucene.build.properties"/>
<property file="${user.home}/build.properties"/>
- <property file="${basedir}/build.properties"/>
- <property file="lucene/build.properties"/><!-- hack for Lucene users, clones Lucene's common-build.xml -->
+ <property file="lucene/build.properties"/><!-- ${common.dir} -->
<!-- include version number from property file (includes "version.*" properties) -->
<loadproperties srcFile="lucene/version.properties"/>
Modified: lucene/dev/trunk/dev-tools/maven/lucene/core/src/test/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/dev-tools/maven/lucene/core/src/test/pom.xml.template?rev=1622666&r1=1622665&r2=1622666&view=diff
==============================================================================
--- lucene/dev/trunk/dev-tools/maven/lucene/core/src/test/pom.xml.template (original)
+++ lucene/dev/trunk/dev-tools/maven/lucene/core/src/test/pom.xml.template Fri Sep 5 09:42:17 2014
@@ -70,15 +70,6 @@
</configuration>
</plugin>
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <systemPropertyVariables>
- <lucene.version>${project.version}</lucene.version>
- </systemPropertyVariables>
- </configuration>
- </plugin>
- <plugin>
<groupId>de.thetaphi</groupId>
<artifactId>forbiddenapis</artifactId>
<executions>
Modified: lucene/dev/trunk/dev-tools/maven/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/dev-tools/maven/pom.xml.template?rev=1622666&r1=1622665&r2=1622666&view=diff
==============================================================================
--- lucene/dev/trunk/dev-tools/maven/pom.xml.template (original)
+++ lucene/dev/trunk/dev-tools/maven/pom.xml.template Fri Sep 5 09:42:17 2014
@@ -239,7 +239,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
- <version>2.15</version>
+ <version>2.17</version>
<configuration>
<runOrder>random</runOrder>
<reportFormat>plain</reportFormat>
Modified: lucene/dev/trunk/extra-targets.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/extra-targets.xml?rev=1622666&r1=1622665&r2=1622666&view=diff
==============================================================================
--- lucene/dev/trunk/extra-targets.xml (original)
+++ lucene/dev/trunk/extra-targets.xml Fri Sep 5 09:42:17 2014
@@ -74,11 +74,20 @@
</target>
<target name="-run-maven-build" depends="install-maven-tasks">
+ <!-- we load all user properties from files again using a prefix, to only pass those down, not all of Ant: -->
+ <property file="${user.home}/lucene.build.properties" prefix="m2userprop."/>
+ <property file="${user.home}/build.properties" prefix="m2userprop."/>
+ <property file="${common.dir}/build.properties" prefix="m2userprop."/>
<mvn xmlns="antlib:org.apache.maven.artifact.ant" pom="${maven-build-dir}/pom.xml"
mavenVersion="${maven-version}" failonerror="true" fork="true">
<arg value="-fae"/>
<arg value="install"/>
<syspropertyset>
+ <propertyref prefix="m2userprop."/>
+ <mapper type="glob" from="m2userprop.*" to="*"/>
+ </syspropertyset>
+ <!-- order is important: later ones override previous ones (against common Ant behaviour): -->
+ <syspropertyset>
<propertyref builtin="commandline"/>
</syspropertyset>
</mvn>
Modified: lucene/dev/trunk/lucene/common-build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/common-build.xml?rev=1622666&r1=1622665&r2=1622666&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/common-build.xml (original)
+++ lucene/dev/trunk/lucene/common-build.xml Fri Sep 5 09:42:17 2014
@@ -32,7 +32,6 @@
(and without typing -D each time it compiles it -->
<property file="${user.home}/lucene.build.properties"/>
<property file="${user.home}/build.properties"/>
- <property file="${basedir}/build.properties"/>
<property file="${common.dir}/build.properties"/>
<property name="dev-tools.dir" location="${common.dir}/../dev-tools"/>