rebase and resolve conflicts

apache · Jul 17, 2024 · 19021a0 · 19021a0
1 parent 4631f77
commit 19021a0
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/...c/test/java/org/apache/gravitino/integration/test/authorization/ranger/RangerDefines.java b/...c/test/java/org/apache/gravitino/integration/test/authorization/ranger/RangerDefines.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.datastrato.gravitino.integration.test.authorization.ranger;
+package org.apache.gravitino.integration.test.authorization.ranger;
 
 import org.apache.ranger.plugin.util.SearchFilter;
 

diff --git a/...rc/test/java/org/apache/gravitino/integration/test/authorization/ranger/RangerHiveIT.java b/...rc/test/java/org/apache/gravitino/integration/test/authorization/ranger/RangerHiveIT.java
@@ -16,11 +16,11 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.datastrato.gravitino.integration.test.authorization.ranger;
+package org.apache.gravitino.integration.test.authorization.ranger;
 
-import com.datastrato.gravitino.integration.test.container.ContainerSuite;
-import com.datastrato.gravitino.integration.test.container.HiveContainer;
-import com.datastrato.gravitino.integration.test.container.RangerContainer;
+import org.apache.gravitino.integration.test.container.ContainerSuite;
+import org.apache.gravitino.integration.test.container.HiveContainer;
+import org.apache.gravitino.integration.test.container.RangerContainer;
 import com.google.common.collect.ImmutableMap;
 import java.sql.Connection;
 import java.sql.DriverManager;