diff --git a/examples/maven/hello-world/pom.xml b/examples/maven/hello-world/pom.xml index 3d52d2af70e..7e742bdd27b 100644 --- a/examples/maven/hello-world/pom.xml +++ b/examples/maven/hello-world/pom.xml @@ -1,95 +1,95 @@ - - - - 4.0.0 - - org.jetbrains.kotlin.examples - hello-world - 1.0-SNAPSHOT - - - 0.1-SNAPSHOT - 4.10 - - UTF-8 - - - - - org.jetbrains.kotlin - kotlin-stdlib - ${kotlin.version} - - - - junit - junit - ${junit.version} - test - - - - - ${project.basedir}/src/main/kotlin - ${project.basedir}/src/test/kotlin - - - - kotlin-maven-plugin - org.jetbrains.kotlin - ${kotlin.version} - - - - - compile - compile - - compile - - - - test-compile - test-compile - - test-compile - - - - - - org.codehaus.mojo - exec-maven-plugin - 1.2.1 - - - test - - java - - - - - hello.namespace - - - - - - - - jetbrains-all - http://repository.jetbrains.com/all - - - - - - jetbrains-all - http://repository.jetbrains.com/all - - - - + + + + 4.0.0 + + org.jetbrains.kotlin.examples + hello-world + 1.0-SNAPSHOT + + + 0.1-SNAPSHOT + 4.10 + + UTF-8 + + + + + org.jetbrains.kotlin + kotlin-stdlib + ${kotlin.version} + + + + junit + junit + ${junit.version} + test + + + + + ${project.basedir}/src/main/kotlin + ${project.basedir}/src/test/kotlin + + + + kotlin-maven-plugin + org.jetbrains.kotlin + ${kotlin.version} + + + + + compile + compile + + compile + + + + test-compile + test-compile + + test-compile + + + + + + org.codehaus.mojo + exec-maven-plugin + 1.2.1 + + + test + + java + + + + + hello.HelloPackage + + + + + + + + jetbrains-all + http://repository.jetbrains.com/all + + + + + + jetbrains-all + http://repository.jetbrains.com/all + + + + diff --git a/examples/maven/mixed-code-hello-world/pom.xml b/examples/maven/mixed-code-hello-world/pom.xml index 21e0939119f..42dedd97203 100644 --- a/examples/maven/mixed-code-hello-world/pom.xml +++ b/examples/maven/mixed-code-hello-world/pom.xml @@ -1,76 +1,76 @@ - - - - 4.0.0 - - org.jetbrains.kotlin.examples - mixed-code-hello-world - 1.0-SNAPSHOT - - - 0.1-SNAPSHOT - 4.10 - - UTF-8 - - - - - org.jetbrains.kotlin - kotlin-stdlib - ${kotlin.version} - - - - junit - junit - ${junit.version} - test - - - - - - - kotlin-maven-plugin - org.jetbrains.kotlin - ${kotlin.version} - - - - - compile - process-sources - - compile - - - - test-compile - process-test-sources - - test-compile - - - - - - - - - - jetbrains-all - http://repository.jetbrains.com/all - - - - - - jetbrains-all - http://repository.jetbrains.com/all - - - - + + + + 4.0.0 + + org.jetbrains.kotlin.examples + mixed-code-hello-world + 1.0-SNAPSHOT + + + 0.1-SNAPSHOT + 4.10 + + UTF-8 + + + + + org.jetbrains.kotlin + kotlin-stdlib + ${kotlin.version} + + + + junit + junit + ${junit.version} + test + + + + + + + kotlin-maven-plugin + org.jetbrains.kotlin + ${kotlin.version} + + + + + compile + process-sources + + compile + + + + test-compile + process-test-sources + + test-compile + + + + + + + + + + jetbrains-all + http://repository.jetbrains.com/all + + + + + + jetbrains-all + http://repository.jetbrains.com/all + + + + diff --git a/examples/maven/mixed-code-hello-world/src/main/java/hello/JavaHello.java b/examples/maven/mixed-code-hello-world/src/main/java/hello/JavaHello.java index 69d31dd58f7..558ab54fabe 100644 --- a/examples/maven/mixed-code-hello-world/src/main/java/hello/JavaHello.java +++ b/examples/maven/mixed-code-hello-world/src/main/java/hello/JavaHello.java @@ -4,11 +4,11 @@ public class JavaHello { public static String JavaHelloString = "Hello from Java!"; public static String getHelloStringFromKotlin() { - return namespace.KotlinHelloString; + return HelloPackage.KotlinHelloString; } public static void main(String[] args) { System.out.println(getHelloStringFromKotlin()); - System.out.println(namespace.getHelloStringFromJava()); + System.out.println(HelloPackage.getHelloStringFromJava()); } } diff --git a/examples/maven/mixed-code-hello-world/src/test/java/hello/tests/HelloTest.java b/examples/maven/mixed-code-hello-world/src/test/java/hello/tests/HelloTest.java index 9ac15d47763..8e92a6bfbe8 100644 --- a/examples/maven/mixed-code-hello-world/src/test/java/hello/tests/HelloTest.java +++ b/examples/maven/mixed-code-hello-world/src/test/java/hello/tests/HelloTest.java @@ -6,8 +6,8 @@ import junit.framework.TestCase; public class HelloTest extends TestCase { public void testAssert() { assertEquals("Hello from Kotlin!", JavaHello.getHelloStringFromKotlin()); - assertEquals("Hello from Java!", hello.namespace.getHelloStringFromJava()); + assertEquals("Hello from Java!", hello.HelloPackage.getHelloStringFromJava()); - System.out.println(hello.namespace.getHelloStringFromJava()); + System.out.println(hello.HelloPackage.getHelloStringFromJava()); } }