You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by sh...@apache.org on 2013/03/10 16:05:21 UTC
svn commit: r1454862 [2/49] - in /lucene/dev/branches/lucene4258: ./
dev-tools/ dev-tools/eclipse/ dev-tools/idea/.idea/
dev-tools/idea/.idea/libraries/ dev-tools/idea/lucene/demo/
dev-tools/idea/lucene/facet/ dev-tools/idea/lucene/highlighter/ dev-too...
Modified: lucene/dev/branches/lucene4258/.gitignore
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4258/.gitignore?rev=1454862&r1=1454861&r2=1454862&view=diff
==============================================================================
--- lucene/dev/branches/lucene4258/.gitignore (original)
+++ lucene/dev/branches/lucene4258/.gitignore Sun Mar 10 15:04:57 2013
@@ -5,6 +5,7 @@
/eclipse-build
/classes
/build
+/idea-build
/dist
/*~
/velocity.log
@@ -16,6 +17,7 @@
/.project
/.classpath
/.settings
+/.caches
/prj.el
/bin
/bin.*
Modified: lucene/dev/branches/lucene4258/build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4258/build.xml?rev=1454862&r1=1454861&r2=1454862&view=diff
==============================================================================
--- lucene/dev/branches/lucene4258/build.xml (original)
+++ lucene/dev/branches/lucene4258/build.xml Sun Mar 10 15:04:57 2013
@@ -102,6 +102,7 @@
</subant>
</target>
+ <!-- lucene/test-framework and solr/test-framework are excluded from compilation -->
<target name="compile" description="Compile Lucene and Solr">
<subant target="compile" inheritall="false" failonerror="true">
<fileset dir="lucene" includes="build.xml" />
@@ -109,6 +110,20 @@
</subant>
</target>
+ <target name="compile-test" description="Compile Lucene and Solr tests and test-frameworks">
+ <subant target="compile-test" inheritAll="false" failonerror="true">
+ <fileset dir="lucene" includes="build.xml" />
+ <fileset dir="solr" includes="build.xml" />
+ </subant>
+ </target>
+
+ <target name="jar" description="Build Lucene and Solr Jar files">
+ <subant target="jar" inheritall="false" failonerror="true">
+ <fileset dir="lucene" includes="build.xml"/>
+ <fileset dir="solr" includes="build.xml"/>
+ </subant>
+ </target>
+
<property name="version" value="5.0-SNAPSHOT"/>
<property name="maven-build-dir" value="maven-build"/>
<property name="maven-version" value="2.2.1"/>
@@ -281,21 +296,14 @@
<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"/>
- <copy todir="${fakeRelease}/solr/changes">
- <fileset dir="solr/build/docs/changes"/>
- </copy>
<makeurl file="${fakeRelease}" validate="false" property="fakeRelease.uri"/>
<exec executable="${python32.exe}" failonerror="true">
<arg value="-u"/>
+ <!-- Tell Python not to write any bytecode cache into the filesystem: -->
+ <arg value="-B"/>
<arg file="dev-tools/scripts/smokeTestRelease.py"/>
<arg value="${fakeRelease.uri}"/>
<arg value="${fakeReleaseVersion}"/>
@@ -367,28 +375,44 @@
</target>
<!-- Jenkins tasks -->
- <target name="jenkins-hourly" depends="clean,test-with-heapdumps,validate,documentation-lint,jar-checksums,check-svn-working-copy"/>
+ <target name="-jenkins-base" depends="clean,test-with-heapdumps,validate,documentation-lint,jar-checksums,check-svn-working-copy"/>
+
+ <target name="jenkins-hourly">
+ <antcall>
+ <param name="is.jenkins.build" value="true"/>
+ <target name="-jenkins-base"/>
+ </antcall>
+ </target>
<target name="jenkins-nightly">
<antcall>
+ <param name="is.jenkins.build" value="true"/>
<param name="tests.nightly" value="true"/>
- <target name="jenkins-hourly"/>
+ <target name="-jenkins-base"/>
</antcall>
</target>
<target name="jenkins-maven-nightly" depends="clean,clean-maven-build">
<!-- step 1: build, install, deploy, and validate ANT-generated maven artifacts: -->
<antcall>
+ <param name="is.jenkins.build" value="true"/>
<target name="remove-maven-artifacts"/>
<!-- this implicitely publishes the maven artifacts: -->
<target name="validate-maven-dependencies"/>
</antcall>
<!-- step 2: run the maven build to check that the pom templates also work to drive "mvn": -->
<antcall>
+ <param name="is.jenkins.build" value="true"/>
<target name="remove-maven-artifacts"/>
<target name="run-maven-build"/>
</antcall>
</target>
- <target name="jenkins-clover" depends="run-clover"/>
+ <target name="jenkins-clover">
+ <antcall>
+ <param name="is.jenkins.build" value="true"/>
+ <target name="run-clover"/>
+ </antcall>
+ </target>
+
</project>
Modified: lucene/dev/branches/lucene4258/dev-tools/README.txt
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4258/dev-tools/README.txt?rev=1454862&r1=1454861&r2=1454862&view=diff
==============================================================================
--- lucene/dev/branches/lucene4258/dev-tools/README.txt (original)
+++ lucene/dev/branches/lucene4258/dev-tools/README.txt Sun Mar 10 15:04:57 2013
@@ -1,7 +1,11 @@
-The tools, documentation, etc. in this directory are intended to be helpful to developers of Lucene and Solr. They are not necessarily maintained in the same way that the core code is maintained and so your mileage may vary as to the usefulness of the tools.
+The tools, documentation, etc. in this directory are intended to be helpful
+to developers of Lucene and Solr. They are not necessarily maintained in
+the same way that the core code is maintained and so your mileage may vary
+as to the usefulness of the tools.
-Description of directories:
-./size-estimator-lucene-solr -- Spreadsheet for estimating memory and disk usage in Lucene/Solr
+Description of dev-tools/ contents:
+
+./size-estimator-lucene-solr.xls -- Spreadsheet for estimating memory and disk usage in Lucene/Solr
./eclipse -- Used to generate project descriptors for the Eclipse IDE.
./idea -- Similar to Eclipse, but for IntelliJ's IDEA IDE.
./maven -- Mavenizes the Lucene/Solr packages
Modified: lucene/dev/branches/lucene4258/dev-tools/eclipse/dot.project
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4258/dev-tools/eclipse/dot.project?rev=1454862&r1=1454861&r2=1454862&view=diff
==============================================================================
--- lucene/dev/branches/lucene4258/dev-tools/eclipse/dot.project (original)
+++ lucene/dev/branches/lucene4258/dev-tools/eclipse/dot.project Sun Mar 10 15:04:57 2013
@@ -60,5 +60,14 @@
<arguments>1.0-projectRelativePath-matches-false-false-solr/dist</arguments>
</matcher>
</filter>
+ <filter>
+ <id>1353353379246</id>
+ <name></name>
+ <type>10</type>
+ <matcher>
+ <id>org.eclipse.ui.ide.multiFilter</id>
+ <arguments>1.0-name-matches-false-false-.svn</arguments>
+ </matcher>
+ </filter>
</filteredResources>
</projectDescription>
Modified: lucene/dev/branches/lucene4258/dev-tools/idea/.idea/compiler.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4258/dev-tools/idea/.idea/compiler.xml?rev=1454862&r1=1454861&r2=1454862&view=diff
==============================================================================
--- lucene/dev/branches/lucene4258/dev-tools/idea/.idea/compiler.xml (original)
+++ lucene/dev/branches/lucene4258/dev-tools/idea/.idea/compiler.xml Sun Mar 10 15:04:57 2013
@@ -3,6 +3,7 @@
<component name="CompilerConfiguration">
<wildcardResourcePatterns>
<entry name="!*.(cpp|java|jflex|jflex-macro|jj|js|pl|py)"/>
+ <entry name="test-files:*"/>
</wildcardResourcePatterns>
</component>
<component name="JavacSettings">
Modified: lucene/dev/branches/lucene4258/dev-tools/idea/.idea/libraries/JUnit.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4258/dev-tools/idea/.idea/libraries/JUnit.xml?rev=1454862&r1=1454861&r2=1454862&view=diff
==============================================================================
--- lucene/dev/branches/lucene4258/dev-tools/idea/.idea/libraries/JUnit.xml (original)
+++ lucene/dev/branches/lucene4258/dev-tools/idea/.idea/libraries/JUnit.xml Sun Mar 10 15:04:57 2013
@@ -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-2.0.7.jar!/" />
+ <root url="jar://$PROJECT_DIR$/lucene/test-framework/lib/randomizedtesting-runner-2.0.8.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
Modified: lucene/dev/branches/lucene4258/dev-tools/idea/.idea/workspace.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4258/dev-tools/idea/.idea/workspace.xml?rev=1454862&r1=1454861&r2=1454862&view=diff
==============================================================================
--- lucene/dev/branches/lucene4258/dev-tools/idea/.idea/workspace.xml (original)
+++ lucene/dev/branches/lucene4258/dev-tools/idea/.idea/workspace.xml Sun Mar 10 15:04:57 2013
@@ -8,7 +8,7 @@
<module name="lucene-core-tests" />
<option name="TEST_OBJECT" value="package" />
<option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/idea-build/lucene/core" />
- <option name="VM_PARAMETERS" value="-ea -Dlucene.version=5.0-SNAPSHOT -DtempDir=temp" />
+ <option name="VM_PARAMETERS" value="-Xmx256m -ea -Dlucene.version=5.0-SNAPSHOT -DtempDir=temp" />
<option name="TEST_SEARCH_SCOPE"><value defaultName="singleModule" /></option>
</configuration>
<configuration default="false" name="Module analyzers-common" type="JUnit" factoryName="JUnit">
Modified: lucene/dev/branches/lucene4258/dev-tools/idea/lucene/demo/demo.iml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4258/dev-tools/idea/lucene/demo/demo.iml?rev=1454862&r1=1454861&r2=1454862&view=diff
==============================================================================
--- lucene/dev/branches/lucene4258/dev-tools/idea/lucene/demo/demo.iml (original)
+++ lucene/dev/branches/lucene4258/dev-tools/idea/lucene/demo/demo.iml Sun Mar 10 15:04:57 2013
@@ -24,6 +24,7 @@
</orderEntry>
<orderEntry type="module" module-name="analysis-common" />
<orderEntry type="module" module-name="lucene-core" />
+ <orderEntry type="module" module-name="facet" />
<orderEntry type="module" module-name="queryparser" />
</component>
</module>
Modified: lucene/dev/branches/lucene4258/dev-tools/idea/lucene/facet/facet.iml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4258/dev-tools/idea/lucene/facet/facet.iml?rev=1454862&r1=1454861&r2=1454862&view=diff
==============================================================================
--- lucene/dev/branches/lucene4258/dev-tools/idea/lucene/facet/facet.iml (original)
+++ lucene/dev/branches/lucene4258/dev-tools/idea/lucene/facet/facet.iml Sun Mar 10 15:04:57 2013
@@ -6,7 +6,7 @@
<exclude-output />
<content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/src/java" isTestSource="false" />
- <sourceFolder url="file://$MODULE_DIR$/src/examples" isTestSource="false" />
+ <sourceFolder url="file://$MODULE_DIR$/src/resources" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/test" isTestSource="true" />
<excludeFolder url="file://$MODULE_DIR$/work" />
</content>
Modified: lucene/dev/branches/lucene4258/dev-tools/idea/lucene/highlighter/highlighter.iml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4258/dev-tools/idea/lucene/highlighter/highlighter.iml?rev=1454862&r1=1454861&r2=1454862&view=diff
==============================================================================
--- lucene/dev/branches/lucene4258/dev-tools/idea/lucene/highlighter/highlighter.iml (original)
+++ lucene/dev/branches/lucene4258/dev-tools/idea/lucene/highlighter/highlighter.iml Sun Mar 10 15:04:57 2013
@@ -14,6 +14,7 @@
<orderEntry type="module" scope="TEST" module-name="lucene-test-framework" />
<orderEntry type="module" module-name="memory" />
<orderEntry type="module" module-name="misc" />
+ <orderEntry type="module" module-name="queries" />
<orderEntry type="module" module-name="lucene-core" />
</component>
</module>
Modified: lucene/dev/branches/lucene4258/dev-tools/maven/lucene/analysis/common/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4258/dev-tools/maven/lucene/analysis/common/pom.xml.template?rev=1454862&r1=1454861&r2=1454862&view=diff
==============================================================================
--- lucene/dev/branches/lucene4258/dev-tools/maven/lucene/analysis/common/pom.xml.template (original)
+++ lucene/dev/branches/lucene4258/dev-tools/maven/lucene/analysis/common/pom.xml.template Sun Mar 10 15:04:57 2013
@@ -33,8 +33,8 @@
<description>Additional Analyzers</description>
<properties>
<module-directory>lucene/analysis/common</module-directory>
- <top-level>../../../..</top-level>
- <module-path>${top-level}/${module-directory}</module-path>
+ <relative-top-level>../../../..</relative-top-level>
+ <module-path>${relative-top-level}/${module-directory}</module-path>
</properties>
<scm>
<connection>scm:svn:${vc-anonymous-base-url}/${module-directory}</connection>
Modified: lucene/dev/branches/lucene4258/dev-tools/maven/lucene/analysis/icu/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4258/dev-tools/maven/lucene/analysis/icu/pom.xml.template?rev=1454862&r1=1454861&r2=1454862&view=diff
==============================================================================
--- lucene/dev/branches/lucene4258/dev-tools/maven/lucene/analysis/icu/pom.xml.template (original)
+++ lucene/dev/branches/lucene4258/dev-tools/maven/lucene/analysis/icu/pom.xml.template Sun Mar 10 15:04:57 2013
@@ -36,8 +36,8 @@
</description>
<properties>
<module-directory>lucene/analysis/icu</module-directory>
- <top-level>../../../..</top-level>
- <module-path>${top-level}/${module-directory}</module-path>
+ <relative-top-level>../../../..</relative-top-level>
+ <module-path>${relative-top-level}/${module-directory}</module-path>
</properties>
<scm>
<connection>scm:svn:${vc-anonymous-base-url}/${module-directory}</connection>
Modified: lucene/dev/branches/lucene4258/dev-tools/maven/lucene/analysis/kuromoji/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4258/dev-tools/maven/lucene/analysis/kuromoji/pom.xml.template?rev=1454862&r1=1454861&r2=1454862&view=diff
==============================================================================
--- lucene/dev/branches/lucene4258/dev-tools/maven/lucene/analysis/kuromoji/pom.xml.template (original)
+++ lucene/dev/branches/lucene4258/dev-tools/maven/lucene/analysis/kuromoji/pom.xml.template Sun Mar 10 15:04:57 2013
@@ -35,8 +35,8 @@
</description>
<properties>
<module-directory>lucene/analysis/kuromoji</module-directory>
- <top-level>../../../..</top-level>
- <module-path>${top-level}/${module-directory}</module-path>
+ <relative-top-level>../../../..</relative-top-level>
+ <module-path>${relative-top-level}/${module-directory}</module-path>
</properties>
<scm>
<connection>scm:svn:${vc-anonymous-base-url}/${module-directory}</connection>
Modified: lucene/dev/branches/lucene4258/dev-tools/maven/lucene/analysis/morfologik/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4258/dev-tools/maven/lucene/analysis/morfologik/pom.xml.template?rev=1454862&r1=1454861&r2=1454862&view=diff
==============================================================================
--- lucene/dev/branches/lucene4258/dev-tools/maven/lucene/analysis/morfologik/pom.xml.template (original)
+++ lucene/dev/branches/lucene4258/dev-tools/maven/lucene/analysis/morfologik/pom.xml.template Sun Mar 10 15:04:57 2013
@@ -35,8 +35,8 @@
</description>
<properties>
<module-directory>lucene/analysis/morfologik</module-directory>
- <top-level>../../../..</top-level>
- <module-path>${top-level}/${module-directory}</module-path>
+ <relative-top-level>../../../..</relative-top-level>
+ <module-path>${relative-top-level}/${module-directory}</module-path>
</properties>
<scm>
<connection>scm:svn:${vc-anonymous-base-url}/${module-directory}</connection>
Modified: lucene/dev/branches/lucene4258/dev-tools/maven/lucene/analysis/phonetic/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4258/dev-tools/maven/lucene/analysis/phonetic/pom.xml.template?rev=1454862&r1=1454861&r2=1454862&view=diff
==============================================================================
--- lucene/dev/branches/lucene4258/dev-tools/maven/lucene/analysis/phonetic/pom.xml.template (original)
+++ lucene/dev/branches/lucene4258/dev-tools/maven/lucene/analysis/phonetic/pom.xml.template Sun Mar 10 15:04:57 2013
@@ -35,8 +35,8 @@
</description>
<properties>
<module-directory>lucene/analysis/phonetic</module-directory>
- <top-level>../../../..</top-level>
- <module-path>${top-level}/${module-directory}</module-path>
+ <relative-top-level>../../../..</relative-top-level>
+ <module-path>${relative-top-level}/${module-directory}</module-path>
</properties>
<scm>
<connection>scm:svn:${vc-anonymous-base-url}/${module-directory}</connection>
Modified: lucene/dev/branches/lucene4258/dev-tools/maven/lucene/analysis/smartcn/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4258/dev-tools/maven/lucene/analysis/smartcn/pom.xml.template?rev=1454862&r1=1454861&r2=1454862&view=diff
==============================================================================
--- lucene/dev/branches/lucene4258/dev-tools/maven/lucene/analysis/smartcn/pom.xml.template (original)
+++ lucene/dev/branches/lucene4258/dev-tools/maven/lucene/analysis/smartcn/pom.xml.template Sun Mar 10 15:04:57 2013
@@ -33,8 +33,8 @@
<description>Smart Chinese Analyzer</description>
<properties>
<module-directory>lucene/analysis/smartcn</module-directory>
- <top-level>../../../..</top-level>
- <module-path>${top-level}/${module-directory}</module-path>
+ <relative-top-level>../../../..</relative-top-level>
+ <module-path>${relative-top-level}/${module-directory}</module-path>
</properties>
<scm>
<connection>scm:svn:${vc-anonymous-base-url}/${module-directory}</connection>
Modified: lucene/dev/branches/lucene4258/dev-tools/maven/lucene/analysis/stempel/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4258/dev-tools/maven/lucene/analysis/stempel/pom.xml.template?rev=1454862&r1=1454861&r2=1454862&view=diff
==============================================================================
--- lucene/dev/branches/lucene4258/dev-tools/maven/lucene/analysis/stempel/pom.xml.template (original)
+++ lucene/dev/branches/lucene4258/dev-tools/maven/lucene/analysis/stempel/pom.xml.template Sun Mar 10 15:04:57 2013
@@ -33,8 +33,8 @@
<description>Stempel Analyzer</description>
<properties>
<module-directory>lucene/analysis/stempel</module-directory>
- <top-level>../../../..</top-level>
- <module-path>${top-level}/${module-directory}</module-path>
+ <relative-top-level>../../../..</relative-top-level>
+ <module-path>${relative-top-level}/${module-directory}</module-path>
</properties>
<scm>
<connection>scm:svn:${vc-anonymous-base-url}/${module-directory}</connection>
@@ -76,5 +76,50 @@
</excludes>
</testResource>
</testResources>
+ <plugins>
+ <plugin>
+ <groupId>de.thetaphi</groupId>
+ <artifactId>forbiddenapis</artifactId>
+ <executions>
+ <execution>
+ <id>lucene-shared-check-forbidden-apis</id>
+ <phase>none</phase> <!-- Block inherited execution -->
+ </execution>
+ <execution>
+ <id>check-forbidden-apis</id>
+ <configuration>
+ <!-- disallow undocumented classes like sun.misc.Unsafe: -->
+ <internalRuntimeForbidden>true</internalRuntimeForbidden>
+ <bundledSignatures>
+ <bundledSignature>jdk-unsafe</bundledSignature>
+ <bundledSignature>jdk-deprecated</bundledSignature>
+ </bundledSignatures>
+ <signaturesFiles>
+ <signaturesFile>${top-level}/lucene/tools/forbiddenApis/executors.txt</signaturesFile>
+ </signaturesFiles>
+ </configuration>
+ <goals>
+ <goal>check</goal>
+ </goals>
+ </execution>
+ <execution>
+ <id>check-system-out</id> <!-- separate execution to specify excludes -->
+ <configuration>
+ <bundledSignatures>
+ <bundledSignature>jdk-system-out</bundledSignature>
+ </bundledSignatures>
+ <excludes>
+ <!-- exclude command line tools -->
+ <exclude>org/egothor/stemmer/Compile.class</exclude>
+ <exclude>org/egothor/stemmer/DiffIt.class</exclude>
+ </excludes>
+ </configuration>
+ <goals>
+ <goal>check</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
</build>
</project>
Modified: lucene/dev/branches/lucene4258/dev-tools/maven/lucene/analysis/uima/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4258/dev-tools/maven/lucene/analysis/uima/pom.xml.template?rev=1454862&r1=1454861&r2=1454862&view=diff
==============================================================================
--- lucene/dev/branches/lucene4258/dev-tools/maven/lucene/analysis/uima/pom.xml.template (original)
+++ lucene/dev/branches/lucene4258/dev-tools/maven/lucene/analysis/uima/pom.xml.template Sun Mar 10 15:04:57 2013
@@ -37,8 +37,8 @@
</description>
<properties>
<module-directory>lucene/analysis/uima</module-directory>
- <top-level>../../../..</top-level>
- <module-path>${top-level}/${module-directory}</module-path>
+ <relative-top-level>../../../..</relative-top-level>
+ <module-path>${relative-top-level}/${module-directory}</module-path>
</properties>
<scm>
<connection>scm:svn:${vc-anonymous-base-url}/${module-directory}</connection>
Modified: lucene/dev/branches/lucene4258/dev-tools/maven/lucene/benchmark/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4258/dev-tools/maven/lucene/benchmark/pom.xml.template?rev=1454862&r1=1454861&r2=1454862&view=diff
==============================================================================
--- lucene/dev/branches/lucene4258/dev-tools/maven/lucene/benchmark/pom.xml.template (original)
+++ lucene/dev/branches/lucene4258/dev-tools/maven/lucene/benchmark/pom.xml.template Sun Mar 10 15:04:57 2013
@@ -33,8 +33,8 @@
<description>Lucene Benchmarking Module</description>
<properties>
<module-directory>lucene/benchmark</module-directory>
- <top-level>../../..</top-level>
- <module-path>${top-level}/${module-directory}</module-path>
+ <relative-top-level>../../..</relative-top-level>
+ <module-path>${relative-top-level}/${module-directory}</module-path>
</properties>
<scm>
<connection>scm:svn:${vc-anonymous-base-url}/${module-directory}</connection>
@@ -120,5 +120,36 @@
</includes>
</testResource>
</testResources>
+ <plugins>
+ <plugin>
+ <groupId>de.thetaphi</groupId>
+ <artifactId>forbiddenapis</artifactId>
+ <executions>
+ <execution>
+ <id>lucene-shared-check-forbidden-apis</id>
+ <phase>none</phase> <!-- Block inherited execution -->
+ </execution>
+ <execution>
+ <id>check-forbidden-apis</id>
+ <configuration>
+ <!-- disallow undocumented classes like sun.misc.Unsafe: -->
+ <internalRuntimeForbidden>true</internalRuntimeForbidden>
+ <bundledSignatures>
+ <bundledSignature>jdk-unsafe</bundledSignature>
+ <bundledSignature>jdk-deprecated</bundledSignature>
+ <!-- Skip jdk-system-out -->
+ <!-- <bundledSignature>jdk-system-out</bundledSignature> -->
+ </bundledSignatures>
+ <signaturesFiles>
+ <signaturesFile>${top-level}/lucene/tools/forbiddenApis/executors.txt</signaturesFile>
+ </signaturesFiles>
+ </configuration>
+ <goals>
+ <goal>check</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
</build>
</project>
Modified: lucene/dev/branches/lucene4258/dev-tools/maven/lucene/classification/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4258/dev-tools/maven/lucene/classification/pom.xml.template?rev=1454862&r1=1454861&r2=1454862&view=diff
==============================================================================
--- lucene/dev/branches/lucene4258/dev-tools/maven/lucene/classification/pom.xml.template (original)
+++ lucene/dev/branches/lucene4258/dev-tools/maven/lucene/classification/pom.xml.template Sun Mar 10 15:04:57 2013
@@ -33,8 +33,8 @@
<description>Lucene Classification</description>
<properties>
<module-directory>lucene/classification</module-directory>
- <top-level>../../..</top-level>
- <module-path>${top-level}/${module-directory}</module-path>
+ <relative-top-level>../../..</relative-top-level>
+ <module-path>${relative-top-level}/${module-directory}</module-path>
</properties>
<scm>
<connection>scm:svn:${vc-anonymous-base-url}/${module-directory}</connection>
Modified: lucene/dev/branches/lucene4258/dev-tools/maven/lucene/codecs/src/java/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4258/dev-tools/maven/lucene/codecs/src/java/pom.xml.template?rev=1454862&r1=1454861&r2=1454862&view=diff
==============================================================================
--- lucene/dev/branches/lucene4258/dev-tools/maven/lucene/codecs/src/java/pom.xml.template (original)
+++ lucene/dev/branches/lucene4258/dev-tools/maven/lucene/codecs/src/java/pom.xml.template Sun Mar 10 15:04:57 2013
@@ -35,8 +35,8 @@
</description>
<properties>
<module-directory>lucene/codecs</module-directory>
- <top-level>../../../../..</top-level>
- <module-path>${top-level}/${module-directory}/src/java</module-path>
+ <relative-top-level>../../../../..</relative-top-level>
+ <module-path>${relative-top-level}/${module-directory}/src/java</module-path>
</properties>
<scm>
<connection>scm:svn:${vc-anonymous-base-url}/${module-directory}</connection>
@@ -73,6 +73,16 @@
<skip>true</skip> <!-- This skips test compilation - tests are run from lucene-codecs-tests module -->
</configuration>
</plugin>
+ <plugin>
+ <groupId>de.thetaphi</groupId>
+ <artifactId>forbiddenapis</artifactId>
+ <executions>
+ <execution>
+ <id>lucene-shared-test-check-forbidden-apis</id>
+ <phase>none</phase> <!-- Block inherited execution -->
+ </execution>
+ </executions>
+ </plugin>
</plugins>
</build>
</project>
Modified: lucene/dev/branches/lucene4258/dev-tools/maven/lucene/codecs/src/test/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4258/dev-tools/maven/lucene/codecs/src/test/pom.xml.template?rev=1454862&r1=1454861&r2=1454862&view=diff
==============================================================================
--- lucene/dev/branches/lucene4258/dev-tools/maven/lucene/codecs/src/test/pom.xml.template (original)
+++ lucene/dev/branches/lucene4258/dev-tools/maven/lucene/codecs/src/test/pom.xml.template Sun Mar 10 15:04:57 2013
@@ -32,8 +32,8 @@
<packaging>jar</packaging>
<properties>
<module-directory>lucene/codecs</module-directory>
- <top-level>../../../../..</top-level>
- <module-path>${top-level}/${module-directory}/src/test</module-path>
+ <relative-top-level>../../../../..</relative-top-level>
+ <module-path>${relative-top-level}/${module-directory}/src/test</module-path>
</properties>
<dependencies>
<dependency>
@@ -69,6 +69,16 @@
<skip>true</skip>
</configuration>
</plugin>
+ <plugin>
+ <groupId>de.thetaphi</groupId>
+ <artifactId>forbiddenapis</artifactId>
+ <executions>
+ <execution>
+ <id>lucene-shared-check-forbidden-apis</id>
+ <phase>none</phase> <!-- Block inherited execution -->
+ </execution>
+ </executions>
+ </plugin>
</plugins>
</build>
</project>
Modified: lucene/dev/branches/lucene4258/dev-tools/maven/lucene/core/src/java/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4258/dev-tools/maven/lucene/core/src/java/pom.xml.template?rev=1454862&r1=1454861&r2=1454862&view=diff
==============================================================================
--- lucene/dev/branches/lucene4258/dev-tools/maven/lucene/core/src/java/pom.xml.template (original)
+++ lucene/dev/branches/lucene4258/dev-tools/maven/lucene/core/src/java/pom.xml.template Sun Mar 10 15:04:57 2013
@@ -33,8 +33,8 @@
<description>Apache Lucene Java Core</description>
<properties>
<module-directory>lucene/core</module-directory>
- <top-level>../../../../..</top-level>
- <module-path>${top-level}/${module-directory}/src/java</module-path>
+ <relative-top-level>../../../../..</relative-top-level>
+ <module-path>${relative-top-level}/${module-directory}/src/java</module-path>
</properties>
<scm>
<connection>scm:svn:${vc-anonymous-base-url}/${module-directory}</connection>
@@ -64,6 +64,57 @@
<skip>true</skip> <!-- This skips test compilation - tests are run from lucene-codecs-tests module -->
</configuration>
</plugin>
+ <plugin>
+ <groupId>de.thetaphi</groupId>
+ <artifactId>forbiddenapis</artifactId>
+ <executions>
+ <execution>
+ <id>lucene-shared-check-forbidden-apis</id>
+ <phase>none</phase> <!-- Block inherited execution -->
+ </execution>
+ <execution>
+ <id>lucene-shared-test-check-forbidden-apis</id>
+ <phase>none</phase> <!-- Block inherited execution -->
+ </execution>
+ <execution>
+ <id>check-forbidden-apis</id>
+ <configuration>
+ <!-- disallow undocumented classes like sun.misc.Unsafe: -->
+ <internalRuntimeForbidden>true</internalRuntimeForbidden>
+ <bundledSignatures>
+ <bundledSignature>jdk-unsafe</bundledSignature>
+ <bundledSignature>jdk-deprecated</bundledSignature>
+ </bundledSignatures>
+ <signaturesFiles>
+ <signaturesFile>${top-level}/lucene/tools/forbiddenApis/executors.txt</signaturesFile>
+ </signaturesFiles>
+ </configuration>
+ <goals>
+ <goal>check</goal>
+ </goals>
+ </execution>
+ <execution>
+ <id>check-system-out</id> <!-- separate execution to specify excludes -->
+ <configuration>
+ <bundledSignatures>
+ <bundledSignature>jdk-system-out</bundledSignature>
+ </bundledSignatures>
+ <excludes>
+ <!-- exclude command line tools -->
+ <exclude>org/apache/lucene/index/CheckIndex.class</exclude>
+ <exclude>org/apache/lucene/index/IndexUpgrader.class</exclude>
+ <exclude>org/apache/lucene/store/LockVerifyServer.class</exclude>
+ <exclude>org/apache/lucene/store/LockStressTest.class</exclude>
+ <!-- not printing, just checking if it's a system stream -->
+ <exclude>org/apache/lucene/util/PrintStreamInfoStream.class</exclude>
+ </excludes>
+ </configuration>
+ <goals>
+ <goal>check</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
</build>
</project>
Modified: lucene/dev/branches/lucene4258/dev-tools/maven/lucene/core/src/test/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4258/dev-tools/maven/lucene/core/src/test/pom.xml.template?rev=1454862&r1=1454861&r2=1454862&view=diff
==============================================================================
--- lucene/dev/branches/lucene4258/dev-tools/maven/lucene/core/src/test/pom.xml.template (original)
+++ lucene/dev/branches/lucene4258/dev-tools/maven/lucene/core/src/test/pom.xml.template Sun Mar 10 15:04:57 2013
@@ -32,8 +32,8 @@
<packaging>jar</packaging>
<properties>
<module-directory>lucene/core</module-directory>
- <top-level>../../../../..</top-level>
- <module-path>${top-level}/${module-directory}/src/test</module-path>
+ <relative-top-level>../../../../..</relative-top-level>
+ <module-path>${relative-top-level}/${module-directory}/src/test</module-path>
</properties>
<dependencies>
<dependency>
@@ -88,6 +88,16 @@
</systemPropertyVariables>
</configuration>
</plugin>
+ <plugin>
+ <groupId>de.thetaphi</groupId>
+ <artifactId>forbiddenapis</artifactId>
+ <executions>
+ <execution>
+ <id>lucene-shared-check-forbidden-apis</id>
+ <phase>none</phase> <!-- Block inherited execution -->
+ </execution>
+ </executions>
+ </plugin>
</plugins>
</build>
</project>
Modified: lucene/dev/branches/lucene4258/dev-tools/maven/lucene/demo/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4258/dev-tools/maven/lucene/demo/pom.xml.template?rev=1454862&r1=1454861&r2=1454862&view=diff
==============================================================================
--- lucene/dev/branches/lucene4258/dev-tools/maven/lucene/demo/pom.xml.template (original)
+++ lucene/dev/branches/lucene4258/dev-tools/maven/lucene/demo/pom.xml.template Sun Mar 10 15:04:57 2013
@@ -33,8 +33,8 @@
<description>This is the demo for Apache Lucene Java</description>
<properties>
<module-directory>lucene/demo</module-directory>
- <top-level>../../..</top-level>
- <module-path>${top-level}/${module-directory}</module-path>
+ <relative-top-level>../../..</relative-top-level>
+ <module-path>${relative-top-level}/${module-directory}</module-path>
</properties>
<scm>
<connection>scm:svn:${vc-anonymous-base-url}/${module-directory}</connection>
@@ -61,6 +61,11 @@
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
+ <artifactId>lucene-facet</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
<artifactId>lucene-queryparser</artifactId>
<version>${project.version}</version>
</dependency>
@@ -73,6 +78,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>
@@ -81,5 +91,36 @@
</excludes>
</testResource>
</testResources>
+ <plugins>
+ <plugin>
+ <groupId>de.thetaphi</groupId>
+ <artifactId>forbiddenapis</artifactId>
+ <executions>
+ <execution>
+ <id>lucene-shared-check-forbidden-apis</id>
+ <phase>none</phase> <!-- Block inherited execution -->
+ </execution>
+ <execution>
+ <id>check-forbidden-apis</id>
+ <configuration>
+ <!-- disallow undocumented classes like sun.misc.Unsafe: -->
+ <internalRuntimeForbidden>true</internalRuntimeForbidden>
+ <bundledSignatures>
+ <bundledSignature>jdk-unsafe</bundledSignature>
+ <bundledSignature>jdk-deprecated</bundledSignature>
+ <!-- demo has mostly command-line programs, so don't do the jdk-system-out check -->
+ <!-- <bundledSignature>jdk-system-out</bundledSignature> -->
+ </bundledSignatures>
+ <signaturesFiles>
+ <signaturesFile>${top-level}/lucene/tools/forbiddenApis/executors.txt</signaturesFile>
+ </signaturesFiles>
+ </configuration>
+ <goals>
+ <goal>check</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
</build>
</project>
Modified: lucene/dev/branches/lucene4258/dev-tools/maven/lucene/facet/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4258/dev-tools/maven/lucene/facet/pom.xml.template?rev=1454862&r1=1454861&r2=1454862&view=diff
==============================================================================
--- lucene/dev/branches/lucene4258/dev-tools/maven/lucene/facet/pom.xml.template (original)
+++ lucene/dev/branches/lucene4258/dev-tools/maven/lucene/facet/pom.xml.template Sun Mar 10 15:04:57 2013
@@ -35,8 +35,8 @@
</description>
<properties>
<module-directory>lucene/facet</module-directory>
- <top-level>../../..</top-level>
- <module-path>${top-level}/${module-directory}</module-path>
+ <relative-top-level>../../..</relative-top-level>
+ <module-path>${relative-top-level}/${module-directory}</module-path>
</properties>
<scm>
<connection>scm:svn:${vc-anonymous-base-url}/${module-directory}</connection>
@@ -65,6 +65,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>
@@ -75,20 +80,44 @@
</testResources>
<plugins>
<plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>build-helper-maven-plugin</artifactId>
+ <groupId>de.thetaphi</groupId>
+ <artifactId>forbiddenapis</artifactId>
<executions>
<execution>
- <id>add-source</id>
- <phase>generate-sources</phase>
+ <id>lucene-shared-check-forbidden-apis</id>
+ <phase>none</phase> <!-- Block inherited execution -->
+ </execution>
+ <execution>
+ <id>check-forbidden-apis</id>
+ <configuration>
+ <!-- disallow undocumented classes like sun.misc.Unsafe: -->
+ <internalRuntimeForbidden>true</internalRuntimeForbidden>
+ <bundledSignatures>
+ <bundledSignature>jdk-unsafe</bundledSignature>
+ <bundledSignature>jdk-deprecated</bundledSignature>
+ </bundledSignatures>
+ <signaturesFiles>
+ <signaturesFile>${top-level}/lucene/tools/forbiddenApis/executors.txt</signaturesFile>
+ </signaturesFiles>
+ </configuration>
<goals>
- <goal>add-source</goal>
+ <goal>check</goal>
</goals>
+ </execution>
+ <execution>
+ <id>check-system-out</id> <!-- separate execution to specify excludes -->
<configuration>
- <sources>
- <source>${module-path}/src/examples</source>
- </sources>
+ <bundledSignatures>
+ <bundledSignature>jdk-system-out</bundledSignature>
+ </bundledSignatures>
+ <excludes>
+ <!-- exclude command line tools -->
+ <exclude>org/apache/lucene/facet/util/PrintTaxonomyStats.class</exclude>
+ </excludes>
</configuration>
+ <goals>
+ <goal>check</goal>
+ </goals>
</execution>
</executions>
</plugin>
Modified: lucene/dev/branches/lucene4258/dev-tools/maven/lucene/grouping/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4258/dev-tools/maven/lucene/grouping/pom.xml.template?rev=1454862&r1=1454861&r2=1454862&view=diff
==============================================================================
--- lucene/dev/branches/lucene4258/dev-tools/maven/lucene/grouping/pom.xml.template (original)
+++ lucene/dev/branches/lucene4258/dev-tools/maven/lucene/grouping/pom.xml.template Sun Mar 10 15:04:57 2013
@@ -33,8 +33,8 @@
<description>Lucene Grouping Module</description>
<properties>
<module-directory>lucene/grouping</module-directory>
- <top-level>../../..</top-level>
- <module-path>${top-level}/${module-directory}</module-path>
+ <relative-top-level>../../..</relative-top-level>
+ <module-path>${relative-top-level}/${module-directory}</module-path>
</properties>
<scm>
<connection>scm:svn:${vc-anonymous-base-url}/${module-directory}</connection>
Modified: lucene/dev/branches/lucene4258/dev-tools/maven/lucene/highlighter/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4258/dev-tools/maven/lucene/highlighter/pom.xml.template?rev=1454862&r1=1454861&r2=1454862&view=diff
==============================================================================
--- lucene/dev/branches/lucene4258/dev-tools/maven/lucene/highlighter/pom.xml.template (original)
+++ lucene/dev/branches/lucene4258/dev-tools/maven/lucene/highlighter/pom.xml.template Sun Mar 10 15:04:57 2013
@@ -35,8 +35,8 @@
</description>
<properties>
<module-directory>lucene/highlighter</module-directory>
- <top-level>../../..</top-level>
- <module-path>${top-level}/${module-directory}</module-path>
+ <relative-top-level>../../..</relative-top-level>
+ <module-path>${relative-top-level}/${module-directory}</module-path>
</properties>
<scm>
<connection>scm:svn:${vc-anonymous-base-url}/${module-directory}</connection>
@@ -61,6 +61,11 @@
<artifactId>lucene-memory</artifactId>
<version>${project.version}</version>
</dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>lucene-queries</artifactId>
+ <version>${project.version}</version>
+ </dependency>
</dependencies>
<build>
<sourceDirectory>${module-path}/src/java</sourceDirectory>
Modified: lucene/dev/branches/lucene4258/dev-tools/maven/lucene/join/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4258/dev-tools/maven/lucene/join/pom.xml.template?rev=1454862&r1=1454861&r2=1454862&view=diff
==============================================================================
--- lucene/dev/branches/lucene4258/dev-tools/maven/lucene/join/pom.xml.template (original)
+++ lucene/dev/branches/lucene4258/dev-tools/maven/lucene/join/pom.xml.template Sun Mar 10 15:04:57 2013
@@ -33,8 +33,8 @@
<description>Lucene Join Module</description>
<properties>
<module-directory>lucene/join</module-directory>
- <top-level>../../..</top-level>
- <module-path>${top-level}/${module-directory}</module-path>
+ <relative-top-level>../../..</relative-top-level>
+ <module-path>${relative-top-level}/${module-directory}</module-path>
</properties>
<scm>
<connection>scm:svn:${vc-anonymous-base-url}/${module-directory}</connection>
Modified: lucene/dev/branches/lucene4258/dev-tools/maven/lucene/memory/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4258/dev-tools/maven/lucene/memory/pom.xml.template?rev=1454862&r1=1454861&r2=1454862&view=diff
==============================================================================
--- lucene/dev/branches/lucene4258/dev-tools/maven/lucene/memory/pom.xml.template (original)
+++ lucene/dev/branches/lucene4258/dev-tools/maven/lucene/memory/pom.xml.template Sun Mar 10 15:04:57 2013
@@ -35,8 +35,8 @@
</description>
<properties>
<module-directory>lucene/memory</module-directory>
- <top-level>../../..</top-level>
- <module-path>${top-level}/${module-directory}</module-path>
+ <relative-top-level>../../..</relative-top-level>
+ <module-path>${relative-top-level}/${module-directory}</module-path>
</properties>
<scm>
<connection>scm:svn:${vc-anonymous-base-url}/${module-directory}</connection>
Modified: lucene/dev/branches/lucene4258/dev-tools/maven/lucene/misc/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4258/dev-tools/maven/lucene/misc/pom.xml.template?rev=1454862&r1=1454861&r2=1454862&view=diff
==============================================================================
--- lucene/dev/branches/lucene4258/dev-tools/maven/lucene/misc/pom.xml.template (original)
+++ lucene/dev/branches/lucene4258/dev-tools/maven/lucene/misc/pom.xml.template Sun Mar 10 15:04:57 2013
@@ -33,8 +33,8 @@
<description>Miscellaneous Lucene extensions</description>
<properties>
<module-directory>lucene/misc</module-directory>
- <top-level>../../..</top-level>
- <module-path>${top-level}/${module-directory}</module-path>
+ <relative-top-level>../../..</relative-top-level>
+ <module-path>${relative-top-level}/${module-directory}</module-path>
</properties>
<scm>
<connection>scm:svn:${vc-anonymous-base-url}/${module-directory}</connection>
@@ -66,5 +66,54 @@
</excludes>
</testResource>
</testResources>
+ <plugins>
+ <plugin>
+ <groupId>de.thetaphi</groupId>
+ <artifactId>forbiddenapis</artifactId>
+ <executions>
+ <execution>
+ <id>lucene-shared-check-forbidden-apis</id>
+ <phase>none</phase> <!-- Block inherited execution -->
+ </execution>
+ <execution>
+ <id>check-forbidden-apis</id>
+ <configuration>
+ <!-- disallow undocumented classes like sun.misc.Unsafe: -->
+ <internalRuntimeForbidden>true</internalRuntimeForbidden>
+ <bundledSignatures>
+ <bundledSignature>jdk-unsafe</bundledSignature>
+ <bundledSignature>jdk-deprecated</bundledSignature>
+ </bundledSignatures>
+ <signaturesFiles>
+ <signaturesFile>${top-level}/lucene/tools/forbiddenApis/executors.txt</signaturesFile>
+ </signaturesFiles>
+ </configuration>
+ <goals>
+ <goal>check</goal>
+ </goals>
+ </execution>
+ <execution>
+ <id>check-system-out</id>
+ <configuration>
+ <bundledSignatures>
+ <bundledSignature>jdk-system-out</bundledSignature>
+ </bundledSignatures>
+ <excludes>
+ <!-- exclude command line tools -->
+ <exclude>org/apache/lucene/index/CompoundFileExtractor.class</exclude>
+ <exclude>org/apache/lucene/index/IndexSplitter.class</exclude>
+ <exclude>org/apache/lucene/index/MultiPassIndexSplitter.class</exclude>
+ <exclude>org/apache/lucene/misc/GetTermInfo.class</exclude>
+ <exclude>org/apache/lucene/misc/HighFreqTerms.class</exclude>
+ <exclude>org/apache/lucene/misc/IndexMergeTool.class</exclude>
+ </excludes>
+ </configuration>
+ <goals>
+ <goal>check</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
</build>
</project>
Modified: lucene/dev/branches/lucene4258/dev-tools/maven/lucene/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4258/dev-tools/maven/lucene/pom.xml.template?rev=1454862&r1=1454861&r2=1454862&view=diff
==============================================================================
--- lucene/dev/branches/lucene4258/dev-tools/maven/lucene/pom.xml.template (original)
+++ lucene/dev/branches/lucene4258/dev-tools/maven/lucene/pom.xml.template Sun Mar 10 15:04:57 2013
@@ -59,4 +59,50 @@
<module>spatial</module>
<module>suggest</module>
</modules>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>de.thetaphi</groupId>
+ <artifactId>forbiddenapis</artifactId>
+ <executions>
+ <execution>
+ <id>lucene-shared-check-forbidden-apis</id>
+ <configuration>
+ <!-- disallow undocumented classes like sun.misc.Unsafe: -->
+ <internalRuntimeForbidden>true</internalRuntimeForbidden>
+ <bundledSignatures>
+ <bundledSignature>jdk-unsafe</bundledSignature>
+ <bundledSignature>jdk-deprecated</bundledSignature>
+ <bundledSignature>jdk-system-out</bundledSignature>
+ </bundledSignatures>
+ <signaturesFiles>
+ <signaturesFile>${top-level}/lucene/tools/forbiddenApis/executors.txt</signaturesFile>
+ </signaturesFiles>
+ </configuration>
+ <goals>
+ <goal>check</goal>
+ </goals>
+ </execution>
+ <execution>
+ <id>lucene-shared-test-check-forbidden-apis</id>
+ <configuration>
+ <!-- disallow undocumented classes like sun.misc.Unsafe: -->
+ <internalRuntimeForbidden>true</internalRuntimeForbidden>
+ <bundledSignatures>
+ <bundledSignature>jdk-unsafe</bundledSignature>
+ <bundledSignature>jdk-deprecated</bundledSignature>
+ </bundledSignatures>
+ <signaturesFiles>
+ <signaturesFile>${top-level}/lucene/tools/forbiddenApis/tests.txt</signaturesFile>
+ <signaturesFile>${top-level}/lucene/tools/forbiddenApis/executors.txt</signaturesFile>
+ </signaturesFiles>
+ </configuration>
+ <goals>
+ <goal>testCheck</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
</project>
Modified: lucene/dev/branches/lucene4258/dev-tools/maven/lucene/queries/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4258/dev-tools/maven/lucene/queries/pom.xml.template?rev=1454862&r1=1454861&r2=1454862&view=diff
==============================================================================
--- lucene/dev/branches/lucene4258/dev-tools/maven/lucene/queries/pom.xml.template (original)
+++ lucene/dev/branches/lucene4258/dev-tools/maven/lucene/queries/pom.xml.template Sun Mar 10 15:04:57 2013
@@ -33,8 +33,8 @@
<description>Lucene Queries Module</description>
<properties>
<module-directory>lucene/queries</module-directory>
- <top-level>../../..</top-level>
- <module-path>${top-level}/${module-directory}</module-path>
+ <relative-top-level>../../..</relative-top-level>
+ <module-path>${relative-top-level}/${module-directory}</module-path>
</properties>
<scm>
<connection>scm:svn:${vc-anonymous-base-url}/${module-directory}</connection>
Modified: lucene/dev/branches/lucene4258/dev-tools/maven/lucene/queryparser/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4258/dev-tools/maven/lucene/queryparser/pom.xml.template?rev=1454862&r1=1454861&r2=1454862&view=diff
==============================================================================
--- lucene/dev/branches/lucene4258/dev-tools/maven/lucene/queryparser/pom.xml.template (original)
+++ lucene/dev/branches/lucene4258/dev-tools/maven/lucene/queryparser/pom.xml.template Sun Mar 10 15:04:57 2013
@@ -33,8 +33,8 @@
<description>Lucene QueryParsers module</description>
<properties>
<module-directory>lucene/queryparser</module-directory>
- <top-level>../../..</top-level>
- <module-path>${top-level}/${module-directory}</module-path>
+ <relative-top-level>../../..</relative-top-level>
+ <module-path>${relative-top-level}/${module-directory}</module-path>
</properties>
<scm>
<connection>scm:svn:${vc-anonymous-base-url}/${module-directory}</connection>
@@ -81,5 +81,51 @@
</excludes>
</testResource>
</testResources>
+ <plugins>
+ <plugin>
+ <groupId>de.thetaphi</groupId>
+ <artifactId>forbiddenapis</artifactId>
+ <executions>
+ <execution>
+ <id>lucene-shared-check-forbidden-apis</id>
+ <phase>none</phase> <!-- Block inherited execution -->
+ </execution>
+ <execution>
+ <id>check-forbidden-apis</id>
+ <configuration>
+ <!-- disallow undocumented classes like sun.misc.Unsafe: -->
+ <internalRuntimeForbidden>true</internalRuntimeForbidden>
+ <bundledSignatures>
+ <bundledSignature>jdk-unsafe</bundledSignature>
+ <bundledSignature>jdk-deprecated</bundledSignature>
+ </bundledSignatures>
+ <signaturesFiles>
+ <signaturesFile>${top-level}/lucene/tools/forbiddenApis/executors.txt</signaturesFile>
+ </signaturesFiles>
+ </configuration>
+ <goals>
+ <goal>check</goal>
+ </goals>
+ </execution>
+ <execution>
+ <id>check-system-out</id>
+ <configuration>
+ <bundledSignatures>
+ <bundledSignature>jdk-system-out</bundledSignature>
+ </bundledSignatures>
+ <excludes>
+ <!-- not printing, just generated code from javacc -->
+ <exclude>org/apache/lucene/queryparser/classic/QueryParserTokenManager.class</exclude>
+ <exclude>org/apache/lucene/queryparser/flexible/standard/parser/StandardSyntaxParserTokenManager.class</exclude>
+ <exclude>org/apache/lucene/queryparser/surround/parser/QueryParserTokenManager.class</exclude>
+ </excludes>
+ </configuration>
+ <goals>
+ <goal>check</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
</build>
</project>
Modified: lucene/dev/branches/lucene4258/dev-tools/maven/lucene/sandbox/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4258/dev-tools/maven/lucene/sandbox/pom.xml.template?rev=1454862&r1=1454861&r2=1454862&view=diff
==============================================================================
--- lucene/dev/branches/lucene4258/dev-tools/maven/lucene/sandbox/pom.xml.template (original)
+++ lucene/dev/branches/lucene4258/dev-tools/maven/lucene/sandbox/pom.xml.template Sun Mar 10 15:04:57 2013
@@ -33,8 +33,8 @@
<description>Lucene Sandbox</description>
<properties>
<module-directory>lucene/sandbox</module-directory>
- <top-level>../../..</top-level>
- <module-path>${top-level}/${module-directory}</module-path>
+ <relative-top-level>../../..</relative-top-level>
+ <module-path>${relative-top-level}/${module-directory}</module-path>
</properties>
<scm>
<connection>scm:svn:${vc-anonymous-base-url}/${module-directory}</connection>
Modified: lucene/dev/branches/lucene4258/dev-tools/maven/lucene/spatial/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4258/dev-tools/maven/lucene/spatial/pom.xml.template?rev=1454862&r1=1454861&r2=1454862&view=diff
==============================================================================
--- lucene/dev/branches/lucene4258/dev-tools/maven/lucene/spatial/pom.xml.template (original)
+++ lucene/dev/branches/lucene4258/dev-tools/maven/lucene/spatial/pom.xml.template Sun Mar 10 15:04:57 2013
@@ -35,8 +35,8 @@
</description>
<properties>
<module-directory>lucene/spatial</module-directory>
- <top-level>../../..</top-level>
- <module-path>${top-level}/${module-directory}</module-path>
+ <relative-top-level>../../..</relative-top-level>
+ <module-path>${relative-top-level}/${module-directory}</module-path>
</properties>
<dependencies>
<dependency>
Modified: lucene/dev/branches/lucene4258/dev-tools/maven/lucene/suggest/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4258/dev-tools/maven/lucene/suggest/pom.xml.template?rev=1454862&r1=1454861&r2=1454862&view=diff
==============================================================================
--- lucene/dev/branches/lucene4258/dev-tools/maven/lucene/suggest/pom.xml.template (original)
+++ lucene/dev/branches/lucene4258/dev-tools/maven/lucene/suggest/pom.xml.template Sun Mar 10 15:04:57 2013
@@ -33,8 +33,8 @@
<description>Lucene Suggest Module</description>
<properties>
<module-directory>lucene/suggest</module-directory>
- <top-level>../../..</top-level>
- <module-path>${top-level}/${module-directory}</module-path>
+ <relative-top-level>../../..</relative-top-level>
+ <module-path>${relative-top-level}/${module-directory}</module-path>
</properties>
<scm>
<connection>scm:svn:${vc-anonymous-base-url}/${module-directory}</connection>
Modified: lucene/dev/branches/lucene4258/dev-tools/maven/lucene/test-framework/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4258/dev-tools/maven/lucene/test-framework/pom.xml.template?rev=1454862&r1=1454861&r2=1454862&view=diff
==============================================================================
--- lucene/dev/branches/lucene4258/dev-tools/maven/lucene/test-framework/pom.xml.template (original)
+++ lucene/dev/branches/lucene4258/dev-tools/maven/lucene/test-framework/pom.xml.template Sun Mar 10 15:04:57 2013
@@ -33,8 +33,8 @@
<description>Apache Lucene Java Test Framework</description>
<properties>
<module-directory>lucene/test-framework</module-directory>
- <top-level>../../..</top-level>
- <module-path>${top-level}/${module-directory}</module-path>
+ <relative-top-level>../../..</relative-top-level>
+ <module-path>${relative-top-level}/${module-directory}</module-path>
</properties>
<scm>
<connection>scm:svn:${vc-anonymous-base-url}/${module-directory}</connection>
@@ -82,6 +82,38 @@
<skip>true</skip>
</configuration>
</plugin>
+ <plugin>
+ <groupId>de.thetaphi</groupId>
+ <artifactId>forbiddenapis</artifactId>
+ <executions>
+ <execution>
+ <id>lucene-shared-check-forbidden-apis</id>
+ <phase>none</phase> <!-- Block inherited execution -->
+ </execution>
+ <execution>
+ <id>lucene-shared-test-check-forbidden-apis</id>
+ <phase>none</phase> <!-- Block inherited execution -->
+ </execution>
+ <execution>
+ <id>test-check-forbidden-apis</id>
+ <configuration>
+ <!-- disallow undocumented classes like sun.misc.Unsafe: -->
+ <internalRuntimeForbidden>true</internalRuntimeForbidden>
+ <bundledSignatures>
+ <bundledSignature>jdk-unsafe</bundledSignature>
+ <bundledSignature>jdk-deprecated</bundledSignature>
+ </bundledSignatures>
+ <signaturesFiles>
+ <signaturesFile>${top-level}/lucene/tools/forbiddenApis/tests.txt</signaturesFile>
+ <signaturesFile>${top-level}/lucene/tools/forbiddenApis/executors.txt</signaturesFile>
+ </signaturesFiles>
+ </configuration>
+ <goals>
+ <goal>check</goal> <!-- NOT testCheck -->
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
</build>
<repositories>
Modified: lucene/dev/branches/lucene4258/dev-tools/maven/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4258/dev-tools/maven/pom.xml.template?rev=1454862&r1=1454861&r2=1454862&view=diff
==============================================================================
--- lucene/dev/branches/lucene4258/dev-tools/maven/pom.xml.template (original)
+++ lucene/dev/branches/lucene4258/dev-tools/maven/pom.xml.template Sun Mar 10 15:04:57 2013
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache</groupId>
<artifactId>apache</artifactId>
- <version>10</version>
+ <version>13</version>
<relativePath/>
</parent>
<groupId>org.apache.lucene</groupId>
@@ -38,7 +38,6 @@
<module>solr</module>
</modules>
<properties>
- <top-level>..</top-level>
<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>
@@ -47,8 +46,10 @@
<java.compat.version>1.6</java.compat.version>
<jetty.version>8.1.8.v20121106</jetty.version>
<slf4j.version>1.6.4</slf4j.version>
- <tika.version>1.2</tika.version>
- <httpcomponents.version>4.1.3</httpcomponents.version>
+ <tika.version>1.3</tika.version>
+ <httpcomponents.version>4.2.3</httpcomponents.version>
+ <commons-io.version>2.1</commons-io.version>
+ <restlet.version>2.1.1</restlet.version>
<!-- RandomizedTesting library system properties -->
<tests.iters>1</tests.iters>
@@ -150,11 +151,6 @@
<version>13.0.1</version>
</dependency>
<dependency>
- <groupId>com.yammer.metrics</groupId>
- <artifactId>metrics-core</artifactId>
- <version>2.1.2</version>
- </dependency>
- <dependency>
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
<version>1.7</version>
@@ -183,7 +179,7 @@
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
- <version>2.1</version>
+ <version>${commons-io.version}</version>
</dependency>
<dependency>
<groupId>org.apache.httpcomponents</groupId>
@@ -289,6 +285,10 @@
<version>${tika.version}</version>
<exclusions>
<exclusion>
+ <groupId>com.adobe.xmp</groupId>
+ <artifactId>xmpcore</artifactId>
+ </exclusion>
+ <exclusion>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
</exclusion>
@@ -338,7 +338,7 @@
<dependency>
<groupId>org.apache.velocity</groupId>
<artifactId>velocity</artifactId>
- <version>1.6.4</version>
+ <version>1.7</version>
</dependency>
<dependency>
<groupId>org.apache.velocity</groupId>
@@ -352,13 +352,13 @@
</dependency>
<dependency>
<groupId>org.carrot2</groupId>
- <artifactId>carrot2-core</artifactId>
- <version>3.5.0</version>
+ <artifactId>carrot2-mini</artifactId>
+ <version>3.6.2</version>
</dependency>
<dependency>
<groupId>org.carrot2</groupId>
<artifactId>morfologik-polish</artifactId>
- <version>1.5.3</version>
+ <version>1.5.5</version>
</dependency>
<dependency>
<groupId>org.codehaus.woodstox</groupId>
@@ -392,13 +392,18 @@
<version>${jetty.version}</version>
</dependency>
<dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>jcl-over-slf4j</artifactId>
- <version>${slf4j.version}</version>
+ <groupId>org.restlet.jee</groupId>
+ <artifactId>org.restlet</artifactId>
+ <version>${restlet.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.restlet.jee</groupId>
+ <artifactId>org.restlet.ext.servlet</artifactId>
+ <version>${restlet.version}</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
- <artifactId>log4j-over-slf4j</artifactId>
+ <artifactId>jcl-over-slf4j</artifactId>
<version>${slf4j.version}</version>
</dependency>
<dependency>
@@ -445,7 +450,7 @@
<dependency>
<groupId>com.carrotsearch.randomizedtesting</groupId>
<artifactId>randomizedtesting-runner</artifactId>
- <version>2.0.7</version>
+ <version>2.0.8</version>
</dependency>
</dependencies>
</dependencyManagement>
@@ -469,6 +474,19 @@
<pluginManagement>
<plugins>
<plugin>
+ <groupId>de.thetaphi</groupId>
+ <artifactId>forbiddenapis</artifactId>
+ <version>1.2</version>
+ <configuration>
+ <!--
+ This is the default setting, we don't support Java 8 at the moment.
+ The checker simply passes by default and only prints a warning.
+ -->
+ <failOnUnsupportedJava>false</failOnUnsupportedJava>
+ <targetVersion>${java.compat.version}</targetVersion>
+ </configuration>
+ </plugin>
+ <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
<version>1.7</version>
@@ -476,12 +494,12 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-clean-plugin</artifactId>
- <version>2.4.1</version>
+ <version>2.5</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
- <version>2.3.2</version>
+ <version>3.0</version>
<configuration>
<source>${java.compat.version}</source>
<target>${java.compat.version}</target>
@@ -490,7 +508,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
- <version>2.4</version>
+ <version>2.6</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -500,7 +518,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-enforcer-plugin</artifactId>
- <version>1.0.1</version>
+ <version>1.2</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -536,17 +554,17 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
- <version>2.8.1</version>
+ <version>2.9</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-resources-plugin</artifactId>
- <version>2.5</version>
+ <version>2.6</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
- <version>2.12.4</version>
+ <version>2.13</version>
<configuration>
<runOrder>random</runOrder>
<reportFormat>plain</reportFormat>
@@ -585,7 +603,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-war-plugin</artifactId>
- <version>2.2</version>
+ <version>2.3</version>
<configuration>
<archive>
<!-- This section should be *exactly* the same under -->
@@ -616,7 +634,7 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>buildnumber-maven-plugin</artifactId>
- <version>1.0</version>
+ <version>1.2</version>
</plugin>
<plugin>
<groupId>org.mortbay.jetty</groupId>
@@ -626,7 +644,7 @@
<plugin>
<groupId>org.codehaus.gmaven</groupId>
<artifactId>gmaven-plugin</artifactId>
- <version>1.4</version>
+ <version>1.5</version>
</plugin>
</plugins>
</pluginManagement>
@@ -636,7 +654,7 @@
<artifactId>gmaven-plugin</artifactId>
<executions>
<execution>
- <id>generate-timestamps</id>
+ <id>generate-timestamps-and-get-top-level-basedir</id>
<phase>validate</phase>
<goals>
<goal>execute</goal>
@@ -646,6 +664,7 @@
project.properties['now.timestamp'] = "${maven.build.timestamp}"
project.properties['now.version'] = ("${maven.build.timestamp}" =~ /[- :]/).replaceAll(".")
project.properties['now.year'] = "${maven.build.timestamp}".substring(0, 4)
+ project.properties['top-level'] = (project.basedir.getAbsolutePath() =~ /[\\\\\/]maven-build.*/).replaceAll("")
</source>
</configuration>
</execution>
@@ -690,8 +709,8 @@
<message>Maven 2.2.1+ is required.</message>
<version>[2.2.1,)</version>
</requireMavenVersion>
- <requirePluginVersions/>
- </rules>
+ <requirePluginVersions/>
+ </rules>
</configuration>
</execution>
</executions>
Modified: lucene/dev/branches/lucene4258/dev-tools/maven/solr/contrib/analysis-extras/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4258/dev-tools/maven/solr/contrib/analysis-extras/pom.xml.template?rev=1454862&r1=1454861&r2=1454862&view=diff
==============================================================================
--- lucene/dev/branches/lucene4258/dev-tools/maven/solr/contrib/analysis-extras/pom.xml.template (original)
+++ lucene/dev/branches/lucene4258/dev-tools/maven/solr/contrib/analysis-extras/pom.xml.template Sun Mar 10 15:04:57 2013
@@ -33,9 +33,8 @@
<description>Apache Solr Analysis Extras</description>
<properties>
<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>
+ <relative-top-level>../../../..</relative-top-level>
+ <module-path>${relative-top-level}/${module-directory}</module-path>
</properties>
<scm>
<connection>scm:svn:${vc-anonymous-base-url}/${module-directory}</connection>
@@ -99,16 +98,5 @@
</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/lucene4258/dev-tools/maven/solr/contrib/clustering/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4258/dev-tools/maven/solr/contrib/clustering/pom.xml.template?rev=1454862&r1=1454861&r2=1454862&view=diff
==============================================================================
--- lucene/dev/branches/lucene4258/dev-tools/maven/solr/contrib/clustering/pom.xml.template (original)
+++ lucene/dev/branches/lucene4258/dev-tools/maven/solr/contrib/clustering/pom.xml.template Sun Mar 10 15:04:57 2013
@@ -33,9 +33,8 @@
<description>Apache Solr Clustering</description>
<properties>
<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>
+ <relative-top-level>../../../..</relative-top-level>
+ <module-path>${relative-top-level}/${module-directory}</module-path>
</properties>
<scm>
<connection>scm:svn:${vc-anonymous-base-url}/${module-directory}</connection>
@@ -65,47 +64,23 @@
</dependency>
<dependency>
<groupId>org.carrot2</groupId>
- <artifactId>carrot2-core</artifactId>
+ <artifactId>carrot2-mini</artifactId>
<exclusions>
<exclusion>
- <groupId>org.apache.lucene</groupId>
- <artifactId>lucene-core</artifactId>
+ <groupId>jfree</groupId>
+ <artifactId>jcommon</artifactId>
</exclusion>
<exclusion>
- <groupId>org.apache.lucene</groupId>
- <artifactId>lucene-analyzers</artifactId>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-math</artifactId>
</exclusion>
<exclusion>
- <groupId>org.apache.lucene</groupId>
- <artifactId>lucene-highlighter</artifactId>
+ <groupId>org.uncommons.maths</groupId>
+ <artifactId>uncommons-maths</artifactId>
</exclusion>
<exclusion>
- <groupId>org.apache.lucene</groupId>
- <artifactId>lucene-snowball</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.lucene</groupId>
- <artifactId>lucene-smartcn</artifactId>
- </exclusion>
- <exclusion>
- <groupId>net.java.dev.rome</groupId>
- <artifactId>rome</artifactId>
- </exclusion>
- <exclusion>
- <groupId>net.java.dev.rome</groupId>
- <artifactId>rome-fetcher</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.jdom</groupId>
- <artifactId>jdom</artifactId>
- </exclusion>
- <exclusion>
- <groupId>net.sf.ehcache</groupId>
- <artifactId>ehcache-core</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.carrot2</groupId>
- <artifactId>morfologik-stemming</artifactId>
+ <groupId>xpp3</groupId>
+ <artifactId>xpp3</artifactId>
</exclusion>
</exclusions>
</dependency>
@@ -124,16 +99,5 @@
</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/lucene4258/dev-tools/maven/solr/contrib/dataimporthandler-extras/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4258/dev-tools/maven/solr/contrib/dataimporthandler-extras/pom.xml.template?rev=1454862&r1=1454861&r2=1454862&view=diff
==============================================================================
--- lucene/dev/branches/lucene4258/dev-tools/maven/solr/contrib/dataimporthandler-extras/pom.xml.template (original)
+++ lucene/dev/branches/lucene4258/dev-tools/maven/solr/contrib/dataimporthandler-extras/pom.xml.template Sun Mar 10 15:04:57 2013
@@ -33,9 +33,8 @@
<description>Apache Solr DataImportHandler Extras</description>
<properties>
<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>
+ <relative-top-level>../../../..</relative-top-level>
+ <module-path>${relative-top-level}/${module-directory}</module-path>
</properties>
<scm>
<connection>scm:svn:${vc-anonymous-base-url}/${module-directory}</connection>
@@ -102,16 +101,5 @@
</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/lucene4258/dev-tools/maven/solr/contrib/dataimporthandler/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4258/dev-tools/maven/solr/contrib/dataimporthandler/pom.xml.template?rev=1454862&r1=1454861&r2=1454862&view=diff
==============================================================================
--- lucene/dev/branches/lucene4258/dev-tools/maven/solr/contrib/dataimporthandler/pom.xml.template (original)
+++ lucene/dev/branches/lucene4258/dev-tools/maven/solr/contrib/dataimporthandler/pom.xml.template Sun Mar 10 15:04:57 2013
@@ -33,9 +33,8 @@
<description>Apache Solr DataImportHandler</description>
<properties>
<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>
+ <relative-top-level>../../../..</relative-top-level>
+ <module-path>${relative-top-level}/${module-directory}</module-path>
</properties>
<scm>
<connection>scm:svn:${vc-anonymous-base-url}/${module-directory}</connection>
@@ -105,15 +104,6 @@
</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/lucene4258/dev-tools/maven/solr/contrib/extraction/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4258/dev-tools/maven/solr/contrib/extraction/pom.xml.template?rev=1454862&r1=1454861&r2=1454862&view=diff
==============================================================================
--- lucene/dev/branches/lucene4258/dev-tools/maven/solr/contrib/extraction/pom.xml.template (original)
+++ lucene/dev/branches/lucene4258/dev-tools/maven/solr/contrib/extraction/pom.xml.template Sun Mar 10 15:04:57 2013
@@ -36,9 +36,8 @@
</description>
<properties>
<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>
+ <relative-top-level>../../../..</relative-top-level>
+ <module-path>${relative-top-level}/${module-directory}</module-path>
</properties>
<scm>
<connection>scm:svn:${vc-anonymous-base-url}/${module-directory}</connection>
@@ -101,13 +100,21 @@
</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>
+ <groupId>de.thetaphi</groupId>
+ <artifactId>forbiddenapis</artifactId>
+ <executions>
+ <execution>
+ <id>test-check-forbidden-servlet-api</id>
+ <configuration>
+ <signaturesFiles>
+ <signaturesFile>${top-level}/lucene/tools/forbiddenApis/servlet-api.txt</signaturesFile>
+ </signaturesFiles>
+ </configuration>
+ <goals>
+ <goal>testCheck</goal>
+ </goals>
+ </execution>
+ </executions>
</plugin>
</plugins>
</build>
Modified: lucene/dev/branches/lucene4258/dev-tools/maven/solr/contrib/langid/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4258/dev-tools/maven/solr/contrib/langid/pom.xml.template?rev=1454862&r1=1454861&r2=1454862&view=diff
==============================================================================
--- lucene/dev/branches/lucene4258/dev-tools/maven/solr/contrib/langid/pom.xml.template (original)
+++ lucene/dev/branches/lucene4258/dev-tools/maven/solr/contrib/langid/pom.xml.template Sun Mar 10 15:04:57 2013
@@ -37,9 +37,8 @@
</description>
<properties>
<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>
+ <relative-top-level>../../../..</relative-top-level>
+ <module-path>${relative-top-level}/${module-directory}</module-path>
</properties>
<scm>
<connection>scm:svn:${vc-anonymous-base-url}/${module-directory}</connection>
@@ -107,13 +106,21 @@
</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>
+ <groupId>de.thetaphi</groupId>
+ <artifactId>forbiddenapis</artifactId>
+ <executions>
+ <execution>
+ <id>test-check-forbidden-servlet-api</id>
+ <configuration>
+ <signaturesFiles>
+ <signaturesFile>${top-level}/lucene/tools/forbiddenApis/servlet-api.txt</signaturesFile>
+ </signaturesFiles>
+ </configuration>
+ <goals>
+ <goal>testCheck</goal>
+ </goals>
+ </execution>
+ </executions>
</plugin>
</plugins>
</build>
Modified: lucene/dev/branches/lucene4258/dev-tools/maven/solr/contrib/uima/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4258/dev-tools/maven/solr/contrib/uima/pom.xml.template?rev=1454862&r1=1454861&r2=1454862&view=diff
==============================================================================
--- lucene/dev/branches/lucene4258/dev-tools/maven/solr/contrib/uima/pom.xml.template (original)
+++ lucene/dev/branches/lucene4258/dev-tools/maven/solr/contrib/uima/pom.xml.template Sun Mar 10 15:04:57 2013
@@ -33,9 +33,8 @@
<description>Apache Solr - UIMA integration</description>
<properties>
<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>
+ <relative-top-level>../../../..</relative-top-level>
+ <module-path>${relative-top-level}/${module-directory}</module-path>
</properties>
<scm>
<connection>scm:svn:${vc-anonymous-base-url}/${module-directory}</connection>
@@ -126,13 +125,21 @@
</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>
+ <groupId>de.thetaphi</groupId>
+ <artifactId>forbiddenapis</artifactId>
+ <executions>
+ <execution>
+ <id>test-check-forbidden-servlet-api</id>
+ <configuration>
+ <signaturesFiles>
+ <signaturesFile>${top-level}/lucene/tools/forbiddenApis/servlet-api.txt</signaturesFile>
+ </signaturesFiles>
+ </configuration>
+ <goals>
+ <goal>testCheck</goal>
+ </goals>
+ </execution>
+ </executions>
</plugin>
</plugins>
</build>
Modified: lucene/dev/branches/lucene4258/dev-tools/maven/solr/contrib/velocity/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4258/dev-tools/maven/solr/contrib/velocity/pom.xml.template?rev=1454862&r1=1454861&r2=1454862&view=diff
==============================================================================
--- lucene/dev/branches/lucene4258/dev-tools/maven/solr/contrib/velocity/pom.xml.template (original)
+++ lucene/dev/branches/lucene4258/dev-tools/maven/solr/contrib/velocity/pom.xml.template Sun Mar 10 15:04:57 2013
@@ -33,9 +33,8 @@
<description>Apache Solr Velocity</description>
<properties>
<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>
+ <relative-top-level>../../../..</relative-top-level>
+ <module-path>${relative-top-level}/${module-directory}</module-path>
</properties>
<scm>
<connection>scm:svn:${vc-anonymous-base-url}/${module-directory}</connection>
@@ -142,13 +141,21 @@
</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>
+ <groupId>de.thetaphi</groupId>
+ <artifactId>forbiddenapis</artifactId>
+ <executions>
+ <execution>
+ <id>test-check-forbidden-servlet-api</id>
+ <configuration>
+ <signaturesFiles>
+ <signaturesFile>${top-level}/lucene/tools/forbiddenApis/servlet-api.txt</signaturesFile>
+ </signaturesFiles>
+ </configuration>
+ <goals>
+ <goal>testCheck</goal>
+ </goals>
+ </execution>
+ </executions>
</plugin>
</plugins>
</build>