- CHG: Version bump.

- CHG: Big dependency update.
- FIX: Fixed issues during automatic trial archiving.

Author: sebastian-raubach

.idea/workspace.xml

@@ -25,7 +25,7 @@ java {
 }
 
 group 'uk.ac.hutton.ics.gridscore'
-version '3.4.2'
+version '3.4.3'
 
 repositories {
     maven {
@@ -42,10 +42,10 @@ dependencies {
     implementation 'com.google.code.gson:gson:2.9.0'
 
     implementation 'com.mysql:mysql-connector-j:8.2.0'
-    implementation 'org.jooq:jooq:3.16.18'
-    implementation 'org.jooq:jooq-codegen:3.16.18'
+    implementation 'org.jooq:jooq:3.20.5'
+    implementation 'org.jooq:jooq-codegen:3.20.5'
 
-    implementation 'commons-io:commons-io:2.11.0'
+    implementation 'commons-io:commons-io:2.20.0'
 
     implementation 'javax.annotation:javax.annotation-api:1.3.2'
     implementation 'javax.activation:activation:1.1.1'
@@ -58,17 +58,18 @@ dependencies {
     implementation 'org.glassfish.jersey.media:jersey-media-json-jackson:3.1.3'
     implementation 'org.glassfish.jersey.media:jersey-media-multipart:3.1.3'
 
-    implementation 'org.apache.poi:poi-ooxml:5.2.2'
+    implementation 'org.apache.poi:poi-ooxml:5.4.1'
 
-    implementation 'org.flywaydb:flyway-core:6.5.7'
+    implementation 'org.flywaydb:flyway-core:10.22.0'
+    implementation 'org.flywaydb:flyway-mysql:10.22.0'
 
     implementation 'javax.media:jai_core:1.1.3'
     implementation 'org.geotools:gt-shapefile:22.2'
 
     compileOnly 'org.projectlombok:lombok:1.18.30'
     annotationProcessor 'org.projectlombok:lombok:1.18.30'
 
-    implementation 'net.logicsquad:nanocaptcha:1.3'
+    implementation 'net.logicsquad:nanocaptcha:2.1'
 }
 
 jar {

build.gradle

@@ -188,7 +188,7 @@ public static void exportShapefile(Trial trial, File folder, String filename)
 			int row = Integer.parseInt(rowColumn[0]);
 			int col = Integer.parseInt(rowColumn[1]);
 			Corners corners = cell.getGeography().getCorners();
-			if (corners != null)
+			if (corners != null && corners.isValid())
 			{
 				Coordinate[] coordinates = new Coordinate[]{
 						new Coordinate(corners.getTopLeft().getLng(), corners.getTopLeft().getLat()),

src/main/java/jhi/gridscore/server/resource/TrialExportResource.java

@@ -1,6 +1,7 @@
 package jhi.gridscore.server.resource;
 
 import jakarta.ws.rs.*;
+import jakarta.ws.rs.Path;
 import jakarta.ws.rs.core.*;
 import jhi.gridscore.server.PropertyWatcher;
 import jhi.gridscore.server.database.Database;
@@ -9,7 +10,9 @@
 import jhi.gridscore.server.util.Secured;
 import net.logicsquad.nanocaptcha.content.LatinContentProducer;
 import net.logicsquad.nanocaptcha.image.ImageCaptcha;
-import net.logicsquad.nanocaptcha.image.backgrounds.FlatColorBackgroundProducer;
+import net.logicsquad.nanocaptcha.image.backgrounds.TransparentBackgroundProducer;
+import net.logicsquad.nanocaptcha.image.noise.CurvedLineNoiseProducer;
+import net.logicsquad.nanocaptcha.image.renderer.DefaultWordRenderer;
 import org.apache.commons.collections4.CollectionUtils;
 import org.jooq.*;
 import org.jooq.impl.*;
@@ -23,8 +26,8 @@
 import java.time.*;
 import java.time.format.*;
 import java.time.temporal.ChronoUnit;
-import java.util.List;
 import java.util.*;
+import java.util.List;
 import java.util.logging.Logger;
 
 import static jhi.gridscore.server.database.codegen.tables.Trials.TRIALS;
@@ -407,7 +410,7 @@ public Response postRenewCaptchaResponse(@PathParam("shareCode") String shareCod
 	@Path("/{shareCode}/captcha")
 	@Consumes(MediaType.APPLICATION_JSON)
 	@Produces({"image/png"})
-	public Response getRenewCaptcha(@PathParam("shareCode") String shareCode)
+	public Response getRenewCaptcha(@PathParam("shareCode") String shareCode, @QueryParam("darkMode") Boolean darkMode)
 			throws SQLException
 	{
 		if (StringUtils.isBlank(shareCode))
@@ -429,9 +432,11 @@ public Response getRenewCaptcha(@PathParam("shareCode") String shareCode)
 
 				// Create a captcha with noise
 				ImageCaptcha imageCaptcha = new ImageCaptcha.Builder(200, 50)
-						.addNoise()
-						.addContent(new LatinContentProducer(7))
-						.addBackground(new FlatColorBackgroundProducer(Color.WHITE))
+						.addNoise(new CurvedLineNoiseProducer(Objects.equals(darkMode, true) ? Color.WHITE : Color.decode("#212529"), 3))
+						.addContent(new LatinContentProducer(7), new DefaultWordRenderer.Builder()
+								.randomColor(Color.decode("#910080"), Color.decode("#ff7c00"), Color.decode("#5ec418"), Color.decode("#00a0f1"))
+								.build())
+						.addBackground(new TransparentBackgroundProducer())
 						.build();
 
 				// Write to image

src/main/java/jhi/gridscore/server/resource/TrialResource.java

@@ -319,7 +319,7 @@ private void exportIndividually(XSSFSheet data, XSSFSheet dates)
 				{
 					Double lat = null;
 					Double lng = null;
-					if (cell.getGeography().getCorners() != null)
+					if (cell.getGeography().getCorners() != null && cell.getGeography().getCorners().isValid())
 					{
 						lat = 0d;
 						lng = 0d;

src/main/java/jhi/gridscore/server/util/DataToSpreadsheet.java

@@ -12,7 +12,7 @@
 
 public abstract class ConfigTest
 {
-	protected static String             URL = "http://localhost:8180/gridscore-next-api/v3.4.0/api/trial";
+	protected static String             URL = "http://localhost:8180/gridscore-next-api/v3.4.3/api/trial";
 	protected static Client             client;
 	protected static Invocation.Builder postBuilder;