SOLR-16540 Fix eclipse import errors (apache#1357)

cowpaths · Mar 1, 2023 · 5188ae0 · 5188ae0
1 parent d5784d6
commit 5188ae0
Show file tree

Hide file tree

Showing 9 changed files with 13 additions and 62 deletions.
diff --git a/.gitignore b/.gitignore
@@ -15,9 +15,10 @@ out/
 /dev-tools/missing-doclet/out/
 
 # Eclipse
-/.project
-/.classpath
-/.settings/
+**/.project
+**/.classpath
+**/.settings/
+/.metadata
 #    Eclipse Gradle oddity
 **/bin/default/
 
@@ -41,4 +42,4 @@ __pycache__
 
 # Ignore gradle wrapper
 gradle/wrapper/gradle-wrapper.jar
-.gradletasknamecache
+.gradletasknamecache
diff --git a/gradle/documentation/render-javadoc.gradle b/gradle/documentation/render-javadoc.gradle
@@ -160,6 +160,7 @@ configure(project(":solr:test-framework")) {
         "org.apache.solr",
         "org.apache.solr.analysis",
         "org.apache.solr.cloud",
+        "org.apache.solr.cloud.api.collections",
         "org.apache.solr.common.cloud",
         "org.apache.solr.core",
         "org.apache.solr.handler",

diff --git a/gradle/ide/eclipse.gradle b/gradle/ide/eclipse.gradle
@@ -31,6 +31,8 @@ configure(rootProject) {
     }
 
     classpath {
+      downloadSources = true
+      downloadJavadoc = true
       defaultOutputDir = file('build/eclipse')
 
       file {

diff --git a/gradle/validation/rat-sources.gradle b/gradle/validation/rat-sources.gradle
@@ -58,6 +58,9 @@ allprojects {
             include "**/*.gradle"
             exclude ".gradle/**"
 
+            // Exclude Eclipse
+            exclude ".metadata"
+
             // Include selected patterns from any source folders. We could make this
             // relative to source sets but it seems to be of little value - all our source sets
             // live under 'src' anyway.

diff --git a/gradle/validation/validate-source-patterns.gradle b/gradle/validation/validate-source-patterns.gradle
@@ -82,6 +82,7 @@ allprojects {
       exclude '**/build/**'
       exclude '**/.idea/**'
       exclude '**/.gradle/**'
+      exclude '.metadata/**'
 
       if (project == rootProject) {
         // ourselves :-)

diff --git a/solr/core/src/test/org/apache/solr/handler/admin/api/package-info.java b/solr/core/src/test/org/apache/solr/handler/admin/api/package-info.java
diff --git a/.../configuration/SSLConfigurationsTest.java → ...guration/HadoopSSLConfigurationsTest.java b/.../configuration/SSLConfigurationsTest.java → ...guration/HadoopSSLConfigurationsTest.java
@@ -38,7 +38,7 @@
 import org.junit.rules.TestRule;
 import org.mockito.Mockito;
 
-public class SSLConfigurationsTest extends SolrTestCaseJ4 {
+public class HadoopSSLConfigurationsTest extends SolrTestCaseJ4 {
   private Map<String, String> envs;
   private SSLConfigurations sut;
 

diff --git a/solr/modules/jwt-auth/src/test/org/apache/solr/security/jwt/api/package-info.java b/solr/modules/jwt-auth/src/test/org/apache/solr/security/jwt/api/package-info.java
diff --git a/solr/test-framework/src/java/org/apache/solr/cloud/api/collections/package-info.java b/solr/test-framework/src/java/org/apache/solr/cloud/api/collections/package-info.java