File tree 2 files changed +11
-3
lines changed
buildSrc/src/main/groovy/org/elasticsearch/gradle
server/src/main/resources/org/elasticsearch/bootstrap
2 files changed +11
-3
lines changed Original file line number Diff line number Diff line change @@ -105,8 +105,6 @@ class BuildPlugin implements Plugin<Project> {
105
105
configureDependenciesInfo(project)
106
106
}
107
107
108
- <<<<<< < HEAD
109
- ====== =
110
108
static void setupSeed (Project project ) {
111
109
if (project. rootProject. ext. has(' testSeed' )) {
112
110
/* Skip this if we've already pinned the testSeed. It is important
@@ -126,7 +124,6 @@ class BuildPlugin implements Plugin<Project> {
126
124
project. ext. testSeed = testSeed
127
125
}
128
126
}
129
- >>>>>>> Remove randomizedtesting plugin #31496
130
127
131
128
/* * Performs checks on the build environment and prints information about the build environment. */
132
129
static void globalBuildInfo (Project project ) {
@@ -846,6 +843,8 @@ class BuildPlugin implements Plugin<Project> {
846
843
} else {
847
844
systemProperty ' runtime.java' , project. ext. runtimeJavaVersion. getMajorVersion()
848
845
}
846
+ // TODO: equivalent for idea
847
+ systemProperty " gradle.user.home" , project. gradle. gradleUserHomeDir
849
848
// TODO: remove setting logging level via system property
850
849
systemProperty ' tests.logger.level' , ' WARN'
851
850
for (Map.Entry < String , String > property : System . properties. entrySet()) {
Original file line number Diff line number Diff line change @@ -86,3 +86,12 @@ grant codeBase "${codebase.httpasyncclient}" {
86
86
// rest client uses system properties which gets the default proxy
87
87
permission java.net.NetPermission "getProxySelector";
88
88
};
89
+
90
+ grant codeBase "file:${gradle.user.home}/-" {
91
+ permission java.security.AllPermission;
92
+ };
93
+
94
+ grant codeBase "file:~/.gradle/caches/-" {
95
+ permission java.security.AllPermission;
96
+ };
97
+
You can’t perform that action at this time.
0 commit comments