Commit Graph

349 Commits

Author SHA1 Message Date
Steven Rowe 72d043e3ec LUCENE-3204: Include maven-ant-tasks jar in the source tree and use this jar from generate-maven-artifacts
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1135801 13f79535-47bb-0310-9956-ffa450edef68
2011-06-14 21:23:31 +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 39063eee73 SOLR-2452: merged with trunk up to r1132517
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/branches/solr2452@1132518 13f79535-47bb-0310-9956-ffa450edef68
2011-06-06 03:58:37 +00:00
Steven Rowe c670b76a32 LUCENE-3172: fix installation problems on lucene-misc OSGI bundle
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1131492 13f79535-47bb-0310-9956-ffa450edef68
2011-06-04 20:58:29 +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 31fca6e58b LUCENE-3149: ICU4J jar version upgraded in Maven configuration
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1130529 13f79535-47bb-0310-9956-ffa450edef68
2011-06-02 13:02:49 +00:00
Steven Rowe 036078baea SOLR-2452: merged with trunk up to r1130266. Removed duplicate solr-contrib-uptodate definition in solr/contrib/contrib-build.xml. Fixed directory glob in solr-contrib-uptodate target: .../src/main/java/ -> .../src/java/
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/branches/solr2452@1130331 13f79535-47bb-0310-9956-ffa450edef68
2011-06-01 22:37:09 +00:00
Ryan McKinley 914d18a2b5 LUCENE-1344 -- adding OSGi packaging to maven build script
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1130150 13f79535-47bb-0310-9956-ffa450edef68
2011-06-01 13:40:50 +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 a64aafadaf SOLR-2452: Merged up to trunk r1126319.
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/branches/solr2452@1126320 13f79535-47bb-0310-9956-ffa450edef68
2011-05-23 05:20:32 +00:00
Steven Rowe 00c35bfec3 LUCENE-2981: Removed ant, bdb, bdb-je, lucli, and swing contribs from the Maven configuration.
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1126310 13f79535-47bb-0310-9956-ffa450edef68
2011-05-23 04:55:03 +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
Stanisław Osiński 548806b7f7 SOLR-2448: Upgrade of Carrot2 to version 3.5.0 and a number of related clustering improvements (SOLR-2449, SOLR-2450, SOLR-2505)
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1103722 13f79535-47bb-0310-9956-ffa450edef68
2011-05-16 13:19:46 +00:00
Steven Rowe d94c164ba3 SOLR-2518: override default grandparent POM's parent POM location to force download from the remote repository
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1103390 13f79535-47bb-0310-9956-ffa450edef68
2011-05-15 14:24:00 +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 92e32ad179 svn:eol-style -> native
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1103172 13f79535-47bb-0310-9956-ffa450edef68
2011-05-14 17:38:53 +00:00
Steven Rowe dbcac4880c LUCENE-1421: Update Maven configuration to support the new grouping module
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1103169 13f79535-47bb-0310-9956-ffa450edef68
2011-05-14 17:31:49 +00:00
Steven Rowe b12ed71c4e fix typo; add vertical whitespace between sections
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1101084 13f79535-47bb-0310-9956-ffa450edef68
2011-05-09 16:09:28 +00:00
Steven Rowe 393239e06b LUCENE-3081: Document Maven nightly builds, artifact generation, and using Maven to build Lucene/Solr
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1101072 13f79535-47bb-0310-9956-ffa450edef68
2011-05-09 15:45:27 +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
Yonik Seeley be2382efb7 SOLR-2495: json parser could hang on corrupted input and fail to detect long overflow
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1099582 13f79535-47bb-0310-9956-ffa450edef68
2011-05-04 20:07:19 +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 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
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
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 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 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 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