diff --git a/libraries/kdoc/pom.xml b/libraries/kdoc/pom.xml
index c65bfbeb064..fb728b55e13 100644
--- a/libraries/kdoc/pom.xml
+++ b/libraries/kdoc/pom.xml
@@ -19,12 +19,6 @@
             <artifactId>pegdown</artifactId>
             <version>${pegdown.version}</version>
         </dependency>
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>${junit-version}</version>
-            <scope>test</scope>
-        </dependency>
     </dependencies>
 
     <build>
diff --git a/libraries/kotlin-java/pom.xml b/libraries/kotlin-java/pom.xml
index 644a2f2fa79..9f9ba9abab5 100644
--- a/libraries/kotlin-java/pom.xml
+++ b/libraries/kotlin-java/pom.xml
@@ -19,13 +19,6 @@
             <artifactId>stdlib</artifactId>
             <version>${project.version}</version>
         </dependency>
-
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>${junit-version}</version>
-            <scope>test</scope>
-        </dependency>
     </dependencies>
 
     <build>
diff --git a/libraries/kotlin-jdbc/pom.xml b/libraries/kotlin-jdbc/pom.xml
index f8ebd621179..8c32a688f9e 100644
--- a/libraries/kotlin-jdbc/pom.xml
+++ b/libraries/kotlin-jdbc/pom.xml
@@ -19,19 +19,12 @@
             <artifactId>stdlib</artifactId>
             <version>${project.version}</version>
         </dependency>
-
         <dependency>
             <groupId>com.h2database</groupId>
             <artifactId>h2</artifactId>
             <version>1.3.164</version>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>${junit-version}</version>
-            <scope>test</scope>
-        </dependency>
     </dependencies>
 
     <build>
diff --git a/libraries/kotlin-maven-plugin/pom.xml b/libraries/kotlin-maven-plugin/pom.xml
index 314d5a124b9..e3a615767da 100644
--- a/libraries/kotlin-maven-plugin/pom.xml
+++ b/libraries/kotlin-maven-plugin/pom.xml
@@ -30,18 +30,30 @@
         </dependency>
     </dependencies>
 
+
     <build>
         <plugins>
+
             <plugin>
                 <groupId>com.github.goldin</groupId>
                 <artifactId>kotlin-maven-plugin</artifactId>
             </plugin>
 
+            <!-- ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -->
+            <!-- AnnoMojo: http://wiki.jfrog.org/confluence/display/OSS/Maven+Anno+Mojo      -->
+            <!-- http://repo1.maven.org/maven2/org/apache/maven/plugins/maven-plugin-plugin/ -->
+            <!-- ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -->
+
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-plugin-plugin</artifactId>
-                <version>2.6</version>
+                <version>2.9</version>
                 <dependencies>
+                    <dependency>
+                      <groupId>org.apache.maven.plugin-tools</groupId>
+                      <artifactId>maven-plugin-tools-api</artifactId>
+                      <version>2.9</version>
+                    </dependency>
                     <dependency>
                         <groupId>org.jfrog.maven.annomojo</groupId>
                         <artifactId>maven-plugin-tools-anno</artifactId>
diff --git a/libraries/kunit/pom.xml b/libraries/kunit/pom.xml
index 6e5272d3fa6..f32adfec9d8 100644
--- a/libraries/kunit/pom.xml
+++ b/libraries/kunit/pom.xml
@@ -13,14 +13,6 @@
 
     <artifactId>kunit</artifactId>
 
-    <dependencies>
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>${junit-version}</version>
-        </dependency>
-    </dependencies>
-
     <build>
         <sourceDirectory>${project.basedir}/src</sourceDirectory>
         <testSourceDirectory>${project.basedir}/test</testSourceDirectory>
diff --git a/libraries/pom.xml b/libraries/pom.xml
index d031eef2394..f787f384fa2 100644
--- a/libraries/pom.xml
+++ b/libraries/pom.xml
@@ -12,7 +12,7 @@
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <junit-version>4.9</junit-version>
+        <junit-version>4.10</junit-version>
         <kotlin-maven-plugin.version>0.2.3.8</kotlin-maven-plugin.version>
         <project-root>${project.basedir}/..</project-root>
         <kotlin-sdk>${project-root}/../dist/kotlinc</kotlin-sdk>
@@ -23,29 +23,44 @@
         <maven-jar-plugin.version>2.4</maven-jar-plugin.version>
     </properties>
 
+
     <repositories>
         <repository>
             <id>evgenyg.artifactoryonline.com</id>
-            <url>http://evgenyg.artifactoryonline.com/evgenyg/repo</url>
+            <url>http://evgenyg.artifactoryonline.com/evgenyg/repo/</url>
         </repository>
     </repositories>
 
+
     <pluginRepositories>
         <pluginRepository>
             <id>evgenyg.artifactoryonline.com</id>
-            <url>http://evgenyg.artifactoryonline.com/evgenyg/repo</url>
+            <url>http://evgenyg.artifactoryonline.com/evgenyg/repo/</url>
         </pluginRepository>
     </pluginRepositories>
 
+
     <modules>
-        <module>stdlib</module>
         <module>kunit</module>
+        <module>stdlib</module>
         <module>kdoc</module>
         <module>kotlin-jdbc</module>
         <module>website</module>
         <module>kotlin-java</module>
+        <module>kotlin-maven-plugin</module>
     </modules>
 
+
+    <dependencies>
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>${junit-version}</version>
+            <scope>compile</scope>
+        </dependency>
+    </dependencies>
+
+
     <build>
         <sourceDirectory>${project.basedir}/src/main/kotlin</sourceDirectory>
         <testSourceDirectory>${project.basedir}/src/test/kotlin</testSourceDirectory>
diff --git a/libraries/stdlib/pom.xml b/libraries/stdlib/pom.xml
index f9e45adc27e..ddde82e1731 100644
--- a/libraries/stdlib/pom.xml
+++ b/libraries/stdlib/pom.xml
@@ -20,12 +20,6 @@
             <version>${project.version}</version>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>${junit-version}</version>
-            <scope>test</scope>
-        </dependency>
     </dependencies>
 
     <build>
diff --git a/libraries/website/pom.xml b/libraries/website/pom.xml
index 1f8539b4af5..05c9d94521b 100644
--- a/libraries/website/pom.xml
+++ b/libraries/website/pom.xml
@@ -44,12 +44,6 @@
             <version>3.3</version>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>${junit-version}</version>
-            <scope>test</scope>
-        </dependency>
     </dependencies>
 
     <build>