diff --git a/README.md b/README.md index 464b062d..365d5e47 100644 --- a/README.md +++ b/README.md @@ -59,8 +59,8 @@ Usage Requires -------- -- Java 7 (8+ does not work) -- MySQL Client + Server +- Java 8+ +- MySQL 5 Client + Server - RabbitMQ Setup (with Docker) @@ -82,6 +82,9 @@ MySQL Server and RabbitMQ installed locally. Instead, Docker needs to be installed as the script will start MySQL and RabbitMQ in Docker containers. +If you have Docker Compose installed, you can also start the +containers by running `docker compose up`. + Build ------ @@ -92,6 +95,9 @@ You can build the project by running: ``` This automatically downloads Gradle and builds the project, including running the tests. +It will also download a Java toolchain that is appropriate + for compiling and running the project, if none can be found + locally. The Gradle build using Maven repositories was provided by Michael Andrews (Github michaelajr and Twitter @MichaelAJr). diff --git a/build.gradle b/build.gradle deleted file mode 100644 index 4706db34..00000000 --- a/build.gradle +++ /dev/null @@ -1,74 +0,0 @@ - -allprojects { - apply plugin: 'java' -} - -subprojects { - repositories { - mavenLocal() - mavenCentral() - - // JBoss Repo - maven { url 'https://repository.jboss.org/nexus/content/groups/public-jboss/' } - } - - dependencies { - compile group: 'org.slf4j', name: 'slf4j-api', version: '1.5.8' - testCompile group: 'junit', name: 'junit', version: '4.8.2' - } -} - -project(':iddd_common') { - - dependencies { - compile group: 'commons-logging', name: 'commons-logging', version: '1.1.2', transitive: true - compile group: 'com.google.code.gson', name: 'gson', version: '2.1' - compile group: 'com.rabbitmq', name: 'amqp-client', version: '3.0.4' - compile group: 'org.hibernate', name: 'hibernate', version: '3.2.7.ga' - compile group: 'org.springframework', name: 'spring', version: '2.5.6' - compile group: 'org.iq80.leveldb', name: 'leveldb', version: '0.5' - compile group: 'org.aspectj', name: 'aspectjweaver', version: '1.7.2' - compile group: 'javassist', name: 'javassist', version: '3.8.0.GA' - compile group: 'javax.transaction', name: 'jta', version: '1.1' - - testCompile group: 'javax.persistence', name: 'persistence-api', version: '1.0.2' - testCompile group: 'mysql', name: 'mysql-connector-java', version: '5.1.6' - testCompile group: 'commons-dbcp', name: 'commons-dbcp', version: '1.4' - } -} - -project(':iddd_identityaccess') { - dependencies { - compile project(':iddd_common') - compile group: 'org.springframework', name: 'spring', version: '2.5.6' - compile group: 'javax.ws.rs', name: 'javax.ws.rs-api', version: '2.0-rc1' - compile group: 'org.jboss.resteasy', name: 'resteasy-cache-core', version: '2.0.1.GA' - - testCompile files(this.project(':iddd_common').sourceSets.test.output) - testCompile group: 'javax.persistence', name: 'persistence-api', version: '1.0.2' - testCompile group: 'mysql', name: 'mysql-connector-java', version: '5.1.6' - testCompile group: 'commons-dbcp', name: 'commons-dbcp', version: '1.4' - testCompile group: 'javax.servlet', name: 'servlet-api', version: '2.5' - testCompile group: 'org.jboss.resteasy', name: 'tjws', version: '2.0.1.GA' - } -} - -project(':iddd_collaboration') { - dependencies { - compile project(':iddd_common') - compile group: 'org.jboss.resteasy', name: 'resteasy-jaxrs', version: '2.0.1.GA' - - testCompile files(this.project(':iddd_common').sourceSets.test.output) - testCompile group: 'javax.persistence', name: 'persistence-api', version: '1.0.2' - testCompile group: 'mysql', name: 'mysql-connector-java', version: '5.1.6' - testCompile group: 'commons-dbcp', name: 'commons-dbcp', version: '1.4' - } -} - -project(':iddd_agilepm') { - dependencies { - compile project(':iddd_common') - - testCompile files(this.project(':iddd_common').sourceSets.test.output) - } -} \ No newline at end of file diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts new file mode 100644 index 00000000..876c922b --- /dev/null +++ b/buildSrc/build.gradle.kts @@ -0,0 +1,7 @@ +plugins { + `kotlin-dsl` +} + +repositories { + mavenCentral() +} diff --git a/buildSrc/settings.gradle.kts b/buildSrc/settings.gradle.kts new file mode 100644 index 00000000..58852890 --- /dev/null +++ b/buildSrc/settings.gradle.kts @@ -0,0 +1 @@ +// Intentionally empty diff --git a/buildSrc/src/main/kotlin/iddd-conventions.gradle.kts b/buildSrc/src/main/kotlin/iddd-conventions.gradle.kts new file mode 100644 index 00000000..5efa4f67 --- /dev/null +++ b/buildSrc/src/main/kotlin/iddd-conventions.gradle.kts @@ -0,0 +1,37 @@ +plugins { + java +} + +dependencies { + implementation(group = "org.slf4j", name = "slf4j-api", version = "1.5.8") + testImplementation(group = "junit", name = "junit", version = "4.8.2") + + dependencies { + constraints { + implementation(group = "javax.transaction", name = "jta") { + version { + require("[1.1,2.0[") + prefer("1.1") + } + because( + "Older versions have licensing issues are were removed from Maven Central." + + "See https://central.sonatype.org/faq/cannot-download-javax-transaction/." + ) + } + } + } +} + +java { + toolchain { + languageVersion.set(JavaLanguageVersion.of(8)) + } + consistentResolution { + useCompileClasspathVersions() + } +} + +tasks.withType(Test::class.java).configureEach { + // Workaround for non-English locales, because checks on decimals fail. + jvmArgs("-Duser.language=en -Duser.country=CA") +} diff --git a/docker-compose.yaml b/docker-compose.yaml new file mode 100644 index 00000000..45a32197 --- /dev/null +++ b/docker-compose.yaml @@ -0,0 +1,34 @@ +version: '3.4' +services: + mysql: + container_name: iddd-mysql + image: mysql:5 + ports: + - 3306:3306 + environment: + MYSQL_ROOT_PASSWORD: root + volumes: + # Files are spread over all components, but need to available in a single location. + # startContainers.sh requires test files to be applied first, so names are mapped to match this policy. + - ./iddd_common/src/main/mysql/test_common.sql:/docker-entrypoint-initdb.d/40_test_common.sql:ro + - ./iddd_common/src/main/mysql/common.sql:/docker-entrypoint-initdb.d/50_common.sql:ro + - ./iddd_identityaccess/src/main/mysql/iam.sql:/docker-entrypoint-initdb.d/60_iam.sql:ro + - ./iddd_collaboration/src/main/mysql/collaboration.sql:/docker-entrypoint-initdb.d/60_collaboration.sql:ro + healthcheck: + test: mysqladmin ping -h 127.0.0.1 -u $$MYSQL_USER --password=$$MYSQL_PASSWORD + start_period: 5s + interval: 5s + timeout: 10s + retries: 10 + rabbitmq: + container_name: iddd-rabbitmq + image: rabbitmq:3-management + ports: + - 5672:5672 + - 8080:15672 # management port + healthcheck: + test: rabbitmq-diagnostics -q ping + start_period: 5s + interval: 5s + timeout: 10s + retries: 10 diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 085a1cdc..943f0cbf 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 1f22d93d..c3549d24 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,7 @@ -#Sat Feb 21 20:13:49 CET 2015 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists +distributionSha256Sum=5861dcc093556fef71cdde8cbae9887be70a8bf40e0f5856b61181ae92dccf33 +distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.2-all.zip +networkTimeout=10000 zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-2.3-all.zip diff --git a/gradlew b/gradlew index 91a7e269..65dcd68d 100755 --- a/gradlew +++ b/gradlew @@ -1,79 +1,129 @@ -#!/usr/bin/env bash +#!/bin/sh + +# +# Copyright © 2015-2021 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. +# ############################################################################## -## -## Gradle start up script for UN*X -## +# +# 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/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# within the Gradle project. +# +# You can find Gradle at https://github.com/gradle/gradle/. +# ############################################################################## -# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -DEFAULT_JVM_OPTS="" +# 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 +done -APP_NAME="Gradle" -APP_BASE_NAME=`basename "$0"` +# This is normally unused +# shellcheck disable=SC2034 +APP_BASE_NAME=${0##*/} +APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit + +# 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"' # Use the maximum available, or set MAX_FD != -1 to use that value. -MAX_FD="maximum" +MAX_FD=maximum -warn ( ) { +warn () { echo "$*" -} +} >&2 -die ( ) { +die () { echo echo "$*" echo exit 1 -} +} >&2 # OS specific support (must be 'true' or 'false'). cygwin=false msys=false darwin=false -case "`uname`" in - CYGWIN* ) - cygwin=true - ;; - Darwin* ) - darwin=true - ;; - MINGW* ) - msys=true - ;; +nonstop=false +case "$( uname )" in #( + CYGWIN* ) cygwin=true ;; #( + Darwin* ) darwin=true ;; #( + MSYS* | MINGW* ) msys=true ;; #( + NONSTOP* ) nonstop=true ;; esac -# For Cygwin, ensure paths are in UNIX format before anything is touched. -if $cygwin ; then - [ -n "$JAVA_HOME" ] && JAVA_HOME=`cygpath --unix "$JAVA_HOME"` -fi - -# Attempt to set APP_HOME -# Resolve links: $0 may be a link -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\"`/" >&- -APP_HOME="`pwd -P`" -cd "$SAVED" >&- - 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 @@ -82,7 +132,7 @@ Please set the JAVA_HOME variable in your environment to match the location of your Java installation." fi else - JAVACMD="java" + 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 @@ -90,75 +140,105 @@ location of your Java installation." fi # Increase the maximum file descriptors if we can. -if [ "$cygwin" = "false" -a "$darwin" = "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 - 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 +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=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=SC3045 + ulimit -n "$MAX_FD" || + warn "Could not set maximum file descriptor limit to $MAX_FD" + esac 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 +# 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" ) + CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) + + JAVACMD=$( cygpath --unix "$JAVACMD" ) -# 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"` - - # 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\"" + 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 - i=$((i+1)) + # 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 - 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 -# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules -function splitJvmOpts() { - JVM_OPTS=("$@") -} -eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS -JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME" +# Collect all arguments for the java command; +# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of +# shell script including quotes and variable substitutions, so put them in +# double quotes to make sure that they get re-expanded; and +# * put everything else in single quotes, so that it's not re-expanded. + +set -- \ + "-Dorg.gradle.appname=$APP_BASE_NAME" \ + -classpath "$CLASSPATH" \ + org.gradle.wrapper.GradleWrapperMain \ + "$@" + +# Stop when "xargs" is not available. +if ! command -v xargs >/dev/null 2>&1 +then + die "xargs is not available" +fi -exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@" +# 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" "$@" diff --git a/gradlew.bat b/gradlew.bat index aec99730..6689b85b 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -1,4 +1,20 @@ -@if "%DEBUG%" == "" @echo off +@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 + +@if "%DEBUG%"=="" @echo off @rem ########################################################################## @rem @rem Gradle startup script for Windows @@ -8,20 +24,24 @@ @rem Set local scope for the variables with windows NT shell if "%OS%"=="Windows_NT" setlocal -@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= - set DIRNAME=%~dp0 -if "%DIRNAME%" == "" set DIRNAME=. +if "%DIRNAME%"=="" set DIRNAME=. +@rem This is normally unused 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" + @rem Find java.exe if defined JAVA_HOME goto findJavaFromJavaHome set JAVA_EXE=java.exe %JAVA_EXE% -version >NUL 2>&1 -if "%ERRORLEVEL%" == "0" goto init +if %ERRORLEVEL% equ 0 goto execute echo. echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. @@ -35,7 +55,7 @@ goto fail set JAVA_HOME=%JAVA_HOME:"=% set JAVA_EXE=%JAVA_HOME%/bin/java.exe -if exist "%JAVA_EXE%" goto init +if exist "%JAVA_EXE%" goto execute echo. echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% @@ -45,44 +65,26 @@ echo location of your Java installation. goto fail -:init -@rem Get command-line arguments, handling Windowz variants - -if not "%OS%" == "Windows_NT" goto win9xME_args -if "%@eval[2+2]" == "4" goto 4NT_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=%* -goto execute - -:4NT_args -@rem Get arguments from the 4NT Shell from JP Software -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%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS% +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* :end @rem End local scope for the variables with windows NT shell -if "%ERRORLEVEL%"=="0" goto mainEnd +if %ERRORLEVEL% equ 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! -if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 -exit /b 1 +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 diff --git a/iddd_agilepm/build.gradle.kts b/iddd_agilepm/build.gradle.kts new file mode 100644 index 00000000..2d5eb4dd --- /dev/null +++ b/iddd_agilepm/build.gradle.kts @@ -0,0 +1,12 @@ +plugins { + id("iddd-conventions") +} + +dependencies { + implementation(project(":iddd_common")) + + implementation(group = "org.iq80.leveldb", name = "leveldb", version = "0.5") + implementation(group = "com.google.code.gson", name = "gson", version = "2.1") + + testImplementation(testFixtures(project(":iddd_common"))) +} diff --git a/iddd_collaboration/build.gradle.kts b/iddd_collaboration/build.gradle.kts new file mode 100644 index 00000000..a23ba5ae --- /dev/null +++ b/iddd_collaboration/build.gradle.kts @@ -0,0 +1,18 @@ +plugins { + id("iddd-conventions") +} + +dependencies { + implementation(project(":iddd_common")) + implementation(group = "org.jboss.resteasy", name = "resteasy-jaxrs", version = "2.0.1.GA") + + implementation(group = "org.springframework", name = "spring-core", version = "3.1.4.RELEASE") + implementation(group = "org.springframework", name = "spring-beans", version = "3.1.4.RELEASE") + implementation(group = "org.springframework", name = "spring-context", version = "3.1.4.RELEASE") + implementation(group = "com.google.code.gson", name = "gson", version = "2.1") + + testImplementation(testFixtures(project(":iddd_common"))) + testImplementation(group = "javax.persistence", name = "persistence-api", version = "1.0.2") + testImplementation(group = "mysql", name = "mysql-connector-java", version = "5.1.6") + testImplementation(group = "commons-dbcp", name = "commons-dbcp", version = "1.4") +} diff --git a/iddd_common/build.gradle.kts b/iddd_common/build.gradle.kts new file mode 100644 index 00000000..566c0031 --- /dev/null +++ b/iddd_common/build.gradle.kts @@ -0,0 +1,33 @@ +plugins { + id("iddd-conventions") + `java-test-fixtures` +} + +dependencies { + implementation(group = "commons-logging", name = "commons-logging", version = "1.1.2") //, transitive= true) + implementation(group = "com.google.code.gson", name = "gson", version = "2.1") + implementation(group = "com.rabbitmq", name = "amqp-client", version = "3.0.4") + implementation(group = "org.hibernate", name = "hibernate", version = "3.2.7.ga") + implementation(group = "org.springframework", name = "spring-core", version = "3.1.4.RELEASE") + implementation(group = "org.springframework", name = "spring-beans", version = "3.1.4.RELEASE") + implementation(group = "org.springframework", name = "spring-context", version = "3.1.4.RELEASE") + implementation(group = "org.springframework", name = "spring-orm", version = "3.1.4.RELEASE") + implementation(group = "org.springframework", name = "spring-tx", version = "3.1.4.RELEASE") + implementation(group = "org.iq80.leveldb", name = "leveldb", version = "0.5") + implementation(group = "org.aspectj", name = "aspectjweaver", version = "1.7.2") + implementation(group = "javassist", name = "javassist", version = "3.8.0.GA") + implementation(group = "javax.transaction", name = "jta", version = "1.1") + + testImplementation(group = "javax.persistence", name = "persistence-api", version = "1.0.2") + testImplementation(group = "mysql", name = "mysql-connector-java", version = "5.1.6") + testImplementation(group = "commons-dbcp", name = "commons-dbcp", version = "1.4") + testImplementation(group= "org.apache.logging.log4j", name= "log4j-slf4j-impl", version= "2.19.0") + + testFixturesImplementation(group = "junit", name = "junit", version = "4.8.2") + testFixturesImplementation(group = "com.google.code.gson", name = "gson", version = "2.1") + testFixturesImplementation(group = "javax.persistence", name = "persistence-api", version = "1.0.2") + testFixturesImplementation(group = "org.hibernate", name = "hibernate", version = "3.2.7.ga") { + exclude(group = "javax.transaction", module = "jta") + } + testFixturesImplementation(group = "org.springframework", name = "spring-orm", version = "3.1.4.RELEASE") +} diff --git a/iddd_common/src/test/java/com/saasovation/common/domain/model/EventTrackingTestCase.java b/iddd_common/src/testFixtures/java/com/saasovation/common/domain/model/EventTrackingTestCase.java similarity index 100% rename from iddd_common/src/test/java/com/saasovation/common/domain/model/EventTrackingTestCase.java rename to iddd_common/src/testFixtures/java/com/saasovation/common/domain/model/EventTrackingTestCase.java diff --git a/iddd_common/src/test/java/com/saasovation/common/domain/model/process/TestableTimeConstrainedProcess.java b/iddd_common/src/testFixtures/java/com/saasovation/common/domain/model/process/TestableTimeConstrainedProcess.java similarity index 100% rename from iddd_common/src/test/java/com/saasovation/common/domain/model/process/TestableTimeConstrainedProcess.java rename to iddd_common/src/testFixtures/java/com/saasovation/common/domain/model/process/TestableTimeConstrainedProcess.java diff --git a/iddd_common/src/test/java/com/saasovation/common/domain/model/process/TestableTimeConstrainedProcessRepository.java b/iddd_common/src/testFixtures/java/com/saasovation/common/domain/model/process/TestableTimeConstrainedProcessRepository.java similarity index 100% rename from iddd_common/src/test/java/com/saasovation/common/domain/model/process/TestableTimeConstrainedProcessRepository.java rename to iddd_common/src/testFixtures/java/com/saasovation/common/domain/model/process/TestableTimeConstrainedProcessRepository.java diff --git a/iddd_common/src/test/java/com/saasovation/common/domain/model/process/TestableTimeConstrainedProcessTimedOut.java b/iddd_common/src/testFixtures/java/com/saasovation/common/domain/model/process/TestableTimeConstrainedProcessTimedOut.java similarity index 100% rename from iddd_common/src/test/java/com/saasovation/common/domain/model/process/TestableTimeConstrainedProcessTimedOut.java rename to iddd_common/src/testFixtures/java/com/saasovation/common/domain/model/process/TestableTimeConstrainedProcessTimedOut.java diff --git a/iddd_common/src/test/java/com/saasovation/common/event/TestableDomainEvent.java b/iddd_common/src/testFixtures/java/com/saasovation/common/event/TestableDomainEvent.java similarity index 100% rename from iddd_common/src/test/java/com/saasovation/common/event/TestableDomainEvent.java rename to iddd_common/src/testFixtures/java/com/saasovation/common/event/TestableDomainEvent.java diff --git a/iddd_identityaccess/build.gradle.kts b/iddd_identityaccess/build.gradle.kts new file mode 100644 index 00000000..2ea6ca37 --- /dev/null +++ b/iddd_identityaccess/build.gradle.kts @@ -0,0 +1,24 @@ +plugins { + id("iddd-conventions") +} + +dependencies { + implementation(project(":iddd_common")) + implementation(group = "org.springframework", name = "spring-core", version = "3.1.4.RELEASE") + implementation(group = "org.springframework", name = "spring-beans", version = "3.1.4.RELEASE") + implementation(group = "org.springframework", name = "spring-tx", version = "3.1.4.RELEASE") + implementation(group = "javax.ws.rs", name = "javax.ws.rs-api", version = "2.0-rc1") + implementation(group = "org.jboss.resteasy", name = "resteasy-cache-core", version = "2.0.1.GA") + + implementation(group = "org.aspectj", name = "aspectjweaver", version = "1.7.2") + implementation(group = "org.hibernate", name = "hibernate", version = "3.2.7.ga") + + testImplementation(testFixtures(project(":iddd_common"))) + testImplementation(group = "javax.persistence", name = "persistence-api", version = "1.0.2") + testImplementation(group = "mysql", name = "mysql-connector-java", version = "5.1.6") + testImplementation(group = "commons-dbcp", name = "commons-dbcp", version = "1.4") + testImplementation(group = "javax.servlet", name = "servlet-api", version = "2.5") + testImplementation(group = "org.jboss.resteasy", name = "tjws", version = "2.0.1.GA") + + testImplementation(group = "com.google.code.gson", name = "gson", version = "2.1") +} diff --git a/settings.gradle b/settings.gradle deleted file mode 100644 index 0ec0fb93..00000000 --- a/settings.gradle +++ /dev/null @@ -1 +0,0 @@ -include 'iddd_common', 'iddd_identityaccess', 'iddd_collaboration', 'iddd_agilepm' \ No newline at end of file diff --git a/settings.gradle.kts b/settings.gradle.kts new file mode 100644 index 00000000..fcec1668 --- /dev/null +++ b/settings.gradle.kts @@ -0,0 +1,20 @@ +plugins { + id("org.gradle.toolchains.foojay-resolver-convention") version("0.7.0") +} + +include( + "iddd_common", + "iddd_identityaccess", + "iddd_collaboration", + "iddd_agilepm", +) + +dependencyResolutionManagement { + repositories { + mavenLocal() + mavenCentral() + + // JBoss Repo + maven { url = uri("https://repository.jboss.org/nexus/content/groups/public-jboss/") } + } +} diff --git a/startContainers.sh b/startContainers.sh index c2bcc348..9830e772 100755 --- a/startContainers.sh +++ b/startContainers.sh @@ -17,7 +17,7 @@ containers[1]="${rabbitmqContainerName}" function start() { echo "Starting MySQL Server container..." docker rm -f "${mysqlContainerName}" - docker run --name "${mysqlContainerName}" -p "${mysqlPort}":3306 -e MYSQL_ROOT_PASSWORD="${mysqlPassword}" -d mysql + docker run --name "${mysqlContainerName}" -p "${mysqlPort}":3306 -e MYSQL_ROOT_PASSWORD="${mysqlPassword}" -d mysql:5 echo "Waiting for MySQL Server to be up and running..." waitForContainer "${mysqlContainerName}" "mysqld: ready for connections."