JAVA-1857, JAVA-1998: Rolling back the changed introduced by JAVA-1857, which caused the regression described in JAVA-1998.

Author: jyemin

mongo-java-driver/build.gradle

@@ -21,14 +21,29 @@ apply plugin: 'osgi'
 
 archivesBaseName = 'mongo-java-driver'
 
-task init() << {
-    new File("${project.rootDir}/${archivesBaseName}/build/classes/main").mkdirs()
+idea {
+    module {
+        sourceDirs = [] // Ignore in idea (prevents intellij crashing due to sources outside project dir)
+}
+}
+
+// dependencies copied from driver-core
+dependencies {
+    compile "io.netty:netty-buffer:$nettyVersion", optional
+    compile "io.netty:netty-transport:$nettyVersion", optional
+    compile "io.netty:netty-handler:$nettyVersion", optional
 }
 
-def getJar(name) {
-    project(name).jar.archivePath
+// srcDirs copied as well, so everything is compiled twice
+sourceSets {
+    main {
+        java {
+            srcDirs = ["$rootDir/driver/src/main", "$rootDir/driver-core/src/main", "$rootDir/bson/src/main"]
+        }
+    }
 }
 
+// copied from driver-core
 jar {
     manifest {
         instruction 'Import-Package',
@@ -44,16 +59,7 @@ jar {
                     'io.netty.*;resolution:=optional',
                     'org.slf4j;resolution:=optional'
     }
-    from(zipTree(getJar(":driver-core"))) {
-        exclude("META-INF")
-    }
-    from(zipTree(getJar(":driver"))) {
-        exclude("META-INF")
-    }
-    from(zipTree(getJar(":bson"))) {
-        exclude("META-INF")
     }
-}.dependsOn("init")
 
 modifyPom {
     project {