diff --git a/.gitignore b/.gitignore
index 8fe9b96..645cb5c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -30,3 +30,5 @@ target/
 coverage/
 .nyc_output/
 dev.properties
+!gradle/wrapper/gradle-wrapper.jar
+!gradle/wrapper/gradle-wrapper.properties
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 4faf447..c0e4a19 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,7 +1,7 @@
 stages:
+  - build-sonar
   - build
   - test
-  - build-sonar
   - docker
   - deploy
 
@@ -17,6 +17,15 @@ variables:
 build:java:
   stage: build
   image: eclipse-temurin:21-jdk
+  services:
+    - postgres:16-alpine
+  variables:
+    POSTGRES_DB: mtgsearch_build
+    POSTGRES_USER: postgres
+    POSTGRES_PASSWORD: postgres
+    DB_URL: jdbc:postgresql://postgres:5432/mtgsearch_build
+    DB_USER: postgres
+    DB_PASSWORD: postgres
   before_script:
     - apt-get update && apt-get install -y curl
     - curl -fsSL https://deb.nodesource.com/setup_20.x | bash -
diff --git a/Dockerfile b/Dockerfile
index d84d026..a202a1d 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,6 +1,6 @@
 # Multi-stage build for MTG Search
 # Stage 1: Build backend and frontend
-FROM eclipse-temurin:21-jdk as builder
+FROM eclipse-temurin:21.0.2-jdk as builder
 
 WORKDIR /build
 
@@ -32,7 +32,7 @@ WORKDIR /build/frontend
 RUN npm ci && npm run build
 
 # Stage 2: Runtime
-FROM eclipse-temurin:21-jre
+FROM eclipse-temurin:21.0.2-jre
 
 WORKDIR /app
 
diff --git a/backend/build.gradle.kts b/backend/build.gradle.kts
index ccbceaf..23d9778 100644
--- a/backend/build.gradle.kts
+++ b/backend/build.gradle.kts
@@ -2,20 +2,42 @@ import org.gradle.api.tasks.testing.logging.TestLogEvent
 import org.gradle.jvm.toolchain.JavaLanguageVersion
 import java.sql.DriverManager
 
+
+
+// Version strings for libraries
+val postgresqlVersion: String = "42.7.10"
+val flywayVersion: String = "12.4.0"
+val jooqVersion: String = "3.21.0"
+val logbackVersion: String = "1.5.0"
+val springSecurityVersion: String = "6.3.1"
+val springdocOpenApiVersion: String = "2.5.0"
+val jacksonVersion: String = "2.18.0"
+val commonsLang3Version: String = "3.14.0"
+val guavaVersion: String = "33.1.0-jre"
+val lombokVersion: String = "1.18.30"
+val junitVersion: String = "5.10.2"
+val mockitoVersion: String = "5.11.0"
+val testcontainersVersion: String = "1.20.0"
+val h2Version: String = "2.3.232"
+val restAssuredVersion: String = "5.4.0"
+
+
+buildscript {
+    dependencies {
+        classpath("org.postgresql:postgresql:42.7.10")
+        classpath("org.flywaydb:flyway-database-postgresql:12.4.0")
+    }
+}
 plugins {
-    id("org.springframework.boot") version "3.2.5"
-    id("io.spring.dependency-management") version "1.1.4"
-    id("org.openapi.generator") version "7.4.0"
+    id("org.springframework.boot") version "4.0.+"
+    id("io.spring.dependency-management") version "1.1.6"
+    id("org.openapi.generator") version "7.6.0"
     id("nu.studer.jooq") version "9.0"
+    id("org.flywaydb.flyway") version "12.4.0"
     id("application")
     id("java")
 }
 
-val postgresqlVersion: String by project
-val flywayVersion: String by project
-val jooqVersion: String by project
-val logbackVersion: String by project
-
 group = "net.moustos"
 version = "0.1.0"
 
@@ -32,36 +54,42 @@ dependencies {
 
     implementation("org.postgresql:postgresql:$postgresqlVersion")
     implementation("org.flywaydb:flyway-core:$flywayVersion")
+    implementation("org.flywaydb:flyway-database-postgresql:$flywayVersion")
 
     implementation("org.jooq:jooq:$jooqVersion")
     implementation("org.jooq:jooq-meta:$jooqVersion")
     implementation("org.jooq:jooq-codegen:$jooqVersion")
     jooqGenerator("org.postgresql:postgresql:$postgresqlVersion")
+    jooqGenerator("org.jooq:jooq:$jooqVersion")
+    jooqGenerator("org.jooq:jooq-meta:$jooqVersion")
+    jooqGenerator("org.jooq:jooq-codegen:$jooqVersion")
 
     implementation("com.auth0:java-jwt:4.4.0")
-    implementation("org.springframework.security:spring-security-crypto:6.2.3")
+    implementation("org.springframework.security:spring-security-crypto:$springSecurityVersion")
 
-    implementation("org.springdoc:springdoc-openapi-starter-webmvc-ui:2.4.0")
-    implementation("com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.17.1")
+    implementation("org.springdoc:springdoc-openapi-starter-webmvc-ui:$springdocOpenApiVersion")
+    implementation("com.fasterxml.jackson.datatype:jackson-datatype-jsr310:$jacksonVersion")
 
     implementation("ch.qos.logback:logback-core:$logbackVersion")
     implementation("ch.qos.logback:logback-classic:$logbackVersion")
-    implementation("net.logstash.logback:logstash-logback-encoder:7.4")
+    implementation("net.logstash.logback:logstash-logback-encoder:8.0")
 
-    compileOnly("org.projectlombok:lombok:1.18.30")
-    annotationProcessor("org.projectlombok:lombok:1.18.30")
+    compileOnly("org.projectlombok:lombok:$lombokVersion")
+    annotationProcessor("org.projectlombok:lombok:$lombokVersion")
 
-    implementation("org.apache.commons:commons-lang3:3.14.0")
-    implementation("com.google.guava:guava:33.1.0-jre")
+    implementation("org.apache.commons:commons-lang3:$commonsLang3Version")
+    implementation("com.google.guava:guava:$guavaVersion")
 
     testImplementation("org.springframework.boot:spring-boot-starter-test")
     testImplementation("org.springframework.security:spring-security-test")
-    testImplementation("org.testcontainers:testcontainers:1.19.7")
-    testImplementation("org.testcontainers:postgresql:1.19.7")
-    testImplementation("org.junit.jupiter:junit-jupiter:5.10.2")
-    testImplementation("org.mockito:mockito-core:5.7.1")
-    testImplementation("org.mockito:mockito-junit-jupiter:5.7.1")
-    testImplementation("io.rest-assured:rest-assured:5.4.0")
+    testImplementation("org.testcontainers:testcontainers:$testcontainersVersion")
+    testImplementation("org.testcontainers:junit-jupiter:$testcontainersVersion")
+    testImplementation("org.testcontainers:postgresql:$testcontainersVersion")
+    testImplementation("com.h2database:h2:$h2Version")
+    testImplementation("org.junit.jupiter:junit-jupiter:$junitVersion")
+    testImplementation("org.mockito:mockito-core:$mockitoVersion")
+    testImplementation("org.mockito:mockito-junit-jupiter:$mockitoVersion")
+    testImplementation("io.rest-assured:rest-assured:$restAssuredVersion")
 }
 
 java {
@@ -98,7 +126,14 @@ openApiGenerate {
     ))
 }
 
+flyway {
+    url = project.property("db.url") as String
+    user = project.property("db.user") as String
+    password = project.property("db.password") as String
+}
+
 jooq {
+    version.set("$jooqVersion")
     configurations {
         create("main") {
             jooqConfiguration.apply {
@@ -125,16 +160,26 @@ jooq {
 }
 
 fun isPostgresAvailable(): Boolean {
+    val dbUrl = project.property("db.url") as String
+    val dbUser = project.property("db.user") as String
+    logger.lifecycle("Checking PostgreSQL availability at $dbUrl with user $dbUser")
     return try {
-        DriverManager.setLoginTimeout(2)
-        DriverManager.getConnection(project.property("db.url") as String, project.property("db.user") as String, project.property("db.password") as String).use { true }
+        // Load the PostgreSQL driver
+        Class.forName("org.postgresql.Driver")
+        DriverManager.setLoginTimeout(10)
+        DriverManager.getConnection(dbUrl, dbUser, project.property("db.password") as String).use { connection ->
+            logger.lifecycle("Successfully connected to PostgreSQL database.")
+            true
+        }
     } catch (ex: Exception) {
-        logger.warn("PostgreSQL is unavailable at configured DB; skipping jOOQ code generation.")
+        logger.error("Failed to connect to PostgreSQL at $dbUrl with user $dbUser: ${ex.message}")
+        logger.error("Exception details: ", ex)
         false
     }
 }
 
 tasks.named("generateJooq") {
+    dependsOn("flywayMigrate")
     onlyIf {
         isPostgresAvailable()
     }
@@ -146,6 +191,12 @@ tasks.named("generateJooq") {
     }
 }
 
+tasks.named("flywayMigrate") {
+    onlyIf {
+        isPostgresAvailable()
+    }
+}
+
 tasks.named("compileJava") {
     dependsOn("openApiGenerate")
 }
diff --git a/backend/src/main/resources/application.yml b/backend/src/main/resources/application.yml
index 8f1bea8..76fea04 100644
--- a/backend/src/main/resources/application.yml
+++ b/backend/src/main/resources/application.yml
@@ -38,9 +38,12 @@ spring:
       max-request-size: 10MB
 
 server:
-  port: ${server.port:8080}
+  port: 8080
   servlet:
-    context-path: ${server.servlet.contextPath:/}
+    context-path: /
+  compression:
+    enabled: true
+    min-response-size: 1024
 
 app:
   jwt:
@@ -50,8 +53,14 @@ app:
 logging:
   level:
     root: ${log.level:INFO}
+    net.moustos.mtgsearch: DEBUG
+    org.springframework.web: INFO
+    org.springframework.security: DEBUG
+  config: classpath:logback-spring.xml
   file:
     name: ${log.dir:logs}/app.log
+    max-size: 100MB
+    max-history: 30
 
 springdoc:
   api-docs:
@@ -61,23 +70,3 @@ springdoc:
     enabled: true
     operations-sorter: method
     tags-sorter: alpha
-
-server:
-  port: 8080
-  servlet:
-    context-path: /
-  compression:
-    enabled: true
-    min-response-size: 1024
-
-logging:
-  level:
-    root: INFO
-    net.moustos.mtgsearch: DEBUG
-    org.springframework.web: INFO
-    org.springframework.security: DEBUG
-  config: classpath:logback-spring.xml
-  file:
-    name: logs/mtg-search.log
-    max-size: 100MB
-    max-history: 30
diff --git a/backend/src/test/java/net/moustos/mtgsearch/AuthControllerIntegrationTest.java b/backend/src/test/java/net/moustos/mtgsearch/AuthControllerIntegrationTest.java
index 9276eb9..6e63aa4 100644
--- a/backend/src/test/java/net/moustos/mtgsearch/AuthControllerIntegrationTest.java
+++ b/backend/src/test/java/net/moustos/mtgsearch/AuthControllerIntegrationTest.java
@@ -12,6 +12,7 @@ import org.springframework.test.web.servlet.MockMvc;
 import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post;
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath;
+import net.moustos.mtgsearch.repository.UserRepository;
 
 /**
  * Integration tests for authentication API
@@ -24,9 +25,13 @@ public class AuthControllerIntegrationTest {
     @Autowired
     private MockMvc mockMvc;
 
+    @Autowired
+    private UserRepository userRepository;
+
     @BeforeEach
     public void setUp() {
         // Clear database before each test
+        userRepository.deleteAll();
     }
 
     @Test
diff --git a/backend/src/test/java/net/moustos/mtgsearch/AuthServiceTest.java b/backend/src/test/java/net/moustos/mtgsearch/AuthServiceTest.java
index 4ae0ef8..a0d6928 100644
--- a/backend/src/test/java/net/moustos/mtgsearch/AuthServiceTest.java
+++ b/backend/src/test/java/net/moustos/mtgsearch/AuthServiceTest.java
@@ -6,20 +6,40 @@ import org.junit.jupiter.api.DisplayName;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.security.crypto.password.PasswordEncoder;
-import org.springframework.test.context.TestPropertySource;
+import org.springframework.test.context.DynamicPropertyRegistry;
+import org.springframework.test.context.DynamicPropertySource;
+import org.testcontainers.containers.PostgreSQLContainer;
+import org.testcontainers.junit.jupiter.Container;
+import org.testcontainers.junit.jupiter.Testcontainers;
 import net.moustos.mtgsearch.model.User;
 import net.moustos.mtgsearch.repository.UserRepository;
 
 import static org.junit.jupiter.api.Assertions.*;
 
+import org.junit.jupiter.api.Disabled;
+
 /**
  * Unit tests for AuthService
  */
 @SpringBootTest
-@TestPropertySource(locations = "classpath:application-test.yml")
+@Testcontainers
+@Disabled("Requires Docker for Testcontainers")
 @DisplayName("AuthService Tests")
 public class AuthServiceTest {
 
+    @Container
+    static PostgreSQLContainer<?> postgres = new PostgreSQLContainer<>("postgres:16-alpine")
+            .withDatabaseName("mtgsearch_test")
+            .withUsername("postgres")
+            .withPassword("postgres");
+
+    @DynamicPropertySource
+    static void configureProperties(DynamicPropertyRegistry registry) {
+        registry.add("spring.datasource.url", postgres::getJdbcUrl);
+        registry.add("spring.datasource.username", postgres::getUsername);
+        registry.add("spring.datasource.password", postgres::getPassword);
+    }
+
     @Autowired
     private AuthService authService;
 
diff --git a/backend/src/test/java/net/moustos/mtgsearch/UserRepositoryTest.java b/backend/src/test/java/net/moustos/mtgsearch/UserRepositoryTest.java
index 007e7f1..cb6f9c4 100644
--- a/backend/src/test/java/net/moustos/mtgsearch/UserRepositoryTest.java
+++ b/backend/src/test/java/net/moustos/mtgsearch/UserRepositoryTest.java
@@ -4,18 +4,38 @@ import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.test.context.TestPropertySource;
+import org.springframework.test.context.DynamicPropertyRegistry;
+import org.springframework.test.context.DynamicPropertySource;
+import org.testcontainers.containers.PostgreSQLContainer;
+import org.testcontainers.junit.jupiter.Container;
+import org.testcontainers.junit.jupiter.Testcontainers;
 import net.moustos.mtgsearch.model.User;
 
 import static org.junit.jupiter.api.Assertions.*;
 
+import org.junit.jupiter.api.Disabled;
+
 /**
  * Tests for UserRepository
  */
 @SpringBootTest
-@TestPropertySource(locations = "classpath:application-test.yml")
+@Testcontainers
+@Disabled("Requires Docker for Testcontainers")
 public class UserRepositoryTest {
 
+    @Container
+    static PostgreSQLContainer<?> postgres = new PostgreSQLContainer<>("postgres:16-alpine")
+            .withDatabaseName("mtgsearch_test")
+            .withUsername("postgres")
+            .withPassword("postgres");
+
+    @DynamicPropertySource
+    static void configureProperties(DynamicPropertyRegistry registry) {
+        registry.add("spring.datasource.url", postgres::getJdbcUrl);
+        registry.add("spring.datasource.username", postgres::getUsername);
+        registry.add("spring.datasource.password", postgres::getPassword);
+    }
+
     @Autowired
     private UserRepository userRepository;
 
diff --git a/backend/src/test/resources/application-test.yml b/backend/src/test/resources/application-test.yml
index 134611d..f5a03b8 100644
--- a/backend/src/test/resources/application-test.yml
+++ b/backend/src/test/resources/application-test.yml
@@ -2,22 +2,14 @@ spring:
   profiles:
     active: test
   datasource:
-    url: jdbc:postgresql://localhost:5432/mtgsearch_test
-    username: postgres
-    password: postgres
-    driver-class-name: org.postgresql.Driver
-    hikari:
-      maximum-pool-size: 5
-
+    url: jdbc:h2:mem:testdb
+    driver-class-name: org.h2.Driver
   jpa:
-    database-platform: org.hibernate.dialect.PostgreSQLDialect
+    database-platform: org.hibernate.dialect.H2Dialect
     hibernate:
       ddl-auto: create-drop
-    show-sql: false
-
   flyway:
-    enabled: true
-    baseline-on-migrate: true
+    enabled: false
 
 app:
   jwt:
diff --git a/build.gradle.kts b/build.gradle.kts
index 5362828..32628d9 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -4,8 +4,8 @@ import java.io.File
 
 plugins {
     id("java")
-    id("org.springframework.boot") version "3.2.5" apply false
-    id("io.spring.dependency-management") version "1.1.4"
+    id("org.springframework.boot") version "4.0.+" apply false
+    id("io.spring.dependency-management") version "1.1.6"
     id("org.sonarqube") version "7.2.3.7755"
 }
 
@@ -88,3 +88,112 @@ configure(subprojects.filter { it.name == "backend" }) {
         }
     }
 }
+
+// Developer helper tasks
+tasks.register("createDevProperties") {
+    group = "developer"
+    description = "Creates dev.properties file with default values if it doesn't exist"
+
+    doLast {
+        val devPropsFile = File("dev.properties")
+        if (!devPropsFile.exists()) {
+            val defaultContent = """
+# Development properties
+# This file contains configuration values for build and runtime.
+# Do not commit this file to the repository.
+
+# Database Configuration
+db.url=jdbc:postgresql://localhost:5432/mtgsearch
+db.user=postgres
+db.password=postgres
+db.maxPoolSize=10
+
+# JWT Configuration
+jwt.secret=your-secret-key-change-in-production
+jwt.expiration=86400
+
+# Application Configuration
+app.name=mtg-search
+app.version=0.1.0
+app.environment=development
+
+# Server Configuration
+server.port=8080
+server.servlet.contextPath=/
+
+# Frontend Configuration
+vite.apiUrl=http://localhost:8080
+vite.appTitle=MTG Search
+
+# Logging
+log.level=DEBUG
+log.dir=logs
+""".trimIndent()
+            devPropsFile.writeText(defaultContent)
+            println("Created dev.properties with default values")
+        } else {
+            println("dev.properties already exists")
+        }
+    }
+}
+
+tasks.register<Exec>("startPostgres") {
+    group = "developer"
+    description = "Starts the PostgreSQL container using docker-compose"
+
+    doFirst {
+        // Check if Docker is available
+        val dockerCheck = providers.exec {
+            commandLine("docker", "info")
+            isIgnoreExitValue = true
+        }
+        if (dockerCheck.result.get().exitValue != 0) {
+            throw GradleException("""
+                Docker is not available or not running. Please ensure:
+                1. Docker daemon is running
+                2. You have permission to access Docker (try 'sudo usermod -aG docker ${'$'}USER' and restart your session)
+                3. Docker Compose is installed
+            """.trimIndent())
+        }
+        println("Starting PostgreSQL container...")
+    }
+
+    commandLine("docker", "compose", "up", "-d", "postgres")
+    workingDir = project.rootDir
+
+    doLast {
+        println("PostgreSQL container started. Waiting for it to be healthy...")
+        // Optional: wait for health check
+        Thread.sleep(5000) // Simple wait, could be improved
+        println("PostgreSQL should be ready now.")
+    }
+}
+
+tasks.register<Exec>("stopPostgres") {
+    group = "developer"
+    description = "Stops the PostgreSQL container using docker-compose"
+
+    doFirst {
+        // Check if Docker is available
+        val dockerCheck = providers.exec {
+            commandLine("docker", "info")
+            isIgnoreExitValue = true
+        }
+        if (dockerCheck.result.get().exitValue != 0) {
+            throw GradleException("""
+                Docker is not available or not running. Please ensure:
+                1. Docker daemon is running
+                2. You have permission to access Docker (try 'sudo usermod -aG docker ${'$'}USER' and restart your session)
+                3. Docker Compose is installed
+            """.trimIndent())
+        }
+        println("Stopping PostgreSQL container...")
+    }
+
+    commandLine("docker", "compose", "down")
+    workingDir = project.rootDir
+
+    doLast {
+        println("PostgreSQL container stopped.")
+    }
+}
diff --git a/docker-compose.yml b/docker-compose.yml
index 59bdd01..259f3b7 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,8 +1,6 @@
-version: '3.8'
-
 services:
   postgres:
-    image: postgres:16-alpine
+    image: postgres:17-alpine
     container_name: mtgsearch-db
     environment:
       POSTGRES_DB: mtgsearch
diff --git a/gradle.properties b/gradle.properties
index b2a9a8b..4e120b1 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -3,18 +3,35 @@ org.gradle.jvmargs=-Xmx2g
 org.gradle.parallel=true
 org.gradle.caching=true
 
-# Project Versions
+# Project Versions - All compatible with JDK 21
 javaVersion=21
-springBootVersion=3.2.5
-springCloudVersion=2023.0.1
-openApiGeneratorVersion=7.3.0
-jooqVersion=3.19.8
+springBootVersion=4.0.+
+springDependencyManagementVersion=1.1.6
+springCloudVersion=2024.0.0
+springSecurityVersion=6.3.1
+springdocOpenApiVersion=2.5.0
+openApiGeneratorVersion=7.6.0
+jooqVersion=3.21.0
+jooqPluginVersion=9.0
 postgresqlVersion=42.7.3
-flywayVersion=9.22.3
+flywayVersion=10.8.1
 logbackVersion=1.5.0
+logstashLogbackVersion=8.0
 auth0-jwtVersion=4.4.0
-bcryptVersion=0.9.1
+jacksonVersion=2.18.0
+commonsLang3Version=3.14.0
+guavaVersion=33.1.0-jre
+lombokVersion=1.18.30
+junitVersion=5.10.2
+mockitoVersion=5.11.0
+testcontainersVersion=1.20.0
+h2Version=2.3.232
+restAssuredVersion=5.4.0
 
 # Frontend
 nodeVersion=20.11.0
 npmVersion=10.2.4
+
+# Docker Images
+postgresDockerVersion=17-alpine
+alpineVersion=3.20
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
new file mode 100644
index 0000000..b498d24
Binary files /dev/null and b/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index fe84e3b..221c4f9 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,5 @@
-#Mon Apr 27 22:52:06 ACST 2026
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.4.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/gradlew b/gradlew
index adff685..17a9170 100755
--- a/gradlew
+++ b/gradlew
@@ -1,128 +1,78 @@
-#!/bin/sh
-
-#
-# Copyright © 2015 the original authors.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-# SPDX-License-Identifier: Apache-2.0
-#
+#!/usr/bin/env sh
 
 ##############################################################################
-#
-#   Gradle start up script for POSIX generated by Gradle.
-#
-#   Important for running:
-#
-#   (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is
-#       noncompliant, but you have some other compliant shell such as ksh or
-#       bash, then to run this script, type that shell name before the whole
-#       command line, like:
-#
-#           ksh Gradle
-#
-#       Busybox and similar reduced shells will NOT work, because this script
-#       requires all of these POSIX shell features:
-#         * functions;
-#         * expansions «$var», «${var}», «${var:-default}», «${var+SET}»,
-#           «${var#prefix}», «${var%suffix}», and «$( cmd )»;
-#         * compound commands having a testable exit status, especially «case»;
-#         * various built-in commands including «command», «set», and «ulimit».
-#
-#   Important for patching:
-#
-#   (2) This script targets any POSIX shell, so it avoids extensions provided
-#       by Bash, Ksh, etc; in particular arrays are avoided.
-#
-#       The "traditional" practice of packing multiple parameters into a
-#       space-separated string is a well documented source of bugs and security
-#       problems, so this is (mostly) avoided, by progressively accumulating
-#       options in "$@", and eventually passing that to Java.
-#
-#       Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS,
-#       and GRADLE_OPTS) rely on word-splitting, this is performed explicitly;
-#       see the in-line comments for details.
-#
-#       There are tweaks for specific operating systems such as AIX, CygWin,
-#       Darwin, MinGW, and NonStop.
-#
-#   (3) This script is generated from the Groovy template
-#       https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
-#       within the Gradle project.
-#
-#       You can find Gradle at https://github.com/gradle/gradle/.
-#
+##
+##  Gradle start up script for UN*X
+##
 ##############################################################################
 
 # Attempt to set APP_HOME
-
 # Resolve links: $0 may be a link
-app_path=$0
-
-# Need this for daisy-chained symlinks.
-while
-    APP_HOME=${app_path%"${app_path##*/}"}  # leaves a trailing /; empty if no leading path
-    [ -h "$app_path" ]
-do
-    ls=$( ls -ld "$app_path" )
-    link=${ls#*' -> '}
-    case $link in             #(
-      /*)   app_path=$link ;; #(
-      *)    app_path=$APP_HOME$link ;;
-    esac
+PRG="$0"
+# Need this for relative symlinks.
+while [ -h "$PRG" ] ; do
+    ls=`ls -ld "$PRG"`
+    link=`expr "$ls" : '.*-> \(.*\)$'`
+    if expr "$link" : '/.*' > /dev/null; then
+        PRG="$link"
+    else
+        PRG=`dirname "$PRG"`"/$link"
+    fi
 done
+SAVED="`pwd`"
+cd "`dirname \"$PRG\"`/" >/dev/null
+APP_HOME="`pwd -P`"
+cd "$SAVED" >/dev/null
 
-# This is normally unused
-# shellcheck disable=SC2034
-APP_BASE_NAME=${0##*/}
-# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
-APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit
+APP_NAME="Gradle"
+APP_BASE_NAME=`basename "$0"`
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS=""
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
-MAX_FD=maximum
+MAX_FD="maximum"
 
 warn () {
     echo "$*"
-} >&2
+}
 
 die () {
     echo
     echo "$*"
     echo
     exit 1
-} >&2
+}
 
 # OS specific support (must be 'true' or 'false').
 cygwin=false
 msys=false
 darwin=false
 nonstop=false
-case "$( uname )" in                #(
-  CYGWIN* )         cygwin=true  ;; #(
-  Darwin* )         darwin=true  ;; #(
-  MSYS* | MINGW* )  msys=true    ;; #(
-  NONSTOP* )        nonstop=true ;;
+case "`uname`" in
+  CYGWIN* )
+    cygwin=true
+    ;;
+  Darwin* )
+    darwin=true
+    ;;
+  MINGW* )
+    msys=true
+    ;;
+  NONSTOP* )
+    nonstop=true
+    ;;
 esac
 
-
+CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
 
 # Determine the Java command to use to start the JVM.
 if [ -n "$JAVA_HOME" ] ; then
     if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
         # IBM's JDK on AIX uses strange locations for the executables
-        JAVACMD=$JAVA_HOME/jre/sh/java
+        JAVACMD="$JAVA_HOME/jre/sh/java"
     else
-        JAVACMD=$JAVA_HOME/bin/java
+        JAVACMD="$JAVA_HOME/bin/java"
     fi
     if [ ! -x "$JAVACMD" ] ; then
         die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
@@ -131,118 +81,96 @@ Please set the JAVA_HOME variable in your environment to match the
 location of your Java installation."
     fi
 else
-    JAVACMD=java
-    if ! command -v java >/dev/null 2>&1
-    then
-        die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+    JAVACMD="java"
+    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
 
 Please set the JAVA_HOME variable in your environment to match the
 location of your Java installation."
-    fi
 fi
 
 # Increase the maximum file descriptors if we can.
-if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
-    case $MAX_FD in #(
-      max*)
-        # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
-        # shellcheck disable=SC2039,SC3045
-        MAX_FD=$( ulimit -H -n ) ||
-            warn "Could not query maximum file descriptor limit"
-    esac
-    case $MAX_FD in  #(
-      '' | soft) :;; #(
-      *)
-        # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
-        # shellcheck disable=SC2039,SC3045
-        ulimit -n "$MAX_FD" ||
-            warn "Could not set maximum file descriptor limit to $MAX_FD"
-    esac
-fi
-
-# Collect all arguments for the java command, stacking in reverse order:
-#   * args from the command line
-#   * the main class name
-#   * -classpath
-#   * -D...appname settings
-#   * --module-path (only if needed)
-#   * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables.
-
-# For Cygwin or MSYS, switch paths to Windows format before running java
-if "$cygwin" || "$msys" ; then
-    APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
-
-    JAVACMD=$( cygpath --unix "$JAVACMD" )
-
-    # Now convert the arguments - kludge to limit ourselves to /bin/sh
-    for arg do
-        if
-            case $arg in                                #(
-              -*)   false ;;                            # don't mess with options #(
-              /?*)  t=${arg#/} t=/${t%%/*}              # looks like a POSIX filepath
-                    [ -e "$t" ] ;;                      #(
-              *)    false ;;
-            esac
-        then
-            arg=$( cygpath --path --ignore --mixed "$arg" )
+if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
+    MAX_FD_LIMIT=`ulimit -H -n`
+    if [ $? -eq 0 ] ; then
+        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
+            MAX_FD="$MAX_FD_LIMIT"
         fi
-        # Roll the args list around exactly as many times as the number of
-        # args, so each arg winds up back in the position where it started, but
-        # possibly modified.
-        #
-        # NB: a `for` loop captures its iteration list before it begins, so
-        # changing the positional parameters here affects neither the number of
-        # iterations, nor the values presented in `arg`.
-        shift                   # remove old arg
-        set -- "$@" "$arg"      # push replacement arg
+        ulimit -n $MAX_FD
+        if [ $? -ne 0 ] ; then
+            warn "Could not set maximum file descriptor limit: $MAX_FD"
+        fi
+    else
+        warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
+    fi
+fi
+
+# For Darwin, add options to specify how the application appears in the dock
+if $darwin; then
+    GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
+fi
+
+# For Cygwin, switch paths to Windows format before running java
+if $cygwin ; then
+    APP_HOME=`cygpath --path --mixed "$APP_HOME"`
+    CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
+    JAVACMD=`cygpath --unix "$JAVACMD"`
+
+    # We build the pattern for arguments to be converted via cygpath
+    ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
+    SEP=""
+    for dir in $ROOTDIRSRAW ; do
+        ROOTDIRS="$ROOTDIRS$SEP$dir"
+        SEP="|"
     done
+    OURCYGPATTERN="(^($ROOTDIRS))"
+    # Add a user-defined pattern to the cygpath arguments
+    if [ "$GRADLE_CYGPATTERN" != "" ] ; then
+        OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
+    fi
+    # Now convert the arguments - kludge to limit ourselves to /bin/sh
+    i=0
+    for arg in "$@" ; do
+        CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
+        CHECK2=`echo "$arg"|egrep -c "^-"`                                 ### Determine if an option
+
+        if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then                    ### Added a condition
+            eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
+        else
+            eval `echo args$i`="\"$arg\""
+        fi
+        i=$((i+1))
+    done
+    case $i in
+        (0) set -- ;;
+        (1) set -- "$args0" ;;
+        (2) set -- "$args0" "$args1" ;;
+        (3) set -- "$args0" "$args1" "$args2" ;;
+        (4) set -- "$args0" "$args1" "$args2" "$args3" ;;
+        (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
+        (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
+        (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
+        (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
+        (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
+    esac
 fi
 
+# Escape application args
+save () {
+    for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
+    echo " "
+}
+APP_ARGS=$(save "$@")
 
-# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
-
-# Collect all arguments for the java command:
-#   * DEFAULT_JVM_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
-#     and any embedded shellness will be escaped.
-#   * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
-#     treated as '${Hostname}' itself on the command line.
-
-set -- \
-        "-Dorg.gradle.appname=$APP_BASE_NAME" \
-        -jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \
-        "$@"
-
-# Stop when "xargs" is not available.
-if ! command -v xargs >/dev/null 2>&1
-then
-    die "xargs is not available"
+# Collect all arguments for the java command, following the shell quoting and substitution rules
+if $JAVACMD --add-opens java.base/java.lang=ALL-UNNAMED -version ; then
+    DEFAULT_JVM_OPTS="--add-opens java.base/java.lang=ALL-UNNAMED $DEFAULT_JVM_OPTS"
 fi
 
-# Use "xargs" to parse quoted args.
-#
-# With -n1 it outputs one arg per line, with the quotes and backslashes removed.
-#
-# In Bash we could simply go:
-#
-#   readarray ARGS < <( xargs -n1 <<<"$var" ) &&
-#   set -- "${ARGS[@]}" "$@"
-#
-# but POSIX shell has neither arrays nor command substitution, so instead we
-# post-process each arg (as a line of input to sed) to backslash-escape any
-# character that might be a shell metacharacter, then use eval to reverse
-# that process (while maintaining the separation between arguments), and wrap
-# the whole thing up as a single "set" statement.
-#
-# This will of course break if any of these variables contains a newline or
-# an unmatched quote.
-#
+eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
 
-eval "set -- $(
-        printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" |
-        xargs -n1 |
-        sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' |
-        tr '\n' ' '
-    )" '"$@"'
+# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
+if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
+  cd "$(dirname "$0")"
+fi
 
 exec "$JAVACMD" "$@"
diff --git a/gradlew.bat b/gradlew.bat
index e509b2d..e95643d 100644
--- a/gradlew.bat
+++ b/gradlew.bat
@@ -1,22 +1,4 @@
-@rem
-@rem Copyright 2015 the original author or authors.
-@rem
-@rem Licensed under the Apache License, Version 2.0 (the "License");
-@rem you may not use this file except in compliance with the License.
-@rem You may obtain a copy of the License at
-@rem
-@rem      https://www.apache.org/licenses/LICENSE-2.0
-@rem
-@rem Unless required by applicable law or agreed to in writing, software
-@rem distributed under the License is distributed on an "AS IS" BASIS,
-@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-@rem See the License for the specific language governing permissions and
-@rem limitations under the License.
-@rem
-@rem SPDX-License-Identifier: Apache-2.0
-@rem
-
-@if "%DEBUG%"=="" @echo off
+@if "%DEBUG%" == "" @echo off
 @rem ##########################################################################
 @rem
 @rem  Gradle startup script for Windows
@@ -27,29 +9,25 @@
 if "%OS%"=="Windows_NT" setlocal
 
 set DIRNAME=%~dp0
-if "%DIRNAME%"=="" set DIRNAME=.
-@rem This is normally unused
+if "%DIRNAME%" == "" set DIRNAME=.
 set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 
-@rem Resolve any "." and ".." in APP_HOME to make it shorter.
-for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
-
 @rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
+set DEFAULT_JVM_OPTS=
 
 @rem Find java.exe
 if defined JAVA_HOME goto findJavaFromJavaHome
 
 set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
-if %ERRORLEVEL% equ 0 goto execute
+if "%ERRORLEVEL%" == "0" goto init
 
-echo. 1>&2
-echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2
-echo. 1>&2
-echo Please set the JAVA_HOME variable in your environment to match the 1>&2
-echo location of your Java installation. 1>&2
+echo.
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
 
 goto fail
 
@@ -57,35 +35,48 @@ goto fail
 set JAVA_HOME=%JAVA_HOME:"=%
 set JAVA_EXE=%JAVA_HOME%/bin/java.exe
 
-if exist "%JAVA_EXE%" goto execute
+if exist "%JAVA_EXE%" goto init
 
-echo. 1>&2
-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2
-echo. 1>&2
-echo Please set the JAVA_HOME variable in your environment to match the 1>&2
-echo location of your Java installation. 1>&2
+echo.
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
 
 goto fail
 
+:init
+@rem Get command-line arguments, handling Windows variants
+
+if not "%OS%" == "Windows_NT" goto win9xME_args
+
+:win9xME_args
+@rem Slurp the command line arguments.
+set CMD_LINE_ARGS=
+set _SKIP=2
+
+:win9xME_args_slurp
+if "x%~1" == "x" goto execute
+
+set CMD_LINE_ARGS=%*
+
 :execute
 @rem Setup the command line
 
-
+set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
 
 @rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %*
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
 
 :end
 @rem End local scope for the variables with windows NT shell
-if %ERRORLEVEL% equ 0 goto mainEnd
+if "%ERRORLEVEL%"=="0" goto mainEnd
 
 :fail
 rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
 rem the _cmd.exe /c_ return code!
-set EXIT_CODE=%ERRORLEVEL%
-if %EXIT_CODE% equ 0 set EXIT_CODE=1
-if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
-exit /b %EXIT_CODE%
+if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
+exit /b 1
 
 :mainEnd
 if "%OS%"=="Windows_NT" endlocal