diff --git a/Kotlin.iml b/Kotlin.iml
index 4278f5e1940..e54fb89ad69 100644
--- a/Kotlin.iml
+++ b/Kotlin.iml
@@ -40,6 +40,7 @@
+
diff --git a/compiler/tests/org/jetbrains/kotlin/parsing/JetCodeConformanceTest.java b/compiler/tests/org/jetbrains/kotlin/parsing/JetCodeConformanceTest.java
index 10f0e887c81..fd4a81063ca 100644
--- a/compiler/tests/org/jetbrains/kotlin/parsing/JetCodeConformanceTest.java
+++ b/compiler/tests/org/jetbrains/kotlin/parsing/JetCodeConformanceTest.java
@@ -37,7 +37,7 @@ public class JetCodeConformanceTest extends TestCase {
private static final List EXCLUDED_FILES_AND_DIRS = Arrays.asList(
new File("android.tests.dependencies"),
new File("core/reflection.jvm/src/kotlin/reflect/jvm/internal/pcollections"),
- new File("libraries/tools/runtime/target/copied-sources"),
+ new File("libraries/tools/kotlin-reflect/target/copied-sources"),
new File("dependencies"),
new File("js/js.translator/qunit/qunit.js"),
new File("libraries/tools/kotlin-js-tests/src/test/web/qunit.js"),
@@ -47,7 +47,8 @@ public class JetCodeConformanceTest extends TestCase {
new File("ideaSDK"),
new File("libraries/tools/kotlin-gradle-plugin-core/gradle_api_jar/build/tmp"),
new File("compiler/testData/psi/kdoc"),
- new File("compiler/tests/org/jetbrains/kotlin/parsing/JetCodeConformanceTest.java"));
+ new File("compiler/tests/org/jetbrains/kotlin/parsing/JetCodeConformanceTest.java")
+ );
public static final Pattern AUTHOR_JAVADOC_PATTERN = Pattern.compile("/\\*.+@author.+\\*/", Pattern.DOTALL);
public void testParserCode() throws Exception {
@@ -73,7 +74,7 @@ public class JetCodeConformanceTest extends TestCase {
});
if (!filesWithAuthorJavadoc.isEmpty()) {
- fail(String.format("%d source files contain @author javadoc tag. Please remove them:\n%s",
+ fail(String.format("%d source files contain @author javadoc tag. Please remove them or exclude in this test:\n%s",
filesWithAuthorJavadoc.size(), StringUtil.join(filesWithAuthorJavadoc, "\n")));
}
}
diff --git a/libraries/pom.xml b/libraries/pom.xml
index d2cb17df171..cac8c027cd5 100644
--- a/libraries/pom.xml
+++ b/libraries/pom.xml
@@ -77,7 +77,13 @@
tools/kotlin-compiler
tools/kotlin-jdk-annotations
tools/kotlin-android-sdk-annotations
+ tools/kotlin-maven-plugin
+
tools/runtime
+ stdlib
+ stdlib/validator
+ tools/kotlin-reflect
+
@@ -86,16 +92,12 @@
tools/kotlin-gradle-plugin-core
tools/kotlin-gradle-plugin-api
tools/kotlin-android-compiler-plugin
- tools/kotlin-maven-plugin
tools/kotlin-maven-plugin-test
tools/kotlin-js-tests
tools/kotlin-js-tests-junit
tools/kdoc
tools/kdoc-maven-plugin
- stdlib
- stdlib/validator
-
kunit
kotlin-jdbc
kotlin-swing
diff --git a/libraries/tools/kotlin-reflect/pom.xml b/libraries/tools/kotlin-reflect/pom.xml
new file mode 100644
index 00000000000..5267871b1e0
--- /dev/null
+++ b/libraries/tools/kotlin-reflect/pom.xml
@@ -0,0 +1,71 @@
+
+
+
+ 4.0.0
+
+
+ org.jetbrains.kotlin
+ kotlin-project
+ 0.1-SNAPSHOT
+ ../../pom.xml
+
+
+ kotlin-reflect
+ jar
+
+
+
+ org.jetbrains.kotlin
+ kotlin-stdlib
+ ${project.version}
+
+
+
+
+ target/copied-sources
+
+
+
+ org.apache.maven.plugins
+ maven-antrun-plugin
+ 1.7
+
+
+
+ copy-sources
+ process-sources
+
+
+
+
+
+
+
+
+
+ run
+
+
+
+
+
+
+ org.jetbrains.kotlin
+ kotlin-maven-plugin
+ ${project.version}
+
+
+
+ compile
+ process-sources
+
+ compile
+
+
+
+
+
+
+
diff --git a/libraries/tools/runtime/pom.xml b/libraries/tools/runtime/pom.xml
index 7fde7c6a810..e8b7800415c 100644
--- a/libraries/tools/runtime/pom.xml
+++ b/libraries/tools/runtime/pom.xml
@@ -35,7 +35,6 @@
-