Commit Graph

165 Commits

Author SHA1 Message Date
Steven Rowe e5e4434bdb Skip compile:test-compile under Maven 3
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1234197 13f79535-47bb-0310-9956-ffa450edef68
2012-01-20 23:05:12 +00:00
Steven Rowe 6a8fbf780e SOLR-3048: Fix incorrect test classpath order under the Maven build
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1233106 13f79535-47bb-0310-9956-ffa450edef68
2012-01-18 23:03:41 +00:00
Steven Rowe 961cc111a8 SOLR-3042: Fixed Maven Jetty plugin configuration.
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1232527 13f79535-47bb-0310-9956-ffa450edef68
2012-01-17 18:35:50 +00:00
Steven Rowe 813aaeccd8 LUCENE-3305: Maven configuration: Added dependency from Solr analysis-extras contrib on the new Kuromoji analysis module
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1230825 13f79535-47bb-0310-9956-ffa450edef68
2012-01-12 22:39:32 +00:00
Chris M. Hostetter afc71a72a6 SOLR-2861: remove inadvertant & unneeded import statement from SolrCore, and revert r1197205 that enabled maven to compile with this mistake
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1208022 13f79535-47bb-0310-9956-ffa450edef68
2011-11-29 18:44:03 +00:00
Steven Rowe 705175cdcb LUCENE-3490: Maven configuration: put lucene-test-framework before lucene-core in the test classpath, via dependency ordering, to allow test-only read/write PreFlexRWCodec to fulfill Lucene3x codec requests instead of lucene-core's read-only Lucene3xCodec
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1204732 13f79535-47bb-0310-9956-ffa450edef68
2011-11-21 22:30:54 +00:00
Steven Rowe b6ac4e451d LUCENE-3490: Maven configuration: remove superfluous lucene test framework dependency
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1197744 13f79535-47bb-0310-9956-ffa450edef68
2011-11-04 20:17:23 +00:00
Steven Rowe 3dbde146af LUCENE-3490: Maven configuration
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1197734 13f79535-47bb-0310-9956-ffa450edef68
2011-11-04 20:06:03 +00:00
Steven Rowe ab8f037d63 SOLR-2861: Maven configuration: added Eclipse JDT Core dependency to allow compilation to succeed.
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1197205 13f79535-47bb-0310-9956-ffa450edef68
2011-11-03 16:27:09 +00:00
Steven Rowe b51612848f SOLR-2849: Fix remaining dependencies in solr-core Maven POM.
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1197198 13f79535-47bb-0310-9956-ffa450edef68
2011-11-03 16:16:06 +00:00
Steven Rowe 51ac833e29 SOLR-2849: Fix dependencies in Maven POMs.
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1195705 13f79535-47bb-0310-9956-ffa450edef68
2011-10-31 22:23:01 +00:00
Steven Rowe d20be405bd SOLR-2588: added Maven configuration for the new Velocity contrib
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1189428 13f79535-47bb-0310-9956-ffa450edef68
2011-10-26 20:26:49 +00:00
Steven Rowe 32866e48bf SOLR-2839: Maven configuration: added support for new langdetect implementation
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1186804 13f79535-47bb-0310-9956-ffa450edef68
2011-10-20 13:46:53 +00:00
Steven Rowe cbde4e03e8 SOLR-1979: Added maven configuration for the new solr langid contrib
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1180726 13f79535-47bb-0310-9956-ffa450edef68
2011-10-09 21:59:09 +00:00
Steven Rowe c8b0eb8254 SOLR-2303: remove the last log4j vestiges
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1178950 13f79535-47bb-0310-9956-ffa450edef68
2011-10-04 21:02:55 +00:00
Steven Rowe 527bcf67b1 SOLR-2756: Maven configuration: Excluded transitive stax:stax-api dependency from org.codehaus.woodstox:wstx-asl dependency.
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1170896 13f79535-47bb-0310-9956-ffa450edef68
2011-09-14 23:12:36 +00:00
Steven Rowe a08639d08d SOLR-2758: Moved ConcurrentLRUCache from o.a.s.common.util package in the solrj module to the o.a.s.util package in the Solr core module.
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1170699 13f79535-47bb-0310-9956-ffa450edef68
2011-09-14 16:00:56 +00:00
Steven Rowe 3615f59446 SOLR-2746: Upgraded UIMA dependencies in solr/contrib/uima/lib/ from *-2.3.1-SNAPSHOT.jar to *-2.3.1.jar
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1166702 13f79535-47bb-0310-9956-ffa450edef68
2011-09-08 14:13:17 +00:00
Christopher John Male 993ce74121 LUCENE-3381: Sandboxed remaining contrib queries
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1159846 13f79535-47bb-0310-9956-ffa450edef68
2011-08-20 04:57:58 +00:00
Steven Rowe 7c7326ef30 LUCENE-3378: Maven build config: stop building no-longer-necessary Lucene and analysis-common test jars; drop unnecessary test dependencies from contribs/modules
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1158947 13f79535-47bb-0310-9956-ffa450edef68
2011-08-17 22:26:43 +00:00
Christopher John Male 5f30bedccc LUCENE-3283: Moved core QueryParsers to queryparser module
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1145016 13f79535-47bb-0310-9956-ffa450edef68
2011-07-11 03:37:00 +00:00
Steven Rowe 31602b986b SOLR-2452: added build/testOutputDirectory, even though solrj tests are not run under solrj module, because without it, 'mvn clean' deletes the whole module (solr/solrj/) in addition to the build directory solr/build/solr-solrj/.
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1144903 13f79535-47bb-0310-9956-ffa450edef68
2011-07-10 16:53:49 +00:00
Steven Rowe 4505c08643 SOLR-2452: merged with trunk up r1144161; applied the svn movement script and the latest version of the post-svn-movement patch
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/branches/solr2452@1144174 13f79535-47bb-0310-9956-ffa450edef68
2011-07-08 06:41:23 +00:00
Dawid Weiss 2b2b97f25b Applied folder moves and renames before merge in SVN r1144174. 2016-01-23 01:17:32 +01:00
Dawid Weiss db22b4d1f7 Applied folder moves and renames before merge in SVN r1144174. 2016-01-23 01:17:07 +01:00
Steven Rowe 9abc6a2912 SOLR-2452: Merged with trunk up to r1143468
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/branches/solr2452@1143567 13f79535-47bb-0310-9956-ffa450edef68
2011-07-06 21:16:33 +00:00
Christopher John Male 36330b50b4 LUCENE-3274: Collapsed common module into lucene core util, removed module
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1143234 13f79535-47bb-0310-9956-ffa450edef68
2011-07-06 00:28:34 +00:00
Steven Rowe 470154ca59 LUCENE-3276: Add Maven build Solr core runtime dependency on wstx-asl stax parser
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1143211 13f79535-47bb-0310-9956-ffa450edef68
2011-07-05 22:01:50 +00:00
Steven Rowe 75d6001f0e SOLR-2452: merged with trunk up to r1140790
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/branches/solr2452@1140809 13f79535-47bb-0310-9956-ffa450edef68
2011-06-28 19:42:31 +00:00
Steven Rowe 8e94c0c216 LUCENE-3240: fixed the maven build; added standard svn:ignore property value for modules/queries/ dir
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1140697 13f79535-47bb-0310-9956-ffa450edef68
2011-06-28 16:05:51 +00:00
Christopher John Male b3f0ae9b7a LUCENE-3240: Moved FunctionQuery, ValueSource and DocValues to new queries module
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1140379 13f79535-47bb-0310-9956-ffa450edef68
2011-06-27 23:45:18 +00:00
Steven Rowe b929c65d15 LUCENE-3232: artifactId lucene-common -> lucene-common-module
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1140225 13f79535-47bb-0310-9956-ffa450edef68
2011-06-27 16:12:42 +00:00
Steven Rowe 3b2343b83d Missing slash in closing </dependency> tag
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1139926 13f79535-47bb-0310-9956-ffa450edef68
2011-06-26 19:38:23 +00:00
Christopher John Male 9bf4c3fd8f LUCENE-3232: Moved MutableValues to common module
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1139467 13f79535-47bb-0310-9956-ffa450edef68
2011-06-25 00:03:35 +00:00
Steven Rowe 4c9c9259e8 SOLR-2452: Merged with trunk up to r1137125
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/branches/solr2452@1137126 13f79535-47bb-0310-9956-ffa450edef68
2011-06-18 05:16:57 +00:00
Steven Rowe 2c3b410cd5 SOLR-2564: Maven build: add grouping module dependency to Solr
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1137124 13f79535-47bb-0310-9956-ffa450edef68
2011-06-18 05:02:06 +00:00
Steven Rowe 21a4f21b02 LUCENE-3211: Maven build: tests.luceneMatchVersion default -> LUCENE_CURRENT
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1137116 13f79535-47bb-0310-9956-ffa450edef68
2011-06-18 02:35:51 +00:00
Steven Rowe 4c6cc4ac18 Remove unused property
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1136995 13f79535-47bb-0310-9956-ffa450edef68
2011-06-17 19:25:25 +00:00
Steven Rowe c98779dd12 SOLR-2452: merge with trunk up to r1134392
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/branches/solr2452@1134403 13f79535-47bb-0310-9956-ffa450edef68
2011-06-10 18:17:44 +00:00
Steven Rowe 1216e243e4 Maven configuration: Removed Guava dependency from Solr core and added it where it is used: the Solr clustering contrib POM
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1133570 13f79535-47bb-0310-9956-ffa450edef68
2011-06-08 21:49:43 +00:00
Steven Rowe 4eeee5c147 SOLR-2452: merged with trunk up to r1130696; finished Solr contrib layout switch (src/main/java/ => src/java/, etc.) in the Maven, Eclipse, and IntelliJ configurations; restored two directories that were dropped as part of the layout switch: solr/contrib/dataimporthandler/src/main/webapp/ => src/webapp/, and solr/contrib/uima/src/main/resources => src/resources/; added jetty.insecurerandom sysprop setting to test-macro in lucene/common-build.xml
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/branches/solr2452@1130815 13f79535-47bb-0310-9956-ffa450edef68
2011-06-02 21:15:00 +00:00
Steven Rowe d2cc7f1330 LUCENE-3149: Switch ICU4J dependency to mavenized version
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1130718 13f79535-47bb-0310-9956-ffa450edef68
2011-06-02 18:42:26 +00:00
Steven Rowe 31c83c9d6f SOLR-2452: Merged with trunk up to r1129202; standardized solr/contrib/* layouts.
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/branches/solr2452@1129205 13f79535-47bb-0310-9956-ffa450edef68
2011-05-30 14:51:25 +00:00
Steven Rowe 7f5843bc8e LUCENE-2995: remove obsolete lucene-spellchecker module from Maven and IntelliJ IDEA configurations
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1128129 13f79535-47bb-0310-9956-ffa450edef68
2011-05-27 00:57:21 +00:00
Steven Rowe 58d99f3415 LUCENE-2995: Update Maven configuration for the new Suggest module
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1126690 13f79535-47bb-0310-9956-ffa450edef68
2011-05-23 19:50:54 +00:00
Steven Rowe 674feedec6 SOLR-2452: Merged up to trunk r1126232; adjusted solr/config/analysis-extras/ directory structure to match other solr contribs; updated configuration for maven and intellij idea.
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/branches/solr2452@1126234 13f79535-47bb-0310-9956-ffa450edef68
2011-05-22 21:45:19 +00:00
Steven Rowe 91c74bb6e7 SOLR-2421: remove unnecessary dependency
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1125567 13f79535-47bb-0310-9956-ffa450edef68
2011-05-20 20:55:31 +00:00
Steven Rowe 46e85ef249 svn:eol-style -> native
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1103175 13f79535-47bb-0310-9956-ffa450edef68
2011-05-14 18:13:39 +00:00
Steven Rowe 6af8928c95 Compilation of the Solr-core module under the Maven build has been broken since SOLR-2378 was committed on April 14th (the Google Guava dependency was declared with <scope>test</scope>, but SOLR-2378 uses it in non-test classes). The fix: remove the test scope declaration on the dependency, so that it is also a non-test dependency.
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1099865 13f79535-47bb-0310-9956-ffa450edef68
2011-05-05 16:32:50 +00:00
Steven Rowe bde0e76eab Fixed jar output directories, from David Smiley
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1099620 13f79535-47bb-0310-9956-ffa450edef68
2011-05-04 22:02:33 +00:00
Steven Rowe 7d236abb4e Added Google Guava as a test dependency to Solr Core
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1088065 13f79535-47bb-0310-9956-ffa450edef68
2011-04-02 17:00:39 +00:00
Steven Rowe 0c7a172d4f SOLR-2061: Generate jar containing test classes
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1087722 13f79535-47bb-0310-9956-ffa450edef68
2011-04-01 14:41:09 +00:00
Steven Rowe fdf66a15b1 Fixed incorrect specification of testResource directory src/test-files/; added javax.servlet:servlet-api as a test dependency.
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1087414 13f79535-47bb-0310-9956-ffa450edef68
2011-03-31 19:25:01 +00:00
Steven Rowe 2cb99bff3e LUCENE-2609: Renamed the Lucene test-framework jar to 'lucene-test-framework-version.jar'; now including the test-framework javadoc jar in the binary packages; modified the Maven POMs to designate the test-framework artifacts as 'jar' packaging rather than 'test-jar' packaging - this changes the artifact classifiers to be the same as those of any other non-test module.
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1085581 13f79535-47bb-0310-9956-ffa450edef68
2011-03-25 22:11:27 +00:00
Steven Rowe 0d76f4e1ec SOLR-2427: Upgraded uima-core 2.3.1-SNAPSHOT jar to released uimaj-core 2.3.1; no longer publishing a Solr-specific uima-core Maven artifact; renamed UIMA jars to include their versions.
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1081880 13f79535-47bb-0310-9956-ffa450edef68
2011-03-15 17:46:17 +00:00
Steven Rowe 979f035d9d Solr DIH and Clustering contribs need jetty test scope dependencies to pass tests, since solr-core's jetty dependencies are now optional
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1080481 13f79535-47bb-0310-9956-ffa450edef68
2011-03-11 07:41:33 +00:00
Steven Rowe d933b418d7 LUCENE-2957: Fixup inconsistent naming of UIMAJ jars
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1080455 13f79535-47bb-0310-9956-ffa450edef68
2011-03-11 05:12:33 +00:00
Steven Rowe 7180bb3cb9 LUCENE-2957: generate-maven-artifacts target should include all non-Mavenized Lucene & Solr dependencies
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1080443 13f79535-47bb-0310-9956-ffa450edef68
2011-03-11 04:32:14 +00:00
Steven Rowe a5a3afca64 Exclude v3.0.1 Lucene artifacts from build classpath for Solr Clustering contrib
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1075972 13f79535-47bb-0310-9956-ffa450edef68
2011-03-01 18:33:12 +00:00
Steven Rowe 3985b909e7 SOLR-2381: adjust maven POMs to use^Che new Jetty jars
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1074796 13f79535-47bb-0310-9956-ffa450edef68
2011-02-26 05:33:31 +00:00
Steven Rowe 3f1e769798 SOLR-2365: remove DIH jar dependency from the Solr war POM
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1072848 13f79535-47bb-0310-9956-ffa450edef68
2011-02-21 04:30:44 +00:00
Shai Erera ece1524805 LUCENE-2609: Generate jar containing test classes (trunk)
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1067738 13f79535-47bb-0310-9956-ffa450edef68
2011-02-06 19:48:54 +00:00
Steven Rowe 1b44e0b9a5 added support for maven artifact generation of the new Solr UIMA contrib; the top-level get-maven-poms target now forces copying of all of the source pom.xml files, even if the source is not newer than the target files, so that version changes will always take effect when specified through the -Dversion ant cmdline option
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1062936 13f79535-47bb-0310-9956-ffa450edef68
2011-01-24 19:33:14 +00:00
Steven Rowe 82640ec617 LUCENE-2657: switched POMs under dev-tools/maven/ to be POM templates, to allow for specification of the version as a system property on the command line.
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1062111 13f79535-47bb-0310-9956-ffa450edef68
2011-01-22 07:26:17 +00:00
Steven Rowe 74360c80f5 LUCENE-2657: Replace Maven POM templates with full POMs
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1061613 13f79535-47bb-0310-9956-ffa450edef68
2011-01-21 03:44:13 +00:00