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/12/13 16:54:03 UTC
svn commit: r1421351 - in /lucene/dev/branches/branch_4x: ./ dev-tools/
dev-tools/maven/ dev-tools/maven/solr/
dev-tools/maven/solr/contrib/analysis-extras/
dev-tools/maven/solr/contrib/clustering/
dev-tools/maven/solr/contrib/dataimporthandler-extras/...
Author: sarowe
Date: Thu Dec 13 15:54:01 2012
New Revision: 1421351
URL: http://svn.apache.org/viewvc?rev=1421351&view=rev
Log:
Maven configuration: divert test console output to log files; increase max perm gen to avoid OOMs this will otherwise cause in Maven (merge trunk r1421332)
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/pom.xml.template
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/src/test/pom.xml.template
lucene/dev/branches/branch_4x/dev-tools/maven/solr/pom.xml.template
lucene/dev/branches/branch_4x/dev-tools/maven/solr/solrj/src/test/pom.xml.template
Modified: lucene/dev/branches/branch_4x/dev-tools/maven/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/dev-tools/maven/pom.xml.template?rev=1421351&r1=1421350&r2=1421351&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/dev-tools/maven/pom.xml.template (original)
+++ lucene/dev/branches/branch_4x/dev-tools/maven/pom.xml.template Thu Dec 13 15:54:01 2012
@@ -551,7 +551,8 @@
<runOrder>random</runOrder>
<reportFormat>plain</reportFormat>
<workingDirectory>${project.build.directory}/test</workingDirectory>
- <argLine>-Xmx512M</argLine>
+ <redirectTestOutputToFile>true</redirectTestOutputToFile>
+ <argLine>-Xmx512M -XX:MaxPermSize=256M</argLine>
<systemPropertyVariables>
<tempDir>.</tempDir>
<java.awt.headless>true</java.awt.headless>
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=1421351&r1=1421350&r2=1421351&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 Thu Dec 13 15:54:01 2012
@@ -35,6 +35,7 @@
<module-directory>solr/contrib/analysis-extras</module-directory>
<top-level>../../../..</top-level>
<module-path>${top-level}/${module-directory}</module-path>
+ <surefire-solr-directory>${top-level}/../../solr</surefire-solr-directory>
</properties>
<scm>
<connection>scm:svn:${vc-anonymous-base-url}/${module-directory}</connection>
@@ -98,5 +99,16 @@
</includes>
</testResource>
</testResources>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <systemPropertyVariables>
+ <java.util.logging.config.file>${surefire-solr-directory}/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=1421351&r1=1421350&r2=1421351&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 Thu Dec 13 15:54:01 2012
@@ -35,6 +35,7 @@
<module-directory>solr/contrib/clustering</module-directory>
<top-level>../../../..</top-level>
<module-path>${top-level}/${module-directory}</module-path>
+ <surefire-solr-directory>${top-level}/../../solr</surefire-solr-directory>
</properties>
<scm>
<connection>scm:svn:${vc-anonymous-base-url}/${module-directory}</connection>
@@ -123,5 +124,16 @@
</includes>
</testResource>
</testResources>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <systemPropertyVariables>
+ <java.util.logging.config.file>${surefire-solr-directory}/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=1421351&r1=1421350&r2=1421351&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 Thu Dec 13 15:54:01 2012
@@ -35,6 +35,7 @@
<module-directory>solr/contrib/dataimporthandler-extras</module-directory>
<top-level>../../../..</top-level>
<module-path>${top-level}/${module-directory}</module-path>
+ <surefire-solr-directory>${top-level}/../../solr</surefire-solr-directory>
</properties>
<scm>
<connection>scm:svn:${vc-anonymous-base-url}/${module-directory}</connection>
@@ -101,5 +102,16 @@
</includes>
</testResource>
</testResources>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <systemPropertyVariables>
+ <java.util.logging.config.file>${surefire-solr-directory}/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=1421351&r1=1421350&r2=1421351&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 Thu Dec 13 15:54:01 2012
@@ -35,6 +35,7 @@
<module-directory>solr/contrib/dataimporthandler</module-directory>
<top-level>../../../..</top-level>
<module-path>${top-level}/${module-directory}</module-path>
+ <surefire-solr-directory>${top-level}/../../solr</surefire-solr-directory>
</properties>
<scm>
<connection>scm:svn:${vc-anonymous-base-url}/${module-directory}</connection>
@@ -104,6 +105,15 @@
</execution>
</executions>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <systemPropertyVariables>
+ <java.util.logging.config.file>${surefire-solr-directory}/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=1421351&r1=1421350&r2=1421351&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 Thu Dec 13 15:54:01 2012
@@ -38,6 +38,7 @@
<module-directory>solr/contrib/extraction</module-directory>
<top-level>../../../..</top-level>
<module-path>${top-level}/${module-directory}</module-path>
+ <surefire-solr-directory>${top-level}/../../solr</surefire-solr-directory>
</properties>
<scm>
<connection>scm:svn:${vc-anonymous-base-url}/${module-directory}</connection>
@@ -98,5 +99,16 @@
</includes>
</testResource>
</testResources>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <systemPropertyVariables>
+ <java.util.logging.config.file>${surefire-solr-directory}/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=1421351&r1=1421350&r2=1421351&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 Thu Dec 13 15:54:01 2012
@@ -39,6 +39,7 @@
<module-directory>solr/contrib/langid</module-directory>
<top-level>../../../..</top-level>
<module-path>${top-level}/${module-directory}</module-path>
+ <surefire-solr-directory>${top-level}/../../solr</surefire-solr-directory>
</properties>
<scm>
<connection>scm:svn:${vc-anonymous-base-url}/${module-directory}</connection>
@@ -104,5 +105,16 @@
</includes>
</testResource>
</testResources>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <systemPropertyVariables>
+ <java.util.logging.config.file>${surefire-solr-directory}/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=1421351&r1=1421350&r2=1421351&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 Thu Dec 13 15:54:01 2012
@@ -35,6 +35,7 @@
<module-directory>solr/contrib/uima</module-directory>
<top-level>../../../..</top-level>
<module-path>${top-level}/${module-directory}</module-path>
+ <surefire-solr-directory>${top-level}/../../solr</surefire-solr-directory>
</properties>
<scm>
<connection>scm:svn:${vc-anonymous-base-url}/${module-directory}</connection>
@@ -123,5 +124,16 @@
</includes>
</testResource>
</testResources>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <systemPropertyVariables>
+ <java.util.logging.config.file>${surefire-solr-directory}/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=1421351&r1=1421350&r2=1421351&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 Thu Dec 13 15:54:01 2012
@@ -35,6 +35,7 @@
<module-directory>solr/contrib/velocity</module-directory>
<top-level>../../../..</top-level>
<module-path>${top-level}/${module-directory}</module-path>
+ <surefire-solr-directory>${top-level}/../../solr</surefire-solr-directory>
</properties>
<scm>
<connection>scm:svn:${vc-anonymous-base-url}/${module-directory}</connection>
@@ -139,5 +140,16 @@
</includes>
</testResource>
</testResources>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <systemPropertyVariables>
+ <java.util.logging.config.file>${surefire-solr-directory}/testlogging.properties</java.util.logging.config.file>
+ </systemPropertyVariables>
+ </configuration>
+ </plugin>
+ </plugins>
</build>
</project>
Modified: lucene/dev/branches/branch_4x/dev-tools/maven/solr/core/src/test/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/dev-tools/maven/solr/core/src/test/pom.xml.template?rev=1421351&r1=1421350&r2=1421351&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/dev-tools/maven/solr/core/src/test/pom.xml.template (original)
+++ lucene/dev/branches/branch_4x/dev-tools/maven/solr/core/src/test/pom.xml.template Thu Dec 13 15:54:01 2012
@@ -34,6 +34,7 @@
<module-directory>solr/core</module-directory>
<top-level>../../../../..</top-level>
<module-path>${top-level}/${module-directory}/src/test</module-path>
+ <surefire-solr-directory>${top-level}/../../solr</surefire-solr-directory>
</properties>
<dependencies>
<dependency>
@@ -118,6 +119,15 @@
<skip>true</skip>
</configuration>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <systemPropertyVariables>
+ <java.util.logging.config.file>${surefire-solr-directory}/testlogging.properties</java.util.logging.config.file>
+ </systemPropertyVariables>
+ </configuration>
+ </plugin>
</plugins>
</build>
</project>
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=1421351&r1=1421350&r2=1421351&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 Thu Dec 13 15:54:01 2012
@@ -99,15 +99,6 @@
<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>
Modified: lucene/dev/branches/branch_4x/dev-tools/maven/solr/solrj/src/test/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/dev-tools/maven/solr/solrj/src/test/pom.xml.template?rev=1421351&r1=1421350&r2=1421351&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/dev-tools/maven/solr/solrj/src/test/pom.xml.template (original)
+++ lucene/dev/branches/branch_4x/dev-tools/maven/solr/solrj/src/test/pom.xml.template Thu Dec 13 15:54:01 2012
@@ -34,7 +34,7 @@
<module-directory>solr/solrj</module-directory>
<top-level>../../../../..</top-level>
<module-path>${top-level}/${module-directory}/src/test</module-path>
- <maven.install.skip>true</maven.install.skip>
+ <surefire-solr-directory>${top-level}/../../solr</surefire-solr-directory>
</properties>
<dependencies>
<dependency>
@@ -108,6 +108,15 @@
<skip>true</skip>
</configuration>
</plugin>
- </plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <systemPropertyVariables>
+ <java.util.logging.config.file>${surefire-solr-directory}/testlogging.properties</java.util.logging.config.file>
+ </systemPropertyVariables>
+ </configuration>
+ </plugin>
+ </plugins>
</build>
</project>