diff --git a/dev-tools/idea/.idea/libraries/Solrj_test_library.xml b/dev-tools/idea/.idea/libraries/Solrj_test_library.xml deleted file mode 100644 index 5ff1abf52f8..00000000000 --- a/dev-tools/idea/.idea/libraries/Solrj_test_library.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - - \ No newline at end of file diff --git a/dev-tools/idea/solr/contrib/analysis-extras/analysis-extras.iml b/dev-tools/idea/solr/contrib/analysis-extras/analysis-extras.iml index 85878b8e743..b43efb544b6 100644 --- a/dev-tools/idea/solr/contrib/analysis-extras/analysis-extras.iml +++ b/dev-tools/idea/solr/contrib/analysis-extras/analysis-extras.iml @@ -27,6 +27,16 @@ + + + + + + + + + + diff --git a/dev-tools/idea/solr/contrib/clustering/clustering.iml b/dev-tools/idea/solr/contrib/clustering/clustering.iml index f19a3b5706a..b54d347c54d 100644 --- a/dev-tools/idea/solr/contrib/clustering/clustering.iml +++ b/dev-tools/idea/solr/contrib/clustering/clustering.iml @@ -27,6 +27,16 @@ + + + + + + + + + + diff --git a/dev-tools/idea/solr/contrib/dataimporthandler-extras/dataimporthandler-extras.iml b/dev-tools/idea/solr/contrib/dataimporthandler-extras/dataimporthandler-extras.iml index ced9613a687..a41171fb083 100644 --- a/dev-tools/idea/solr/contrib/dataimporthandler-extras/dataimporthandler-extras.iml +++ b/dev-tools/idea/solr/contrib/dataimporthandler-extras/dataimporthandler-extras.iml @@ -14,6 +14,16 @@ + + + + + + + + + + diff --git a/dev-tools/idea/solr/contrib/extraction/extraction.iml b/dev-tools/idea/solr/contrib/extraction/extraction.iml index fc729a9763d..2413752bd90 100644 --- a/dev-tools/idea/solr/contrib/extraction/extraction.iml +++ b/dev-tools/idea/solr/contrib/extraction/extraction.iml @@ -14,6 +14,16 @@ + + + + + + + + + + diff --git a/dev-tools/idea/solr/contrib/langid/langid.iml b/dev-tools/idea/solr/contrib/langid/langid.iml index 8a95345a5bf..879ad34655c 100644 --- a/dev-tools/idea/solr/contrib/langid/langid.iml +++ b/dev-tools/idea/solr/contrib/langid/langid.iml @@ -28,6 +28,16 @@ + + + + + + + + + + diff --git a/dev-tools/idea/solr/contrib/map-reduce/map-reduce.iml b/dev-tools/idea/solr/contrib/map-reduce/map-reduce.iml index 572e1d838ac..fd2c86d2615 100644 --- a/dev-tools/idea/solr/contrib/map-reduce/map-reduce.iml +++ b/dev-tools/idea/solr/contrib/map-reduce/map-reduce.iml @@ -21,6 +21,16 @@ + + + + + + + + + + diff --git a/dev-tools/idea/solr/contrib/morphlines-cell/morphlines-cell.iml b/dev-tools/idea/solr/contrib/morphlines-cell/morphlines-cell.iml index a4198a13b32..94078051c95 100644 --- a/dev-tools/idea/solr/contrib/morphlines-cell/morphlines-cell.iml +++ b/dev-tools/idea/solr/contrib/morphlines-cell/morphlines-cell.iml @@ -21,6 +21,16 @@ + + + + + + + + + + diff --git a/dev-tools/idea/solr/contrib/uima/uima.iml b/dev-tools/idea/solr/contrib/uima/uima.iml index b765a2cce78..be03e9f4676 100644 --- a/dev-tools/idea/solr/contrib/uima/uima.iml +++ b/dev-tools/idea/solr/contrib/uima/uima.iml @@ -27,6 +27,16 @@ + + + + + + + + + + diff --git a/dev-tools/idea/solr/contrib/velocity/velocity.iml b/dev-tools/idea/solr/contrib/velocity/velocity.iml index 63080198597..816601f1f3a 100644 --- a/dev-tools/idea/solr/contrib/velocity/velocity.iml +++ b/dev-tools/idea/solr/contrib/velocity/velocity.iml @@ -17,6 +17,16 @@ + + + + + + + + + + diff --git a/dev-tools/idea/solr/solrj/src/test/solrj-tests.iml b/dev-tools/idea/solr/solrj/src/test/solrj-tests.iml index 9ec607cf929..9718e70e1d1 100644 --- a/dev-tools/idea/solr/solrj/src/test/solrj-tests.iml +++ b/dev-tools/idea/solr/solrj/src/test/solrj-tests.iml @@ -12,7 +12,16 @@ - + + + + + + + + + + diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt index 82bac73706c..3a83dcb1551 100644 --- a/solr/CHANGES.txt +++ b/solr/CHANGES.txt @@ -138,9 +138,9 @@ Other Changes Build --------------------- -* SOLR-6006: Separate test and compile scope dependencies in the Solrj ivy.xml - file, so that the derived Maven dependencies get filled out properly in the - Solrj POM. (Steven Scott, Steve Rowe) +* SOLR-6006: Separate test and compile scope dependencies in the Solrj and + Solr contrib ivy.xml files, so that the derived Maven dependencies get + filled out properly in the corresponding POMs. (Steven Scott, Steve Rowe) ================== 4.8.0 ================== diff --git a/solr/contrib/analysis-extras/build.xml b/solr/contrib/analysis-extras/build.xml index 1c6945aaf6f..2f9c599a87e 100644 --- a/solr/contrib/analysis-extras/build.xml +++ b/solr/contrib/analysis-extras/build.xml @@ -17,7 +17,7 @@ limitations under the License. --> - + Additional analysis components @@ -43,6 +43,10 @@ + + + + - - - - - - - - - + + + + + + + + + + + + + + + + diff --git a/solr/contrib/clustering/build.xml b/solr/contrib/clustering/build.xml index 7a6f1a2efb0..0a4aa453044 100644 --- a/solr/contrib/clustering/build.xml +++ b/solr/contrib/clustering/build.xml @@ -17,11 +17,26 @@ limitations under the License. --> - + Clustering Integraton + + + + + + + + + + + + + + diff --git a/solr/contrib/clustering/ivy.xml b/solr/contrib/clustering/ivy.xml index f336018124a..b56b3ccbf92 100644 --- a/solr/contrib/clustering/ivy.xml +++ b/solr/contrib/clustering/ivy.xml @@ -17,27 +17,33 @@ under the License. --> - - - + + + + + + + - - - + + + - - + + - - + + - + com.google.guava:guava:jar:14.0.1:compile + commons-lang:commons-lang:jar:2.6:compile + --> - - + + + + diff --git a/solr/contrib/contrib-build.xml b/solr/contrib/contrib-build.xml index fc5888b8a4b..82b2509a79d 100644 --- a/solr/contrib/contrib-build.xml +++ b/solr/contrib/contrib-build.xml @@ -17,10 +17,12 @@ limitations under the License. --> - + + + @@ -44,4 +46,12 @@ + + + + + + + diff --git a/solr/contrib/dataimporthandler-extras/build.xml b/solr/contrib/dataimporthandler-extras/build.xml index b2fb410d4b0..9daf9004052 100644 --- a/solr/contrib/dataimporthandler-extras/build.xml +++ b/solr/contrib/dataimporthandler-extras/build.xml @@ -63,6 +63,7 @@ + diff --git a/solr/contrib/dataimporthandler-extras/ivy.xml b/solr/contrib/dataimporthandler-extras/ivy.xml index cce44a4caf7..432c6c1e9cd 100644 --- a/solr/contrib/dataimporthandler-extras/ivy.xml +++ b/solr/contrib/dataimporthandler-extras/ivy.xml @@ -26,5 +26,11 @@ https://issues.apache.org/jira/browse/SOLR-3848 --> - + + + + + + + diff --git a/solr/contrib/dataimporthandler/build.xml b/solr/contrib/dataimporthandler/build.xml index 87e365faf12..a3befd85f82 100644 --- a/solr/contrib/dataimporthandler/build.xml +++ b/solr/contrib/dataimporthandler/build.xml @@ -17,7 +17,7 @@ limitations under the License. --> - + Data Import Handler @@ -26,20 +26,10 @@ - - - - - - - - - diff --git a/solr/contrib/dataimporthandler/ivy.xml b/solr/contrib/dataimporthandler/ivy.xml index 2a6a143e8f5..1e4d9dc751c 100644 --- a/solr/contrib/dataimporthandler/ivy.xml +++ b/solr/contrib/dataimporthandler/ivy.xml @@ -24,11 +24,12 @@ - + - - - + + + + diff --git a/solr/contrib/extraction/build.xml b/solr/contrib/extraction/build.xml index ab56899250e..a9505711383 100644 --- a/solr/contrib/extraction/build.xml +++ b/solr/contrib/extraction/build.xml @@ -25,4 +25,8 @@ + + + + diff --git a/solr/contrib/extraction/ivy.xml b/solr/contrib/extraction/ivy.xml index 30af1fedc7b..bf1da736618 100644 --- a/solr/contrib/extraction/ivy.xml +++ b/solr/contrib/extraction/ivy.xml @@ -17,47 +17,54 @@ under the License. --> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - + + + + + + + + diff --git a/solr/contrib/langid/build.xml b/solr/contrib/langid/build.xml index 271ea0ecc17..bc3cd1b48a1 100644 --- a/solr/contrib/langid/build.xml +++ b/solr/contrib/langid/build.xml @@ -31,7 +31,12 @@ - + + + + + + diff --git a/solr/contrib/langid/ivy.xml b/solr/contrib/langid/ivy.xml index c62f7176bd3..b4772a9628e 100644 --- a/solr/contrib/langid/ivy.xml +++ b/solr/contrib/langid/ivy.xml @@ -17,10 +17,17 @@ under the License. --> - - - - - - + + + + + + + + + + + + + diff --git a/solr/contrib/map-reduce/build.xml b/solr/contrib/map-reduce/build.xml index 8391c1acfbd..2b858cd3cc0 100644 --- a/solr/contrib/map-reduce/build.xml +++ b/solr/contrib/map-reduce/build.xml @@ -93,6 +93,7 @@ + diff --git a/solr/contrib/map-reduce/ivy.xml b/solr/contrib/map-reduce/ivy.xml index 3af96eddd61..2e0e55d8459 100644 --- a/solr/contrib/map-reduce/ivy.xml +++ b/solr/contrib/map-reduce/ivy.xml @@ -16,7 +16,7 @@ specific language governing permissions and limitations under the License. --> - + @@ -31,7 +31,9 @@ - + + + diff --git a/solr/contrib/morphlines-cell/build.xml b/solr/contrib/morphlines-cell/build.xml index f036d236c10..6e5d5a9199b 100644 --- a/solr/contrib/morphlines-cell/build.xml +++ b/solr/contrib/morphlines-cell/build.xml @@ -95,6 +95,7 @@ + diff --git a/solr/contrib/morphlines-cell/ivy.xml b/solr/contrib/morphlines-cell/ivy.xml index 62bb81888c0..4122861f20e 100644 --- a/solr/contrib/morphlines-cell/ivy.xml +++ b/solr/contrib/morphlines-cell/ivy.xml @@ -16,7 +16,7 @@ specific language governing permissions and limitations under the License. --> - + @@ -29,7 +29,9 @@ - + + + diff --git a/solr/contrib/morphlines-core/build.xml b/solr/contrib/morphlines-core/build.xml index 859b0322e2b..0b1b59543ae 100644 --- a/solr/contrib/morphlines-core/build.xml +++ b/solr/contrib/morphlines-core/build.xml @@ -23,8 +23,6 @@ Solr Morphlines commands. - - - - - - - - - diff --git a/solr/contrib/morphlines-core/ivy.xml b/solr/contrib/morphlines-core/ivy.xml index 58b07d02e19..939914acd44 100644 --- a/solr/contrib/morphlines-core/ivy.xml +++ b/solr/contrib/morphlines-core/ivy.xml @@ -114,6 +114,8 @@ + + diff --git a/solr/contrib/uima/build.xml b/solr/contrib/uima/build.xml index ee564221148..438f139f243 100644 --- a/solr/contrib/uima/build.xml +++ b/solr/contrib/uima/build.xml @@ -35,6 +35,11 @@ + + + + + diff --git a/solr/contrib/uima/ivy.xml b/solr/contrib/uima/ivy.xml index 69c3c40ac61..a09a09cef95 100644 --- a/solr/contrib/uima/ivy.xml +++ b/solr/contrib/uima/ivy.xml @@ -17,14 +17,21 @@ under the License. --> - - - - - - - - - - + + + + + + + + + + + + + + + + + diff --git a/solr/contrib/velocity/build.xml b/solr/contrib/velocity/build.xml index a6712afcd79..fc08da1615c 100644 --- a/solr/contrib/velocity/build.xml +++ b/solr/contrib/velocity/build.xml @@ -25,4 +25,8 @@ + + + + diff --git a/solr/contrib/velocity/ivy.xml b/solr/contrib/velocity/ivy.xml index 279c61fe202..129dde496b1 100644 --- a/solr/contrib/velocity/ivy.xml +++ b/solr/contrib/velocity/ivy.xml @@ -17,12 +17,19 @@ under the License. --> - - - - - - - - + + + + + + + + + + + + + + +