Changeset 7522

Timestamp:

Nov 6, 2018, 3:50:29 PM (5 years ago)

Author:

Nicklas Nordborg

Message:

References #2130: Upgrade 3-rd party libraries

Updated to Hibernate 5.3.7. Except for some API changes and deprecations that is affecting our wrappers around Session, Query, etc. most other things seems to be working. The bug that was reported in #2110 and #2113 seems to be fixed and the workaround has been removed.

Location:

trunk

Files:

• .classpath (modified) (2 diffs)
• doc/3rd-party-components.txt (modified) (1 diff)
• lib/dist/byte-buddy-1.8.17.jar (added)
• lib/dist/classmate-1.3.0.jar (deleted)
• lib/dist/classmate-1.3.4.jar (added)
• lib/dist/dom4j-1.6.1.jar (deleted)
• lib/dist/dom4j-2.1.1.jar (added)
• lib/dist/hibernate-c3p0-5.2.10.Final.jar (deleted)
• lib/dist/hibernate-c3p0-5.3.7.Final.jar (added)
• lib/dist/hibernate-commons-annotations-5.0.1.Final.jar (deleted)
• lib/dist/hibernate-commons-annotations-5.0.4.Final.jar (added)
• lib/dist/hibernate-core-5.2.10.Final.jar (deleted)
• lib/dist/hibernate-core-5.3.7.Final.jar (added)
• lib/dist/hibernate-ehcache-5.2.10.Final.jar (deleted)
• lib/dist/hibernate-ehcache-5.3.7.Final.jar (added)
• lib/dist/hibernate-jpa-2.1-api-1.0.0.Final.jar (deleted)
• lib/dist/jandex-2.0.3.Final.jar (deleted)
• lib/dist/jandex-2.0.5.Final.jar (added)
• lib/dist/javax.persistence-api-2.2.jar (added)
• lib/dist/jboss-logging-3.3.0.Final.jar (deleted)
• lib/dist/jboss-logging-3.3.2.Final.jar (added)
• lib/dist/jboss-transaction-api_1.2_spec-1.0.1.Final.jar (deleted)
• lib/dist/jboss-transaction-api_1.2_spec-1.1.1.Final.jar (added)
• src/core/net/sf/basedb/core/AnnotationBatcher.java (modified) (1 diff)
• src/core/net/sf/basedb/core/HibernateUtil.java (modified) (9 diffs)
• src/core/net/sf/basedb/core/LogControl.java (modified) (1 diff)
• src/core/net/sf/basedb/core/hibernate/EntityQueryWrapper.java (modified) (1 diff)
• src/core/net/sf/basedb/core/hibernate/NativeQueryWrapper.java (modified) (8 diffs)
• src/core/net/sf/basedb/core/hibernate/QueryWrapper.java (modified) (2 diffs)
• src/core/net/sf/basedb/core/hibernate/SessionWrapper.java (modified) (1 diff)
• src/core/net/sf/basedb/core/hibernate/StatelessSessionWrapper.java (modified) (3 diffs)
• src/install/net/sf/basedb/install/InitDB.java (modified) (1 diff)
• src/test/TestUtil.java (modified) (1 diff)
• src/test/net/sf/basedb/test/TestUtil.java (modified) (2 diffs)

trunk/.classpath

@@ -28 +28 @@
   <classpathentry kind="lib" path="lib/dist/javasysmon-0.3.5.jar"/>
   <classpathentry kind="lib" path="lib/dist/slf4j-api-1.7.25.jar"/>
-  <classpathentry kind="lib" path="lib/dist/hibernate-core-5.2.10.Final.jar"/>
-  <classpathentry kind="lib" path="lib/dist/hibernate-jpa-2.1-api-1.0.0.Final.jar"/>
   <classpathentry kind="lib" path="lib/dist/parallelgzip-1.0.5.jar"/>
   <classpathentry kind="lib" path="lib/dist/yauaa-2.2.jar"/>
@@ -35 +33 @@
   <classpathentry kind="lib" path="lib/dist/bcprov-jdk15on-159.jar"/>
   <classpathentry kind="lib" path="lib/dist/postgresql-42.2.5.jar"/>
+  <classpathentry kind="lib" path="lib/dist/hibernate-core-5.3.7.Final.jar" sourcepath="D:/Download/Firefox/hibernate-release-5.3.7.Final/project/hibernate-core/src/main/java"/>
+  <classpathentry kind="lib" path="lib/dist/javax.persistence-api-2.2.jar"/>
   <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
   <classpathentry kind="output" path="xbin"/>

trunk/doc/3rd-party-components.txt

@@ -40 +40 @@
 
 More info : http://www.hibernate.org/
-Version   : 5.2.10
+Version   : 5.3.7
 License   : LGPL (hibernate.license.txt)
-Jar files : hibernate-core-5.2.10.Final.jar, hibernate-commons-annotations-5.0.1.Final.jar,
-            hibernate-jpa-2.1-api-1.0.0.Final.jar, 
-            antlr-2.7.7.jar, dom4j-1.6.1.jar, jandex-2.0.3.Final.jar,
-            javassist-3.23.1-GA.jar, classmate-1.3.0.jar
-            jboss-logging-3.3.0.Final.jar, jboss-transaction-api_1.2_spec-1.0.1.Final.jar, 
-            c3p0-0.9.5.2.jar, hibernate-c3p0-5.2.10.Final.jar, mchange-commons-java-0.2.11.jar,
-            ehcache-2.10.3.jar, hibernate-ehcache-5.2.10.Final.jar, 
+Jar files : hibernate-core-5.3.7.Final.jar, hibernate-commons-annotations-5.0.4.Final.jar,
+            javax.persistence-api-2.2.jar,
+            antlr-2.7.7.jar, dom4j-2.1.1.jar, jandex-2.0.5.Final.jar,
+            javassist-3.23.1-GA.jar, byte-buddy-1.18.17.jar, classmate-1.3.4.jar
+            jboss-logging-3.3.2.Final.jar, jboss-transaction-api_1.2_spec-1.1.1.Final.jar, 
+            c3p0-0.9.5.2.jar, hibernate-c3p0-5.3.7.Final.jar, mchange-commons-java-0.2.11.jar,
+            ehcache-2.10.3.jar, hibernate-ehcache-5.3.7.Final.jar, 
             slf4j-api.1.7.25.jar, slf4j-log4j12-1.7.25.jar
 

trunk/src/core/net/sf/basedb/core/AnnotationBatcher.java

@@ -900 +900 @@
               // We must evict the entity from the Hibernate second-level 
               // cache or Hibernate may use the old data
-              secondLevelCache.evictEntity(itemType.getDataClass(), currentItem.getId());
+              secondLevelCache.evictEntityData(itemType.getDataClass(), currentItem.getId());
             }
           }

trunk/src/core/net/sf/basedb/core/HibernateUtil.java

@@ -104 +104 @@
 import org.hibernate.mapping.PersistentClass;
 import org.hibernate.mapping.Table;
-import org.hibernate.mapping.SimpleValue;
 import org.hibernate.mapping.Index;
 import org.hibernate.mapping.Column;
@@ -1078 +1077 @@
     hibernateColumn.setNullable(column.isNullable());
     hibernateColumn.setLength(column.getSize());
-    
-    // Create Hibernate SimpleValue mapping
-    SimpleValue hibernateValue = new SimpleValue(metadata);
-    hibernateValue.setTypeName(column.getTypeWrapper().getHibernateType().getName());
-    hibernateValue.addColumn(hibernateColumn);
+    hibernateColumn.setSqlType(dialect.getTypeName(hibernateColumn.getSqlTypeCode(), hibernateColumn.getLength(), hibernateColumn.getPrecision(), hibernateColumn.getScale()));
     
     // Add column to Table mapping
@@ -1860 +1855 @@
 
   /**
-    Create a Hibernate query using a stateless session.
-  */
-  @SuppressWarnings({ "unchecked", "rawtypes" })
-  static Query<?> createQuery(StatelessSession session, String hql)
-    throws BaseException
-  {
-    assert session != null : "session == null";
-    assert hql != null : "hql == null";
-    try
-    {
-      Query<?> q = session.createQuery(hql);
-      q.setFetchSize(getJdbcFetchSize());
-      return new EntityQueryWrapper(q);
-    }
-    catch (HibernateException ex)
-    {
-      throw new BaseException(ex);
-    }
-  }
-  
-  /**
     Create a Hibernate query using a stateless session and a known return type.
     @since 3.12
@@ -1913 +1887 @@
     {
       NativeQuery<?> q = session.createNativeQuery(sql);
-      ((Query<?>)q).setFetchSize(getJdbcFetchSize());
+      q.setFetchSize(getJdbcFetchSize());
       return new NativeQueryWrapper<>(q);
     }
@@ -1946 +1920 @@
         q = session.createNativeQuery(sql);
       }
-      ((Query<R>)q).setFetchSize(getJdbcFetchSize());
+      q.setFetchSize(getJdbcFetchSize());
       return new NativeQueryWrapper<>(q);
     }
@@ -1967 +1941 @@
     {
       NativeQuery<?> q = session.createNativeQuery(sql);
-      ((Query<?>)q).setFetchSize(getJdbcFetchSize());
+      q.setFetchSize(getJdbcFetchSize());
       return new NativeQueryWrapper<>(q);
     }
@@ -2000 +1974 @@
         q = session.createNativeQuery(sql);
       }
-      ((Query<R>)q).setFetchSize(getJdbcFetchSize());
+      q.setFetchSize(getJdbcFetchSize());
       return new NativeQueryWrapper<>(q);
     }
@@ -2140 +2114 @@
   }
 
-  
-  /**
-    Get a predefined HQL query using the stateless session.
-    @see PredefinedQuery
-  */
-  static Query<?> getPredefinedQuery(StatelessSession session, String name)
-    throws BaseException
-  {
-    assert session != null : "session == null";
-    assert name != null : "name == null";
-    return createQuery(session, PredefinedQuery.getQueryString(name));
-  }
-  
   /**
     Get a predefined HQL query with a known return type using the stateless session.
@@ -2330 +2291 @@
       
       //  Evict the item from the cache and, in another session, try to load the news item
-      sf.getCache().evictEntity(NewsData.class, newsId);
+      sf.getCache().evictEntityData(NewsData.class, newsId);
       session = HibernateUtil.newSession();
       tx = HibernateUtil.newTransaction(session);

trunk/src/core/net/sf/basedb/core/LogControl.java

@@ -130 +130 @@
   
   /**
-    Creates a Hibernate HQL query. Use this to get information
-    from the database that is relevent for the logging implementation.
-    The query uses the stateless session, which means that there
-    is no first- or second-level cache and on support for initialization
-    of proxies. We recommend that queries are used to return
-    scalar values only, not entities.
-    @return A Query
-    @deprecated In 3.12. use {@link #createHqlQuery(String, Class)} instead
-  */
-  @Deprecated
-  public org.hibernate.query.Query<?> createHqlQuery(String hql)
-  {
-    return HibernateUtil.createQuery(getSession(), hql);
-  }
-  
-  /**
     Creates a Hibernate HQL query with a known return type. Use this to get information
     from the database that is relevent for the logging implementation.

trunk/src/core/net/sf/basedb/core/hibernate/EntityQueryWrapper.java

@@ -186 +186 @@
   public <P> Query<R> setParameterList(QueryParameter<P> param, Collection<P> values) 
   {
-    if (param.getType().isEntityType()) checkEntityCollection(values);
+    if (param.getHibernateType().isEntityType()) checkEntityCollection(values);
     return super.setParameterList(param, values);
   }

trunk/src/core/net/sf/basedb/core/hibernate/NativeQueryWrapper.java

@@ -22 +22 @@
 package net.sf.basedb.core.hibernate;
 
-import java.lang.reflect.Field;
+import java.time.Instant;
+import java.time.LocalDateTime;
+import java.time.OffsetDateTime;
+import java.time.ZonedDateTime;
 import java.util.Calendar;
 import java.util.Collection;
 import java.util.Date;
-import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 
 import javax.persistence.FlushModeType;
+import javax.persistence.LockModeType;
 import javax.persistence.Parameter;
 import javax.persistence.TemporalType;
@@ -41 +44 @@
 import org.hibernate.query.NativeQuery;
 import org.hibernate.query.QueryParameter;
-import org.hibernate.query.internal.AbstractProducedQuery;
-import org.hibernate.query.internal.QueryParameterBindingsImpl;
-import org.hibernate.query.spi.QueryParameterBinding;
 import org.hibernate.engine.query.spi.sql.NativeSQLQueryReturn;
 import org.hibernate.type.Type;
@@ -434 +434 @@
   {
     query.setParameterList(parameter, values);
-    clearOldParameterListParameters(parameter.getName());
     return this;
   }
@@ -443 +442 @@
   {
     query.setParameterList(name, values);
-    clearOldParameterListParameters(name);
     return this;
   }
@@ -452 +450 @@
   {
     query.setParameterList(name, values, type);
-    clearOldParameterListParameters(name);
     return this;
   }
@@ -460 +457 @@
   {
     query.setParameterList(name, values, type);
-    clearOldParameterListParameters(name);
     return this;
   }
@@ -468 +464 @@
   {
     query.setParameterList(name, values);
-    clearOldParameterListParameters(name);
     return this;
   }
@@ -512 +507 @@
   
   
-  // Reference to the "QueryParameterBindingsImpl.parameterBindingMap" variable
-  private Field parameterBindingMap;
   
-  /**
-    We need to remove "synthetic" parameters from the "parameterBindingMap".
-    The parameters are created by Hibernate when a list-type parameter is 
-    specified on a query: name_0, name_1, etc. The problem is that the 
-    "synthetic" parameters are never cleared and if the same query is re-used
-    with a shorter list, Hibernate will try to set the non-existing parameters
-    which causes an exception. See http://base.thep.lu.se/ticket/2110
-    UPDATE: We also need to check for copied parameter (name) in case the list 
-    contained only a single element. See http://base.thep.lu.se/ticket/2113
-  */
-  @SuppressWarnings({ "unchecked", "rawtypes" })
-  private void clearOldParameterListParameters(String parameterName)
-  {
-    try
-    {
-      if (parameterBindingMap == null)
-      {
-        parameterBindingMap = QueryParameterBindingsImpl.class.getDeclaredField("parameterBindingMap");
-        parameterBindingMap.setAccessible(true);
-      }
-      
-      String prefixOfParametersToRemove = parameterName + "_";
-      Map<QueryParameter<?>, QueryParameterBinding<?>> m = (Map)parameterBindingMap.get(((AbstractProducedQuery)query).getQueryParameterBindings());
-      Iterator<QueryParameter<?>> i = m.keySet().iterator();
-      while (i.hasNext())
-      {
-        String name = i.next().getName();
-        if (name.startsWith(prefixOfParametersToRemove) || name.equals(parameterName)) 
-        {
-          i.remove();
-        }
-      }
-    }
-    catch (Exception ex)
-    {
-      throw new RuntimeException(ex);
-    }
-  }
+  
+  @Override
+  public NativeQuery<R> setFirstResult(int firstResult) 
+  {
+    query.setFirstResult(firstResult);
+    return this;
+  }
+
+  @Override
+  public NativeQuery<R> setMaxResults(int maxResults) 
+  {
+    query.setMaxResults(maxResults);
+    return this;
+  }
+
+  @Override
+  public NativeQuery<R> setHint(String name, Object value) 
+  {
+    query.setHint(name, value);
+    return this;
+  }
+
+  @Override
+  public NativeQuery<R> setLockMode(LockModeType lockMode) 
+  {
+    query.setLockMode(lockMode);
+    return this;
+  }
+
+  @Override
+  public NativeQuery<R> setParameter(int position, Instant value, TemporalType type) 
+  {
+    query.setParameter(position, value, type);
+    return this;
+  }
+
+  @Override
+  public NativeQuery<R> setParameter(int position, LocalDateTime value, TemporalType type)
+  {
+    query.setParameter(position, value, type);
+    return this;
+  }
+
+  @Override
+  public NativeQuery<R> setParameter(int position, OffsetDateTime value, TemporalType type) 
+  {
+    query.setParameter(position, value, type);
+    return this;
+  }
+
+  @Override
+  public NativeQuery<R> setParameter(int position, ZonedDateTime value, TemporalType type) 
+  {
+    query.setParameter(position, value, type);
+    return this;
+  }
+
+  @Override
+  public NativeQuery<R> setParameter(Parameter<Instant> param, Instant value, TemporalType type) 
+  {
+    query.setParameter(param, value, type);
+    return this;
+  }
+
+  @Override
+  public NativeQuery<R> setParameter(Parameter<LocalDateTime> param, LocalDateTime value, TemporalType type)
+  {
+    query.setParameter(param, value, type);
+    return this;
+  }
+
+  @Override
+  public NativeQuery<R> setParameter(Parameter<OffsetDateTime> param, OffsetDateTime value, TemporalType type)
+  {
+    query.setParameter(param, value, type);
+    return this;
+  }
+
+  @Override
+  public NativeQuery<R> setParameter(Parameter<ZonedDateTime> param, ZonedDateTime value, TemporalType type) 
+  {
+    query.setParameter(param, value, type);
+    return this;
+  }
+
+  @Override
+  public NativeQuery<R> setParameter(String name, Instant value, TemporalType type) 
+  {
+    query.setParameter(name, value, type);
+    return this;
+  }
+
+  @Override
+  public NativeQuery<R> setParameter(String name, LocalDateTime value, TemporalType type)
+  {
+    query.setParameter(name, value, type);
+    return this;
+  }
+
+  @Override
+  public NativeQuery<R> setParameter(String name, OffsetDateTime value, TemporalType type)
+  {
+    query.setParameter(name, value, type);
+    return this;
+  }
+
+  @Override
+  public NativeQuery<R> setParameter(String name, ZonedDateTime value, TemporalType type)
+  {
+    query.setParameter(name, value, type);
+    return this;
+  } 
+
 }

trunk/src/core/net/sf/basedb/core/hibernate/QueryWrapper.java

@@ -849 +849 @@
 
   @Override
+  @Deprecated
   public RowSelection getQueryOptions() 
   {
@@ -1069 +1070 @@
   }
 
+  @SuppressWarnings("rawtypes")
+  @Override
+  @Deprecated
+  public org.hibernate.Query<R> setParameterList(int param, Collection values)
+  {
+    query.setParameterList(param, values);
+    return this;
+  }
+
+  @SuppressWarnings("rawtypes")
+  @Override
+  @Deprecated
+  public org.hibernate.Query<R> setParameterList(int param, Collection values, Type type) 
+  {
+    query.setParameterList(param, values, type);
+    return this;
+  }
+
+  @Override
+  @Deprecated
+  public org.hibernate.Query<R> setParameterList(int param, Object[] values, Type type) 
+  {
+    query.setParameterList(param, values, type);
+    return this;
+  }
+
+  @Override
+  @Deprecated
+  public org.hibernate.Query<R> setParameterList(int param, Object[] values) 
+  {
+    query.setParameterList(param, values);
+    return this;
+  }
+
 }

trunk/src/core/net/sf/basedb/core/hibernate/SessionWrapper.java

@@ -173 +173 @@
   }
 
-  @Override
-  public Query<?> createFilter(Object collection, String queryString)
+  @SuppressWarnings("deprecation")
+  @Override
+  public org.hibernate.Query<?> createFilter(Object collection, String queryString)
     throws HibernateException
   {

trunk/src/core/net/sf/basedb/core/hibernate/StatelessSessionWrapper.java

@@ -146 +146 @@
   */
   @Override
-  public Query<?> createQuery(String queryString)
+  @SuppressWarnings("deprecation")
+  public org.hibernate.Query<?> createQuery(String queryString)
     throws HibernateException
   {
-    Query<?> q = getCachedQuery(queryString);
-    if (q == null)
-    {
-      q = session.createQuery(queryString);
-      q.setFetchSize(HibernateUtil.getJdbcFetchSize());
-      cacheQuery(queryString, q);
-    }
+    org.hibernate.Query<?> q = session.createQuery(queryString);
+    q.setFetchSize(HibernateUtil.getJdbcFetchSize());
     return q;
   }
@@ -166 +162 @@
   @Override
   @Deprecated
-  public NativeQuery<?> createSQLQuery(String queryString) 
+  public org.hibernate.SQLQuery<?> createSQLQuery(String queryString) 
     throws HibernateException
   {
-    Query<?> q = getCachedQuery(queryString);
-    if (q == null || !(q instanceof NativeQuery))
-    {
-      q = session.createSQLQuery(queryString);
-      q.setFetchSize(HibernateUtil.getJdbcFetchSize());
-    }
-    return (NativeQuery<?>)q;
+    org.hibernate.SQLQuery<?> q = session.createSQLQuery(queryString);
+    q.setFetchSize(HibernateUtil.getJdbcFetchSize());
+    return q;
   }
 
@@ -222 +214 @@
   */
   @Override
-  public Query<?> getNamedQuery(String queryName) 
+  @SuppressWarnings("deprecation")
+  public org.hibernate.Query<?> getNamedQuery(String queryName) 
     throws HibernateException
   {
-    Query<?> q = getCachedQuery(queryName);
-    if (q == null)
-    {
-      q = session.getNamedQuery(queryName);
-      cacheQuery(queryName, q);
-    }
+    org.hibernate.Query<?> q = session.getNamedQuery(queryName);
     return q;
   }

trunk/src/install/net/sf/basedb/install/InitDB.java

@@ -215 +215 @@
     String message = 
       "--System information-----------------------------\n" + 
-      "BASE     : " + Version.getVersion() + "\n" + 
-      "Database : " + dbUrl + "\n" + 
-      "Dialect  : " + Config.getString("db.dialect") + "\n" + 
-      "JDBC     : " + driverClass + "; " + driverVersion + "\n" +
-      "Java     : " + properties.getProperty("java.runtime.name") + "; " +
+      "BASE      : " + Version.getVersion() + "\n" + 
+      "Database  : " + dbUrl + "\n" + 
+      "Dialect   : " + Config.getString("db.dialect") + "\n" + 
+      "JDBC      : " + driverClass + "; " + driverVersion + "\n" +
+      "Hibernate : " + org.hibernate.Version.getVersionString() + "\n"+
+      "Java      : " + properties.getProperty("java.runtime.name") + "; " +
         properties.getProperty("java.runtime.version") + "; " +
         properties.getProperty("java.vendor") + "\n" + 
-      "OS       : " + properties.getProperty("os.name") +"; " +
+      "OS        : " + properties.getProperty("os.name") +"; " +
         properties.getProperty("os.arch") + "; " +
         properties.getProperty("os.version") +"\n" +

trunk/src/test/TestUtil.java

@@ -286 +286 @@
     String message = 
       "--System information-----------------------------\n" + 
-      "BASE     : " + Version.getMajor() + "." +
-        Version.getMinor() + "." + Version.getMaintenance() + Version.getSuffix() + "\n" + 
-      "Database : " + database + "\n" + 
-      "Dialect  : " + Config.getString("db.dialect") + "\n" + 
-      "JDBC     : " + driverClass + "; " + driverVersion + "\n" +
-      "URL      : " + dbUrl + "\n" +
-      "Java     : " + properties.getProperty("java.runtime.name") + "; " +
+      "BASE      : " + Version.getVersion() + "\n" + 
+      "Database  : " + database + "\n" + 
+      "Dialect   : " + Config.getString("db.dialect") + "\n" + 
+      "Hibernate : " + org.hibernate.Version.getVersionString() + "\n"+
+      "JDBC      : " + driverClass + "; " + driverVersion + "\n" +
+      "URL       : " + dbUrl + "\n" +
+      "Java      : " + properties.getProperty("java.runtime.name") + "; " +
         properties.getProperty("java.runtime.version") + "; " +
         properties.getProperty("java.vendor") + "\n" + 
-      "OS       : " + properties.getProperty("os.name") +"; " +
+      "OS        : " + properties.getProperty("os.name") +"; " +
         properties.getProperty("os.arch") + "; " +
         properties.getProperty("os.version") +"\n" +

trunk/src/test/net/sf/basedb/test/TestUtil.java

@@ -38 +38 @@
 import net.sf.basedb.core.DbControl;
 import net.sf.basedb.core.SessionControl;
+import net.sf.basedb.core.Version;
 import net.sf.basedb.core.authentication.LoginRequest;
 
@@ -258 +259 @@
     String message = 
       "--System information-----------------------------\n" + 
-      "BASE     : " + Application.getMajorVersion() + "." +
-        Application.getMinorVersion() + "." + 
-        Application.getMaintenanceVersion() + "\n" + 
-      "Database : " + database + "\n" + 
-      "Dialect  : " + Config.getString("db.dialect") + "\n" + 
-      "JDBC     : " + driverClass + "; " + driverVersion + "\n" +
-      "URL      : " + dbUrl + "\n" +
-      "Java     : " + properties.getProperty("java.runtime.name") + "; " +
+      "BASE      : " + Version.getVersion() + "\n" + 
+      "Database  : " + database + "\n" + 
+      "Dialect   : " + Config.getString("db.dialect") + "\n" + 
+      "Hibernate : " + org.hibernate.Version.getVersionString() + "\n"+
+      "JDBC      : " + driverClass + "; " + driverVersion + "\n" +
+      "URL       : " + dbUrl + "\n" +
+      "Java      : " + properties.getProperty("java.runtime.name") + "; " +
         properties.getProperty("java.runtime.version") + "; " +
         properties.getProperty("java.vendor") + "\n" + 
-      "OS       : " + properties.getProperty("os.name") +"; " +
+      "OS        : " + properties.getProperty("os.name") +"; " +
         properties.getProperty("os.arch") + "; " +
         properties.getProperty("os.version") +"\n" +