Browse Source

Update .backportrc.json

Mark Vieira 4 years ago
parent
commit
75d8079c37
2 changed files with 14 additions and 2 deletions
  1. 2 1
      .backportrc.json
  2. 12 1
      build-tools-internal/src/main/groovy/elasticsearch.ide.gradle

+ 2 - 1
.backportrc.json

@@ -3,13 +3,14 @@
   "targetBranchChoices": [
     { "name": "master", "checked": true },
     { "name": "7.x", "checked": true },
+    "7.14",
     "7.13",
     "6.8"
   ],
   "targetPRLabels": ["backport"],
   "branchLabelMapping": {
     "^v8.0.0$": "master",
-    "^v7.14.0$": "7.x",
+    "^v7.15.0$": "7.x",
     "^v(\\d+).(\\d+).\\d+$": "$1.$2"
   }
 }

+ 12 - 1
build-tools-internal/src/main/groovy/elasticsearch.ide.gradle

@@ -118,7 +118,18 @@ if (System.getProperty('idea.active') == 'true') {
         }
         runConfigurations {
           defaults(JUnit) {
-            vmParameters = '-ea -Djava.locale.providers=SPI,COMPAT'
+            vmParameters = [
+              '-ea',
+              '-Djava.locale.providers=SPI,COMPAT',
+              "--illegal-access=deny",
+              // TODO: only open these for mockito when it is modularized
+              '--add-opens=java.base/java.security.cert=ALL-UNNAMED',
+              '--add-opens=java.base/java.nio.channels=ALL-UNNAMED',
+              '--add-opens=java.base/java.net=ALL-UNNAMED',
+              '--add-opens=java.base/javax.net.ssl=ALL-UNNAMED',
+              '--add-opens=java.base/java.nio.file=ALL-UNNAMED',
+              '--add-opens=java.base/java.time=ALL-UNNAMED'
+            ].join(' ')
           }
         }
         copyright {