diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 3a886611e1246..78b21a5886dca 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -298,6 +298,7 @@ stages: - tika - hibernate-validator - test-extension + - gradle name: misc_2 - template: ci-templates/native-build-steps.yaml diff --git a/devtools/maven/src/main/java/io/quarkus/maven/CreateProjectMojo.java b/devtools/maven/src/main/java/io/quarkus/maven/CreateProjectMojo.java index 230437d43a989..eb737f0527a71 100644 --- a/devtools/maven/src/main/java/io/quarkus/maven/CreateProjectMojo.java +++ b/devtools/maven/src/main/java/io/quarkus/maven/CreateProjectMojo.java @@ -16,6 +16,7 @@ import java.io.File; import java.io.IOException; import java.nio.file.Files; +import java.util.ArrayList; import java.util.Arrays; import java.util.HashMap; import java.util.List; @@ -245,12 +246,17 @@ public void execute() throws MojoExecutionException { private void createGradleWrapper(File projectDirectory) { try { - String gradleName = IS_WINDOWS ? "gradle.bat" : "gradle"; - ProcessBuilder pb = new ProcessBuilder(gradleName, "wrapper", - "--gradle-version=" + MojoUtils.getGradleWrapperVersion()).directory(projectDirectory) - .inheritIO(); + List arguments = new ArrayList<>(); + arguments.add(IS_WINDOWS ? "gradle.bat" : "gradle"); + arguments.add("wrapper"); + arguments.add("--gradle-version=" + MojoUtils.getGradleWrapperVersion()); + // CI sets a different maven.repo.local + if (System.getenv("MAVEN_OPTS") != null) { + arguments.add(System.getenv("MAVEN_OPTS")); + } + ProcessBuilder pb = new ProcessBuilder(arguments).directory(projectDirectory) + .inheritIO(); Process x = pb.start(); - x.waitFor(); if (x.exitValue() != 0) { diff --git a/integration-tests/gradle/pom.xml b/integration-tests/gradle/pom.xml new file mode 100644 index 0000000000000..0dc1d057ca507 --- /dev/null +++ b/integration-tests/gradle/pom.xml @@ -0,0 +1,160 @@ + + + 4.0.0 + + + io.quarkus + quarkus-build-parent + 999-SNAPSHOT + ../../build-parent/pom.xml + + + quarkus-integration-test-gradle-plugin + pom + Quarkus - Integration Tests - Gradle Plugin + Module that contains Gradle plugin related tests + + + ${project.build.directory}/foo + ${gradle.project.directory}/gradlew + ${skipTests} + + + + + + io.quarkus + quarkus-gradle-plugin + ${project.version} + provided + + + + io.quarkus + quarkus-resteasy-deployment + + + + + + + + maven-clean-plugin + + + clean-temp-project + generate-sources + + clean + + + + + + + io.quarkus + quarkus-maven-plugin + + + generate-gradle-project + + create + + generate-sources + + org.acme + foo + org.acme.quickstart.GreetingResource + /hello + resteasy + gradle + ${project.build.directory} + + + + + + io.quarkus + quarkus-gradle-plugin + ${project.version} + + + + + org.codehaus.mojo + exec-maven-plugin + + + gradle-test + test + + ${gradle.executable} + ${gradle.project.directory} + + test + -S + ${env.MAVEN_OPTS} + + ${skip.gradle.build} + + + exec + + + + + + + + + + windows + + + windows + + + + ${gradle.project.directory}\gradlew.bat + + + + native-image + + + native + + + + + + org.codehaus.mojo + exec-maven-plugin + + + run-native-integration-test + integration-test + + ${gradle.executable} + ${gradle.project.directory} + + buildNative + --docker-build=true + testNative + -S + ${env.MAVEN_OPTS} + + ${skip.gradle.build} + + + exec + + + + + + + + + \ No newline at end of file diff --git a/integration-tests/pom.xml b/integration-tests/pom.xml index 71c6f558fb1b4..a21b2a274aed8 100644 --- a/integration-tests/pom.xml +++ b/integration-tests/pom.xml @@ -52,6 +52,7 @@ elytron-resteasy elytron-undertow flyway + gradle oidc oidc-code-flow keycloak-authorization