[CONJ-802] version parser correction

pom.xml

@@ -60,7 +60,7 @@
   <artifactId>mariadb-java-client</artifactId>
   <packaging>jar</packaging>
   <name>mariadb-java-client</name>
-  <version>2.6.1</version>
+  <version>2.6.2-SNAPSHOT</version>
   <description>JDBC driver for MariaDB and MySQL</description>
   <url>https://mariadb.com/kb/en/mariadb/about-mariadb-connector-j/</url>
 

src/main/java/org/mariadb/jdbc/internal/util/constant/Version.java

@@ -65,23 +65,24 @@ public final class Version {
 
   static {
     InputStream inputStream = null;
-    String tmpVersion = "5.5.0";
+    String tmpVersion = "2.6.2";
     try {
       Properties prop = new Properties();
-      inputStream = Version.class.getClassLoader().getResourceAsStream("mariadb.properties");
+      inputStream = Version.class.getResourceAsStream("/mariadb.properties");
       if (inputStream != null) {
         prop.load(inputStream);
+        // get the property value and print it out
+        tmpVersion = prop.getProperty("version");
       } else {
         System.out.println("property file 'mariadb.properties' not found in the classpath");
       }
-
-      // get the property value and print it out
-      tmpVersion = prop.getProperty("version");
     } catch (Exception e) {
       // eat
     } finally {
       try {
-        inputStream.close();
+        if (inputStream != null) {
+          inputStream.close();
+        }
       } catch (IOException ioe) {
         // eat
       }

src/test/java/org/mariadb/jdbc/ConnectionTest.java

@@ -1006,4 +1006,23 @@ public void readOnly() throws SQLException {
     connection.setReadOnly(false);
     stmt.execute("DROP TABLE testReadOnly");
   }
+
+
+  @Test
+  public void connectionAttributes() throws SQLException {
+
+    try (MariaDbConnection conn = (MariaDbConnection) setConnection("&connectionAttributes=test:test1")) {
+      Statement stmt = conn.createStatement();
+      ResultSet rs1 = stmt.executeQuery("SELECT @@performance_schema");
+      rs1.next();
+      if ("1".equals(rs1.getString(1))) {
+        ResultSet rs = stmt.executeQuery("SELECT * from performance_schema.session_connect_attrs where processlist_id="
+            + conn.getServerThreadId() + " AND ATTR_NAME='test'");
+        while (rs.next()) {
+          assertEquals("test1", rs.getString("ATTR_VALUE"));
+        }
+      }
+    };
+  }
+
 }

src/test/resources/conf.properties

@@ -2,5 +2,4 @@ DB_HOST=localhost
 DB_PORT=3306
 DB_DATABASE=testj
 DB_USER=root
-DB_PASSWORD=
-
+DB_PASSWORD=