File tree Expand file tree Collapse file tree 2 files changed +3
-17
lines changed
buildSrc/src/main/java/org/opensearch/gradle Expand file tree Collapse file tree 2 files changed +3
-17
lines changed Original file line number Diff line number Diff line change @@ -174,10 +174,7 @@ public static void configureCompile(Project project) {
174174 // workaround for https://github.com/gradle/gradle/issues/14141
175175 compileTask .getConventionMapping ().map ("sourceCompatibility" , () -> java .getSourceCompatibility ().toString ());
176176 compileTask .getConventionMapping ().map ("targetCompatibility" , () -> java .getTargetCompatibility ().toString ());
177- // The '--release is available from JDK-9 and above
178- if (BuildParams .getRuntimeJavaVersion ().compareTo (JavaVersion .VERSION_1_8 ) > 0 ) {
179- compileOptions .getRelease ().set (releaseVersionProviderFromCompileTask (project , compileTask ));
180- }
177+ compileOptions .getRelease ().set (releaseVersionProviderFromCompileTask (project , compileTask ));
181178 });
182179 // also apply release flag to groovy, which is used in build-tools
183180 project .getTasks ().withType (GroovyCompile .class ).configureEach (compileTask -> {
@@ -271,9 +268,7 @@ private static void configureJavadoc(Project project) {
271268 * that the default will change to html5 in the future.
272269 */
273270 CoreJavadocOptions javadocOptions = (CoreJavadocOptions ) javadoc .getOptions ();
274- if (BuildParams .getRuntimeJavaVersion ().compareTo (JavaVersion .VERSION_1_8 ) > 0 ) {
275- javadocOptions .addBooleanOption ("html5" , true );
276- }
271+ javadocOptions .addBooleanOption ("html5" , true );
277272 });
278273
279274 TaskProvider <Javadoc > javadoc = project .getTasks ().withType (Javadoc .class ).named ("javadoc" );
Original file line number Diff line number Diff line change 4040import org .opensearch .gradle .test .ErrorReportingTestListener ;
4141import org .opensearch .gradle .util .Util ;
4242import org .gradle .api .Action ;
43- import org .gradle .api .JavaVersion ;
4443import org .gradle .api .Plugin ;
4544import org .gradle .api .Project ;
4645import org .gradle .api .Task ;
@@ -106,15 +105,7 @@ public void execute(Task t) {
106105 mkdirs (test .getWorkingDir ());
107106 mkdirs (test .getWorkingDir ().toPath ().resolve ("temp" ).toFile ());
108107
109- // TODO remove once jvm.options are added to test system properties
110- if (BuildParams .getRuntimeJavaVersion () == JavaVersion .VERSION_1_8 ) {
111- test .systemProperty ("java.locale.providers" , "SPI,JRE" );
112- } else {
113- test .systemProperty ("java.locale.providers" , "SPI,CLDR" );
114- if (test .getJavaVersion ().compareTo (JavaVersion .VERSION_17 ) < 0 ) {
115- test .jvmArgs ("--illegal-access=warn" );
116- }
117- }
108+ test .systemProperty ("java.locale.providers" , "SPI,CLDR" );
118109 }
119110 });
120111 test .getJvmArgumentProviders ().add (nonInputProperties );
You can’t perform that action at this time.
0 commit comments