From 7ab2a2c1819c2d88627fa78c8ca0787855cbd2bd Mon Sep 17 00:00:00 2001 From: Loredana Crusoveanu Date: Wed, 11 Jul 2018 22:28:11 +0300 Subject: [PATCH] moven kotlin-maven project --- .../baeldung/mavenjavakotlin/Application.java | 0 .../mavenjavakotlin/services/JavaService.java | 0 .../mavenjavakotlin/services/KotlinService.kt | 0 maven-java-kotlin/pom.xml | 96 ------------------- pom.xml | 1 - 5 files changed, 97 deletions(-) rename {maven-java-kotlin => core-kotlin}/src/main/java/com/baeldung/mavenjavakotlin/Application.java (100%) rename {maven-java-kotlin => core-kotlin}/src/main/java/com/baeldung/mavenjavakotlin/services/JavaService.java (100%) rename {maven-java-kotlin => core-kotlin}/src/main/kotlin/com/baeldung/mavenjavakotlin/services/KotlinService.kt (100%) delete mode 100644 maven-java-kotlin/pom.xml diff --git a/maven-java-kotlin/src/main/java/com/baeldung/mavenjavakotlin/Application.java b/core-kotlin/src/main/java/com/baeldung/mavenjavakotlin/Application.java similarity index 100% rename from maven-java-kotlin/src/main/java/com/baeldung/mavenjavakotlin/Application.java rename to core-kotlin/src/main/java/com/baeldung/mavenjavakotlin/Application.java diff --git a/maven-java-kotlin/src/main/java/com/baeldung/mavenjavakotlin/services/JavaService.java b/core-kotlin/src/main/java/com/baeldung/mavenjavakotlin/services/JavaService.java similarity index 100% rename from maven-java-kotlin/src/main/java/com/baeldung/mavenjavakotlin/services/JavaService.java rename to core-kotlin/src/main/java/com/baeldung/mavenjavakotlin/services/JavaService.java diff --git a/maven-java-kotlin/src/main/kotlin/com/baeldung/mavenjavakotlin/services/KotlinService.kt b/core-kotlin/src/main/kotlin/com/baeldung/mavenjavakotlin/services/KotlinService.kt similarity index 100% rename from maven-java-kotlin/src/main/kotlin/com/baeldung/mavenjavakotlin/services/KotlinService.kt rename to core-kotlin/src/main/kotlin/com/baeldung/mavenjavakotlin/services/KotlinService.kt diff --git a/maven-java-kotlin/pom.xml b/maven-java-kotlin/pom.xml deleted file mode 100644 index c4011ec884..0000000000 --- a/maven-java-kotlin/pom.xml +++ /dev/null @@ -1,96 +0,0 @@ - - - - parent-modules - com.baeldung - 1.0.0-SNAPSHOT - - 4.0.0 - - maven-java-kotlin - jar - - - 1.8 - 1.2.51 - - - - - org.jetbrains.kotlin - kotlin-stdlib-jdk8 - ${kotlin.version} - - - - - - - kotlin-maven-plugin - org.jetbrains.kotlin - ${kotlin.version} - - - compile - - compile - - - - ${project.basedir}/src/main/kotlin - ${project.basedir}/src/main/java - - - - - test-compile - - test-compile - - - - ${project.basedir}/src/test/kotlin - ${project.basedir}/src/test/java - - - - - - - org.apache.maven.plugins - maven-compiler-plugin - 3.1 - - ${java.version} - ${java.version} - - - - default-compile - none - - - default-testCompile - none - - - java-compile - compile - - compile - - - - java-test-compile - test-compile - - testCompile - - - - - - - \ No newline at end of file diff --git a/pom.xml b/pom.xml index d6c440a194..5321ec751e 100644 --- a/pom.xml +++ b/pom.xml @@ -270,7 +270,6 @@ spring-webflux-amqp antlr maven-archetype - maven-java-kotlin apache-meecrowave