commit

.gitignore

@@ -29,3 +29,4 @@ target/
 *.sublime-project
 coverage/
 .nyc_output/
+dev.properties

backend/build.gradle.kts

@@ -1,14 +1,21 @@
 import org.gradle.api.tasks.testing.logging.TestLogEvent
-import org.jooq.meta.jaxb.Property
+import org.gradle.jvm.toolchain.JavaLanguageVersion
+import java.sql.DriverManager
 
 plugins {
     id("org.springframework.boot") version "3.2.5"
     id("io.spring.dependency-management") version "1.1.4"
-    id("org.openapi.generator") version "7.3.0"
+    id("org.openapi.generator") version "7.4.0"
     id("nu.studer.jooq") version "9.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"
 
@@ -17,48 +24,38 @@ repositories {
 }
 
 dependencies {
-    // Spring Boot
+    implementation("org.springframework.boot:spring-boot-starter-web")
-    implementation("org.springframework.boot:spring-boot-starter-web:3.2.5")
+    implementation("org.springframework.boot:spring-boot-starter-data-jpa")
-    implementation("org.springframework.boot:spring-boot-starter-data-jpa:3.2.5")
+    implementation("org.springframework.boot:spring-boot-starter-security")
-    implementation("org.springframework.boot:spring-boot-starter-security:3.2.5")
+    implementation("org.springframework.boot:spring-boot-starter-validation")
-    implementation("org.springframework.boot:spring-boot-starter-validation:3.2.5")
+    developmentOnly("org.springframework.boot:spring-boot-devtools")
-    developmentOnly("org.springframework.boot:spring-boot-devtools:3.2.5")
 
-    // Database
+    implementation("org.postgresql:postgresql:$postgresqlVersion")
-    implementation("org.postgresql:postgresql:42.7.3")
+    implementation("org.flywaydb:flyway-core:$flywayVersion")
-    implementation("org.flywaydb:flyway-core:9.22.3")
-    implementation("org.flywaydb:flyway-database-postgresql:9.22.3")
 
-    // jOOQ
+    implementation("org.jooq:jooq:$jooqVersion")
-    implementation("org.jooq:jooq:3.19.8")
+    implementation("org.jooq:jooq-meta:$jooqVersion")
-    implementation("org.jooq:jooq-meta:3.19.8")
+    implementation("org.jooq:jooq-codegen:$jooqVersion")
-    implementation("org.jooq:jooq-codegen:3.19.8")
+    jooqGenerator("org.postgresql:postgresql:$postgresqlVersion")
-    jooqGenerator("org.postgresql:postgresql:42.7.3")
 
-    // Security & JWT
     implementation("com.auth0:java-jwt:4.4.0")
-    implementation("at.fageorgetown:jbcrypt:0.9.1")
     implementation("org.springframework.security:spring-security-crypto:6.2.3")
 
-    // OpenAPI & Swagger
     implementation("org.springdoc:springdoc-openapi-starter-webmvc-ui:2.4.0")
-    implementation("jakarta.annotation:jakarta.annotation-api:2.1.1")
     implementation("com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.17.1")
 
-    // Logging
+    implementation("ch.qos.logback:logback-core:$logbackVersion")
-    implementation("ch.qos.logback:logback-core:1.5.0")
+    implementation("ch.qos.logback:logback-classic:$logbackVersion")
-    implementation("ch.qos.logback:logback-classic:1.5.0")
     implementation("net.logstash.logback:logstash-logback-encoder:7.4")
 
-    // Utilities
+    compileOnly("org.projectlombok:lombok:1.18.30")
-    implementation("org.projectlombok:lombok:1.18.30")
     annotationProcessor("org.projectlombok:lombok:1.18.30")
+
     implementation("org.apache.commons:commons-lang3:3.14.0")
     implementation("com.google.guava:guava:33.1.0-jre")
 
-    // Testing
+    testImplementation("org.springframework.boot:spring-boot-starter-test")
-    testImplementation("org.springframework.boot:spring-boot-starter-test:3.2.5")
+    testImplementation("org.springframework.security:spring-security-test")
-    testImplementation("org.springframework.security:spring-security-test:6.2.3")
     testImplementation("org.testcontainers:testcontainers:1.19.7")
     testImplementation("org.testcontainers:postgresql:1.19.7")
     testImplementation("org.junit.jupiter:junit-jupiter:5.10.2")
@@ -68,8 +65,9 @@ dependencies {
 }
 
 java {
-    sourceCompatibility = JavaVersion.VERSION_21
+    toolchain {
-    targetCompatibility = JavaVersion.VERSION_21
+        languageVersion.set(JavaLanguageVersion.of(21))
+    }
 }
 
 application {
@@ -80,7 +78,6 @@ springBoot {
     buildInfo()
 }
 
-// OpenAPI Generator Configuration
 openApiGenerate {
     generatorName.set("spring")
     inputSpec.set("$projectDir/openapi/api.yaml")
@@ -101,16 +98,15 @@ openApiGenerate {
     ))
 }
 
-// jOOQ Configuration
 jooq {
     configurations {
         create("main") {
             jooqConfiguration.apply {
                 jdbc.apply {
                     driver = "org.postgresql.Driver"
-                    url = "jdbc:postgresql://localhost:5432/mtgsearch"
+                    url = project.property("db.url") as String
-                    user = "postgres"
+                    user = project.property("db.user") as String
-                    password = "postgres"
+                    password = project.property("db.password") as String
                 }
                 generator.apply {
                     name = "org.jooq.codegen.JavaGenerator"
@@ -128,35 +124,51 @@ jooq {
     }
 }
 
-tasks.register("generateJooqCode") {
+fun isPostgresAvailable(): Boolean {
-    dependsOn("jooqCodegen")
+    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 }
-sourceSets {
+    } catch (ex: Exception) {
-    main {
+        logger.warn("PostgreSQL is unavailable at configured DB; skipping jOOQ code generation.")
-        java {
+        false
-            srcDirs(
-                "src/main/java",
-                "$buildDir/generated/src/main/java",
-                "$buildDir/generated/jooq"
-            )
-        }
     }
 }
 
-tasks.compileJava {
+tasks.named("generateJooq") {
-    dependsOn("openApiGenerate", "generateJooqCode")
+    onlyIf {
+        isPostgresAvailable()
+    }
+    doFirst {
+        logger.lifecycle("Starting jOOQ code generation...")
+    }
+    doLast {
+        logger.lifecycle("Finished jOOQ task.")
+    }
 }
 
-tasks.test {
+tasks.named("compileJava") {
+    dependsOn("openApiGenerate")
+}
+
+sourceSets["main"].java {
+    srcDir("$buildDir/generated/src/main/java")
+    srcDir("$buildDir/generated/jooq")
+}
+
+tasks.withType<JavaCompile> {
+    options.encoding = "UTF-8"
+    options.compilerArgs.add("-parameters")
+}
+
+tasks.withType<Test> {
     useJUnitPlatform()
     testLogging {
-        events("passed", "skipped", "failed")
+        events(TestLogEvent.PASSED, TestLogEvent.SKIPPED, TestLogEvent.FAILED)
         exceptionFormat = org.gradle.api.tasks.testing.logging.TestExceptionFormat.FULL
         showStandardStreams = false
     }
 }
 
 tasks.named("build") {
-    dependsOn("openApiGenerate", "generateJooqCode")
+    dependsOn("openApiGenerate")
 }

backend/src/main/java/net/moustos/mtgsearch/service/UserDetailsServiceImpl.java

@@ -27,14 +27,16 @@ public class UserDetailsServiceImpl implements UserDetailsService {
         var user = userRepository.findByUsername(username)
                 .orElseThrow(() -> new UsernameNotFoundException("User not found: " + username));
 
+        boolean active = Boolean.TRUE.equals(user.getActive());
+
         return User.builder()
                 .username(user.getUsername())
                 .password(user.getPassword())
                 .authorities(Collections.singleton(new SimpleGrantedAuthority("ROLE_USER")))
-                .accountNonLocked(user.getActive())
+                .accountLocked(!active)
-                .accountNonExpired(true)
+                .accountExpired(false)
-                .credentialsNonExpired(true)
+                .credentialsExpired(false)
-                .enabled(user.getActive())
+                .disabled(!active)
                 .build();
     }
 }

backend/src/main/resources/application.yml

@@ -1,14 +1,14 @@
 spring:
   application:
-    name: mtg-search
+    name: ${app.name:mtg-search}
-    version: 0.1.0
+    version: ${app.version:0.1.0}
   
   datasource:
-    url: jdbc:postgresql://localhost:5432/mtgsearch
+    url: ${db.url:jdbc:postgresql://localhost:5432/mtgsearch}
-    username: postgres
+    username: ${db.user:postgres}
-    password: postgres
+    password: ${db.password:postgres}
     hikari:
-      maximum-pool-size: 10
+      maximum-pool-size: ${db.maxPoolSize:10}
       minimum-idle: 2
       idle-timeout: 300000
       max-lifetime: 1200000
@@ -37,10 +37,21 @@ spring:
       max-file-size: 10MB
       max-request-size: 10MB
 
+server:
+  port: ${server.port:8080}
+  servlet:
+    context-path: ${server.servlet.contextPath:/}
+
 app:
   jwt:
-    secret: ${JWT_SECRET:your-secret-key-change-in-production}
+    secret: ${jwt.secret:your-secret-key-change-in-production}
-    expiration: ${JWT_EXPIRATION:86400}
+    expiration: ${jwt.expiration:86400}
+
+logging:
+  level:
+    root: ${log.level:INFO}
+  file:
+    name: ${log.dir:logs}/app.log
 
 springdoc:
   api-docs:

build.gradle.kts

@@ -1,4 +1,6 @@
 import org.gradle.api.tasks.testing.logging.TestLogEvent
+import java.util.Properties
+import java.io.File
 
 plugins {
     id("java")
@@ -9,6 +11,43 @@ plugins {
 group = "net.moustos"
 version = "0.1.0"
 
+// Load dev.properties if it exists
+val devPropsFile = File("dev.properties")
+val devProps = Properties().apply {
+    if (devPropsFile.exists()) {
+        load(devPropsFile.inputStream())
+    }
+}
+
+// Define properties with defaults, preferring env vars over dev.properties
+val propertiesMap = mapOf(
+    "db.url" to (System.getenv("DB_URL") ?: devProps.getProperty("db.url", "jdbc:postgresql://localhost:5432/mtgsearch")),
+    "db.user" to (System.getenv("DB_USER") ?: devProps.getProperty("db.user", "postgres")),
+    "db.password" to (System.getenv("DB_PASSWORD") ?: devProps.getProperty("db.password", "postgres")),
+    "db.maxPoolSize" to (System.getenv("DB_MAX_POOL_SIZE") ?: devProps.getProperty("db.maxPoolSize", "10")),
+    "jwt.secret" to (System.getenv("JWT_SECRET") ?: devProps.getProperty("jwt.secret", "your-secret-key-change-in-production")),
+    "jwt.expiration" to (System.getenv("JWT_EXPIRATION") ?: devProps.getProperty("jwt.expiration", "86400")),
+    "app.name" to (System.getenv("APP_NAME") ?: devProps.getProperty("app.name", "mtg-search")),
+    "app.version" to (System.getenv("APP_VERSION") ?: devProps.getProperty("app.version", "0.1.0")),
+    "app.environment" to (System.getenv("APP_ENVIRONMENT") ?: devProps.getProperty("app.environment", "development")),
+    "server.port" to (System.getenv("SERVER_PORT") ?: devProps.getProperty("server.port", "8080")),
+    "server.servlet.contextPath" to (System.getenv("SERVER_SERVLET_CONTEXT_PATH") ?: devProps.getProperty("server.servlet.contextPath", "/")),
+    "vite.apiUrl" to (System.getenv("VITE_API_URL") ?: devProps.getProperty("vite.apiUrl", "http://localhost:8080")),
+    "vite.appTitle" to (System.getenv("VITE_APP_TITLE") ?: devProps.getProperty("vite.appTitle", "MTG Search")),
+    "log.level" to (System.getenv("LOG_LEVEL") ?: devProps.getProperty("log.level", "DEBUG")),
+    "log.dir" to (System.getenv("LOG_DIR") ?: devProps.getProperty("log.dir", "logs"))
+)
+
+// Set system properties for Spring Boot
+propertiesMap.forEach { (key, value) ->
+    System.setProperty(key, value)
+}
+
+// Also set as project extra for Gradle use
+propertiesMap.forEach { (key, value) ->
+    extra.set(key, value)
+}
+
 allprojects {
     repositories {
         mavenCentral()
@@ -18,7 +57,7 @@ allprojects {
     }
 }
 
-subprojects {
+configure(subprojects.filter { it.name == "backend" }) {
     apply(plugin = "java")
 
     java {

gradle/wrapper/gradle-wrapper.properties

@@ -1 +1,6 @@
-gradleVersion=8.9
+#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
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists

gradlew

@@ -1,6 +1,7 @@
 #!/bin/sh
+
 #
-# Copyright 2015 the original author or authors.
+# 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.
@@ -14,33 +15,234 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
+# SPDX-License-Identifier: Apache-2.0
+#
 
 ##############################################################################
-# Gradle start up script for POSIX generated by Gradle.
 #
-# Important for running:
+#   Gradle start up script for POSIX generated by Gradle.
 #
-# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is
+#   Important for running:
-#     noncompliant, but you have some other compliant shell available, you may
-#     specify it by setting the SHELL variable when running this script.
-# For example: SHELL=/bin/bash ./gradlew <some-task>
 #
-# (2) Springboot 3 requires Java 17+
+#   (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/.
 #
 ##############################################################################
 
-set -e
+# Attempt to set APP_HOME
 
-SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
+# Resolve links: $0 may be a link
-APP_HOME=$( cd "$SCRIPT_DIR" && cd "$(dirname "$0")" && pwd -P || echo "$SCRIPT_DIR" )
+app_path=$0
-APP_NAME="mtg-search"
-APP_JAR_NAME="mtg-search-0.1.0.jar"
 
-case "$(uname)" in
+# Need this for daisy-chained symlinks.
-  *CYGWIN*) APP_HOME=`(cd "$APP_HOME" && pwd -W)` ;;
+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
+done
+
+# 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
+
+# Use the maximum available, or set MAX_FD != -1 to use that value.
+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 ;;
 esac
 
-DEFAULT_JVM_OPTS='"-Xmx2g" "-Xms256m"'
-CLASSPATH=$APP_HOME/backend/build/libs/$APP_JAR_NAME
 
-java $DEFAULT_JVM_OPTS -jar "$CLASSPATH" "$@"
+
+# 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
+    else
+        JAVACMD=$JAVA_HOME/bin/java
+    fi
+    if [ ! -x "$JAVACMD" ] ; then
+        die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
+
+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.
+
+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" )
+        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
+    done
+fi
+
+
+# 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"
+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 -- $(
+        printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" |
+        xargs -n1 |
+        sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' |
+        tr '\n' ' '
+    )" '"$@"'
+
+exec "$JAVACMD" "$@"

gradlew.bat

@@ -13,6 +13,8 @@
 @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
 @rem ##########################################################################
@@ -26,6 +28,7 @@ if "%OS%"=="Windows_NT" setlocal
 
 set DIRNAME=%~dp0
 if "%DIRNAME%"=="" set DIRNAME=.
+@rem This is normally unused
 set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 
@@ -33,20 +36,20 @@ set APP_HOME=%DIRNAME%
 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="-Xmx2g" "-Xms256m"
+set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
 
 @rem Find java.exe
 if defined JAVA_HOME goto findJavaFromJavaHome
 
 set JAVA_EXE=java.exe
-%JAVA_EXE% -version >nul 2>&1
+%JAVA_EXE% -version >NUL 2>&1
 if %ERRORLEVEL% equ 0 goto execute
 
-echo.
+echo. 1>&2
-echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2
-echo.
+echo. 1>&2
-echo Please set the JAVA_HOME variable in your environment to match the
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
-echo the location of your Java installation.
+echo location of your Java installation. 1>&2
 
 goto fail
 
@@ -56,31 +59,35 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe
 
 if exist "%JAVA_EXE%" goto execute
 
-echo.
+echo. 1>&2
-echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2
-echo.
+echo. 1>&2
-echo Please set the JAVA_HOME variable in your environment to match the
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
-echo the location of your Java installation.
+echo location of your Java installation. 1>&2
 
 goto fail
 
 :execute
 @rem Setup the command line
 
-set CLASSPATH=%APP_HOME%\backend\build\libs\mtg-search-0.1.0.jar
+
 
 @rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% -jar "%CLASSPATH%" %*
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %*
 
 :end
-@endlocal & set ERROR_CODE=%ERRORLEVEL%
+@rem End local scope for the variables with windows NT shell
-
+if %ERRORLEVEL% equ 0 goto mainEnd
-if not "%ERRORLEVEL%"=="0" goto fail
 
 :fail
-exit /b %ERRORLEVEL%
+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%
 
 :mainEnd
 if "%OS%"=="Windows_NT" endlocal
 
-exit /b %ERRORLEVEL%
+:omega