diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 23714f20e..cf59c9c2c 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -101,9 +101,9 @@ jobs:
       - name: Setup java
         uses: actions/setup-java@v1
         with:
-          java-version: 8
+          java-version: 11
       - name: Publish jars
-        run: ./gradlew publish
+        run: ./gradlew :timebase-collections:publish :timebase-lang:publish :timebase-messages:publish :timebase-util:publish
         env:
           SONATYPE_REPOSITORY:      ${{ secrets.SONATYPE_REPOSITORY }}
           SONATYPE_NEXUS_USERNAME:  ${{ secrets.SONATYPE_NEXUS_USERNAME }}
diff --git a/build.gradle b/build.gradle
index dee913d02..e3709c463 100644
--- a/build.gradle
+++ b/build.gradle
@@ -108,8 +108,7 @@ configure(leafProjects) {
         compileOnly 'com.google.code.findbugs:jsr305'
         compileOnly 'com.google.code.findbugs:annotations'
 
-        testCompile 'junit:junit:4.12'
-                //'org.mockito:mockito-core:1.10.19'
+        testImplementation 'junit:junit:4.12'
 
         spotbugsPlugins 'com.h3xstream.findsecbugs:findsecbugs-plugin:1.9.0'
     }
@@ -263,15 +262,15 @@ configure(leafProjects) {
                 from components.java
 
                 pom {
-                    name = 'thread.affinity'
+                    name = project.name
                     packaging = 'jar'
-                    description = 'A wrapper over net.openhft:affinity providing handy classes to create threads pinned to the specified CPUs.'
-                    url = 'https://github.com/epam/ThreadAffinity'
+                    description = 'Timebase Common utilities and collections.'
+                    url = 'https://github.com/epam/TimeBaseCommons.git'
 
                     scm {
-                        connection = 'scm:git:https://github.com/epam/ThreadAffinity.git'
-                        developerConnection = 'scm:git:https://github.com/epam/ThreadAffinity.git'
-                        url = 'https://github.com/epam/ThreadAffinity.git'
+                        connection = 'scm:git:https://github.com/epam/TimeBaseCommons.git'
+                        developerConnection = 'scm:git:https://github.com/epam/TimeBaseCommons.git'
+                        url = 'https://github.com/epam/TimeBaseCommons.git'
                     }
 
                     licenses {
diff --git a/collections/build.gradle b/collections/build.gradle
index a572be327..3ec2a409a 100644
--- a/collections/build.gradle
+++ b/collections/build.gradle
@@ -1,4 +1,4 @@
-description = 'QuantServer commons-collections set of utilities'
+description = 'Timebase commons-collections set of utilities'
 
 buildscript {
     repositories {
diff --git a/gradle.properties b/gradle.properties
index 4761bd589..1062c882a 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,5 +1,6 @@
 #Thu Feb 11 09:31:42 UTC 2021
+version=6.0.58-SNAPSHOT
+
 dfpVersion=0.11.01
-version=6.0.53-SNAPSHOT
 hdTimeVersion=0.2.4
 group=com.epam.deltix
\ No newline at end of file
diff --git a/lang/build.gradle b/lang/build.gradle
index 39e7c8e1f..79ca61949 100644
--- a/lang/build.gradle
+++ b/lang/build.gradle
@@ -2,12 +2,16 @@ plugins {
     id 'me.champeau.gradle.jmh' version '0.4.5' apply false
 }
 
-description = 'QuantServer commons-lang set of utilities'
+description = 'Timebase commons-lang set of utilities'
 
 dependencies {
-    implementation 'com.epam.deltix:dfp'
-    implementation 'com.epam.deltix:hd-date-time'
+    //implementation 'com.epam.deltix:dfp'
+    //implementation 'com.epam.deltix:hd-date-time'
+    
+    implementation group: 'com.epam.deltix', name: 'dfp', version: dfpVersion
+    implementation group: 'com.epam.deltix', name: 'hd-date-time', version: hdTimeVersion
     implementation 'com.epam.deltix:gflog-api'
+    implementation 'com.epam.deltix:gflog-core'
 
     // For JMH-based tests
     testImplementation 'org.openjdk.jmh:jmh-core'
diff --git a/messages/build.gradle b/messages/build.gradle
index 9c60f1a79..f30ed8a13 100644
--- a/messages/build.gradle
+++ b/messages/build.gradle
@@ -18,7 +18,7 @@ configurations {
 //
 //compileJava.dependsOn generate
 
-description = 'QuantServer Messages Interfaces'
+description = 'Timebase Messages Interfaces'
 
 dependencies {
     //dojoGenerator group: 'deltix', name: 'dojo-generator', version: '3.0.10'
diff --git a/util/build.gradle b/util/build.gradle
index 383985764..d5ae1455c 100644
--- a/util/build.gradle
+++ b/util/build.gradle
@@ -1,4 +1,4 @@
-description = 'QuantServer general purpose utilities'
+description = 'Timebase general purpose utilities'
 
 dependencies {
     implementation project(':timebase-lang')
@@ -25,7 +25,7 @@ dependencies {
     //compile 'org.glassfish.jaxb:jaxb-runtime:2.2.11'  // Glassfish replaces JAXB RI
     //compile('javax.xml:jsr173:1.0'){ transitive = false }
 
-    compile('net.java.dev.jna:jna:4.2.1'){ transitive = false }
-    compile('net.java.dev.jna:jna-platform:4.2.1'){ transitive = false }
-    compile('org.apache.bcel:bcel:6.0'){ transitive = false }
+    implementation('net.java.dev.jna:jna:4.2.1')
+    implementation('net.java.dev.jna:jna-platform:4.2.1')
+    implementation('org.apache.bcel:bcel:6.0')
 }
\ No newline at end of file