Skip to content

Commit

Permalink
Enable gradle modules on JDK 16 build
Browse files Browse the repository at this point in the history
  • Loading branch information
glefloch committed May 10, 2021
1 parent 659c043 commit a672589
Show file tree
Hide file tree
Showing 3 changed files with 1 addition and 10 deletions.
3 changes: 1 addition & 2 deletions .github/workflows/jdk-early-access-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -70,10 +70,9 @@ jobs:
- name: Build with Maven
# -fae to try to gather as many failures as possible
# (but not maven.test.failure.ignore because test report generation is buggy)
# Gradle bits are excluded due to https://github.com/gradle/gradle/issues/13481
# descriptor-tests (integration-tests/maven) are disabled due to https://github.com/quarkusio/quarkus/issues/16862 (and/or 16806)
run: |
./mvnw $JVM_TEST_MAVEN_OPTS -Dtcks install -fae -pl '!devtools/gradle' -pl '!integration-tests/gradle' -Dno-descriptor-tests
./mvnw $JVM_TEST_MAVEN_OPTS -Dtcks install -fae -Dno-descriptor-tests
# Test reports disabled due to: https://github.com/ScaCap/action-surefire-report/issues/39
#- name: Publish Test Report
# if: always()
Expand Down
4 changes: 0 additions & 4 deletions devtools/cli/src/test/java/io/quarkus/cli/CliTest.java
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Tag;
import org.junit.jupiter.api.Test;

import io.quarkus.cli.core.ExecuteUtil;
Expand Down Expand Up @@ -158,7 +157,6 @@ public void testAddListRemove() throws Exception {
}

@Test
@Tag("failsOnJDK16")
public void testGradleAddListRemove() throws Exception {
// Gradle list command cannot be screen captured with the current implementation
// so I will just test good return values
Expand Down Expand Up @@ -285,7 +283,6 @@ public void testCreateWithAppConfig() throws Exception {
}

@Test
@Tag("failsOnJDK16")
public void testCreateGradleDefaults() throws Exception {
Path project = workspace.resolve("code-with-quarkus");

Expand All @@ -305,7 +302,6 @@ public void testCreateGradleDefaults() throws Exception {
}

@Test
@Tag("failsOnJDK16")
public void testGradleBuild() throws Exception {

execute("create", "--gradle", "resteasy");
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,6 @@ public void testRunTogetherCodestartsJava() throws Exception {
}

@Test
@org.junit.jupiter.api.Tag("failsOnJDK16")
public void testRunTogetherCodestartsKotlin() throws Exception {
generateProjectRunTests("maven", "kotlin", getExtensionCodestarts(), Collections.emptyMap());
}
Expand All @@ -69,15 +68,13 @@ public void testRunTogetherCodestartsScala() throws Exception {

@ParameterizedTest
@MethodSource("provideLanguages")
@org.junit.jupiter.api.Tag("failsOnJDK16")
public void testGradle(String language) throws Exception {
final List<String> codestarts = getExtensionCodestarts();
generateProjectRunTests("gradle", language, codestarts, Collections.emptyMap());
}

@ParameterizedTest
@MethodSource("provideLanguages")
@org.junit.jupiter.api.Tag("failsOnJDK16")
public void testGradleKotlinDSL(String language) throws Exception {
final List<String> codestarts = getExtensionCodestarts();
generateProjectRunTests("gradle-kotlin-dsl", language, codestarts, Collections.emptyMap());
Expand All @@ -91,7 +88,6 @@ public void testRunAloneCodestartsJava(String codestart) throws Exception {

@ParameterizedTest
@MethodSource("provideRunAloneCodestarts")
@org.junit.jupiter.api.Tag("failsOnJDK16")
public void testRunAloneCodestartsKotlin(String codestart) throws Exception {
generateProjectRunTests("maven", "kotlin", singletonList(codestart), Collections.emptyMap());
}
Expand Down

0 comments on commit a672589

Please sign in to comment.