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 2012/08/12 22:00:27 UTC
svn commit: r1372191 - in /lucene/dev/branches/branch_4x: ./ dev-tools/
dev-tools/maven/solr/ dev-tools/maven/solr/contrib/analysis-extras/
dev-tools/maven/solr/contrib/clustering/
dev-tools/maven/solr/contrib/dataimporthandler-extras/ dev-tools/maven/...
Author: sarowe
Date: Sun Aug 12 20:00:26 2012
New Revision: 1372191
URL: http://svn.apache.org/viewvc?rev=1372191&view=rev
Log:
maven build: reduce solr test logging output, to allow Jenkins mailer to succeed (merge r1372190 from trunk)
Added:
lucene/dev/branches/branch_4x/dev-tools/maven/solr/maven.testlogging.properties
- copied unchanged from r1372190, lucene/dev/trunk/dev-tools/maven/solr/maven.testlogging.properties
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/solr/contrib/analysis-extras/pom.xml.template
lucene/dev/branches/branch_4x/dev-tools/maven/solr/contrib/clustering/pom.xml.template
lucene/dev/branches/branch_4x/dev-tools/maven/solr/contrib/dataimporthandler-extras/pom.xml.template
lucene/dev/branches/branch_4x/dev-tools/maven/solr/contrib/dataimporthandler/pom.xml.template
lucene/dev/branches/branch_4x/dev-tools/maven/solr/contrib/extraction/pom.xml.template
lucene/dev/branches/branch_4x/dev-tools/maven/solr/contrib/langid/pom.xml.template
lucene/dev/branches/branch_4x/dev-tools/maven/solr/contrib/uima/pom.xml.template
lucene/dev/branches/branch_4x/dev-tools/maven/solr/contrib/velocity/pom.xml.template
lucene/dev/branches/branch_4x/dev-tools/maven/solr/core/pom.xml.template
lucene/dev/branches/branch_4x/dev-tools/maven/solr/pom.xml.template
lucene/dev/branches/branch_4x/lucene/ (props changed)
lucene/dev/branches/branch_4x/solr/ (props changed)
Modified: lucene/dev/branches/branch_4x/dev-tools/maven/solr/contrib/analysis-extras/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/dev-tools/maven/solr/contrib/analysis-extras/pom.xml.template?rev=1372191&r1=1372190&r2=1372191&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/dev-tools/maven/solr/contrib/analysis-extras/pom.xml.template (original)
+++ lucene/dev/branches/branch_4x/dev-tools/maven/solr/contrib/analysis-extras/pom.xml.template Sun Aug 12 20:00:26 2012
@@ -35,7 +35,6 @@
<module-directory>solr/contrib/analysis-extras</module-directory>
<top-level>../../../..</top-level>
<module-path>${top-level}/${module-directory}</module-path>
- <surefire-top-level>${top-level}/../..</surefire-top-level>
</properties>
<scm>
<connection>scm:svn:${vc-anonymous-base-url}/${module-directory}</connection>
@@ -95,17 +94,12 @@
<testResource>
<directory>${top-level}/solr/core/src/test-files</directory>
</testResource>
+ <testResource>
+ <directory>${top-level}/dev-tools/maven/solr</directory>
+ <includes>
+ <include>maven.testlogging.properties</include>
+ </includes>
+ </testResource>
</testResources>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <systemPropertyVariables>
- <java.util.logging.config.file>${surefire-top-level}/solr/testlogging.properties</java.util.logging.config.file>
- </systemPropertyVariables>
- </configuration>
- </plugin>
- </plugins>
</build>
</project>
Modified: lucene/dev/branches/branch_4x/dev-tools/maven/solr/contrib/clustering/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/dev-tools/maven/solr/contrib/clustering/pom.xml.template?rev=1372191&r1=1372190&r2=1372191&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/dev-tools/maven/solr/contrib/clustering/pom.xml.template (original)
+++ lucene/dev/branches/branch_4x/dev-tools/maven/solr/contrib/clustering/pom.xml.template Sun Aug 12 20:00:26 2012
@@ -35,7 +35,6 @@
<module-directory>solr/contrib/clustering</module-directory>
<top-level>../../../..</top-level>
<module-path>${top-level}/${module-directory}</module-path>
- <surefire-top-level>${top-level}/../..</surefire-top-level>
</properties>
<scm>
<connection>scm:svn:${vc-anonymous-base-url}/${module-directory}</connection>
@@ -100,17 +99,12 @@
<testResource>
<directory>${top-level}/solr/core/src/test-files</directory>
</testResource>
+ <testResource>
+ <directory>${top-level}/dev-tools/maven/solr</directory>
+ <includes>
+ <include>maven.testlogging.properties</include>
+ </includes>
+ </testResource>
</testResources>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <systemPropertyVariables>
- <java.util.logging.config.file>${surefire-top-level}/solr/testlogging.properties</java.util.logging.config.file>
- </systemPropertyVariables>
- </configuration>
- </plugin>
- </plugins>
</build>
</project>
Modified: lucene/dev/branches/branch_4x/dev-tools/maven/solr/contrib/dataimporthandler-extras/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/dev-tools/maven/solr/contrib/dataimporthandler-extras/pom.xml.template?rev=1372191&r1=1372190&r2=1372191&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/dev-tools/maven/solr/contrib/dataimporthandler-extras/pom.xml.template (original)
+++ lucene/dev/branches/branch_4x/dev-tools/maven/solr/contrib/dataimporthandler-extras/pom.xml.template Sun Aug 12 20:00:26 2012
@@ -35,7 +35,6 @@
<module-directory>solr/contrib/dataimporthandler-extras</module-directory>
<top-level>../../../..</top-level>
<module-path>${top-level}/${module-directory}</module-path>
- <surefire-top-level>${top-level}/../..</surefire-top-level>
</properties>
<scm>
<connection>scm:svn:${vc-anonymous-base-url}/${module-directory}</connection>
@@ -98,17 +97,12 @@
<testResource>
<directory>${top-level}/solr/core/src/test-files</directory>
</testResource>
+ <testResource>
+ <directory>${top-level}/dev-tools/maven/solr</directory>
+ <includes>
+ <include>maven.testlogging.properties</include>
+ </includes>
+ </testResource>
</testResources>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <systemPropertyVariables>
- <java.util.logging.config.file>${surefire-top-level}/solr/testlogging.properties</java.util.logging.config.file>
- </systemPropertyVariables>
- </configuration>
- </plugin>
- </plugins>
</build>
</project>
Modified: lucene/dev/branches/branch_4x/dev-tools/maven/solr/contrib/dataimporthandler/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/dev-tools/maven/solr/contrib/dataimporthandler/pom.xml.template?rev=1372191&r1=1372190&r2=1372191&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/dev-tools/maven/solr/contrib/dataimporthandler/pom.xml.template (original)
+++ lucene/dev/branches/branch_4x/dev-tools/maven/solr/contrib/dataimporthandler/pom.xml.template Sun Aug 12 20:00:26 2012
@@ -35,7 +35,6 @@
<module-directory>solr/contrib/dataimporthandler</module-directory>
<top-level>../../../..</top-level>
<module-path>${top-level}/${module-directory}</module-path>
- <surefire-top-level>${top-level}/../..</surefire-top-level>
</properties>
<scm>
<connection>scm:svn:${vc-anonymous-base-url}/${module-directory}</connection>
@@ -84,6 +83,12 @@
<testResource>
<directory>${top-level}/solr/core/src/test-files</directory>
</testResource>
+ <testResource>
+ <directory>${top-level}/dev-tools/maven/solr</directory>
+ <includes>
+ <include>maven.testlogging.properties</include>
+ </includes>
+ </testResource>
</testResources>
<plugins>
<plugin>
@@ -97,15 +102,6 @@
</execution>
</executions>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <systemPropertyVariables>
- <java.util.logging.config.file>${surefire-top-level}/solr/testlogging.properties</java.util.logging.config.file>
- </systemPropertyVariables>
- </configuration>
- </plugin>
</plugins>
</build>
</project>
Modified: lucene/dev/branches/branch_4x/dev-tools/maven/solr/contrib/extraction/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/dev-tools/maven/solr/contrib/extraction/pom.xml.template?rev=1372191&r1=1372190&r2=1372191&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/dev-tools/maven/solr/contrib/extraction/pom.xml.template (original)
+++ lucene/dev/branches/branch_4x/dev-tools/maven/solr/contrib/extraction/pom.xml.template Sun Aug 12 20:00:26 2012
@@ -38,7 +38,6 @@
<module-directory>solr/contrib/extraction</module-directory>
<top-level>../../../..</top-level>
<module-path>${top-level}/${module-directory}</module-path>
- <surefire-top-level>${top-level}/../..</surefire-top-level>
</properties>
<scm>
<connection>scm:svn:${vc-anonymous-base-url}/${module-directory}</connection>
@@ -96,17 +95,12 @@
<testResource>
<directory>${top-level}/solr/core/src/test-files</directory>
</testResource>
+ <testResource>
+ <directory>${top-level}/dev-tools/maven/solr</directory>
+ <includes>
+ <include>maven.testlogging.properties</include>
+ </includes>
+ </testResource>
</testResources>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <systemPropertyVariables>
- <java.util.logging.config.file>${surefire-top-level}/solr/testlogging.properties</java.util.logging.config.file>
- </systemPropertyVariables>
- </configuration>
- </plugin>
- </plugins>
</build>
</project>
Modified: lucene/dev/branches/branch_4x/dev-tools/maven/solr/contrib/langid/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/dev-tools/maven/solr/contrib/langid/pom.xml.template?rev=1372191&r1=1372190&r2=1372191&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/dev-tools/maven/solr/contrib/langid/pom.xml.template (original)
+++ lucene/dev/branches/branch_4x/dev-tools/maven/solr/contrib/langid/pom.xml.template Sun Aug 12 20:00:26 2012
@@ -39,7 +39,6 @@
<module-directory>solr/contrib/langid</module-directory>
<top-level>../../../..</top-level>
<module-path>${top-level}/${module-directory}</module-path>
- <surefire-top-level>${top-level}/../..</surefire-top-level>
</properties>
<scm>
<connection>scm:svn:${vc-anonymous-base-url}/${module-directory}</connection>
@@ -101,17 +100,12 @@
<testResource>
<directory>${top-level}/solr/core/src/test-files</directory>
</testResource>
+ <testResource>
+ <directory>${top-level}/dev-tools/maven/solr</directory>
+ <includes>
+ <include>maven.testlogging.properties</include>
+ </includes>
+ </testResource>
</testResources>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <systemPropertyVariables>
- <java.util.logging.config.file>${surefire-top-level}/solr/testlogging.properties</java.util.logging.config.file>
- </systemPropertyVariables>
- </configuration>
- </plugin>
- </plugins>
</build>
</project>
Modified: lucene/dev/branches/branch_4x/dev-tools/maven/solr/contrib/uima/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/dev-tools/maven/solr/contrib/uima/pom.xml.template?rev=1372191&r1=1372190&r2=1372191&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/dev-tools/maven/solr/contrib/uima/pom.xml.template (original)
+++ lucene/dev/branches/branch_4x/dev-tools/maven/solr/contrib/uima/pom.xml.template Sun Aug 12 20:00:26 2012
@@ -35,7 +35,6 @@
<module-directory>solr/contrib/uima</module-directory>
<top-level>../../../..</top-level>
<module-path>${top-level}/${module-directory}</module-path>
- <surefire-top-level>${top-level}/../..</surefire-top-level>
</properties>
<scm>
<connection>scm:svn:${vc-anonymous-base-url}/${module-directory}</connection>
@@ -115,17 +114,12 @@
<testResource>
<directory>${module-path}/src/test-files</directory>
</testResource>
+ <testResource>
+ <directory>${top-level}/dev-tools/maven/solr</directory>
+ <includes>
+ <include>maven.testlogging.properties</include>
+ </includes>
+ </testResource>
</testResources>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <systemPropertyVariables>
- <java.util.logging.config.file>${surefire-top-level}/solr/testlogging.properties</java.util.logging.config.file>
- </systemPropertyVariables>
- </configuration>
- </plugin>
- </plugins>
</build>
</project>
Modified: lucene/dev/branches/branch_4x/dev-tools/maven/solr/contrib/velocity/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/dev-tools/maven/solr/contrib/velocity/pom.xml.template?rev=1372191&r1=1372190&r2=1372191&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/dev-tools/maven/solr/contrib/velocity/pom.xml.template (original)
+++ lucene/dev/branches/branch_4x/dev-tools/maven/solr/contrib/velocity/pom.xml.template Sun Aug 12 20:00:26 2012
@@ -35,7 +35,6 @@
<module-directory>solr/contrib/velocity</module-directory>
<top-level>../../../..</top-level>
<module-path>${top-level}/${module-directory}</module-path>
- <surefire-top-level>${top-level}/../..</surefire-top-level>
</properties>
<scm>
<connection>scm:svn:${vc-anonymous-base-url}/${module-directory}</connection>
@@ -136,17 +135,12 @@
<testResource>
<directory>${top-level}/solr/core/src/test-files</directory>
</testResource>
+ <testResource>
+ <directory>${top-level}/dev-tools/maven/solr</directory>
+ <includes>
+ <include>maven.testlogging.properties</include>
+ </includes>
+ </testResource>
</testResources>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <systemPropertyVariables>
- <java.util.logging.config.file>${surefire-top-level}/solr/testlogging.properties</java.util.logging.config.file>
- </systemPropertyVariables>
- </configuration>
- </plugin>
- </plugins>
</build>
</project>
Modified: lucene/dev/branches/branch_4x/dev-tools/maven/solr/core/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/dev-tools/maven/solr/core/pom.xml.template?rev=1372191&r1=1372190&r2=1372191&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/dev-tools/maven/solr/core/pom.xml.template (original)
+++ lucene/dev/branches/branch_4x/dev-tools/maven/solr/core/pom.xml.template Sun Aug 12 20:00:26 2012
@@ -35,7 +35,6 @@
<module-directory>solr/core</module-directory>
<top-level>../../..</top-level>
<module-path>${top-level}/${module-directory}</module-path>
- <surefire-top-level>${top-level}/../..</surefire-top-level>
</properties>
<scm>
<connection>scm:svn:${vc-anonymous-base-url}/${module-directory}</connection>
@@ -237,19 +236,15 @@
<testResource>
<directory>${top-level}/solr/solrj/src/test-files</directory>
</testResource>
+ <testResource>
+ <directory>${top-level}/dev-tools/maven/solr</directory>
+ <includes>
+ <include>maven.testlogging.properties</include>
+ </includes>
+ </testResource>
</testResources>
<plugins>
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <systemPropertyVariables>
- <java.util.logging.config.file>${surefire-top-level}/solr/testlogging.properties</java.util.logging.config.file>
- <java.util.logging.ConsoleHandler.level>INFO</java.util.logging.ConsoleHandler.level>
- </systemPropertyVariables>
- </configuration>
- </plugin>
- <plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
<executions>
Modified: lucene/dev/branches/branch_4x/dev-tools/maven/solr/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/dev-tools/maven/solr/pom.xml.template?rev=1372191&r1=1372190&r2=1372191&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/dev-tools/maven/solr/pom.xml.template (original)
+++ lucene/dev/branches/branch_4x/dev-tools/maven/solr/pom.xml.template Sun Aug 12 20:00:26 2012
@@ -99,6 +99,15 @@
<doctitle>${project.name} ${project.version} API (${now.version})</doctitle>
</configuration>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <systemPropertyVariables>
+ <java.util.logging.config.file>../test-classes/maven.testlogging.properties</java.util.logging.config.file>
+ </systemPropertyVariables>
+ </configuration>
+ </plugin>
</plugins>
</pluginManagement>
</build>