Skip to content

Commit

Permalink
Applied temporary workaround for gradle/gradle#23995
Browse files Browse the repository at this point in the history
Signed-off-by: Andriy Redko <[email protected]>
  • Loading branch information
reta committed Mar 3, 2023
1 parent fbd618e commit 30d7bb9
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 2 deletions.
7 changes: 6 additions & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
*/

import java.nio.file.Files
import org.gradle.api.internal.tasks.testing.junitplatform.JUnitPlatformTestFramework

plugins {
id 'java'
Expand Down Expand Up @@ -84,12 +85,14 @@ dependencies {
def guiceVersion = "5.1.0"
def junit4Version = "4.13.2"
def junit5Version = "5.9.2"
def junitPlatform = "1.9.2"
def jaxbVersion = "2.3.1"
def requireJavadocVersion = "1.0.6"

implementation("org.opensearch:opensearch:${opensearchVersion}")
implementation("org.apache.logging.log4j:log4j-api:${log4jVersion}")
implementation("org.apache.logging.log4j:log4j-core:${log4jVersion}")
implementation("org.apache.logging.log4j:log4j-jul:${log4jVersion}")
implementation("org.opensearch.client:opensearch-rest-high-level-client:${opensearchVersion}")
implementation("org.opensearch.client:opensearch-rest-client:${opensearchVersion}")
implementation("org.opensearch.client:opensearch-java:${opensearchVersion}")
Expand All @@ -113,6 +116,7 @@ dependencies {
testImplementation("org.junit.jupiter:junit-jupiter-api:${junit5Version}")
testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:${junit5Version}")
testImplementation("org.opensearch.test:framework:${opensearchVersion}")
testRuntimeOnly("org.junit.platform:junit-platform-launcher:${junitPlatform}")
requireJavadoc("org.plumelib:require-javadoc:${requireJavadocVersion}")
}

Expand Down Expand Up @@ -150,7 +154,8 @@ task helloWorld(type: JavaExec) {
}

test {
useJUnitPlatform()
// Temporary workaround for https://github.com/gradle/gradle/issues/23995
getTestFrameworkProperty().convention(getProviderFactory().provider(() -> new JUnitPlatformTestFramework(it.getFilter(), false)))
jvmArgs '--enable-preview'
systemProperty 'tests.security.manager', 'false'
testLogging {
Expand Down
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.0.1-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.0.2-bin.zip
networkTimeout=10000
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists

0 comments on commit 30d7bb9

Please sign in to comment.