Rename manifest.properties to kotlinManifest.properties to avoid clashing with other resources.

.idea/artifacts/KotlinJpsPlugin.xml

@@ -12,7 +12,7 @@
       <element id="module-output" name="preloader" />
       <element id="module-output" name="util" />
       <element id="module-output" name="util.runtime" />
-      <element id="file-copy" path="$PROJECT_DIR$/resources/manifest.properties" />
+      <element id="file-copy" path="$PROJECT_DIR$/resources/kotlinManifest.properties" />
     </root>
   </artifact>
 </component>

.idea/artifacts/KotlinPlugin.xml

@@ -30,7 +30,7 @@
           <element id="module-output" name="eval4j" />
           <element id="module-output" name="idea-analysis" />
           <element id="module-output" name="ide-common" />
-          <element id="file-copy" path="$PROJECT_DIR$/resources/manifest.properties" />
+          <element id="file-copy" path="$PROJECT_DIR$/resources/kotlinManifest.properties" />
           <element id="module-output" name="kotlin-android-plugin" />
         </element>
         <element id="library" level="project" name="javax.inject" />

build.xml

@@ -1,7 +1,7 @@
 <project name="Kotlin" default="dist">
     <include file="jslib_files.xml" />
 
-    <property file="resources/manifest.properties"/>
+    <property file="resources/kotlinManifest.properties"/>
 
     <!-- Set to false to disable proguard run on kotlin-compiler.jar. Speeds up the build -->
     <property name="shrink" value="true"/>
@@ -385,7 +385,7 @@
                 </fileset>
                 <fileset dir="${basedir}/compiler/frontend.java/src" includes="META-INF/services/**"/>
                 <fileset dir="${basedir}/compiler/backend/src" includes="META-INF/services/**"/>
-                <fileset dir="${basedir}/resources" includes="manifest.properties"/>
+                <fileset dir="${basedir}/resources" includes="kotlinManifest.properties"/>
 
                 <fileset dir="idea/src">
                     <include name="META-INF/extensions/common.xml"/>

compiler/util/src/org/jetbrains/jet/utils/LibraryUtils.kt

@@ -47,7 +47,7 @@ public object LibraryUtils {
         var jsStdLib = ""
         var jsLib = ""
 
-        val manifestProperties = javaClass<LibraryUtils>().getResourceAsStream("/manifest.properties")
+        val manifestProperties = javaClass<LibraryUtils>().getResourceAsStream("/kotlinManifest.properties")
         if (manifestProperties != null) {
             try {
                 val properties = Properties()
@@ -61,7 +61,7 @@ public object LibraryUtils {
 
         }
         else {
-            LOG.error("Resource 'manifest.properties' not found.")
+            LOG.error("Resource 'kotlinManifest.properties' not found.")
         }
 
         TITLE_KOTLIN_JAVASCRIPT_STDLIB = jsStdLib

libraries/examples/kotlin-js-library-example/pom.xml

@@ -46,7 +46,7 @@
                         </goals>
                         <configuration>
                             <files>
-                                <file>../../../resources/manifest.properties</file>
+                                <file>../../../resources/kotlinManifest.properties</file>
                             </files>
                         </configuration>
                     </execution>