You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by si...@apache.org on 2012/08/13 15:53:27 UTC
svn commit: r1372423 [2/45] - in /lucene/dev/branches/LUCENE-2878: ./
dev-tools/ dev-tools/eclipse/ dev-tools/idea/.idea/libraries/
dev-tools/maven/ dev-tools/maven/lucene/
dev-tools/maven/lucene/analysis/common/
dev-tools/maven/lucene/analysis/icu/ de...
Modified: lucene/dev/branches/LUCENE-2878/build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/LUCENE-2878/build.xml?rev=1372423&r1=1372422&r2=1372423&view=diff
==============================================================================
--- lucene/dev/branches/LUCENE-2878/build.xml (original)
+++ lucene/dev/branches/LUCENE-2878/build.xml Mon Aug 13 13:52:46 2012
@@ -24,7 +24,7 @@
</subant>
</target>
- <target name="test" description="Test both Lucene and Solr" depends="validate">
+ <target name="test" description="Test both Lucene and Solr">
<sequential>
<subant target="test" inheritall="false" failonerror="true">
<fileset dir="lucene" includes="build.xml" />
@@ -51,11 +51,28 @@
</sequential>
</target>
- <target name="validate" description="Validate dependencies, licenses, etc.">
- <sequential><subant target="validate" inheritall="false" failonerror="true">
- <fileset dir="lucene" includes="build.xml" />
- <fileset dir="solr" includes="build.xml" />
- </subant></sequential>
+ <target name="validate" description="Validate dependencies, licenses, etc." depends="-validate-source-patterns">
+ <subant target="validate" inheritall="false" failonerror="true">
+ <fileset dir="lucene" includes="build.xml" />
+ <fileset dir="solr" includes="build.xml" />
+ </subant>
+ </target>
+
+ <target name="-validate-source-patterns" unless="disable.source-patterns">
+ <!-- check that there are no nocommits or @author javadoc tags: -->
+ <property name="validate.currDir" location="."/>
+ <pathconvert pathsep="${line.separator}" dirsep="/" property="validate.patternsFound" setonempty="false">
+ <fileset dir="${validate.currDir}">
+ <include name="**/*.java"/>
+ <exclude name="**/backwards/**"/>
+ <or>
+ <containsregexp expression="@author\b" casesensitive="yes"/>
+ <containsregexp expression="\bno(n|)commit\b" casesensitive="no"/>
+ </or>
+ </fileset>
+ <map from="${validate.currDir}${file.separator}" to="* "/>
+ </pathconvert>
+ <fail if="validate.patternsFound">The following files contain @author tags or nocommits:${line.separator}${validate.patternsFound}</fail>
</target>
<target name="rat-sources" description="Runs rat across all sources and tests">
@@ -149,7 +166,7 @@
</delete>
</target>
- <target name="clean" depends="clean-jars" description="Clean Lucene and Solr">
+ <target name="clean" description="Clean Lucene and Solr">
<delete dir="dist" />
<sequential>
<subant target="clean" inheritall="false" failonerror="true">
@@ -176,22 +193,119 @@
</subant>
</target>
- <target name="jar-checksums" depends="resolve" description="Recompute SHA1 checksums for all JAR files.">
- <delete>
- <fileset dir="${basedir}">
- <include name="**/*.jar.sha1"/>
- </fileset>
- </delete>
+ <target name="jar-checksums" description="Recompute SHA1 checksums for all JAR files.">
+ <sequential>
+ <subant target="jar-checksums" inheritall="false" failonerror="true">
+ <fileset dir="lucene" includes="build.xml" />
+ <fileset dir="solr" includes="build.xml" />
+ </subant>
+ </sequential>
+ </target>
- <checksum algorithm="SHA1" fileext=".sha1">
- <fileset dir="${basedir}">
- <include name="**/*.jar"/>
- </fileset>
- </checksum>
+ <!-- define here, as common-build is not included! -->
+ <property name="python32.exe" value="python3.2" />
+ <property name="fakeRelease" value="lucene/build/fakeRelease"/>
+ <property name="fakeReleaseTmp" value="lucene/build/fakeReleaseTmp"/>
+ <property name="fakeReleaseVersion" value="5.0"/> <!-- *not* -SNAPSHOT, the real version -->
+
+ <target name="nightly-smoke" description="Builds an unsigned release and smoke tests it." depends="clean">
+ <sequential>
+ <fail unless="JAVA6_HOME">JAVA6_HOME property is not defined.</fail>
+ <fail unless="JAVA7_HOME">JAVA7_HOME property is not defined.</fail>
+ <subant target="prepare-release-no-sign" inheritall="false" failonerror="true">
+ <fileset dir="lucene" includes="build.xml" />
+ <fileset dir="solr" includes="build.xml" />
+ <property name="version" value="${fakeReleaseVersion}" />
+ </subant>
+ <delete dir="${fakeRelease}"/>
+ <delete dir="${fakeReleaseTmp}"/>
+ <mkdir dir="${fakeRelease}"/>
+ <copy todir="${fakeRelease}/lucene">
+ <fileset dir="lucene/dist"/>
+ </copy>
+ <copy todir="${fakeRelease}/lucene/changes">
+ <fileset dir="lucene/build/docs/changes"/>
+ </copy>
+ <get src="http://people.apache.org/keys/group/lucene.asc"
+ dest="${fakeRelease}/lucene/KEYS"/>
+ <copy todir="${fakeRelease}/solr">
+ <fileset dir="solr/package"/>
+ </copy>
+ <copy file="${fakeRelease}/lucene/KEYS" todir="${fakeRelease}/solr"/>
+ <makeurl file="${fakeRelease}" validate="false" property="fakeRelease.uri"/>
+ <exec executable="${python32.exe}" failonerror="true">
+ <arg value="-u"/>
+ <arg value="dev-tools/scripts/smokeTestRelease.py"/>
+ <arg value="${fakeRelease.uri}"/>
+ <arg value="${fakeReleaseVersion}"/>
+ <arg value="${fakeReleaseTmp}"/>
+ <arg value="false"/>
+ <env key="JAVA6_HOME" value="${JAVA6_HOME}"/>
+ <env key="JAVA7_HOME" value="${JAVA7_HOME}"/>
+ </exec>
+ <delete dir="${fakeRelease}"/>
+ <delete dir="${fakeReleaseTmp}"/>
+ </sequential>
+ </target>
+
+ <!-- Calls only generate-clover-reports on Lucene, as Solr's is just a clone with other target; the database itsself is fixed -->
+ <target name="generate-clover-reports">
+ <subant target="generate-clover-reports" inheritall="false" failonerror="true">
+ <fileset dir="." includes="build-clover.xml" />
+ </subant>
+ </target>
- <fixcrlf
- srcdir="${basedir}"
- includes="**/*.jar.sha1"
- eol="lf" fixlast="true" encoding="US-ASCII" />
+ <!-- Jenkins tasks -->
+ <target name="jenkins-hourly" depends="clean,test,validate,-jenkins-javadocs-lint,-svn-status"/>
+
+ <target name="jenkins-clover">
+ <antcall target="-jenkins-clover">
+ <param name="run.clover" value="true"/>
+ <!-- must be 1, as clover does not like parallel test runs: -->
+ <param name="tests.jvms" value="1"/>
+ <!-- Also override some other props to be fast, ignoring what's set on command line: -->
+ <param name="tests.multiplier" value="1"/>
+ <param name="tests.slow" value="false"/>
+ <param name="tests.nightly" value="false"/>
+ <param name="tests.weekly" value="false"/>
+ <param name="tests.multiplier" value="1"/>
+ </antcall>
+ </target>
+ <target name="-jenkins-clover" depends="clean,test,generate-clover-reports"/>
+
+ <!-- we need this extra condition, as we want to match only on "true", not solely if property is set: -->
+ <property name="disable.javadocs-lint" value="false" />
+ <condition property="-disable.javadocs-lint">
+ <equals arg1="${disable.javadocs-lint}" arg2="true"/>
+ </condition>
+ <target name="-jenkins-javadocs-lint" unless="-disable.javadocs-lint">
+ <antcall target="javadocs-lint"/>
+ </target>
+
+ <!-- define here, as common-build is not included! -->
+ <property name="svn.exe" value="svn" />
+
+ <target name="-svn-status">
+ <exec executable="${svn.exe}" dir="." failonerror="true">
+ <arg value="status"/>
+ <redirector outputproperty="svn.status.output">
+ <outputfilterchain>
+ <linecontainsregexp>
+ <regexp pattern="^\?" />
+ </linecontainsregexp>
+ <tokenfilter>
+ <replaceregex pattern="^........" replace="* " />
+ <replacestring from="${file.separator}" to="/" />
+ </tokenfilter>
+ </outputfilterchain>
+ </redirector>
+ </exec>
+ <fail message="Source checkout is dirty after running tests!!! Offending files:${line.separator}${svn.status.output}">
+ <condition>
+ <not>
+ <equals arg1="${svn.status.output}" arg2=""/>
+ </not>
+ </condition>
+ </fail>
</target>
</project>
Modified: lucene/dev/branches/LUCENE-2878/dev-tools/eclipse/dot.classpath
URL: http://svn.apache.org/viewvc/lucene/dev/branches/LUCENE-2878/dev-tools/eclipse/dot.classpath?rev=1372423&r1=1372422&r2=1372423&view=diff
==============================================================================
--- lucene/dev/branches/LUCENE-2878/dev-tools/eclipse/dot.classpath (original)
+++ lucene/dev/branches/LUCENE-2878/dev-tools/eclipse/dot.classpath Mon Aug 13 13:52:46 2012
@@ -15,27 +15,30 @@
<classpathentry kind="src" path="lucene/sandbox/src/java"/>
<classpathentry kind="src" path="lucene/sandbox/src/test"/>
<classpathentry kind="src" path="lucene/test-framework/src/java"/>
- <classpathentry kind="src" output="bin.tests-framework" path="lucene/test-framework/src/resources"/>
+ <classpathentry kind="src" output="bin/tests-framework" path="lucene/test-framework/src/resources"/>
<classpathentry kind="src" path="lucene/analysis/common/src/java"/>
- <classpathentry kind="src" path="lucene/analysis/common/src/resources"/>
+ <classpathentry kind="src" output="bin/analysis-common" path="lucene/analysis/common/src/resources"/>
<classpathentry kind="src" path="lucene/analysis/common/src/test"/>
<classpathentry kind="src" path="lucene/analysis/icu/src/java"/>
- <classpathentry kind="src" path="lucene/analysis/icu/src/resources"/>
+ <classpathentry kind="src" output="bin/analysis-icu" path="lucene/analysis/icu/src/resources"/>
<classpathentry kind="src" path="lucene/analysis/icu/src/test"/>
<classpathentry kind="src" path="lucene/analysis/kuromoji/src/java"/>
- <classpathentry kind="src" path="lucene/analysis/kuromoji/src/resources"/>
+ <classpathentry kind="src" output="bin/analysis-kuromoji" path="lucene/analysis/kuromoji/src/resources"/>
<classpathentry kind="src" path="lucene/analysis/kuromoji/src/test"/>
<classpathentry kind="src" path="lucene/analysis/phonetic/src/java"/>
+ <classpathentry kind="src" output="bin/analysis-phonetic" path="lucene/analysis/phonetic/src/resources"/>
<classpathentry kind="src" path="lucene/analysis/phonetic/src/test"/>
<classpathentry kind="src" path="lucene/analysis/smartcn/src/java"/>
- <classpathentry kind="src" path="lucene/analysis/smartcn/src/resources"/>
+ <classpathentry kind="src" output="bin/analysis-smartcn" path="lucene/analysis/smartcn/src/resources"/>
<classpathentry kind="src" path="lucene/analysis/smartcn/src/test"/>
<classpathentry kind="src" path="lucene/analysis/stempel/src/java"/>
- <classpathentry kind="src" path="lucene/analysis/stempel/src/resources"/>
+ <classpathentry kind="src" output="bin/analysis-stempel" path="lucene/analysis/stempel/src/resources"/>
<classpathentry kind="src" path="lucene/analysis/stempel/src/test"/>
<classpathentry kind="src" path="lucene/analysis/morfologik/src/java"/>
+ <classpathentry kind="src" output="bin/analysis-morfologik" path="lucene/analysis/morfologik/src/resources"/>
<classpathentry kind="src" path="lucene/analysis/morfologik/src/test"/>
<classpathentry kind="src" path="lucene/analysis/uima/src/java"/>
+ <classpathentry kind="src" output="bin/analysis-uima" path="lucene/analysis/uima/src/resources"/>
<classpathentry kind="src" path="lucene/analysis/uima/src/test"/>
<classpathentry kind="src" path="lucene/benchmark/src/java"/>
<classpathentry kind="src" path="lucene/benchmark/src/test"/>
@@ -95,12 +98,12 @@
<classpathentry kind="lib" path="lucene/test-framework/lib/ant-junit-1.8.2.jar"/>
<classpathentry kind="lib" path="lucene/test-framework/lib/junit-4.10.jar"/>
<classpathentry kind="lib" path="lucene/sandbox/lib/jakarta-regexp-1.4.jar"/>
- <classpathentry kind="lib" path="lucene/analysis/icu/lib/icu4j-4.8.1.1.jar"/>
+ <classpathentry kind="lib" path="lucene/analysis/icu/lib/icu4j-49.1.jar"/>
<classpathentry kind="lib" path="lucene/analysis/phonetic/lib/commons-codec-1.6.jar"/>
<classpathentry kind="lib" path="lucene/analysis/morfologik/lib/morfologik-fsa-1.5.3.jar"/>
<classpathentry kind="lib" path="lucene/analysis/morfologik/lib/morfologik-polish-1.5.3.jar"/>
<classpathentry kind="lib" path="lucene/analysis/morfologik/lib/morfologik-stemming-1.5.3.jar"/>
- <classpathentry kind="lib" path="lucene/benchmark/lib/commons-compress-1.2.jar"/>
+ <classpathentry kind="lib" path="lucene/benchmark/lib/commons-compress-1.3.jar"/>
<classpathentry kind="lib" path="lucene/benchmark/lib/xercesImpl-2.9.1.jar"/>
<classpathentry kind="lib" path="lucene/benchmark/lib/nekohtml-1.9.15.jar"/>
<classpathentry kind="lib" path="solr/lib/commons-fileupload-1.2.1.jar"/>
@@ -117,7 +120,7 @@
<classpathentry kind="lib" path="solr/lib/slf4j-api-1.6.4.jar"/>
<classpathentry kind="lib" path="solr/lib/slf4j-jdk14-1.6.4.jar"/>
<classpathentry kind="lib" path="solr/lib/wstx-asl-3.2.7.jar"/>
- <classpathentry kind="lib" path="solr/lib/zookeeper-3.3.5.jar"/>
+ <classpathentry kind="lib" path="solr/lib/zookeeper-3.3.6.jar"/>
<classpathentry kind="lib" path="solr/example/lib/jetty-continuation-8.1.2.v20120308.jar"/>
<classpathentry kind="lib" path="solr/example/lib/jetty-deploy-8.1.2.v20120308.jar"/>
<classpathentry kind="lib" path="solr/example/lib/jetty-http-8.1.2.v20120308.jar"/>
@@ -139,7 +142,6 @@
<classpathentry kind="lib" path="solr/contrib/clustering/lib/simple-xml-2.4.1.jar"/>
<classpathentry kind="lib" path="solr/contrib/dataimporthandler/lib/activation-1.1.jar"/>
<classpathentry kind="lib" path="solr/contrib/dataimporthandler/lib/mail-1.4.1.jar"/>
- <classpathentry kind="lib" path="solr/contrib/extraction/lib/asm-3.1.jar"/>
<classpathentry kind="lib" path="solr/contrib/extraction/lib/bcmail-jdk15-1.45.jar"/>
<classpathentry kind="lib" path="solr/contrib/extraction/lib/bcprov-jdk15-1.45.jar"/>
<classpathentry kind="lib" path="solr/contrib/extraction/lib/boilerpipe-1.1.0.jar"/>
@@ -172,6 +174,6 @@
<classpathentry kind="lib" path="solr/contrib/velocity/lib/commons-beanutils-1.7.0.jar"/>
<classpathentry kind="lib" path="solr/contrib/velocity/lib/commons-collections-3.2.1.jar"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry kind="lib" path="lucene/test-framework/lib/randomizedtesting-runner-1.6.0.jar"/>
- <classpathentry kind="output" path="bin"/>
+ <classpathentry kind="lib" path="lucene/test-framework/lib/randomizedtesting-runner-2.0.0.rc5.jar"/>
+ <classpathentry kind="output" path="bin/other"/>
</classpath>
Modified: lucene/dev/branches/LUCENE-2878/dev-tools/eclipse/dot.project
URL: http://svn.apache.org/viewvc/lucene/dev/branches/LUCENE-2878/dev-tools/eclipse/dot.project?rev=1372423&r1=1372422&r2=1372423&view=diff
==============================================================================
--- lucene/dev/branches/LUCENE-2878/dev-tools/eclipse/dot.project (original)
+++ lucene/dev/branches/LUCENE-2878/dev-tools/eclipse/dot.project Mon Aug 13 13:52:46 2012
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
- <name>lucene_solr</name>
+ <name>lucene_solr_trunk</name>
<comment></comment>
<projects>
</projects>
Modified: lucene/dev/branches/LUCENE-2878/dev-tools/idea/.idea/libraries/JUnit.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/LUCENE-2878/dev-tools/idea/.idea/libraries/JUnit.xml?rev=1372423&r1=1372422&r2=1372423&view=diff
==============================================================================
--- lucene/dev/branches/LUCENE-2878/dev-tools/idea/.idea/libraries/JUnit.xml (original)
+++ lucene/dev/branches/LUCENE-2878/dev-tools/idea/.idea/libraries/JUnit.xml Mon Aug 13 13:52:46 2012
@@ -2,7 +2,7 @@
<library name="JUnit">
<CLASSES>
<root url="jar://$PROJECT_DIR$/lucene/test-framework/lib/junit-4.10.jar!/" />
- <root url="jar://$PROJECT_DIR$/lucene/test-framework/lib/randomizedtesting-runner-1.6.0.jar!/" />
+ <root url="jar://$PROJECT_DIR$/lucene/test-framework/lib/randomizedtesting-runner-2.0.0.rc5.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
Modified: lucene/dev/branches/LUCENE-2878/dev-tools/maven/README.maven
URL: http://svn.apache.org/viewvc/lucene/dev/branches/LUCENE-2878/dev-tools/maven/README.maven?rev=1372423&r1=1372422&r2=1372423&view=diff
==============================================================================
--- lucene/dev/branches/LUCENE-2878/dev-tools/maven/README.maven (original)
+++ lucene/dev/branches/LUCENE-2878/dev-tools/maven/README.maven Mon Aug 13 13:52:46 2012
@@ -36,27 +36,25 @@ A. How to use nightly Jenkins-built Luce
B. How to generate Lucene/Solr Maven artifacts
- Prerequisites: JDK 1.6+ and Ant 1.7.X
+ Prerequisites: JDK 1.6+ and Ant 1.8.2+
Run 'ant generate-maven-artifacts' to create an internal Maven
repository, including POMs, binary .jars, source .jars, and javadoc
.jars.
- You can run the above command in four possible places: the top-level
- directory; under lucene/; under solr/; or under modules/. From the
- top-level directory, from lucene/, or from modules/, the internal
- repository will be located at dist/maven/. From solr/, the internal
- repository will be located at package/maven/.
+ You can run the above command in three possible places: the top-level
+ directory; under lucene/; or under solr/. From the top-level directory
+ or from lucene/, the internal repository will be located at dist/maven/.
+ From solr/, the internal repository will be located at package/maven/.
C. How to deploy Maven artifacts to a repository
- Prerequisites: JDK 1.6+ and Ant 1.7.X
+ Prerequisites: JDK 1.6+ and Ant 1.8.2+
- You can deploy targets for all of Lucene/Solr, only Lucene, only Solr,
- or only modules/, as in B. above. To deploy to a Maven repository, the
- command is the same as in B. above, with the addition of two system
- properties:
+ You can deploy targets for all of Lucene/Solr, only Lucene, or only Solr,
+ as in B. above. To deploy to a Maven repository, the command is the same
+ as in B. above, with the addition of two system properties:
ant -Dm2.repository.id=my-repo-id \
-Dm2.repository.url=http://example.org/my/repo \
@@ -101,7 +99,7 @@ D. How to use Maven to build Lucene/Solr
the default, you can supply an alternate version on the command line
with the above command, e.g.:
- ant -Dversion=5.0-my-special-version get-maven-poms
+ ant -Dversion=my-special-version get-maven-poms
Note: if you change the version in the POMs, there is one test method
that will fail under maven-surefire-plugin:
Modified: lucene/dev/branches/LUCENE-2878/dev-tools/maven/lucene/analysis/common/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/LUCENE-2878/dev-tools/maven/lucene/analysis/common/pom.xml.template?rev=1372423&r1=1372422&r2=1372423&view=diff
==============================================================================
--- lucene/dev/branches/LUCENE-2878/dev-tools/maven/lucene/analysis/common/pom.xml.template (original)
+++ lucene/dev/branches/LUCENE-2878/dev-tools/maven/lucene/analysis/common/pom.xml.template Mon Aug 13 13:52:46 2012
@@ -37,15 +37,9 @@
<module-path>${top-level}/${module-directory}</module-path>
</properties>
<scm>
- <connection>
- scm:svn:http://svn.apache.org/repos/asf/lucene/dev/trunk/${module-directory}
- </connection>
- <developerConnection>
- scm:svn:https://svn.apache.org/repos/asf/lucene/dev/trunk/${module-directory}
- </developerConnection>
- <url>
- http://svn.apache.org/viewvc/lucene/dev/trunk/${module-directory}
- </url>
+ <connection>scm:svn:${vc-anonymous-base-url}/${module-directory}</connection>
+ <developerConnection>scm:svn:${vc-dev-base-url}/${module-directory}</developerConnection>
+ <url>${vc-browse-base-url}/${module-directory}</url>
</scm>
<dependencies>
<dependency>
@@ -77,33 +71,5 @@
</excludes>
</testResource>
</testResources>
- <plugins>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>appassembler-maven-plugin</artifactId>
- <configuration>
- <extraJvmArguments>-Xmx128M</extraJvmArguments>
- <repositoryLayout>flat</repositoryLayout>
- <platforms>
- <platform>windows</platform>
- <platform>unix</platform>
- </platforms>
- <programs>
- <program>
- <mainClass>org.apache.lucene.analysis.charfilter.HtmlStripCharFilter</mainClass>
- <name>HtmlStripCharFilter</name>
- </program>
- <program>
- <mainClass>org.apache.lucene.analysis.en.PorterStemmer</mainClass>
- <name>EnglishPorterStemmer</name>
- </program>
- <program>
- <mainClass>org.tartarus.snowball.TestApp</mainClass>
- <name>SnowballTestApp</name>
- </program>
- </programs>
- </configuration>
- </plugin>
- </plugins>
</build>
</project>
Modified: lucene/dev/branches/LUCENE-2878/dev-tools/maven/lucene/analysis/icu/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/LUCENE-2878/dev-tools/maven/lucene/analysis/icu/pom.xml.template?rev=1372423&r1=1372422&r2=1372423&view=diff
==============================================================================
--- lucene/dev/branches/LUCENE-2878/dev-tools/maven/lucene/analysis/icu/pom.xml.template (original)
+++ lucene/dev/branches/LUCENE-2878/dev-tools/maven/lucene/analysis/icu/pom.xml.template Mon Aug 13 13:52:46 2012
@@ -40,15 +40,9 @@
<module-path>${top-level}/${module-directory}</module-path>
</properties>
<scm>
- <connection>
- scm:svn:http://svn.apache.org/repos/asf/lucene/dev/trunk/${module-directory}
- </connection>
- <developerConnection>
- scm:svn:https://svn.apache.org/repos/asf/lucene/dev/trunk/${module-directory}
- </developerConnection>
- <url>
- http://svn.apache.org/viewvc/lucene/dev/trunk/${module-directory}
- </url>
+ <connection>scm:svn:${vc-anonymous-base-url}/${module-directory}</connection>
+ <developerConnection>scm:svn:${vc-dev-base-url}/${module-directory}</developerConnection>
+ <url>${vc-browse-base-url}/${module-directory}</url>
</scm>
<dependencies>
<dependency>
Modified: lucene/dev/branches/LUCENE-2878/dev-tools/maven/lucene/analysis/kuromoji/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/LUCENE-2878/dev-tools/maven/lucene/analysis/kuromoji/pom.xml.template?rev=1372423&r1=1372422&r2=1372423&view=diff
==============================================================================
--- lucene/dev/branches/LUCENE-2878/dev-tools/maven/lucene/analysis/kuromoji/pom.xml.template (original)
+++ lucene/dev/branches/LUCENE-2878/dev-tools/maven/lucene/analysis/kuromoji/pom.xml.template Mon Aug 13 13:52:46 2012
@@ -39,15 +39,9 @@
<module-path>${top-level}/${module-directory}</module-path>
</properties>
<scm>
- <connection>
- scm:svn:http://svn.apache.org/repos/asf/lucene/dev/trunk/${module-directory}
- </connection>
- <developerConnection>
- scm:svn:https://svn.apache.org/repos/asf/lucene/dev/trunk/${module-directory}
- </developerConnection>
- <url>
- http://svn.apache.org/viewvc/lucene/dev/trunk/${module-directory}
- </url>
+ <connection>scm:svn:${vc-anonymous-base-url}/${module-directory}</connection>
+ <developerConnection>scm:svn:${vc-dev-base-url}/${module-directory}</developerConnection>
+ <url>${vc-browse-base-url}/${module-directory}</url>
</scm>
<dependencies>
<dependency>
Modified: lucene/dev/branches/LUCENE-2878/dev-tools/maven/lucene/analysis/morfologik/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/LUCENE-2878/dev-tools/maven/lucene/analysis/morfologik/pom.xml.template?rev=1372423&r1=1372422&r2=1372423&view=diff
==============================================================================
--- lucene/dev/branches/LUCENE-2878/dev-tools/maven/lucene/analysis/morfologik/pom.xml.template (original)
+++ lucene/dev/branches/LUCENE-2878/dev-tools/maven/lucene/analysis/morfologik/pom.xml.template Mon Aug 13 13:52:46 2012
@@ -39,15 +39,9 @@
<module-path>${top-level}/${module-directory}</module-path>
</properties>
<scm>
- <connection>
- scm:svn:http://svn.apache.org/repos/asf/lucene/dev/trunk/${module-directory}
- </connection>
- <developerConnection>
- scm:svn:https://svn.apache.org/repos/asf/lucene/dev/trunk/${module-directory}
- </developerConnection>
- <url>
- http://svn.apache.org/viewvc/lucene/dev/trunk/${module-directory}
- </url>
+ <connection>scm:svn:${vc-anonymous-base-url}/${module-directory}</connection>
+ <developerConnection>scm:svn:${vc-dev-base-url}/${module-directory}</developerConnection>
+ <url>${vc-browse-base-url}/${module-directory}</url>
</scm>
<dependencies>
<dependency>
@@ -75,6 +69,11 @@
<build>
<sourceDirectory>${module-path}/src/java</sourceDirectory>
<testSourceDirectory>${module-path}/src/test</testSourceDirectory>
+ <resources>
+ <resource>
+ <directory>${module-path}/src/resources</directory>
+ </resource>
+ </resources>
<testResources>
<testResource>
<directory>${project.build.testSourceDirectory}</directory>
Modified: lucene/dev/branches/LUCENE-2878/dev-tools/maven/lucene/analysis/phonetic/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/LUCENE-2878/dev-tools/maven/lucene/analysis/phonetic/pom.xml.template?rev=1372423&r1=1372422&r2=1372423&view=diff
==============================================================================
--- lucene/dev/branches/LUCENE-2878/dev-tools/maven/lucene/analysis/phonetic/pom.xml.template (original)
+++ lucene/dev/branches/LUCENE-2878/dev-tools/maven/lucene/analysis/phonetic/pom.xml.template Mon Aug 13 13:52:46 2012
@@ -39,15 +39,9 @@
<module-path>${top-level}/${module-directory}</module-path>
</properties>
<scm>
- <connection>
- scm:svn:http://svn.apache.org/repos/asf/lucene/dev/trunk/${module-directory}
- </connection>
- <developerConnection>
- scm:svn:https://svn.apache.org/repos/asf/lucene/dev/trunk/${module-directory}
- </developerConnection>
- <url>
- http://svn.apache.org/viewvc/lucene/dev/trunk/${module-directory}
- </url>
+ <connection>scm:svn:${vc-anonymous-base-url}/${module-directory}</connection>
+ <developerConnection>scm:svn:${vc-dev-base-url}/${module-directory}</developerConnection>
+ <url>${vc-browse-base-url}/${module-directory}</url>
</scm>
<dependencies>
<dependency>
@@ -75,6 +69,11 @@
<build>
<sourceDirectory>${module-path}/src/java</sourceDirectory>
<testSourceDirectory>${module-path}/src/test</testSourceDirectory>
+ <resources>
+ <resource>
+ <directory>${module-path}/src/resources</directory>
+ </resource>
+ </resources>
<testResources>
<testResource>
<directory>${project.build.testSourceDirectory}</directory>
Modified: lucene/dev/branches/LUCENE-2878/dev-tools/maven/lucene/analysis/smartcn/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/LUCENE-2878/dev-tools/maven/lucene/analysis/smartcn/pom.xml.template?rev=1372423&r1=1372422&r2=1372423&view=diff
==============================================================================
--- lucene/dev/branches/LUCENE-2878/dev-tools/maven/lucene/analysis/smartcn/pom.xml.template (original)
+++ lucene/dev/branches/LUCENE-2878/dev-tools/maven/lucene/analysis/smartcn/pom.xml.template Mon Aug 13 13:52:46 2012
@@ -37,15 +37,9 @@
<module-path>${top-level}/${module-directory}</module-path>
</properties>
<scm>
- <connection>
- scm:svn:http://svn.apache.org/repos/asf/lucene/dev/trunk/${module-directory}
- </connection>
- <developerConnection>
- scm:svn:https://svn.apache.org/repos/asf/lucene/dev/trunk/${module-directory}
- </developerConnection>
- <url>
- http://svn.apache.org/viewvc/lucene/dev/trunk/${module-directory}
- </url>
+ <connection>scm:svn:${vc-anonymous-base-url}/${module-directory}</connection>
+ <developerConnection>scm:svn:${vc-dev-base-url}/${module-directory}</developerConnection>
+ <url>${vc-browse-base-url}/${module-directory}</url>
</scm>
<dependencies>
<dependency>
Modified: lucene/dev/branches/LUCENE-2878/dev-tools/maven/lucene/analysis/stempel/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/LUCENE-2878/dev-tools/maven/lucene/analysis/stempel/pom.xml.template?rev=1372423&r1=1372422&r2=1372423&view=diff
==============================================================================
--- lucene/dev/branches/LUCENE-2878/dev-tools/maven/lucene/analysis/stempel/pom.xml.template (original)
+++ lucene/dev/branches/LUCENE-2878/dev-tools/maven/lucene/analysis/stempel/pom.xml.template Mon Aug 13 13:52:46 2012
@@ -37,15 +37,9 @@
<module-path>${top-level}/${module-directory}</module-path>
</properties>
<scm>
- <connection>
- scm:svn:http://svn.apache.org/repos/asf/lucene/dev/trunk/${module-directory}
- </connection>
- <developerConnection>
- scm:svn:https://svn.apache.org/repos/asf/lucene/dev/trunk/${module-directory}
- </developerConnection>
- <url>
- http://svn.apache.org/viewvc/lucene/dev/trunk/${module-directory}
- </url>
+ <connection>scm:svn:${vc-anonymous-base-url}/${module-directory}</connection>
+ <developerConnection>scm:svn:${vc-dev-base-url}/${module-directory}</developerConnection>
+ <url>${vc-browse-base-url}/${module-directory}</url>
</scm>
<dependencies>
<dependency>
Modified: lucene/dev/branches/LUCENE-2878/dev-tools/maven/lucene/analysis/uima/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/LUCENE-2878/dev-tools/maven/lucene/analysis/uima/pom.xml.template?rev=1372423&r1=1372422&r2=1372423&view=diff
==============================================================================
--- lucene/dev/branches/LUCENE-2878/dev-tools/maven/lucene/analysis/uima/pom.xml.template (original)
+++ lucene/dev/branches/LUCENE-2878/dev-tools/maven/lucene/analysis/uima/pom.xml.template Mon Aug 13 13:52:46 2012
@@ -41,15 +41,9 @@
<module-path>${top-level}/${module-directory}</module-path>
</properties>
<scm>
- <connection>
- scm:svn:http://svn.apache.org/repos/asf/lucene/dev/trunk/${module-directory}
- </connection>
- <developerConnection>
- scm:svn:https://svn.apache.org/repos/asf/lucene/dev/trunk/${module-directory}
- </developerConnection>
- <url>
- http://svn.apache.org/viewvc/lucene/dev/trunk/${module-directory}
- </url>
+ <connection>scm:svn:${vc-anonymous-base-url}/${module-directory}</connection>
+ <developerConnection>scm:svn:${vc-dev-base-url}/${module-directory}</developerConnection>
+ <url>${vc-browse-base-url}/${module-directory}</url>
</scm>
<dependencies>
<dependency>
Modified: lucene/dev/branches/LUCENE-2878/dev-tools/maven/lucene/benchmark/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/LUCENE-2878/dev-tools/maven/lucene/benchmark/pom.xml.template?rev=1372423&r1=1372422&r2=1372423&view=diff
==============================================================================
--- lucene/dev/branches/LUCENE-2878/dev-tools/maven/lucene/benchmark/pom.xml.template (original)
+++ lucene/dev/branches/LUCENE-2878/dev-tools/maven/lucene/benchmark/pom.xml.template Mon Aug 13 13:52:46 2012
@@ -37,15 +37,9 @@
<module-path>${top-level}/${module-directory}</module-path>
</properties>
<scm>
- <connection>
- scm:svn:http://svn.apache.org/repos/asf/lucene/dev/trunk/${module-directory}
- </connection>
- <developerConnection>
- scm:svn:https://svn.apache.org/repos/asf/lucene/dev/trunk/${module-directory}
- </developerConnection>
- <url>
- http://svn.apache.org/viewvc/lucene/dev/trunk/${module-directory}
- </url>
+ <connection>scm:svn:${vc-anonymous-base-url}/${module-directory}</connection>
+ <developerConnection>scm:svn:${vc-dev-base-url}/${module-directory}</developerConnection>
+ <url>${vc-browse-base-url}/${module-directory}</url>
</scm>
<dependencies>
<dependency>
@@ -120,41 +114,5 @@
</includes>
</testResource>
</testResources>
- <plugins>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>appassembler-maven-plugin</artifactId>
- <configuration>
- <extraJvmArguments>-Xmx128M</extraJvmArguments>
- <repositoryLayout>flat</repositoryLayout>
- <platforms>
- <platform>windows</platform>
- <platform>unix</platform>
- </platforms>
- <programs>
- <program>
- <mainClass>org.apache.lucene.benchmark.byTask.Benchmark</mainClass>
- <name>Benchmark</name>
- </program>
- <program>
- <mainClass>org.apache.lucene.benchmark.quality.trec.QueryDriver</mainClass>
- <name>QueryDriver</name>
- </program>
- <program>
- <mainClass>org.apache.lucene.benchmark.quality.utils.QualityQueriesFinder</mainClass>
- <name>QualityQueriesFinder</name>
- </program>
- <program>
- <mainClass>org.apache.lucene.benchmark.utils.ExtractReuters</mainClass>
- <name>ExtractReuters</name>
- </program>
- <program>
- <mainClass>org.apache.lucene.benchmark.utils.ExtractWikipedia</mainClass>
- <name>ExtractWikipedia</name>
- </program>
- </programs>
- </configuration>
- </plugin>
- </plugins>
</build>
</project>
Modified: lucene/dev/branches/LUCENE-2878/dev-tools/maven/lucene/core/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/LUCENE-2878/dev-tools/maven/lucene/core/pom.xml.template?rev=1372423&r1=1372422&r2=1372423&view=diff
==============================================================================
--- lucene/dev/branches/LUCENE-2878/dev-tools/maven/lucene/core/pom.xml.template (original)
+++ lucene/dev/branches/LUCENE-2878/dev-tools/maven/lucene/core/pom.xml.template Mon Aug 13 13:52:46 2012
@@ -37,15 +37,9 @@
<module-path>${top-level}/${module-directory}</module-path>
</properties>
<scm>
- <connection>
- scm:svn:http://svn.apache.org/repos/asf/lucene/dev/trunk/${module-directory}
- </connection>
- <developerConnection>
- scm:svn:https://svn.apache.org/repos/asf/lucene/dev/trunk/${module-directory}
- </developerConnection>
- <url>
- http://svn.apache.org/viewvc/lucene/dev/trunk/${module-directory}
- </url>
+ <connection>scm:svn:${vc-anonymous-base-url}/${module-directory}</connection>
+ <developerConnection>scm:svn:${vc-dev-base-url}/${module-directory}</developerConnection>
+ <url>${vc-browse-base-url}/${module-directory}</url>
</scm>
<dependencies>
<dependency>
@@ -106,40 +100,6 @@
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
- <artifactId>appassembler-maven-plugin</artifactId>
- <configuration>
- <extraJvmArguments>-Xmx128M</extraJvmArguments>
- <repositoryLayout>flat</repositoryLayout>
- <platforms>
- <platform>windows</platform>
- <platform>unix</platform>
- </platforms>
- <programs>
- <program>
- <mainClass>org.apache.lucene.index.CheckIndex</mainClass>
- <name>CheckIndex</name>
- </program>
- <program>
- <mainClass>org.apache.lucene.index.IndexReader</mainClass>
- <name>IndexReader</name>
- </program>
- <program>
- <mainClass>org.apache.lucene.store.LockStressTest</mainClass>
- <name>LockStressTest</name>
- </program>
- <program>
- <mainClass>org.apache.lucene.store.LockVerifyServer</mainClass>
- <name>LockVerifyServer</name>
- </program>
- <program>
- <mainClass>org.apache.lucene.util.English</mainClass>
- <name>English</name>
- </program>
- </programs>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
<executions>
<execution>
Modified: lucene/dev/branches/LUCENE-2878/dev-tools/maven/lucene/demo/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/LUCENE-2878/dev-tools/maven/lucene/demo/pom.xml.template?rev=1372423&r1=1372422&r2=1372423&view=diff
==============================================================================
--- lucene/dev/branches/LUCENE-2878/dev-tools/maven/lucene/demo/pom.xml.template (original)
+++ lucene/dev/branches/LUCENE-2878/dev-tools/maven/lucene/demo/pom.xml.template Mon Aug 13 13:52:46 2012
@@ -37,15 +37,9 @@
<module-path>${top-level}/${module-directory}</module-path>
</properties>
<scm>
- <connection>
- scm:svn:http://svn.apache.org/repos/asf/lucene/dev/trunk/${module-directory}
- </connection>
- <developerConnection>
- scm:svn:https://svn.apache.org/repos/asf/lucene/dev/trunk/${module-directory}
- </developerConnection>
- <url>
- http://svn.apache.org/viewvc/lucene/dev/trunk/${module-directory}
- </url>
+ <connection>scm:svn:${vc-anonymous-base-url}/${module-directory}</connection>
+ <developerConnection>scm:svn:${vc-dev-base-url}/${module-directory}</developerConnection>
+ <url>${vc-browse-base-url}/${module-directory}</url>
</scm>
<dependencies>
<dependency>
@@ -87,30 +81,5 @@
</excludes>
</testResource>
</testResources>
- <plugins>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>appassembler-maven-plugin</artifactId>
- <configuration>
- <extraJvmArguments>-Xmx128M</extraJvmArguments>
- <repositoryLayout>flat</repositoryLayout>
- <assembleDirectory>${build-directory}</assembleDirectory>
- <platforms>
- <platform>windows</platform>
- <platform>unix</platform>
- </platforms>
- <programs>
- <program>
- <mainClass>org.apache.lucene.demo.IndexFiles</mainClass>
- <name>IndexFiles</name>
- </program>
- <program>
- <mainClass>org.apache.lucene.demo.SearchFiles</mainClass>
- <name>SearchFiles</name>
- </program>
- </programs>
- </configuration>
- </plugin>
- </plugins>
</build>
</project>
Modified: lucene/dev/branches/LUCENE-2878/dev-tools/maven/lucene/facet/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/LUCENE-2878/dev-tools/maven/lucene/facet/pom.xml.template?rev=1372423&r1=1372422&r2=1372423&view=diff
==============================================================================
--- lucene/dev/branches/LUCENE-2878/dev-tools/maven/lucene/facet/pom.xml.template (original)
+++ lucene/dev/branches/LUCENE-2878/dev-tools/maven/lucene/facet/pom.xml.template Mon Aug 13 13:52:46 2012
@@ -39,15 +39,9 @@
<module-path>${top-level}/${module-directory}</module-path>
</properties>
<scm>
- <connection>
- scm:svn:http://svn.apache.org/repos/asf/lucene/dev/trunk/${module-directory}
- </connection>
- <developerConnection>
- scm:svn:https://svn.apache.org/repos/asf/lucene/dev/trunk/${module-directory}
- </developerConnection>
- <url>
- http://svn.apache.org/viewvc/lucene/dev/trunk/${module-directory}
- </url>
+ <connection>scm:svn:${vc-anonymous-base-url}/${module-directory}</connection>
+ <developerConnection>scm:svn:${vc-dev-base-url}/${module-directory}</developerConnection>
+ <url>${vc-browse-base-url}/${module-directory}</url>
</scm>
<dependencies>
<dependency>
Modified: lucene/dev/branches/LUCENE-2878/dev-tools/maven/lucene/grouping/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/LUCENE-2878/dev-tools/maven/lucene/grouping/pom.xml.template?rev=1372423&r1=1372422&r2=1372423&view=diff
==============================================================================
--- lucene/dev/branches/LUCENE-2878/dev-tools/maven/lucene/grouping/pom.xml.template (original)
+++ lucene/dev/branches/LUCENE-2878/dev-tools/maven/lucene/grouping/pom.xml.template Mon Aug 13 13:52:46 2012
@@ -37,15 +37,9 @@
<module-path>${top-level}/${module-directory}</module-path>
</properties>
<scm>
- <connection>
- scm:svn:http://svn.apache.org/repos/asf/lucene/dev/trunk/${module-directory}
- </connection>
- <developerConnection>
- scm:svn:https://svn.apache.org/repos/asf/lucene/dev/trunk/${module-directory}
- </developerConnection>
- <url>
- http://svn.apache.org/viewvc/lucene/dev/trunk/${module-directory}
- </url>
+ <connection>scm:svn:${vc-anonymous-base-url}/${module-directory}</connection>
+ <developerConnection>scm:svn:${vc-dev-base-url}/${module-directory}</developerConnection>
+ <url>${vc-browse-base-url}/${module-directory}</url>
</scm>
<dependencies>
<dependency>
Modified: lucene/dev/branches/LUCENE-2878/dev-tools/maven/lucene/highlighter/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/LUCENE-2878/dev-tools/maven/lucene/highlighter/pom.xml.template?rev=1372423&r1=1372422&r2=1372423&view=diff
==============================================================================
--- lucene/dev/branches/LUCENE-2878/dev-tools/maven/lucene/highlighter/pom.xml.template (original)
+++ lucene/dev/branches/LUCENE-2878/dev-tools/maven/lucene/highlighter/pom.xml.template Mon Aug 13 13:52:46 2012
@@ -39,15 +39,9 @@
<module-path>${top-level}/${module-directory}</module-path>
</properties>
<scm>
- <connection>
- scm:svn:http://svn.apache.org/repos/asf/lucene/dev/trunk/${module-directory}
- </connection>
- <developerConnection>
- scm:svn:https://svn.apache.org/repos/asf/lucene/dev/trunk/${module-directory}
- </developerConnection>
- <url>
- http://svn.apache.org/viewvc/lucene/dev/trunk/${module-directory}
- </url>
+ <connection>scm:svn:${vc-anonymous-base-url}/${module-directory}</connection>
+ <developerConnection>scm:svn:${vc-dev-base-url}/${module-directory}</developerConnection>
+ <url>${vc-browse-base-url}/${module-directory}</url>
</scm>
<dependencies>
<dependency>
Modified: lucene/dev/branches/LUCENE-2878/dev-tools/maven/lucene/join/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/LUCENE-2878/dev-tools/maven/lucene/join/pom.xml.template?rev=1372423&r1=1372422&r2=1372423&view=diff
==============================================================================
--- lucene/dev/branches/LUCENE-2878/dev-tools/maven/lucene/join/pom.xml.template (original)
+++ lucene/dev/branches/LUCENE-2878/dev-tools/maven/lucene/join/pom.xml.template Mon Aug 13 13:52:46 2012
@@ -37,15 +37,9 @@
<module-path>${top-level}/${module-directory}</module-path>
</properties>
<scm>
- <connection>
- scm:svn:http://svn.apache.org/repos/asf/lucene/dev/trunk/${module-directory}
- </connection>
- <developerConnection>
- scm:svn:https://svn.apache.org/repos/asf/lucene/dev/trunk/${module-directory}
- </developerConnection>
- <url>
- http://svn.apache.org/viewvc/lucene/dev/trunk/${module-directory}
- </url>
+ <connection>scm:svn:${vc-anonymous-base-url}/${module-directory}</connection>
+ <developerConnection>scm:svn:${vc-dev-base-url}/${module-directory}</developerConnection>
+ <url>${vc-browse-base-url}/${module-directory}</url>
</scm>
<dependencies>
<dependency>
Modified: lucene/dev/branches/LUCENE-2878/dev-tools/maven/lucene/memory/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/LUCENE-2878/dev-tools/maven/lucene/memory/pom.xml.template?rev=1372423&r1=1372422&r2=1372423&view=diff
==============================================================================
--- lucene/dev/branches/LUCENE-2878/dev-tools/maven/lucene/memory/pom.xml.template (original)
+++ lucene/dev/branches/LUCENE-2878/dev-tools/maven/lucene/memory/pom.xml.template Mon Aug 13 13:52:46 2012
@@ -39,15 +39,9 @@
<module-path>${top-level}/${module-directory}</module-path>
</properties>
<scm>
- <connection>
- scm:svn:http://svn.apache.org/repos/asf/lucene/dev/trunk/${module-directory}
- </connection>
- <developerConnection>
- scm:svn:https://svn.apache.org/repos/asf/lucene/dev/trunk/${module-directory}
- </developerConnection>
- <url>
- http://svn.apache.org/viewvc/lucene/dev/trunk/${module-directory}
- </url>
+ <connection>scm:svn:${vc-anonymous-base-url}/${module-directory}</connection>
+ <developerConnection>scm:svn:${vc-dev-base-url}/${module-directory}</developerConnection>
+ <url>${vc-browse-base-url}/${module-directory}</url>
</scm>
<dependencies>
<dependency>
Modified: lucene/dev/branches/LUCENE-2878/dev-tools/maven/lucene/misc/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/LUCENE-2878/dev-tools/maven/lucene/misc/pom.xml.template?rev=1372423&r1=1372422&r2=1372423&view=diff
==============================================================================
--- lucene/dev/branches/LUCENE-2878/dev-tools/maven/lucene/misc/pom.xml.template (original)
+++ lucene/dev/branches/LUCENE-2878/dev-tools/maven/lucene/misc/pom.xml.template Mon Aug 13 13:52:46 2012
@@ -37,15 +37,9 @@
<module-path>${top-level}/${module-directory}</module-path>
</properties>
<scm>
- <connection>
- scm:svn:http://svn.apache.org/repos/asf/lucene/dev/trunk/${module-directory}
- </connection>
- <developerConnection>
- scm:svn:https://svn.apache.org/repos/asf/lucene/dev/trunk/${module-directory}
- </developerConnection>
- <url>
- http://svn.apache.org/viewvc/lucene/dev/trunk/${module-directory}
- </url>
+ <connection>scm:svn:${vc-anonymous-base-url}/${module-directory}</connection>
+ <developerConnection>scm:svn:${vc-dev-base-url}/${module-directory}</developerConnection>
+ <url>${vc-browse-base-url}/${module-directory}</url>
</scm>
<dependencies>
<dependency>
@@ -72,49 +66,5 @@
</excludes>
</testResource>
</testResources>
- <plugins>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>appassembler-maven-plugin</artifactId>
- <configuration>
- <extraJvmArguments>-Xmx128M</extraJvmArguments>
- <repositoryLayout>flat</repositoryLayout>
- <platforms>
- <platform>windows</platform>
- <platform>unix</platform>
- </platforms>
- <programs>
- <program>
- <mainClass>org.apache.lucene.index.FieldNormModifier</mainClass>
- <name>FieldNormModifier</name>
- </program>
- <program>
- <mainClass>org.apache.lucene.index.IndexSplitter</mainClass>
- <name>IndexSplitter</name>
- </program>
- <program>
- <mainClass>org.apache.lucene.index.MultiPassIndexSplitter</mainClass>
- <name>MultiPassIndexSplitter</name>
- </program>
- <program>
- <mainClass>org.apache.lucene.misc.GetTermInfo</mainClass>
- <name>GetTermInfo</name>
- </program>
- <program>
- <mainClass>org.apache.lucene.misc.HighFreqTerms</mainClass>
- <name>HighFreqTerms</name>
- </program>
- <program>
- <mainClass>org.apache.lucene.misc.IndexMergeTool</mainClass>
- <name>IndexMergeTool</name>
- </program>
- <program>
- <mainClass>org.apache.lucene.misc.LengthNormModifier</mainClass>
- <name>LengthNormModifier</name>
- </program>
- </programs>
- </configuration>
- </plugin>
- </plugins>
</build>
</project>
Modified: lucene/dev/branches/LUCENE-2878/dev-tools/maven/lucene/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/LUCENE-2878/dev-tools/maven/lucene/pom.xml.template?rev=1372423&r1=1372422&r2=1372423&view=diff
==============================================================================
--- lucene/dev/branches/LUCENE-2878/dev-tools/maven/lucene/pom.xml.template (original)
+++ lucene/dev/branches/LUCENE-2878/dev-tools/maven/lucene/pom.xml.template Mon Aug 13 13:52:46 2012
@@ -35,15 +35,9 @@
<module-directory>lucene</module-directory>
</properties>
<scm>
- <connection>
- scm:svn:http://svn.apache.org/repos/asf/lucene/dev/trunk/${module-directory}
- </connection>
- <developerConnection>
- scm:svn:https://svn.apache.org/repos/asf/lucene/dev/trunk/${module-directory}
- </developerConnection>
- <url>
- http://svn.apache.org/viewvc/lucene/dev/trunk/${module-directory}
- </url>
+ <connection>scm:svn:${vc-anonymous-base-url}/${module-directory}</connection>
+ <developerConnection>scm:svn:${vc-dev-base-url}/${module-directory}</developerConnection>
+ <url>${vc-browse-base-url}/${module-directory}</url>
</scm>
<modules>
<module>core</module>
Modified: lucene/dev/branches/LUCENE-2878/dev-tools/maven/lucene/queries/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/LUCENE-2878/dev-tools/maven/lucene/queries/pom.xml.template?rev=1372423&r1=1372422&r2=1372423&view=diff
==============================================================================
--- lucene/dev/branches/LUCENE-2878/dev-tools/maven/lucene/queries/pom.xml.template (original)
+++ lucene/dev/branches/LUCENE-2878/dev-tools/maven/lucene/queries/pom.xml.template Mon Aug 13 13:52:46 2012
@@ -37,15 +37,9 @@
<module-path>${top-level}/${module-directory}</module-path>
</properties>
<scm>
- <connection>
- scm:svn:http://svn.apache.org/repos/asf/lucene/dev/trunk/${module-directory}
- </connection>
- <developerConnection>
- scm:svn:https://svn.apache.org/repos/asf/lucene/dev/trunk/${module-directory}
- </developerConnection>
- <url>
- http://svn.apache.org/viewvc/lucene/dev/trunk/${module-directory}
- </url>
+ <connection>scm:svn:${vc-anonymous-base-url}/${module-directory}</connection>
+ <developerConnection>scm:svn:${vc-dev-base-url}/${module-directory}</developerConnection>
+ <url>${vc-browse-base-url}/${module-directory}</url>
</scm>
<dependencies>
<dependency>
Modified: lucene/dev/branches/LUCENE-2878/dev-tools/maven/lucene/queryparser/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/LUCENE-2878/dev-tools/maven/lucene/queryparser/pom.xml.template?rev=1372423&r1=1372422&r2=1372423&view=diff
==============================================================================
--- lucene/dev/branches/LUCENE-2878/dev-tools/maven/lucene/queryparser/pom.xml.template (original)
+++ lucene/dev/branches/LUCENE-2878/dev-tools/maven/lucene/queryparser/pom.xml.template Mon Aug 13 13:52:46 2012
@@ -37,15 +37,9 @@
<module-path>${top-level}/${module-directory}</module-path>
</properties>
<scm>
- <connection>
- scm:svn:http://svn.apache.org/repos/asf/lucene/dev/trunk/${module-directory}
- </connection>
- <developerConnection>
- scm:svn:https://svn.apache.org/repos/asf/lucene/dev/trunk/${module-directory}
- </developerConnection>
- <url>
- http://svn.apache.org/viewvc/lucene/dev/trunk/${module-directory}
- </url>
+ <connection>scm:svn:${vc-anonymous-base-url}/${module-directory}</connection>
+ <developerConnection>scm:svn:${vc-dev-base-url}/${module-directory}</developerConnection>
+ <url>${vc-browse-base-url}/${module-directory}</url>
</scm>
<dependencies>
<dependency>
Modified: lucene/dev/branches/LUCENE-2878/dev-tools/maven/lucene/sandbox/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/LUCENE-2878/dev-tools/maven/lucene/sandbox/pom.xml.template?rev=1372423&r1=1372422&r2=1372423&view=diff
==============================================================================
--- lucene/dev/branches/LUCENE-2878/dev-tools/maven/lucene/sandbox/pom.xml.template (original)
+++ lucene/dev/branches/LUCENE-2878/dev-tools/maven/lucene/sandbox/pom.xml.template Mon Aug 13 13:52:46 2012
@@ -37,15 +37,9 @@
<module-path>${top-level}/${module-directory}</module-path>
</properties>
<scm>
- <connection>
- scm:svn:http://svn.apache.org/repos/asf/lucene/dev/trunk/${module-directory}
- </connection>
- <developerConnection>
- scm:svn:https://svn.apache.org/repos/asf/lucene/dev/trunk/${module-directory}
- </developerConnection>
- <url>
- http://svn.apache.org/viewvc/lucene/dev/trunk/${module-directory}
- </url>
+ <connection>scm:svn:${vc-anonymous-base-url}/${module-directory}</connection>
+ <developerConnection>scm:svn:${vc-dev-base-url}/${module-directory}</developerConnection>
+ <url>${vc-browse-base-url}/${module-directory}</url>
</scm>
<dependencies>
<dependency>
Modified: lucene/dev/branches/LUCENE-2878/dev-tools/maven/lucene/suggest/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/LUCENE-2878/dev-tools/maven/lucene/suggest/pom.xml.template?rev=1372423&r1=1372422&r2=1372423&view=diff
==============================================================================
--- lucene/dev/branches/LUCENE-2878/dev-tools/maven/lucene/suggest/pom.xml.template (original)
+++ lucene/dev/branches/LUCENE-2878/dev-tools/maven/lucene/suggest/pom.xml.template Mon Aug 13 13:52:46 2012
@@ -37,15 +37,9 @@
<module-path>${top-level}/${module-directory}</module-path>
</properties>
<scm>
- <connection>
- scm:svn:http://svn.apache.org/repos/asf/lucene/dev/trunk/${module-directory}
- </connection>
- <developerConnection>
- scm:svn:https://svn.apache.org/repos/asf/lucene/dev/trunk/${module-directory}
- </developerConnection>
- <url>
- http://svn.apache.org/viewvc/lucene/dev/trunk/${module-directory}
- </url>
+ <connection>scm:svn:${vc-anonymous-base-url}/${module-directory}</connection>
+ <developerConnection>scm:svn:${vc-dev-base-url}/${module-directory}</developerConnection>
+ <url>${vc-browse-base-url}/${module-directory}</url>
</scm>
<dependencies>
<dependency>
Modified: lucene/dev/branches/LUCENE-2878/dev-tools/maven/lucene/test-framework/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/LUCENE-2878/dev-tools/maven/lucene/test-framework/pom.xml.template?rev=1372423&r1=1372422&r2=1372423&view=diff
==============================================================================
--- lucene/dev/branches/LUCENE-2878/dev-tools/maven/lucene/test-framework/pom.xml.template (original)
+++ lucene/dev/branches/LUCENE-2878/dev-tools/maven/lucene/test-framework/pom.xml.template Mon Aug 13 13:52:46 2012
@@ -37,15 +37,9 @@
<module-path>${top-level}/${module-directory}</module-path>
</properties>
<scm>
- <connection>
- scm:svn:http://svn.apache.org/repos/asf/lucene/dev/trunk/${module-directory}
- </connection>
- <developerConnection>
- scm:svn:https://svn.apache.org/repos/asf/lucene/dev/trunk/${module-directory}
- </developerConnection>
- <url>
- http://svn.apache.org/viewvc/lucene/dev/trunk/${module-directory}
- </url>
+ <connection>scm:svn:${vc-anonymous-base-url}/${module-directory}</connection>
+ <developerConnection>scm:svn:${vc-dev-base-url}/${module-directory}</developerConnection>
+ <url>${vc-browse-base-url}/${module-directory}</url>
</scm>
<dependencies>
<dependency>
Modified: lucene/dev/branches/LUCENE-2878/dev-tools/maven/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/LUCENE-2878/dev-tools/maven/pom.xml.template?rev=1372423&r1=1372422&r2=1372423&view=diff
==============================================================================
--- lucene/dev/branches/LUCENE-2878/dev-tools/maven/pom.xml.template (original)
+++ lucene/dev/branches/LUCENE-2878/dev-tools/maven/pom.xml.template Mon Aug 13 13:52:46 2012
@@ -31,15 +31,18 @@
<version>@version@</version>
<packaging>pom</packaging>
<name>Grandparent POM for Apache Lucene Core and Apache Solr</name>
- <description>Parent POM for Apache Lucene Core and Apache Solr</description>
- <url>http://lucene.apache.org/java</url>
+ <description>Grandparent POM for Apache Lucene Core and Apache Solr</description>
+ <url>http://lucene.apache.org</url>
<modules>
<module>lucene</module>
<module>solr</module>
</modules>
<properties>
<top-level>..</top-level>
- <base.specification.version>4.0.0</base.specification.version>
+ <vc-anonymous-base-url>http://svn.apache.org/repos/asf/lucene/dev/trunk</vc-anonymous-base-url>
+ <vc-dev-base-url>https://svn.apache.org/repos/asf/lucene/dev/trunk</vc-dev-base-url>
+ <vc-browse-base-url>http://svn.apache.org/viewvc/lucene/dev/trunk</vc-browse-base-url>
+ <base.specification.version>5.0.0</base.specification.version>
<maven.build.timestamp.format>yyyy-MM-dd HH:mm:ss</maven.build.timestamp.format>
<java.compat.version>1.6</java.compat.version>
<jetty.version>8.1.2.v20120308</jetty.version>
@@ -69,11 +72,11 @@
</properties>
<issueManagement>
<system>JIRA</system>
- <url>http://issues.apache.org/jira/browse/LUCENE</url>
+ <url>https://issues.apache.org/jira/browse/LUCENE</url>
</issueManagement>
<ciManagement>
- <system>Hudson</system>
- <url>http://lucene.zones.apache.org:8080/hudson/job/Lucene-Nightly/</url>
+ <system>Jenkins</system>
+ <url>https://builds.apache.org/computer/lucene/</url>
</ciManagement>
<mailingLists>
<mailingList>
@@ -109,15 +112,9 @@
</mailingLists>
<inceptionYear>2000</inceptionYear>
<scm>
- <connection>
- scm:svn:http://svn.apache.org/repos/asf/lucene/dev/trunk
- </connection>
- <developerConnection>
- scm:svn:https://svn.apache.org/repos/asf/lucene/dev/trunk
- </developerConnection>
- <url>
- http://svn.apache.org/viewvc/lucene/dev/trunk
- </url>
+ <connection>scm:svn:${vc-anonymous-base-url}</connection>
+ <developerConnection>scm:svn:${vc-dev-base-url}</developerConnection>
+ <url>${vc-browse-base-url}</url>
</scm>
<licenses>
<license>
@@ -143,7 +140,7 @@
<dependency>
<groupId>com.ibm.icu</groupId>
<artifactId>icu4j</artifactId>
- <version>4.8.1.1</version>
+ <version>49.1</version>
</dependency>
<dependency>
<groupId>com.google.guava</groupId>
@@ -298,7 +295,7 @@
<dependency>
<groupId>org.apache.zookeeper</groupId>
<artifactId>zookeeper</artifactId>
- <version>3.3.5</version>
+ <version>3.3.6</version>
</dependency>
<dependency>
<groupId>org.carrot2</groupId>
@@ -388,7 +385,7 @@
<dependency>
<groupId>com.carrotsearch.randomizedtesting</groupId>
<artifactId>randomizedtesting-runner</artifactId>
- <version>1.6.0</version>
+ <version>2.0.0.rc5</version>
</dependency>
</dependencies>
</dependencyManagement>
@@ -551,11 +548,6 @@
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
- <artifactId>appassembler-maven-plugin</artifactId>
- <version>1.2.1</version>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
<version>1.7</version>
</plugin>
Modified: lucene/dev/branches/LUCENE-2878/dev-tools/maven/solr/contrib/analysis-extras/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/LUCENE-2878/dev-tools/maven/solr/contrib/analysis-extras/pom.xml.template?rev=1372423&r1=1372422&r2=1372423&view=diff
==============================================================================
--- lucene/dev/branches/LUCENE-2878/dev-tools/maven/solr/contrib/analysis-extras/pom.xml.template (original)
+++ lucene/dev/branches/LUCENE-2878/dev-tools/maven/solr/contrib/analysis-extras/pom.xml.template Mon Aug 13 13:52:46 2012
@@ -35,18 +35,11 @@
<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:http://svn.apache.org/repos/asf/lucene/dev/trunk/${module-directory}
- </connection>
- <developerConnection>
- scm:svn:https://svn.apache.org/repos/asf/lucene/dev/trunk/${module-directory}
- </developerConnection>
- <url>
- http://svn.apache.org/viewvc/lucene/dev/trunk/${module-directory}
- </url>
+ <connection>scm:svn:${vc-anonymous-base-url}/${module-directory}</connection>
+ <developerConnection>scm:svn:${vc-dev-base-url}/${module-directory}</developerConnection>
+ <url>${vc-browse-base-url}/${module-directory}</url>
</scm>
<dependencies>
<dependency>
@@ -101,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/LUCENE-2878/dev-tools/maven/solr/contrib/clustering/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/LUCENE-2878/dev-tools/maven/solr/contrib/clustering/pom.xml.template?rev=1372423&r1=1372422&r2=1372423&view=diff
==============================================================================
--- lucene/dev/branches/LUCENE-2878/dev-tools/maven/solr/contrib/clustering/pom.xml.template (original)
+++ lucene/dev/branches/LUCENE-2878/dev-tools/maven/solr/contrib/clustering/pom.xml.template Mon Aug 13 13:52:46 2012
@@ -35,18 +35,11 @@
<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:http://svn.apache.org/repos/asf/lucene/dev/trunk/${module-directory}
- </connection>
- <developerConnection>
- scm:svn:https://svn.apache.org/repos/asf/lucene/dev/trunk/${module-directory}
- </developerConnection>
- <url>
- http://svn.apache.org/viewvc/lucene/dev/trunk/${module-directory}
- </url>
+ <connection>scm:svn:${vc-anonymous-base-url}/${module-directory}</connection>
+ <developerConnection>scm:svn:${vc-dev-base-url}/${module-directory}</developerConnection>
+ <url>${vc-browse-base-url}/${module-directory}</url>
</scm>
<dependencies>
<dependency>
@@ -106,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/LUCENE-2878/dev-tools/maven/solr/contrib/dataimporthandler-extras/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/LUCENE-2878/dev-tools/maven/solr/contrib/dataimporthandler-extras/pom.xml.template?rev=1372423&r1=1372422&r2=1372423&view=diff
==============================================================================
--- lucene/dev/branches/LUCENE-2878/dev-tools/maven/solr/contrib/dataimporthandler-extras/pom.xml.template (original)
+++ lucene/dev/branches/LUCENE-2878/dev-tools/maven/solr/contrib/dataimporthandler-extras/pom.xml.template Mon Aug 13 13:52:46 2012
@@ -35,18 +35,11 @@
<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:http://svn.apache.org/repos/asf/lucene/dev/trunk/${module-directory}
- </connection>
- <developerConnection>
- scm:svn:https://svn.apache.org/repos/asf/lucene/dev/trunk/${module-directory}
- </developerConnection>
- <url>
- http://svn.apache.org/viewvc/lucene/dev/trunk/${module-directory}
- </url>
+ <connection>scm:svn:${vc-anonymous-base-url}/${module-directory}</connection>
+ <developerConnection>scm:svn:${vc-dev-base-url}/${module-directory}</developerConnection>
+ <url>${vc-browse-base-url}/${module-directory}</url>
</scm>
<dependencies>
<dependency>
@@ -104,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/LUCENE-2878/dev-tools/maven/solr/contrib/dataimporthandler/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/LUCENE-2878/dev-tools/maven/solr/contrib/dataimporthandler/pom.xml.template?rev=1372423&r1=1372422&r2=1372423&view=diff
==============================================================================
--- lucene/dev/branches/LUCENE-2878/dev-tools/maven/solr/contrib/dataimporthandler/pom.xml.template (original)
+++ lucene/dev/branches/LUCENE-2878/dev-tools/maven/solr/contrib/dataimporthandler/pom.xml.template Mon Aug 13 13:52:46 2012
@@ -35,18 +35,11 @@
<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:http://svn.apache.org/repos/asf/lucene/dev/trunk/${module-directory}
- </connection>
- <developerConnection>
- scm:svn:https://svn.apache.org/repos/asf/lucene/dev/trunk/${module-directory}
- </developerConnection>
- <url>
- http://svn.apache.org/viewvc/lucene/dev/trunk/${module-directory}
- </url>
+ <connection>scm:svn:${vc-anonymous-base-url}/${module-directory}</connection>
+ <developerConnection>scm:svn:${vc-dev-base-url}/${module-directory}</developerConnection>
+ <url>${vc-browse-base-url}/${module-directory}</url>
</scm>
<dependencies>
<dependency>
@@ -90,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>
@@ -103,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/LUCENE-2878/dev-tools/maven/solr/contrib/extraction/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/LUCENE-2878/dev-tools/maven/solr/contrib/extraction/pom.xml.template?rev=1372423&r1=1372422&r2=1372423&view=diff
==============================================================================
--- lucene/dev/branches/LUCENE-2878/dev-tools/maven/solr/contrib/extraction/pom.xml.template (original)
+++ lucene/dev/branches/LUCENE-2878/dev-tools/maven/solr/contrib/extraction/pom.xml.template Mon Aug 13 13:52:46 2012
@@ -38,18 +38,11 @@
<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:http://svn.apache.org/repos/asf/lucene/dev/trunk/${module-directory}
- </connection>
- <developerConnection>
- scm:svn:https://svn.apache.org/repos/asf/lucene/dev/trunk/${module-directory}
- </developerConnection>
- <url>
- http://svn.apache.org/viewvc/lucene/dev/trunk/${module-directory}
- </url>
+ <connection>scm:svn:${vc-anonymous-base-url}/${module-directory}</connection>
+ <developerConnection>scm:svn:${vc-dev-base-url}/${module-directory}</developerConnection>
+ <url>${vc-browse-base-url}/${module-directory}</url>
</scm>
<dependencies>
<dependency>
@@ -102,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/LUCENE-2878/dev-tools/maven/solr/contrib/langid/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/LUCENE-2878/dev-tools/maven/solr/contrib/langid/pom.xml.template?rev=1372423&r1=1372422&r2=1372423&view=diff
==============================================================================
--- lucene/dev/branches/LUCENE-2878/dev-tools/maven/solr/contrib/langid/pom.xml.template (original)
+++ lucene/dev/branches/LUCENE-2878/dev-tools/maven/solr/contrib/langid/pom.xml.template Mon Aug 13 13:52:46 2012
@@ -39,18 +39,11 @@
<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:http://svn.apache.org/repos/asf/lucene/dev/trunk/${module-directory}
- </connection>
- <developerConnection>
- scm:svn:https://svn.apache.org/repos/asf/lucene/dev/trunk/${module-directory}
- </developerConnection>
- <url>
- http://svn.apache.org/viewvc/lucene/dev/trunk/${module-directory}
- </url>
+ <connection>scm:svn:${vc-anonymous-base-url}/${module-directory}</connection>
+ <developerConnection>scm:svn:${vc-dev-base-url}/${module-directory}</developerConnection>
+ <url>${vc-browse-base-url}/${module-directory}</url>
</scm>
<dependencies>
<dependency>
@@ -107,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/LUCENE-2878/dev-tools/maven/solr/contrib/uima/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/LUCENE-2878/dev-tools/maven/solr/contrib/uima/pom.xml.template?rev=1372423&r1=1372422&r2=1372423&view=diff
==============================================================================
--- lucene/dev/branches/LUCENE-2878/dev-tools/maven/solr/contrib/uima/pom.xml.template (original)
+++ lucene/dev/branches/LUCENE-2878/dev-tools/maven/solr/contrib/uima/pom.xml.template Mon Aug 13 13:52:46 2012
@@ -35,18 +35,11 @@
<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:http://svn.apache.org/repos/asf/lucene/dev/trunk/${module-directory}
- </connection>
- <developerConnection>
- scm:svn:https://svn.apache.org/repos/asf/lucene/dev/trunk/${module-directory}
- </developerConnection>
- <url>
- http://svn.apache.org/viewvc/lucene/dev/trunk/${module-directory}
- </url>
+ <connection>scm:svn:${vc-anonymous-base-url}/${module-directory}</connection>
+ <developerConnection>scm:svn:${vc-dev-base-url}/${module-directory}</developerConnection>
+ <url>${vc-browse-base-url}/${module-directory}</url>
</scm>
<dependencies>
<dependency>
@@ -121,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/LUCENE-2878/dev-tools/maven/solr/contrib/velocity/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/LUCENE-2878/dev-tools/maven/solr/contrib/velocity/pom.xml.template?rev=1372423&r1=1372422&r2=1372423&view=diff
==============================================================================
--- lucene/dev/branches/LUCENE-2878/dev-tools/maven/solr/contrib/velocity/pom.xml.template (original)
+++ lucene/dev/branches/LUCENE-2878/dev-tools/maven/solr/contrib/velocity/pom.xml.template Mon Aug 13 13:52:46 2012
@@ -35,18 +35,11 @@
<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:http://svn.apache.org/repos/asf/lucene/dev/trunk/${module-directory}
- </connection>
- <developerConnection>
- scm:svn:https://svn.apache.org/repos/asf/lucene/dev/trunk/${module-directory}
- </developerConnection>
- <url>
- http://svn.apache.org/viewvc/lucene/dev/trunk/${module-directory}
- </url>
+ <connection>scm:svn:${vc-anonymous-base-url}/${module-directory}</connection>
+ <developerConnection>scm:svn:${vc-dev-base-url}/${module-directory}</developerConnection>
+ <url>${vc-browse-base-url}/${module-directory}</url>
</scm>
<dependencies>
<dependency>
@@ -142,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/LUCENE-2878/dev-tools/maven/solr/core/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/LUCENE-2878/dev-tools/maven/solr/core/pom.xml.template?rev=1372423&r1=1372422&r2=1372423&view=diff
==============================================================================
--- lucene/dev/branches/LUCENE-2878/dev-tools/maven/solr/core/pom.xml.template (original)
+++ lucene/dev/branches/LUCENE-2878/dev-tools/maven/solr/core/pom.xml.template Mon Aug 13 13:52:46 2012
@@ -35,18 +35,11 @@
<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:http://svn.apache.org/repos/asf/lucene/dev/trunk/${module-directory}
- </connection>
- <developerConnection>
- scm:svn:https://svn.apache.org/repos/asf/lucene/dev/trunk/${module-directory}
- </developerConnection>
- <url>
- http://svn.apache.org/viewvc/lucene/dev/trunk/${module-directory}
- </url>
+ <connection>scm:svn:${vc-anonymous-base-url}/${module-directory}</connection>
+ <developerConnection>scm:svn:${vc-dev-base-url}/${module-directory}</developerConnection>
+ <url>${vc-browse-base-url}/${module-directory}</url>
</scm>
<dependencies>
<dependency>
@@ -243,49 +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>
- </systemPropertyVariables>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>appassembler-maven-plugin</artifactId>
- <configuration>
- <extraJvmArguments>-Xmx128M</extraJvmArguments>
- <repositoryLayout>flat</repositoryLayout>
- <platforms>
- <platform>windows</platform>
- <platform>unix</platform>
- </platforms>
- <programs>
- <program>
- <mainClass>org.apache.solr.client.solrj.embedded.JettySolrRunner</mainClass>
- <name>JettySolrRunner</name>
- </program>
- <program>
- <mainClass>org.apache.solr.util.BitSetPerf</mainClass>
- <name>BitSetPerf</name>
- <extraJvmArguments>-Xms128m -Xbatch</extraJvmArguments>
- </program>
- <program>
- <mainClass>org.apache.solr.util.SimplePostTool</mainClass>
- <name>SimplePostTool</name>
- </program>
- <program>
- <mainClass>org.apache.solr.util.SuggestMissingFactories</mainClass>
- <name>SuggestMissingFactories</name>
- </program>
- </programs>
- </configuration>
- </plugin>
- <plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
<executions>
Modified: lucene/dev/branches/LUCENE-2878/dev-tools/maven/solr/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/LUCENE-2878/dev-tools/maven/solr/pom.xml.template?rev=1372423&r1=1372422&r2=1372423&view=diff
==============================================================================
--- lucene/dev/branches/LUCENE-2878/dev-tools/maven/solr/pom.xml.template (original)
+++ lucene/dev/branches/LUCENE-2878/dev-tools/maven/solr/pom.xml.template Mon Aug 13 13:52:46 2012
@@ -43,26 +43,14 @@
<module-directory>solr</module-directory>
</properties>
<scm>
- <connection>
- scm:svn:http://svn.apache.org/repos/asf/lucene/dev/trunk/${module-directory}
- </connection>
- <developerConnection>
- scm:svn:https://svn.apache.org/repos/asf/lucene/dev/trunk/${module-directory}
- </developerConnection>
- <url>
- http://svn.apache.org/viewvc/lucene/dev/trunk/${module-directory}
- </url>
+ <connection>scm:svn:${vc-anonymous-base-url}/${module-directory}</connection>
+ <developerConnection>scm:svn:${vc-dev-base-url}/${module-directory}</developerConnection>
+ <url>${vc-browse-base-url}/${module-directory}</url>
</scm>
<issueManagement>
<system>JIRA</system>
- <url>http://issues.apache.org/jira/browse/SOLR</url>
+ <url>https://issues.apache.org/jira/browse/SOLR</url>
</issueManagement>
- <ciManagement>
- <system>Hudson</system>
- <url>
- http://lucene.zones.apache.org:8080/hudson/job/Solr-Nightly/
- </url>
- </ciManagement>
<mailingLists>
<mailingList>
<name>Solr User List</name>
@@ -111,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>
Modified: lucene/dev/branches/LUCENE-2878/dev-tools/maven/solr/solrj/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/LUCENE-2878/dev-tools/maven/solr/solrj/pom.xml.template?rev=1372423&r1=1372422&r2=1372423&view=diff
==============================================================================
--- lucene/dev/branches/LUCENE-2878/dev-tools/maven/solr/solrj/pom.xml.template (original)
+++ lucene/dev/branches/LUCENE-2878/dev-tools/maven/solr/solrj/pom.xml.template Mon Aug 13 13:52:46 2012
@@ -37,15 +37,9 @@
<module-path>${top-level}/${module-directory}</module-path>
</properties>
<scm>
- <connection>
- scm:svn:http://svn.apache.org/repos/asf/lucene/dev/trunk/${module-directory}
- </connection>
- <developerConnection>
- scm:svn:https://svn.apache.org/repos/asf/lucene/dev/trunk/${module-directory}
- </developerConnection>
- <url>
- http://svn.apache.org/viewvc/lucene/dev/trunk/${module-directory}
- </url>
+ <connection>scm:svn:${vc-anonymous-base-url}/${module-directory}</connection>
+ <developerConnection>scm:svn:${vc-dev-base-url}/${module-directory}</developerConnection>
+ <url>${vc-browse-base-url}/${module-directory}</url>
</scm>
<dependencies>
<dependency>
Modified: lucene/dev/branches/LUCENE-2878/dev-tools/maven/solr/test-framework/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/LUCENE-2878/dev-tools/maven/solr/test-framework/pom.xml.template?rev=1372423&r1=1372422&r2=1372423&view=diff
==============================================================================
--- lucene/dev/branches/LUCENE-2878/dev-tools/maven/solr/test-framework/pom.xml.template (original)
+++ lucene/dev/branches/LUCENE-2878/dev-tools/maven/solr/test-framework/pom.xml.template Mon Aug 13 13:52:46 2012
@@ -37,15 +37,9 @@
<module-path>${top-level}/${module-directory}</module-path>
</properties>
<scm>
- <connection>
- scm:svn:http://svn.apache.org/repos/asf/lucene/dev/trunk/${module-directory}
- </connection>
- <developerConnection>
- scm:svn:https://svn.apache.org/repos/asf/lucene/dev/trunk/${module-directory}
- </developerConnection>
- <url>
- http://svn.apache.org/viewvc/lucene/dev/trunk/${module-directory}
- </url>
+ <connection>scm:svn:${vc-anonymous-base-url}/${module-directory}</connection>
+ <developerConnection>scm:svn:${vc-dev-base-url}/${module-directory}</developerConnection>
+ <url>${vc-browse-base-url}/${module-directory}</url>
</scm>
<dependencies>
<!-- These dependencies are compile scope because this is a test framework. -->
@@ -61,19 +55,28 @@
<version>${project.version}</version>
</dependency>
<dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ <!-- SOLR-3263: Provided scope is required to avoid jar signing conflicts -->
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
</dependency>
- <!-- If your tests don't use BaseDistributedSearchTestCase or SolrJettyTestBase,
- you can exclude the three Jetty dependencies below. -->
<dependency>
<groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-server</artifactId>
- <scope>runtime</scope>
+ <artifactId>jetty-servlet</artifactId>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-util</artifactId>
+ </dependency>
+ <!-- If your tests don't use BaseDistributedSearchTestCase or SolrJettyTestBase,
+ you can exclude the two Jetty dependencies below. -->
+ <dependency>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-server</artifactId>
<scope>runtime</scope>
</dependency>
<dependency>
Modified: lucene/dev/branches/LUCENE-2878/dev-tools/maven/solr/webapp/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/LUCENE-2878/dev-tools/maven/solr/webapp/pom.xml.template?rev=1372423&r1=1372422&r2=1372423&view=diff
==============================================================================
--- lucene/dev/branches/LUCENE-2878/dev-tools/maven/solr/webapp/pom.xml.template (original)
+++ lucene/dev/branches/LUCENE-2878/dev-tools/maven/solr/webapp/pom.xml.template Mon Aug 13 13:52:46 2012
@@ -37,15 +37,9 @@
<module-path>${top-level}/${module-directory}</module-path>
</properties>
<scm>
- <connection>
- scm:svn:http://svn.apache.org/repos/asf/lucene/dev/trunk/${module-directory}
- </connection>
- <developerConnection>
- scm:svn:https://svn.apache.org/repos/asf/lucene/dev/trunk/${module-directory}
- </developerConnection>
- <url>
- http://svn.apache.org/viewvc/lucene/dev/trunk/${module-directory}
- </url>
+ <connection>scm:svn:${vc-anonymous-base-url}/${module-directory}</connection>
+ <developerConnection>scm:svn:${vc-dev-base-url}/${module-directory}</developerConnection>
+ <url>${vc-browse-base-url}/${module-directory}</url>
</scm>
<dependencies>
<dependency>