JAVA-2308

unable to start MongoClient

Author: Vladimir Dolzhenko

bson/build.gradle

@@ -28,6 +28,7 @@ clirr {
 
 jar {
     manifest {
+        instruction 'Build-Version', getGitVersion()
         instruction 'Import-Package',
                     'javax.xml.bind.*',
                     'org.slf4j;resolution:=optional'

build.gradle

@@ -131,8 +131,6 @@ configure(subprojects.findAll { it.name != 'util' }) {
     task generateVersionPropertiesFile << {
         def directory = new File(project.ext.generatedResources)
         directory.mkdirs()
-        def propertiesFile = new File(directory, "version.properties")
-        propertiesFile.text = "version=${getGitVersion()}"
     }
 }
 

driver-core/build.gradle

@@ -38,6 +38,7 @@ dependencies {
 
 jar {
     manifest {
+        instruction 'Build-Version', getGitVersion()
         instruction 'Import-Package',
                     'org.bson.*',                       // unfortunate that this is necessary, but if it's left out then it's not included
                     'javax.crypto.*',

driver-core/src/main/com/mongodb/connection/ClientMetadataHelper.java

@@ -26,11 +26,12 @@
 import org.bson.io.BasicOutputBuffer;
 
 import java.io.IOException;
-import java.io.InputStream;
+import java.net.JarURLConnection;
 import java.net.URL;
 import java.nio.charset.Charset;
 import java.util.List;
-import java.util.Properties;
+import java.util.jar.Attributes;
+import java.util.jar.Manifest;
 
 import static com.mongodb.assertions.Assertions.isTrueArgument;
 import static java.lang.String.format;
@@ -106,13 +107,13 @@ private static String getDriverVersion() {
         String driverVersion = "unknown";
 
         try {
-            Class<InternalStreamConnectionInitializer> clazz = InternalStreamConnectionInitializer.class;
-            URL versionPropertiesFileURL = clazz.getResource("/version.properties");
-            if (versionPropertiesFileURL != null) {
-                Properties versionProperties = new Properties();
-                InputStream versionPropertiesInputStream = versionPropertiesFileURL.openStream();
-                versionProperties.load(versionPropertiesInputStream);
-                driverVersion = versionProperties.getProperty("version");
+            String path = InternalStreamConnectionInitializer.class.getProtectionDomain().getCodeSource().getLocation().getPath();
+            URL jarUrl = path.endsWith(".jar") ? new URL("jar:file:" + path + "!/") : null;
+            if (jarUrl != null) {
+                JarURLConnection jarURLConnection = (JarURLConnection) jarUrl.openConnection();
+                Manifest manifest = jarURLConnection.getManifest();
+                String version = (String) manifest.getMainAttributes().get(new Attributes.Name("Build-Version"));
+                driverVersion = version;
             }
         } catch (IOException e) {
             // do nothing

mongo-java-driver/build.gradle

@@ -47,6 +47,7 @@ sourceSets {
 // copied from driver-core
 jar {
     manifest {
+        instruction 'Build-Version', getGitVersion()
         instruction 'Import-Package',
                     'javax.xml.bind.*',
                     'javax.crypto.*',