Merge remote-tracking branch 'origin/2.1' into 2.1

Conflicts: pom.xml
2021-09-13 01:26:12 +00:00 · 2015-07-14 20:02:41 +01:00
parent 99b0a07671 11b34e40ee
commit ea83dd97d1
1 changed files with 8 additions and 2 deletions
@@ -44,11 +44,17 @@
            <dependency>
                <groupId>net.openhft</groupId>
                <artifactId>chronicle-bom</artifactId>
-                <version>1.5.8</version>
+                <version>1.5.9</version>
                <type>pom</type>
                <scope>import</scope>
            </dependency>
-            
+
+            <dependency>
+                <groupId>net.openhft</groupId>
+                <artifactId>affinity</artifactId>
+                <version>2.2</version>
+            </dependency>
+
        </dependencies>

    </dependencyManagement>