Commit Graph

66 Commits

Author SHA1 Message Date
Simon Willnauer 0ee7cba028 LUCENE-3023: manually merged missed chunks from trunk and minor cleanup after review patch from re-integration
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/branches/realtime_search@1097440 13f79535-47bb-0310-9956-ffa450edef68
2011-04-28 12:55:12 +00:00
Robert Muir 46c9175e76 LUCENE-3023: add changes that were lost (e.g. marked as merged but somehow didnt make it in)
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/branches/realtime_search@1097270 13f79535-47bb-0310-9956-ffa450edef68
2011-04-27 23:01:38 +00:00
Simon Willnauer 8428ecc7ee merged with trunk
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/branches/realtime_search@1091748 13f79535-47bb-0310-9956-ffa450edef68
2011-04-13 11:22:24 +00:00
Steven Rowe 4ea675e29c - Re-ordered module dependencies to be the last <orderEntry>s - modules that depend on other modules will otherwise refuse to compile under IntelliJ 10.0.3.
- Removed <orderEntry> for the now-nonexistent contrib/demo/lib/

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1089739 13f79535-47bb-0310-9956-ffa450edef68
2011-04-07 04:57:20 +00:00
Simon Willnauer a7d460ca14 merged with trunk
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/branches/realtime_search@1088606 13f79535-47bb-0310-9956-ffa450edef68
2011-04-04 13:03:42 +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
Simon Willnauer 98dffb255d Merged with Trunk
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/branches/realtime_search@1086876 13f79535-47bb-0310-9956-ffa450edef68
2011-03-30 09:17:25 +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 68ebd4392d Removed from contrib/demo/lib/ in r1078463; now pulling from solr/lib/.
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1084836 13f79535-47bb-0310-9956-ffa450edef68
2011-03-24 04:06:21 +00:00
Doron Cohen bb8e6ae846 LUCENE-2978: Upgrade benchmark's commons-compress from 1.0 to 1.1.
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1084210 13f79535-47bb-0310-9956-ffa450edef68
2011-03-22 15:08:29 +00:00
Yonik Seeley 1c0ff82ac1 LUCENE-2894: move prettify to lucene
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1083991 13f79535-47bb-0310-9956-ffa450edef68
2011-03-21 22:13:14 +00:00
Grant Ingersoll 8bee953057 LUCENE-2952: drop dev-tools dependency, move to test framework, split out checking to each area: lucene, modules, solr
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1083010 13f79535-47bb-0310-9956-ffa450edef68
2011-03-18 18:40:02 +00:00
Grant Ingersoll f36c32405d LUCENE-2952: hook in dependency checking for license, notice
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1082535 13f79535-47bb-0310-9956-ffa450edef68
2011-03-17 15:34:21 +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 99aed2c176 Tell IntelliJ to ignore more directories containing build output (e.g. dist, package, lucene-lib, etc.)
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1080770 13f79535-47bb-0310-9956-ffa450edef68
2011-03-11 21:44:42 +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 3fcf6d6525 LUCENE-2961: Remove benchmark/lib/xml-apis-2.9.0.jar - JVM 1.5+ contains these JAXP 1.3 interface classes
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1080258 13f79535-47bb-0310-9956-ffa450edef68
2011-03-10 15:57:52 +00:00
Steven Rowe 708d6fada1 Make the Maven build work even when the source is not under Subversion control
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1079388 13f79535-47bb-0310-9956-ffa450edef68
2011-03-08 15:19:56 +00:00
Robert Muir 4797c55101 update eclipse classpath
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1078501 13f79535-47bb-0310-9956-ffa450edef68
2011-03-06 15:51:47 +00:00
Robert Muir c80bad9f29 rename easymock.jar to easymock-2.2.jar so the version information is known
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1078471 13f79535-47bb-0310-9956-ffa450edef68
2011-03-06 14:16:53 +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
Robert Muir 7b7d144aec SOLR-2381: use patched version of jetty with correct UTF-8 handling
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1074726 13f79535-47bb-0310-9956-ffa450edef68
2011-02-25 22:42:32 +00:00
Michael Busch a11da24e91 Merging r1074015 through r1074414 into realtime branch
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/branches/realtime_search@1074415 13f79535-47bb-0310-9956-ffa450edef68
2011-02-25 07:18:09 +00:00
Steven Rowe 12c4c4e987 LUCENE-2611: switched the code style file from a manually configured global style to an already-setup per-project code style; adjusted code style continuation indents; added groovy code style support.
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1074130 13f79535-47bb-0310-9956-ffa450edef68
2011-02-24 13:02:44 +00:00
Michael Busch 6b9c787a9b Merging r1062944 through r1073113 into realtime branch
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/branches/realtime_search@1073192 13f79535-47bb-0310-9956-ffa450edef68
2011-02-22 01:00:39 +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
Steven Rowe f7b037d3cf LUCENE-2923: Cleanup contrib/demo
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1072250 13f79535-47bb-0310-9956-ffa450edef68
2011-02-19 04:49:36 +00:00
Yonik Seeley 2493780acb SOLR-2373: update to slf4j 1.6.1
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1071812 13f79535-47bb-0310-9956-ffa450edef68
2011-02-17 22:14:08 +00:00
Steven Rowe 8396617fb4 include RSLP stemmer grammar files in the build classpath, for the Galician and Portuguese stemmers in modules/analysis/common/
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1071747 13f79535-47bb-0310-9956-ffa450edef68
2011-02-17 18:52:56 +00:00
Steven Rowe 57956f0948 removed dependency on (no-longer-present) remote module
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1071067 13f79535-47bb-0310-9956-ffa450edef68
2011-02-15 21:14:54 +00:00
Steven Rowe a82fa91d41 removed (non-existent) solrj dep
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1071066 13f79535-47bb-0310-9956-ffa450edef68
2011-02-15 21:14:18 +00:00
Steven Rowe 18944a28b5 javac should always use UTF-8 encoding
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1070488 13f79535-47bb-0310-9956-ffa450edef68
2011-02-14 14:04:35 +00:00
Steven Rowe 52c2eb7c77 LUCENE-2609: queries contrib needs lucene test classes outside of test-framework
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1067836 13f79535-47bb-0310-9956-ffa450edef68
2011-02-07 01:13:18 +00:00
Steven Rowe 8d7afc0d05 LUCENE-2609: phonetic module can depend only on lucene-test-framework rather than the full lucene-core tests
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1067834 13f79535-47bb-0310-9956-ffa450edef68
2011-02-07 01:12:14 +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 5c1983b27b Make the lucene module's run configuration appear on the list, and make it selected by default
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1067566 13f79535-47bb-0310-9956-ffa450edef68
2011-02-06 01:16:15 +00:00
Koji Sekiguchi a3dbc97978 LUCENE-2894: Use google-code-prettify for syntax highlighting in javadocs
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1067551 13f79535-47bb-0310-9956-ffa450edef68
2011-02-05 23:36:32 +00:00
Steven Rowe 80d45a4ee3 LUCENE-1591: update maven poms for xercesImpl.jar revert
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1065802 13f79535-47bb-0310-9956-ffa450edef68
2011-01-31 21:28:47 +00:00
Steven Rowe 7088a4d555 LUCENE-1591: Eclipse config update for xercesImpl.jar revert
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1065787 13f79535-47bb-0310-9956-ffa450edef68
2011-01-31 21:16:39 +00:00
Shai Erera b24a26b251 LUCENE-2609: Generate jar containing test classes (trunk)
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1064068 13f79535-47bb-0310-9956-ffa450edef68
2011-01-27 10:10:36 +00:00
Michael Busch 1588c32135 Merging r1061975 through r1062931 into realtime branch
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/branches/realtime_search@1062944 13f79535-47bb-0310-9956-ffa450edef68
2011-01-24 19:38:40 +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
Michael Busch a7875a8228 add missing files to RT branch
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/branches/realtime_search@1062931 13f79535-47bb-0310-9956-ffa450edef68
2011-01-24 19:16:18 +00:00
Steven Rowe 2ea5e65959 Added IntelliJ support for the new Solr UIMA contrib
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1062817 13f79535-47bb-0310-9956-ffa450edef68
2011-01-24 15:02:31 +00:00
Robert Muir 6c05d94c93 SOLR-2129: Provide a Solr module for dynamic metadata extraction/indexing with Apache UIMA
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1062604 13f79535-47bb-0310-9956-ffa450edef68
2011-01-24 01:58:00 +00:00