Automatic merge of jdk:master into master

openjdk · Jun 26, 2020 · 9d07363 · 9d07363
2 parents 6cd41f0 + fc82a46
commit 9d07363
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/...st/sql/DriverManagerPermissionsTests.java → ...thervm/DriverManagerPermissionsTests.java b/...st/sql/DriverManagerPermissionsTests.java → ...thervm/DriverManagerPermissionsTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2020, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -20,7 +20,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package test.sql;
+package test.sql.othervm;
 
 import java.security.AccessControlException;
 import java.security.Policy;