Harmonize Maven build to use containers

Closes gh-996
This commit is contained in:
Stephane Nicoll
2019-09-04 16:37:02 +02:00
parent 04a78a94d6
commit 88f986b7c1
8 changed files with 159 additions and 123 deletions

View File

@@ -29,7 +29,7 @@ class GroovyMavenBuildCustomizer implements BuildCustomizer<MavenBuild> {
@Override
public void customize(MavenBuild build) {
build.plugins().add("org.codehaus.gmavenplus", "gmavenplus-plugin", (groovyMavenPlugin) -> {
groovyMavenPlugin.setVersion("1.6.3");
groovyMavenPlugin.version("1.6.3");
groovyMavenPlugin.execution(null,
(execution) -> execution.goal("addSources").goal("addTestSources").goal("generateStubs")
.goal("compile").goal("generateTestStubs").goal("compileTests").goal("removeStubs")

View File

@@ -39,7 +39,7 @@ class KotlinMavenFullBuildCustomizer implements BuildCustomizer<MavenBuild> {
build.settings().sourceDirectory("${project.basedir}/src/main/kotlin")
.testSourceDirectory("${project.basedir}/src/test/kotlin");
build.plugins().add("org.jetbrains.kotlin", "kotlin-maven-plugin", (kotlinMavenPlugin) -> {
kotlinMavenPlugin.setVersion("${kotlin.version}");
kotlinMavenPlugin.version("${kotlin.version}");
kotlinMavenPlugin.configuration((configuration) -> {
configuration.configure("args",
(args) -> this.settings.getCompilerArgs().forEach((arg) -> args.add("arg", arg)));