Upgrade dependencies (#118)

Author: NathanEckert

.gitignore

@@ -3,7 +3,7 @@
 # Statistic folder to drop exported reports
 # Keep the folder for the README but ignore everything else
 /input_statistics/*
-!/input_statistics/README.txt
+!/input_statistics/README.md
 target
 logs
 # misc. IDE config files

input_statistics/README.txt renamed to input_statistics/README.md

@@ -6,14 +6,14 @@
   <parent>
     <groupId>org.springframework.boot</groupId>
     <artifactId>spring-boot-starter-parent</artifactId>
-    <version>2.7.8</version>
+    <version>2.7.18</version>
     <relativePath/>
   </parent>
 
   <groupId>com.activeviam.tools</groupId>
   <artifactId>mac</artifactId>
   <version>3.0.0-SNAPSHOT</version>
-  <name>ActivePivot Memory Analysis Cube</name>
+  <name>Atoti Server Memory Analysis Cube</name>
 
   <licenses>
     <license>
@@ -25,11 +25,10 @@
   <properties>
     <jdk.version>11</jdk.version>
 
-    <activepivot.version>6.0.6</activepivot.version>
-    <activeui.version>5.1.5</activeui.version>
+    <atoti-server.version>6.0.10</atoti-server.version>
+    <atoti-ui.version>5.1.13</atoti-ui.version>
 
     <tomcat.version>9.0.31</tomcat.version>
-    <lombok.version>1.18.18</lombok.version>
 
     <spring.boot.mainclass>com.activeviam.mac.app.MacSpringBootApp</spring.boot.mainclass>
 
@@ -43,7 +42,7 @@
       <dependency>
         <groupId>com.activeviam.activepivot</groupId>
         <artifactId>activepivot-server</artifactId>
-        <version>${activepivot.version}</version>
+        <version>${atoti-server.version}</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>
@@ -54,7 +53,6 @@
     <dependency>
       <groupId>org.projectlombok</groupId>
       <artifactId>lombok</artifactId>
-      <version>${lombok.version}</version>
       <scope>provided</scope>
     </dependency>
 
@@ -101,11 +99,11 @@
       <artifactId>hibernate-c3p0</artifactId>
     </dependency>
 
-    <!-- ActiveUI dependency -->
+    <!-- Atoti UI dependency -->
     <dependency>
       <groupId>com.activeviam.activeui</groupId>
       <artifactId>activeui</artifactId>
-      <version>${activeui.version}</version>
+      <version>${atoti-ui.version}</version>
       <scope>runtime</scope>
     </dependency>
 
@@ -137,13 +135,13 @@
     <dependency>
       <groupId>com.activeviam.activepivot</groupId>
       <artifactId>activepivot-test</artifactId>
-      <version>${activepivot.version}</version>
+      <version>${atoti-server.version}</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>com.activeviam.activepivot</groupId>
       <artifactId>activepivot-server-test</artifactId>
-      <version>${activepivot.version}</version>
+      <version>${atoti-server.version}</version>
       <scope>test</scope>
     </dependency>
     <dependency>
@@ -169,7 +167,7 @@
     <dependency>
       <groupId>com.google.guava</groupId>
       <artifactId>guava</artifactId>
-      <version>31.0.1-jre</version>
+      <version>32.1.3-jre</version>
       <scope>test</scope>
     </dependency>
   </dependencies>
@@ -179,7 +177,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-enforcer-plugin</artifactId>
-        <version>3.0.0-M3</version>
+        <version>3.4.1</version>
         <executions>
           <execution>
             <id>enforce-versions</id>

pom.xml

@@ -50,7 +50,6 @@
 import com.qfs.store.NoTransactionException;
 import com.qfs.store.TypeValues;
 import com.qfs.store.build.impl.UnitTestDatastoreBuilder;
-import com.qfs.store.impl.Datastore;
 import com.qfs.store.query.ICursor;
 import com.qfs.store.record.IRecordReader;
 import com.qfs.store.transaction.DatastoreTransactionException;
@@ -111,13 +110,13 @@ public static void performGC() {
 
     /*
      * Note. We can't rely on calling MemUtils.runGC() because on some servers (alto), it seems not enough.
-     * Plus, MemUtils relies on on heap memory....
+     * Plus, MemUtils relies on on-heap memory....
      */
     for (int i = 0; i < MAX_GC_STEPS; i++) {
       try {
         System.gc();
 
-        Thread.sleep(1 << i); // give gc some times.
+        Thread.sleep(1 << i); // give gc some time.
 
         // create a soft assertion that allows getting the assertions results of all assertions
         // even if the first assertion is already false.
@@ -134,7 +133,7 @@ public static void performGC() {
   }
 
   void createApplication(
-      final ThrowingLambda.ThrowingBiConsumer<Datastore, IActivePivotManager> actions) {
+      final ThrowingLambda.ThrowingBiConsumer<IDatastore, IActivePivotManager> actions) {
     final IDatastoreSchemaDescription datastoreSchema =
         StartBuilding.datastoreSchema()
             .withStore(
@@ -321,7 +320,7 @@ void createApplication(
                     .end()
                     .build())
             .build();
-    final ApplicationInTests<Datastore> application =
+    final ApplicationInTests<IDatastore> application =
         ApplicationInTests.builder()
             .withDatastore(datastoreSchema)
             .withManager(userManagerDescription)
@@ -332,7 +331,7 @@ void createApplication(
   }
 
   void createMinimalApplication(
-      final ThrowingLambda.ThrowingBiConsumer<Datastore, IActivePivotManager> actions) {
+      final ThrowingLambda.ThrowingBiConsumer<IDatastore, IActivePivotManager> actions) {
 
     final IDatastoreSchemaDescription datastoreSchema =
         StartBuilding.datastoreSchema()
@@ -382,7 +381,7 @@ void createMinimalApplication(
                     .build())
             .build();
 
-    final ApplicationInTests<Datastore> application =
+    final ApplicationInTests<IDatastore> application =
         ApplicationInTests.builder()
             .withDatastore(datastoreSchema)
             .withManager(userManagerDescription)
@@ -397,7 +396,7 @@ void createMinimalApplication(
    *
    * @param datastore datastore to fill
    */
-  static void fillApplicationMinimal(final Datastore datastore) {
+  static void fillApplicationMinimal(final IDatastore datastore) {
     AtomicInteger operationsBatch = new AtomicInteger();
     datastore.edit(
         tm -> {
@@ -429,7 +428,7 @@ static void fillApplicationMinimal(final Datastore datastore) {
    *
    * @param datastore datastore to fill
    */
-  static void fillApplication(final Datastore datastore) {
+  static void fillApplication(final IDatastore datastore) {
     datastore.edit(
         tm -> {
           final int peopleCount = STORE_PEOPLE_COUNT;
@@ -470,7 +469,7 @@ static void fillApplication(final Datastore datastore) {
    *
    * @param datastore datastore to fill
    */
-  static void fillApplicationMinimalWithSingleValue(final Datastore datastore) {
+  static void fillApplicationMinimalWithSingleValue(final IDatastore datastore) {
     AtomicInteger operationsBatch = new AtomicInteger();
 
     datastore.edit(
@@ -502,7 +501,7 @@ static void fillApplicationMinimalWithSingleValue(final Datastore datastore) {
    *
    * @param datastore datastore to fill
    */
-  static void editApplicationMinimalWithSingleValue(final Datastore datastore) {
+  static void editApplicationMinimalWithSingleValue(final IDatastore datastore) {
     datastore.edit(
         tm -> {
           final int peopleCount = STORE_PEOPLE_COUNT;
@@ -534,7 +533,7 @@ static void editApplicationMinimalWithSingleValue(final Datastore datastore) {
    * @param datastore datastore to fill
    */
   static void fillApplicationWithBranches(
-      final Datastore datastore, Collection<String> branches, boolean minimalFilling)
+      final IDatastore datastore, Collection<String> branches, boolean minimalFilling)
       throws IllegalArgumentException {
     if (minimalFilling) {
       fillApplicationMinimal(datastore);
@@ -940,7 +939,11 @@ ApplicationInTests<IDatastore> createDistributedApplicationWithKeepAllEpochPolic
                 StartBuilding.cube("QueryCubeA")
                     .withContributorsCount()
                     .withCalculations(
-                        context -> Copper.count().multiply(Copper.constant(2L)).publish(context))
+                        context ->
+                            Copper.count()
+                                .multiply(Copper.constant(2L))
+                                .as("Contributors count times 2")
+                                .publish(context))
                     .asQueryCube()
                     .withClusterDefinition()
                     .withClusterId(clusterName)