Apache Solr open-source search software
SOLR-16325: JWT module Javadoc split package issue on JDK16+ (#964)
Kevin Risden2759391c6b34
diff --git a/solr/modules/jwt-auth/src/java/org/apache/solr/security/jwt/JWTAuthPlugin.java b/solr/modules/jwt-auth/src/java/org/apache/solr/security/jwt/JWTAuthPlugin.javaindex e5d42ca8f81..aa13b44e293 100644--- a/solr/modules/jwt-auth/src/java/org/apache/solr/security/jwt/JWTAuthPlugin.java+++ b/solr/modules/jwt-auth/src/java/org/apache/solr/security/jwt/JWTAuthPlugin.java@@ -59,10 +59,10 @@ import org.apache.solr.common.util.CommandOperation;import org.apache.solr.common.util.Utils;import org.apache.solr.common.util.ValidatingJsonMap;import org.apache.solr.core.CoreContainer;-import org.apache.solr.handler.admin.api.ModifyJWTAuthPluginConfigAPI;import org.apache.solr.security.AuthenticationPlugin;import org.apache.solr.security.ConfigEditablePlugin;import org.apache.solr.security.jwt.JWTAuthPlugin.JWTAuthenticationResponse.AuthCode;+import org.apache.solr.security.jwt.api.ModifyJWTAuthPluginConfigAPI;import org.apache.solr.util.CryptoKeys;import org.eclipse.jetty.client.api.Request;import org.jose4j.jwa.AlgorithmConstraints;diff --git a/solr/solrj/src/java/org/apache/solr/handler/admin/api/JWTConfigurationPayload.java b/solr/modules/jwt-auth/src/java/org/apache/solr/security/jwt/api/JWTConfigurationPayload.javasimilarity index 96%rename from solr/solrj/src/java/org/apache/solr/handler/admin/api/JWTConfigurationPayload.javarename to solr/modules/jwt-auth/src/java/org/apache/solr/security/jwt/api/JWTConfigurationPayload.javaindex 07f1c63bd80..3a042e8a668 100644--- a/solr/solrj/src/java/org/apache/solr/handler/admin/api/JWTConfigurationPayload.java+++ b/solr/modules/jwt-auth/src/java/org/apache/solr/security/jwt/api/JWTConfigurationPayload.java@@ -6,7 +6,7 @@* (the "License"); you may not use this file except in compliance with* the License. You may obtain a copy of the License at*- * http://www.apache.org/licenses/LICENSE-2.0+ * http://www.apache.org/licenses/LICENSE-2.0** Unless required by applicable law or agreed to in writing, software* distributed under the License is distributed on an "AS IS" BASIS,@@ -15,7 +15,7 @@* limitations under the License.*/-package org.apache.solr.handler.admin.api;+package org.apache.solr.security.jwt.api;import java.util.List;import java.util.Map;diff --git a/solr/modules/jwt-auth/src/java/org/apache/solr/handler/admin/api/ModifyJWTAuthPluginConfigAPI.java b/solr/modules/jwt-auth/src/java/org/apache/solr/security/jwt/api/ModifyJWTAuthPluginConfigAPI.javasimilarity index 94%rename from solr/modules/jwt-auth/src/java/org/apache/solr/handler/admin/api/ModifyJWTAuthPluginConfigAPI.javarename to solr/modules/jwt-auth/src/java/org/apache/solr/security/jwt/api/ModifyJWTAuthPluginConfigAPI.javaindex ea24208c66e..7fc21646220 100644--- a/solr/modules/jwt-auth/src/java/org/apache/solr/handler/admin/api/ModifyJWTAuthPluginConfigAPI.java+++ b/solr/modules/jwt-auth/src/java/org/apache/solr/security/jwt/api/ModifyJWTAuthPluginConfigAPI.java@@ -6,7 +6,7 @@* (the "License"); you may not use this file except in compliance with* the License. You may obtain a copy of the License at*- * http://www.apache.org/licenses/LICENSE-2.0+ * http://www.apache.org/licenses/LICENSE-2.0** Unless required by applicable law or agreed to in writing, software* distributed under the License is distributed on an "AS IS" BASIS,@@ -15,7 +15,7 @@* limitations under the License.*/-package org.apache.solr.handler.admin.api;+package org.apache.solr.security.jwt.api;import static org.apache.solr.client.solrj.SolrRequest.METHOD.POST;import static org.apache.solr.security.PermissionNameProvider.Name.SECURITY_EDIT_PERM;diff --git a/solr/modules/jwt-auth/src/java/org/apache/solr/handler/admin/api/package-info.java b/solr/modules/jwt-auth/src/java/org/apache/solr/security/jwt/api/package-info.javasimilarity index 89%rename from solr/modules/jwt-auth/src/java/org/apache/solr/handler/admin/api/package-info.javarename to solr/modules/jwt-auth/src/java/org/apache/solr/security/jwt/api/package-info.javaindex f16f5f29a4e..bdc1413d469 100644--- a/solr/modules/jwt-auth/src/java/org/apache/solr/handler/admin/api/package-info.java+++ b/solr/modules/jwt-auth/src/java/org/apache/solr/security/jwt/api/package-info.java@@ -6,7 +6,7 @@* (the "License"); you may not use this file except in compliance with* the License. You may obtain a copy of the License at*- * http://www.apache.org/licenses/LICENSE-2.0+ * http://www.apache.org/licenses/LICENSE-2.0** Unless required by applicable law or agreed to in writing, software* distributed under the License is distributed on an "AS IS" BASIS,@@ -14,5 +14,6 @@* See the License for the specific language governing permissions and* limitations under the License.*/+/** API endpoint and associated files for the JWT Authentication Plugin */-package org.apache.solr.handler.admin.api;+package org.apache.solr.security.jwt.api;diff --git a/solr/modules/jwt-auth/src/test/org/apache/solr/handler/admin/api/V2JWTSecurityApiMappingTest.java b/solr/modules/jwt-auth/src/test/org/apache/solr/security/jwt/api/V2JWTSecurityApiMappingTest.javasimilarity index 95%rename from solr/modules/jwt-auth/src/test/org/apache/solr/handler/admin/api/V2JWTSecurityApiMappingTest.javarename to solr/modules/jwt-auth/src/test/org/apache/solr/security/jwt/api/V2JWTSecurityApiMappingTest.javaindex 252f8b9f953..8c55dbfcb9c 100644--- a/solr/modules/jwt-auth/src/test/org/apache/solr/handler/admin/api/V2JWTSecurityApiMappingTest.java+++ b/solr/modules/jwt-auth/src/test/org/apache/solr/security/jwt/api/V2JWTSecurityApiMappingTest.java@@ -6,7 +6,7 @@* (the "License"); you may not use this file except in compliance with* the License. You may obtain a copy of the License at*- * http://www.apache.org/licenses/LICENSE-2.0+ * http://www.apache.org/licenses/LICENSE-2.0** Unless required by applicable law or agreed to in writing, software* distributed under the License is distributed on an "AS IS" BASIS,@@ -15,7 +15,7 @@* limitations under the License.*/-package org.apache.solr.handler.admin.api;+package org.apache.solr.security.jwt.api;import java.util.HashMap;import org.apache.solr.SolrTestCaseJ4;diff --git a/solr/modules/jwt-auth/src/test/org/apache/solr/handler/admin/api/package-info.java b/solr/modules/jwt-auth/src/test/org/apache/solr/security/jwt/api/package-info.javasimilarity index 89%rename from solr/modules/jwt-auth/src/test/org/apache/solr/handler/admin/api/package-info.javarename to solr/modules/jwt-auth/src/test/org/apache/solr/security/jwt/api/package-info.javaindex 563aabcd128..8705daf787a 100644--- a/solr/modules/jwt-auth/src/test/org/apache/solr/handler/admin/api/package-info.java+++ b/solr/modules/jwt-auth/src/test/org/apache/solr/security/jwt/api/package-info.java@@ -6,7 +6,7 @@* (the "License"); you may not use this file except in compliance with* the License. You may obtain a copy of the License at*- * http://www.apache.org/licenses/LICENSE-2.0+ * http://www.apache.org/licenses/LICENSE-2.0** Unless required by applicable law or agreed to in writing, software* distributed under the License is distributed on an "AS IS" BASIS,@@ -16,4 +16,4 @@*//** Tests for the API(s) bundled with the jwt-auth module. */-package org.apache.solr.handler.admin.api;+package org.apache.solr.security.jwt.api;diff --git a/solr/solrj/src/java/org/apache/solr/handler/admin/api/package-info.java b/solr/solrj/src/java/org/apache/solr/handler/admin/api/package-info.javadeleted file mode 100644index 993c5b4c4ed..00000000000--- a/solr/solrj/src/java/org/apache/solr/handler/admin/api/package-info.java+++ /dev/null@@ -1,19 +0,0 @@-/*- * Licensed to the Apache Software Foundation (ASF) under one or more- * contributor license agreements. See the NOTICE file distributed with- * this work for additional information regarding copyright ownership.- * The ASF licenses this file to You under the Apache License, Version 2.0- * (the "License"); you may not use this file except in compliance with- * the License. You may obtain a copy of the License at- *- * http://www.apache.org/licenses/LICENSE-2.0- *- * Unless required by applicable law or agreed to in writing, software- * distributed under the License is distributed on an "AS IS" BASIS,- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.- * See the License for the specific language governing permissions and- * limitations under the License.- */--/** Payload implementations for APIs associated with the jwt-auth optional module */-package org.apache.solr.handler.admin.api;