From 4c7fb980fe916269a32e1728a3c187092f763dd0 Mon Sep 17 00:00:00 2001 From: Mehdi El Fadil Date: Fri, 14 Jun 2019 15:45:03 +0200 Subject: [PATCH 1/2] add support to MINGW64 (used in git bash) --- .../resources/org/codehaus/mojo/appassembler/daemon/booter/app | 1 + 1 file changed, 1 insertion(+) diff --git a/appassembler-maven-plugin/src/test/resources/org/codehaus/mojo/appassembler/daemon/booter/app b/appassembler-maven-plugin/src/test/resources/org/codehaus/mojo/appassembler/daemon/booter/app index 42739730..a002767f 100644 --- a/appassembler-maven-plugin/src/test/resources/org/codehaus/mojo/appassembler/daemon/booter/app +++ b/appassembler-maven-plugin/src/test/resources/org/codehaus/mojo/appassembler/daemon/booter/app @@ -42,6 +42,7 @@ cygwin=false; darwin=false; case "`uname`" in CYGWIN*) cygwin=true ;; + MINGW*) cygwin=true ;; Darwin*) darwin=true if [ -z "$JAVA_VERSION" ] ; then JAVA_VERSION="CurrentJDK" From 1b9474d9d7adf2b1b658d23335823ce62f1e88ff Mon Sep 17 00:00:00 2001 From: Mehdi El Fadil Date: Fri, 14 Jun 2019 15:48:15 +0200 Subject: [PATCH 2/2] add support to MINGW64 (used in git bash) fix #55 fix #61 fix mybatis/migrations#94 --- .../org/codehaus/mojo/appassembler/daemon/script/unixBinTemplate | 1 + .../src/site/apt/usage-program-jvmsettings.apt.vm | 1 + .../daemon/script-basedir-repo/expected-basedir-test | 1 + .../appassembler/daemon/script-basedir-repo/expected-repo-test | 1 + .../script/background/expected-false-showConsoleWindow-test | 1 + .../org/codehaus/mojo/appassembler/daemon/script/expected-test | 1 + .../mojo/appassembler/daemon/script/expected-test-endorsed-lib | 1 + 7 files changed, 7 insertions(+) diff --git a/appassembler-maven-plugin/src/main/resources/org/codehaus/mojo/appassembler/daemon/script/unixBinTemplate b/appassembler-maven-plugin/src/main/resources/org/codehaus/mojo/appassembler/daemon/script/unixBinTemplate index b1c61626..59568f9d 100644 --- a/appassembler-maven-plugin/src/main/resources/org/codehaus/mojo/appassembler/daemon/script/unixBinTemplate +++ b/appassembler-maven-plugin/src/main/resources/org/codehaus/mojo/appassembler/daemon/script/unixBinTemplate @@ -26,6 +26,7 @@ cygwin=false; darwin=false; case "`uname`" in CYGWIN*) cygwin=true ;; + MINGW*) cygwin=true ;; Darwin*) darwin=true if [ -z "$JAVA_VERSION" ] ; then JAVA_VERSION="CurrentJDK" diff --git a/appassembler-maven-plugin/src/site/apt/usage-program-jvmsettings.apt.vm b/appassembler-maven-plugin/src/site/apt/usage-program-jvmsettings.apt.vm index cc1df055..caec550b 100644 --- a/appassembler-maven-plugin/src/site/apt/usage-program-jvmsettings.apt.vm +++ b/appassembler-maven-plugin/src/site/apt/usage-program-jvmsettings.apt.vm @@ -72,6 +72,7 @@ cygwin=false; darwin=false; case "`uname`" in CYGWIN*) cygwin=true ;; + MINGW*) cygwin=true ;; Darwin*) darwin=true if [ -z "$JAVA_VERSION" ] ; then JAVA_VERSION="CurrentJDK" diff --git a/appassembler-maven-plugin/src/test/resources/org/codehaus/mojo/appassembler/daemon/script-basedir-repo/expected-basedir-test b/appassembler-maven-plugin/src/test/resources/org/codehaus/mojo/appassembler/daemon/script-basedir-repo/expected-basedir-test index 5eb32981..c3d961a5 100644 --- a/appassembler-maven-plugin/src/test/resources/org/codehaus/mojo/appassembler/daemon/script-basedir-repo/expected-basedir-test +++ b/appassembler-maven-plugin/src/test/resources/org/codehaus/mojo/appassembler/daemon/script-basedir-repo/expected-basedir-test @@ -44,6 +44,7 @@ cygwin=false; darwin=false; case "`uname`" in CYGWIN*) cygwin=true ;; + MINGW*) cygwin=true ;; Darwin*) darwin=true if [ -z "$JAVA_VERSION" ] ; then JAVA_VERSION="CurrentJDK" diff --git a/appassembler-maven-plugin/src/test/resources/org/codehaus/mojo/appassembler/daemon/script-basedir-repo/expected-repo-test b/appassembler-maven-plugin/src/test/resources/org/codehaus/mojo/appassembler/daemon/script-basedir-repo/expected-repo-test index 9bd999bc..414be706 100644 --- a/appassembler-maven-plugin/src/test/resources/org/codehaus/mojo/appassembler/daemon/script-basedir-repo/expected-repo-test +++ b/appassembler-maven-plugin/src/test/resources/org/codehaus/mojo/appassembler/daemon/script-basedir-repo/expected-repo-test @@ -44,6 +44,7 @@ cygwin=false; darwin=false; case "`uname`" in CYGWIN*) cygwin=true ;; + MINGW*) cygwin=true ;; Darwin*) darwin=true if [ -z "$JAVA_VERSION" ] ; then JAVA_VERSION="CurrentJDK" diff --git a/appassembler-maven-plugin/src/test/resources/org/codehaus/mojo/appassembler/daemon/script/background/expected-false-showConsoleWindow-test b/appassembler-maven-plugin/src/test/resources/org/codehaus/mojo/appassembler/daemon/script/background/expected-false-showConsoleWindow-test index f065e671..d38e3f9f 100644 --- a/appassembler-maven-plugin/src/test/resources/org/codehaus/mojo/appassembler/daemon/script/background/expected-false-showConsoleWindow-test +++ b/appassembler-maven-plugin/src/test/resources/org/codehaus/mojo/appassembler/daemon/script/background/expected-false-showConsoleWindow-test @@ -44,6 +44,7 @@ cygwin=false; darwin=false; case "`uname`" in CYGWIN*) cygwin=true ;; + MINGW*) cygwin=true ;; Darwin*) darwin=true if [ -z "$JAVA_VERSION" ] ; then JAVA_VERSION="CurrentJDK" diff --git a/appassembler-maven-plugin/src/test/resources/org/codehaus/mojo/appassembler/daemon/script/expected-test b/appassembler-maven-plugin/src/test/resources/org/codehaus/mojo/appassembler/daemon/script/expected-test index cbd989e6..b9c5dc87 100644 --- a/appassembler-maven-plugin/src/test/resources/org/codehaus/mojo/appassembler/daemon/script/expected-test +++ b/appassembler-maven-plugin/src/test/resources/org/codehaus/mojo/appassembler/daemon/script/expected-test @@ -44,6 +44,7 @@ cygwin=false; darwin=false; case "`uname`" in CYGWIN*) cygwin=true ;; + MINGW*) cygwin=true ;; Darwin*) darwin=true if [ -z "$JAVA_VERSION" ] ; then JAVA_VERSION="CurrentJDK" diff --git a/appassembler-maven-plugin/src/test/resources/org/codehaus/mojo/appassembler/daemon/script/expected-test-endorsed-lib b/appassembler-maven-plugin/src/test/resources/org/codehaus/mojo/appassembler/daemon/script/expected-test-endorsed-lib index 8668e4ad..552e4370 100644 --- a/appassembler-maven-plugin/src/test/resources/org/codehaus/mojo/appassembler/daemon/script/expected-test-endorsed-lib +++ b/appassembler-maven-plugin/src/test/resources/org/codehaus/mojo/appassembler/daemon/script/expected-test-endorsed-lib @@ -44,6 +44,7 @@ cygwin=false; darwin=false; case "`uname`" in CYGWIN*) cygwin=true ;; + MINGW*) cygwin=true ;; Darwin*) darwin=true if [ -z "$JAVA_VERSION" ] ; then JAVA_VERSION="CurrentJDK"