diff --git a/kotlin-runtime/scaffolding/ftl-module-{{ .Name | lower }}/pom.xml b/kotlin-runtime/scaffolding/ftl-module-{{ .Name | lower }}/pom.xml index de80aa3c16..76bbd57d2c 100644 --- a/kotlin-runtime/scaffolding/ftl-module-{{ .Name | lower }}/pom.xml +++ b/kotlin-runtime/scaffolding/ftl-module-{{ .Name | lower }}/pom.xml @@ -6,4 +6,37 @@ ftl ftl-module-{{ .Name | camel | lower }} 1.0-SNAPSHOT + + {{ .GroupID }} + {{ .ArtifactID }} + 1.0-SNAPSHOT + + + + + + kotlin-maven-plugin + org.jetbrains.kotlin + + + org.apache.maven.plugins + maven-dependency-plugin + + + + org.codehaus.mojo + exec-maven-plugin + + + + org.codehaus.mojo + build-helper-maven-plugin + + + + com.github.ozsie + detekt-maven-plugin + + + \ No newline at end of file diff --git a/kotlin-runtime/scaffolding/pom.xml b/kotlin-runtime/scaffolding/pom.xml index 42d0dd3d5d..f7dfe6ddf9 100644 --- a/kotlin-runtime/scaffolding/pom.xml +++ b/kotlin-runtime/scaffolding/pom.xml @@ -37,168 +37,164 @@ - - - kotlin-maven-plugin - org.jetbrains.kotlin - ${kotlin.version} - - - compile - - compile - - - - ${project.basedir}/src/main/kotlin - - - - - test-compile - - test-compile - - - - ${project.basedir}/src/test/kotlin - - - - - - - org.apache.maven.plugins - maven-dependency-plugin - 3.2.0 - - - - initialize - - copy - - - - - xyz.block - ftl-generator - ${ftl.version} - jar-with-dependencies - ftl-generator.jar - - - xyz.block - ftl-runtime - ${ftl.version} - ftl-runtime.jar - - - - - - - copy-dependencies - compile - - copy-dependencies - - - ${project.build.directory}/dependency - runtime - - - - - build-classpath - compile - - build-classpath - - - ${project.build.directory}/classpath.txt - generated.classpath - ${project.build.directory}/dependency - - - - - - - org.codehaus.mojo - exec-maven-plugin - 3.0.0 - - - initialize - - exec - - - java - - -jar - target/dependency/ftl-generator.jar - --endpoint=http://127.0.0.1:8892 - --dest=${project.build.directory} - --module={{ .Name | camel | lower }} - --module-client-suffix=ModuleClient - - - - - - - - org.codehaus.mojo - build-helper-maven-plugin - 3.2.0 - - - generate-sources - - add-source - - - - ${project.build.directory}/generated-sources/ftl - - - - - - - com.github.ozsie - detekt-maven-plugin - 1.23.3 - - true - ${generated.classpath} - ${java.version} - ${project.build.directory}/detekt.yml - - - ${project.build.directory}/dependency/ftl-runtime-${ftl.version}.jar - - - ${project.basedir} - - - - compile - - check-with-type-resolution - - - - - - xyz.block - ftl-runtime - ${ftl.version} - - - - + + + + kotlin-maven-plugin + org.jetbrains.kotlin + ${kotlin.version} + + + compile + + compile + + + + ${project.basedir}/src/main/kotlin + + + + + test-compile + + test-compile + + + + ${project.basedir}/src/test/kotlin + + + + + + + org.apache.maven.plugins + maven-dependency-plugin + 3.2.0 + + + + initialize + + copy + + + + + xyz.block + ftl-generator + ${ftl.version} + jar-with-dependencies + ftl-generator.jar + + + + + + + copy-dependencies + compile + + copy-dependencies + + + ${project.build.directory}/dependency + runtime + + + + + build-classpath + compile + + build-classpath + + + ${project.build.directory}/classpath.txt + generated.classpath + ${project.build.directory}/dependency + + + + + + + org.codehaus.mojo + exec-maven-plugin + 3.0.0 + + + initialize + + exec + + + java + + -jar + target/dependency/ftl-generator.jar + --endpoint=http://127.0.0.1:8892 + --dest=${project.build.directory} + --module={{ .Name | camel | lower }} + --module-client-suffix=ModuleClient + + + + + + + + org.codehaus.mojo + build-helper-maven-plugin + 3.2.0 + + + generate-sources + + add-source + + + + ${project.build.directory}/generated-sources/ftl + + + + + + + com.github.ozsie + detekt-maven-plugin + 1.23.3 + + true + ${generated.classpath} + ${java.version} + ${project.build.directory}/detekt.yml + + + ${project.build.directory}/dependency/ftl-runtime-${ftl.version}.jar + + + ${project.basedir} + + + + compile + + check-with-type-resolution + + + + + + xyz.block + ftl-runtime + ${ftl.version} + + + + + \ No newline at end of file diff --git a/scripts/integration-tests b/scripts/integration-tests index dee5eff0ee..9b67aeaeef 100755 --- a/scripts/integration-tests +++ b/scripts/integration-tests @@ -61,7 +61,7 @@ deploy_fresh_kotlin() ( info "Deploying newly initialised Kotlin module" rm -rf build/echo2 ftl init kotlin -n echo2 build/echo2 - cd build/echo2 + cd build/echo2/ftl-module-echo2 mvn compile ftl deploy target )