- CHG: Version bump and dependency update.

germinateplatform · Jun 5, 2024 · 7676c6b · 7676c6b
1 parent 7ca5c89
commit 7676c6b
Show file tree

Hide file tree

Showing 7 changed files with 364 additions and 293 deletions.
diff --git a/build.gradle b/build.gradle
@@ -21,7 +21,7 @@ apply plugin: 'com.bmuschko.cargo-base'
 compileJava.options.encoding = 'UTF-8'
 
 group 'uk.ac.hutton.germinate'
-version '4.7.2'
+version '4.7.3'
 
 sourceCompatibility = 11
 

diff --git a/docs/setup-example.md b/docs/setup-example.md
@@ -123,7 +123,7 @@ database.port=3306
 
 # We're using the Docker container name of Gatekeeper here.
 gatekeeper.url=http://gatekeeper:8080
-gatekeeper.username=gatekeeper-username
+gatekeeper.username=gatekeeper-username@email.com
 gatekeeper.password=gatekeeper-password
 
 # This is only true if trying to access it from the machine running Docker.
@@ -147,11 +147,12 @@ database.password=gatekeeper-password
 # Note, we're not using the 9307 port here. That's only for remote access.
 database.port=3306
 
-email.address=
-email.username=
-email.password=
-email.server=
-email.port=
+# Replace these with actual email properties
+email.address=dummyemail@gmail.com
+email.username=dummyemail@gmail.com
+email.password=mysimplepassword
+email.server=smtp.gmail.com
+email.port=587
 
 # This is only true if trying to access it from the machine running Docker.
 # If you want the setup to be available from the outside world, use whatever your Proxy setup is configured as. 

diff --git a/lib/germinate-brapi-4.7.2.jar → lib/germinate-brapi-4.7.3.jar b/lib/germinate-brapi-4.7.2.jar → lib/germinate-brapi-4.7.3.jar
diff --git a/lib/germinate-codegen-4.7.2.jar → lib/germinate-codegen-4.7.3.jar b/lib/germinate-codegen-4.7.2.jar → lib/germinate-codegen-4.7.3.jar
diff --git a/lib/germinate-importer-4.7.2.jar → lib/germinate-importer-4.7.3.jar b/lib/germinate-importer-4.7.2.jar → lib/germinate-importer-4.7.3.jar
diff --git a/src/main/java/jhi/germinate/server/util/FlywayChecksumGenerator.java b/src/main/java/jhi/germinate/server/util/FlywayChecksumGenerator.java
@@ -13,7 +13,7 @@ public class FlywayChecksumGenerator
 	public static void main(String[] args)
 		throws IOException
 	{
-		System.out.println(getChecksum(new File("src/main/resources/jhi/germinate/server/util/database/migration/V4.24.02.09__update.sql")));
+		System.out.println(getChecksum(new File("src/main/resources/jhi/germinate/server/util/database/migration/V4.23.08.03__update.sql")));
 	}
 
 	/**

diff --git a/src/main/resources/jhi/germinate/server/util/database/init/db_setup.sql b/src/main/resources/jhi/germinate/server/util/database/init/db_setup.sql