BNPPFSLA-1125 [Fix] Double JAR files in docker-solr container

  * Core-issue is that imported docker-solr container contains an old SOLR-BACKUP.
  * This has to be removed on docker level.
  * Build itself does need to include the jackson/joda libraries.

Author: codingBenVdS

integration-tests/build.gradle

@@ -46,6 +46,12 @@ createDockerFile {
     dependsOn(configurations.backupJar)
 
     if (flavor == "solr6") {
+        // Remove the old imported solr-backup from docker-solr:
+        // Resolves DOUBLE library issues!
+        runCommand 'rm /opt/alfresco-search-services/solrhome/lib/solr-backup-0.0.11.jar'
+        runCommand 'rm /opt/alfresco-search-services/solrhome/lib/aws-java-sdk*'
+        runCommand 'rm /opt/alfresco-search-services/solrhome/lib/jackson-*'
+
         smartCopy "${project.projectDir}/src/test/resources/solr.xml", "/opt/alfresco-search-services/solrhome/solr.xml"
         smartCopy configurations.backupJar, "/opt/alfresco-search-services/solrhome/lib/"
     }

integration-tests/src/test/java/eu/xenit/solr/backup/s3/SolrBackupTest.java

@@ -93,12 +93,13 @@ public void setup() {
                 .build();
         restoreFixedSnapshotRequestSpec = new RequestSpecBuilder()
                 .setBaseUri(baseURISolr)
-                .setPort(8081)
+                .setPort(solrPort)
                 .setBasePath(basePathSolrBackup)
-                .addParam("command", "restorestatus")
-                .addParam("wt", "json")
+                .addParam("command", "restore")
+                .addParam("repository", "s3")
+                .addParam("location", "bucket")
+                .addParam("name", "my-alfresco-backup-20251006")
                 .build();
-
         // wait for solr to track
         try {
             sleep(30000);
@@ -111,11 +112,23 @@ public void setup() {
     @Order(3)
     void testRestorePointInTimeScriptEndpoint() {
         System.out.println("Restore triggered at solr-startup after health-check succeeded, will wait maximum 3 minutes");
+        // Check logs for restore at startup... (Solr doesnt remember by the time we reach our test).
+        // Retrigger a restore from the backup
+        String responseBody = given()
+                .spec(restoreFixedSnapshotRequestSpec)
+                .when()
+                .get()
+                .then()
+                .statusCode(200)
+                .extract()
+                .body() // Extract the whole body
+                .asString(); // as a simple string
+        System.out.println("RAW RESPONSE: " + responseBody); // Print it!
         long startTime = System.currentTimeMillis();
-        await().atMost(360, TimeUnit.SECONDS)
+        await().atMost(180, TimeUnit.SECONDS)
                 .pollInterval(1, TimeUnit.SECONDS).until(() -> {
                     String status = given()
-                            .spec(restoreFixedSnapshotRequestSpec)
+                            .spec(restoreStatusRequestSpec)
                             .when()
                             .get()
                             .then()

integration-tests/src/test/resources/compose/aws/script.sh

@@ -3,6 +3,4 @@ echo "--- Creating S3 bucket for Solr backups ---"
 awslocal s3 mb s3://bucket
 
 echo "--- Uploading Solr snapshot 'my-test-name-x' to S3 ---"
-awslocal s3 sync /backups/snapshot.my-test-name-1 s3://bucket/snapshot.my-test-name-1/
-awslocal s3 sync /backups/snapshot.my-test-name-0 s3://bucket/snapshot.my-test-name-0/
-awslocal s3 sync /backups/snapshot.my-test-name-2 s3://bucket/snapshot.my-test-name-2/
+awslocal s3 sync /backups/snapshot s3://bucket/opt/alfresco-search-services/data/solr6Backup/alfresco/snapshot.my-alfresco-backup-20251006

integration-tests/src/test/resources/compose/docker-compose.yml

@@ -38,29 +38,6 @@ services:
     ports:
       - "8080:8080"
       - "8000:8000"
-    volumes:
-      - ./solr_backups:/opt/alfresco-search-services/data/solr6Backup/alfresco
-    environment:
-      - ALFRESCO_SSL=secret
-      - DEBUG=true
-      - JMX_ENABLED=true
-      - JAVA_XMX=1024M
-      - ALFRESCO_SECRET=mysolrsecret
-      - S3_ENDPOINT=http://localstack:4566
-      - S3_REGION=us-east-1
-      - S3_BUCKET_NAME=bucket
-      - S3_ACCESS_KEY=access_key
-      - S3_SECRET_KEY=secret_key
-      - S3_PATH_STYLE_ACCESS_ENABLED=true
-  solr-fixed-snapshot-restore:
-    image: "${DOCKER_IMAGE:-local}"
-    restart: unless-stopped
-    hostname: solr-fixed-snapshot-restore
-    networks:
-      - solr-backup-local-network
-    ports:
-      - "8081:8080"
-      - "8001:8000"
     environment:
       - ALFRESCO_SSL=secret
       - DEBUG=true
@@ -73,9 +50,30 @@ services:
       - S3_ACCESS_KEY=access_key
       - S3_SECRET_KEY=secret_key
       - S3_PATH_STYLE_ACCESS_ENABLED=true
-      - RESTORE_FROM_BACKUP=true
-      - RESTORE_BACKUP_NAME=snapshot.my-test-name-1
-      - RESTORE_BACKUP_PATH=bucket
+#  solr-fixed-snapshot-restore:
+#    image: "${DOCKER_IMAGE:-local}"
+#    restart: unless-stopped
+#    hostname: solr-fixed-snapshot-restore
+#    networks:
+#      - solr-backup-local-network
+#    ports:
+#      - "8081:8080"
+#      - "8001:8000"
+#    environment:
+#      - ALFRESCO_SSL=secret
+#      - DEBUG=true
+#      - JMX_ENABLED=true
+#      - JAVA_XMX=1024M
+#      - ALFRESCO_SECRET=mysolrsecret
+#      - S3_ENDPOINT=http://localstack:4566
+#      - S3_REGION=us-east-1
+#      - S3_BUCKET_NAME=bucket
+#      - S3_ACCESS_KEY=access_key
+#      - S3_SECRET_KEY=secret_key
+#      - S3_PATH_STYLE_ACCESS_ENABLED=true
+#      - RESTORE_FROM_BACKUP=true
+#      - RESTORE_BACKUP_NAME=my-alfresco-backup-20251006
+#      - RESTORE_BACKUP_PATH=bucket
   localstack:
     container_name: localstack
     image: localstack/localstack:2.3.2
@@ -90,7 +88,7 @@ services:
       - AWS_DEFAULT_REGION=us-east-1
     volumes:
       - ./aws:/etc/localstack/init/ready.d
-      - ./solr_backups:/backups
+      - ./solr-snapshot:/backups
 networks:
   solr-backup-local-network:
     driver: bridge