diff --git a/.mvn/wrapper/MavenWrapperDownloader.java b/.mvn/wrapper/MavenWrapperDownloader.java new file mode 100644 index 0000000..b901097 --- /dev/null +++ b/.mvn/wrapper/MavenWrapperDownloader.java @@ -0,0 +1,117 @@ +/* + * Copyright 2007-present the original author or 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 + * + * http://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. + */ +import java.net.*; +import java.io.*; +import java.nio.channels.*; +import java.util.Properties; + +public class MavenWrapperDownloader { + + private static final String WRAPPER_VERSION = "0.5.6"; + /** + * Default URL to download the maven-wrapper.jar from, if no 'downloadUrl' is provided. + */ + private static final String DEFAULT_DOWNLOAD_URL = "https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/" + + WRAPPER_VERSION + "/maven-wrapper-" + WRAPPER_VERSION + ".jar"; + + /** + * Path to the maven-wrapper.properties file, which might contain a downloadUrl property to + * use instead of the default one. + */ + private static final String MAVEN_WRAPPER_PROPERTIES_PATH = + ".mvn/wrapper/maven-wrapper.properties"; + + /** + * Path where the maven-wrapper.jar will be saved to. + */ + private static final String MAVEN_WRAPPER_JAR_PATH = + ".mvn/wrapper/maven-wrapper.jar"; + + /** + * Name of the property which should be used to override the default download url for the wrapper. + */ + private static final String PROPERTY_NAME_WRAPPER_URL = "wrapperUrl"; + + public static void main(String args[]) { + System.out.println("- Downloader started"); + File baseDirectory = new File(args[0]); + System.out.println("- Using base directory: " + baseDirectory.getAbsolutePath()); + + // If the maven-wrapper.properties exists, read it and check if it contains a custom + // wrapperUrl parameter. + File mavenWrapperPropertyFile = new File(baseDirectory, MAVEN_WRAPPER_PROPERTIES_PATH); + String url = DEFAULT_DOWNLOAD_URL; + if(mavenWrapperPropertyFile.exists()) { + FileInputStream mavenWrapperPropertyFileInputStream = null; + try { + mavenWrapperPropertyFileInputStream = new FileInputStream(mavenWrapperPropertyFile); + Properties mavenWrapperProperties = new Properties(); + mavenWrapperProperties.load(mavenWrapperPropertyFileInputStream); + url = mavenWrapperProperties.getProperty(PROPERTY_NAME_WRAPPER_URL, url); + } catch (IOException e) { + System.out.println("- ERROR loading '" + MAVEN_WRAPPER_PROPERTIES_PATH + "'"); + } finally { + try { + if(mavenWrapperPropertyFileInputStream != null) { + mavenWrapperPropertyFileInputStream.close(); + } + } catch (IOException e) { + // Ignore ... + } + } + } + System.out.println("- Downloading from: " + url); + + File outputFile = new File(baseDirectory.getAbsolutePath(), MAVEN_WRAPPER_JAR_PATH); + if(!outputFile.getParentFile().exists()) { + if(!outputFile.getParentFile().mkdirs()) { + System.out.println( + "- ERROR creating output directory '" + outputFile.getParentFile().getAbsolutePath() + "'"); + } + } + System.out.println("- Downloading to: " + outputFile.getAbsolutePath()); + try { + downloadFileFromURL(url, outputFile); + System.out.println("Done"); + System.exit(0); + } catch (Throwable e) { + System.out.println("- Error downloading"); + e.printStackTrace(); + System.exit(1); + } + } + + private static void downloadFileFromURL(String urlString, File destination) throws Exception { + if (System.getenv("MVNW_USERNAME") != null && System.getenv("MVNW_PASSWORD") != null) { + String username = System.getenv("MVNW_USERNAME"); + char[] password = System.getenv("MVNW_PASSWORD").toCharArray(); + Authenticator.setDefault(new Authenticator() { + @Override + protected PasswordAuthentication getPasswordAuthentication() { + return new PasswordAuthentication(username, password); + } + }); + } + URL website = new URL(urlString); + ReadableByteChannel rbc; + rbc = Channels.newChannel(website.openStream()); + FileOutputStream fos = new FileOutputStream(destination); + fos.getChannel().transferFrom(rbc, 0, Long.MAX_VALUE); + fos.close(); + rbc.close(); + } + +} diff --git a/.mvn/wrapper/maven-wrapper.jar b/.mvn/wrapper/maven-wrapper.jar new file mode 100644 index 0000000..2cc7d4a Binary files /dev/null and b/.mvn/wrapper/maven-wrapper.jar differ diff --git a/.mvn/wrapper/maven-wrapper.properties b/.mvn/wrapper/maven-wrapper.properties new file mode 100644 index 0000000..642d572 --- /dev/null +++ b/.mvn/wrapper/maven-wrapper.properties @@ -0,0 +1,2 @@ +distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.6.3/apache-maven-3.6.3-bin.zip +wrapperUrl=https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar diff --git a/mvnw b/mvnw new file mode 100755 index 0000000..41c0f0c --- /dev/null +++ b/mvnw @@ -0,0 +1,310 @@ +#!/bin/sh +# ---------------------------------------------------------------------------- +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you 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 +# +# http://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. +# ---------------------------------------------------------------------------- + +# ---------------------------------------------------------------------------- +# Maven Start Up Batch script +# +# Required ENV vars: +# ------------------ +# JAVA_HOME - location of a JDK home dir +# +# Optional ENV vars +# ----------------- +# M2_HOME - location of maven2's installed home dir +# MAVEN_OPTS - parameters passed to the Java VM when running Maven +# e.g. to debug Maven itself, use +# set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000 +# MAVEN_SKIP_RC - flag to disable loading of mavenrc files +# ---------------------------------------------------------------------------- + +if [ -z "$MAVEN_SKIP_RC" ] ; then + + if [ -f /etc/mavenrc ] ; then + . /etc/mavenrc + fi + + if [ -f "$HOME/.mavenrc" ] ; then + . "$HOME/.mavenrc" + fi + +fi + +# OS specific support. $var _must_ be set to either true or false. +cygwin=false; +darwin=false; +mingw=false +case "`uname`" in + CYGWIN*) cygwin=true ;; + MINGW*) mingw=true;; + Darwin*) darwin=true + # Use /usr/libexec/java_home if available, otherwise fall back to /Library/Java/Home + # See https://developer.apple.com/library/mac/qa/qa1170/_index.html + if [ -z "$JAVA_HOME" ]; then + if [ -x "/usr/libexec/java_home" ]; then + export JAVA_HOME="`/usr/libexec/java_home`" + else + export JAVA_HOME="/Library/Java/Home" + fi + fi + ;; +esac + +if [ -z "$JAVA_HOME" ] ; then + if [ -r /etc/gentoo-release ] ; then + JAVA_HOME=`java-config --jre-home` + fi +fi + +if [ -z "$M2_HOME" ] ; then + ## resolve links - $0 may be a link to maven's home + 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 + + saveddir=`pwd` + + M2_HOME=`dirname "$PRG"`/.. + + # make it fully qualified + M2_HOME=`cd "$M2_HOME" && pwd` + + cd "$saveddir" + # echo Using m2 at $M2_HOME +fi + +# For Cygwin, ensure paths are in UNIX format before anything is touched +if $cygwin ; then + [ -n "$M2_HOME" ] && + M2_HOME=`cygpath --unix "$M2_HOME"` + [ -n "$JAVA_HOME" ] && + JAVA_HOME=`cygpath --unix "$JAVA_HOME"` + [ -n "$CLASSPATH" ] && + CLASSPATH=`cygpath --path --unix "$CLASSPATH"` +fi + +# For Mingw, ensure paths are in UNIX format before anything is touched +if $mingw ; then + [ -n "$M2_HOME" ] && + M2_HOME="`(cd "$M2_HOME"; pwd)`" + [ -n "$JAVA_HOME" ] && + JAVA_HOME="`(cd "$JAVA_HOME"; pwd)`" +fi + +if [ -z "$JAVA_HOME" ]; then + javaExecutable="`which javac`" + if [ -n "$javaExecutable" ] && ! [ "`expr \"$javaExecutable\" : '\([^ ]*\)'`" = "no" ]; then + # readlink(1) is not available as standard on Solaris 10. + readLink=`which readlink` + if [ ! `expr "$readLink" : '\([^ ]*\)'` = "no" ]; then + if $darwin ; then + javaHome="`dirname \"$javaExecutable\"`" + javaExecutable="`cd \"$javaHome\" && pwd -P`/javac" + else + javaExecutable="`readlink -f \"$javaExecutable\"`" + fi + javaHome="`dirname \"$javaExecutable\"`" + javaHome=`expr "$javaHome" : '\(.*\)/bin'` + JAVA_HOME="$javaHome" + export JAVA_HOME + fi + fi +fi + +if [ -z "$JAVACMD" ] ; then + 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 + else + JAVACMD="`which java`" + fi +fi + +if [ ! -x "$JAVACMD" ] ; then + echo "Error: JAVA_HOME is not defined correctly." >&2 + echo " We cannot execute $JAVACMD" >&2 + exit 1 +fi + +if [ -z "$JAVA_HOME" ] ; then + echo "Warning: JAVA_HOME environment variable is not set." +fi + +CLASSWORLDS_LAUNCHER=org.codehaus.plexus.classworlds.launcher.Launcher + +# traverses directory structure from process work directory to filesystem root +# first directory with .mvn subdirectory is considered project base directory +find_maven_basedir() { + + if [ -z "$1" ] + then + echo "Path not specified to find_maven_basedir" + return 1 + fi + + basedir="$1" + wdir="$1" + while [ "$wdir" != '/' ] ; do + if [ -d "$wdir"/.mvn ] ; then + basedir=$wdir + break + fi + # workaround for JBEAP-8937 (on Solaris 10/Sparc) + if [ -d "${wdir}" ]; then + wdir=`cd "$wdir/.."; pwd` + fi + # end of workaround + done + echo "${basedir}" +} + +# concatenates all lines of a file +concat_lines() { + if [ -f "$1" ]; then + echo "$(tr -s '\n' ' ' < "$1")" + fi +} + +BASE_DIR=`find_maven_basedir "$(pwd)"` +if [ -z "$BASE_DIR" ]; then + exit 1; +fi + +########################################################################################## +# Extension to allow automatically downloading the maven-wrapper.jar from Maven-central +# This allows using the maven wrapper in projects that prohibit checking in binary data. +########################################################################################## +if [ -r "$BASE_DIR/.mvn/wrapper/maven-wrapper.jar" ]; then + if [ "$MVNW_VERBOSE" = true ]; then + echo "Found .mvn/wrapper/maven-wrapper.jar" + fi +else + if [ "$MVNW_VERBOSE" = true ]; then + echo "Couldn't find .mvn/wrapper/maven-wrapper.jar, downloading it ..." + fi + if [ -n "$MVNW_REPOURL" ]; then + jarUrl="$MVNW_REPOURL/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar" + else + jarUrl="https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar" + fi + while IFS="=" read key value; do + case "$key" in (wrapperUrl) jarUrl="$value"; break ;; + esac + done < "$BASE_DIR/.mvn/wrapper/maven-wrapper.properties" + if [ "$MVNW_VERBOSE" = true ]; then + echo "Downloading from: $jarUrl" + fi + wrapperJarPath="$BASE_DIR/.mvn/wrapper/maven-wrapper.jar" + if $cygwin; then + wrapperJarPath=`cygpath --path --windows "$wrapperJarPath"` + fi + + if command -v wget > /dev/null; then + if [ "$MVNW_VERBOSE" = true ]; then + echo "Found wget ... using wget" + fi + if [ -z "$MVNW_USERNAME" ] || [ -z "$MVNW_PASSWORD" ]; then + wget "$jarUrl" -O "$wrapperJarPath" + else + wget --http-user=$MVNW_USERNAME --http-password=$MVNW_PASSWORD "$jarUrl" -O "$wrapperJarPath" + fi + elif command -v curl > /dev/null; then + if [ "$MVNW_VERBOSE" = true ]; then + echo "Found curl ... using curl" + fi + if [ -z "$MVNW_USERNAME" ] || [ -z "$MVNW_PASSWORD" ]; then + curl -o "$wrapperJarPath" "$jarUrl" -f + else + curl --user $MVNW_USERNAME:$MVNW_PASSWORD -o "$wrapperJarPath" "$jarUrl" -f + fi + + else + if [ "$MVNW_VERBOSE" = true ]; then + echo "Falling back to using Java to download" + fi + javaClass="$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.java" + # For Cygwin, switch paths to Windows format before running javac + if $cygwin; then + javaClass=`cygpath --path --windows "$javaClass"` + fi + if [ -e "$javaClass" ]; then + if [ ! -e "$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.class" ]; then + if [ "$MVNW_VERBOSE" = true ]; then + echo " - Compiling MavenWrapperDownloader.java ..." + fi + # Compiling the Java class + ("$JAVA_HOME/bin/javac" "$javaClass") + fi + if [ -e "$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.class" ]; then + # Running the downloader + if [ "$MVNW_VERBOSE" = true ]; then + echo " - Running MavenWrapperDownloader.java ..." + fi + ("$JAVA_HOME/bin/java" -cp .mvn/wrapper MavenWrapperDownloader "$MAVEN_PROJECTBASEDIR") + fi + fi + fi +fi +########################################################################################## +# End of extension +########################################################################################## + +export MAVEN_PROJECTBASEDIR=${MAVEN_BASEDIR:-"$BASE_DIR"} +if [ "$MVNW_VERBOSE" = true ]; then + echo $MAVEN_PROJECTBASEDIR +fi +MAVEN_OPTS="$(concat_lines "$MAVEN_PROJECTBASEDIR/.mvn/jvm.config") $MAVEN_OPTS" + +# For Cygwin, switch paths to Windows format before running java +if $cygwin; then + [ -n "$M2_HOME" ] && + M2_HOME=`cygpath --path --windows "$M2_HOME"` + [ -n "$JAVA_HOME" ] && + JAVA_HOME=`cygpath --path --windows "$JAVA_HOME"` + [ -n "$CLASSPATH" ] && + CLASSPATH=`cygpath --path --windows "$CLASSPATH"` + [ -n "$MAVEN_PROJECTBASEDIR" ] && + MAVEN_PROJECTBASEDIR=`cygpath --path --windows "$MAVEN_PROJECTBASEDIR"` +fi + +# Provide a "standardized" way to retrieve the CLI args that will +# work with both Windows and non-Windows executions. +MAVEN_CMD_LINE_ARGS="$MAVEN_CONFIG $@" +export MAVEN_CMD_LINE_ARGS + +WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain + +exec "$JAVACMD" \ + $MAVEN_OPTS \ + -classpath "$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.jar" \ + "-Dmaven.home=${M2_HOME}" "-Dmaven.multiModuleProjectDirectory=${MAVEN_PROJECTBASEDIR}" \ + ${WRAPPER_LAUNCHER} $MAVEN_CONFIG "$@" diff --git a/mvnw.cmd b/mvnw.cmd new file mode 100644 index 0000000..8611571 --- /dev/null +++ b/mvnw.cmd @@ -0,0 +1,182 @@ +@REM ---------------------------------------------------------------------------- +@REM Licensed to the Apache Software Foundation (ASF) under one +@REM or more contributor license agreements. See the NOTICE file +@REM distributed with this work for additional information +@REM regarding copyright ownership. The ASF licenses this file +@REM to you under the Apache License, Version 2.0 (the +@REM "License"); you may not use this file except in compliance +@REM with the License. You may obtain a copy of the License at +@REM +@REM http://www.apache.org/licenses/LICENSE-2.0 +@REM +@REM Unless required by applicable law or agreed to in writing, +@REM software distributed under the License is distributed on an +@REM "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +@REM KIND, either express or implied. See the License for the +@REM specific language governing permissions and limitations +@REM under the License. +@REM ---------------------------------------------------------------------------- + +@REM ---------------------------------------------------------------------------- +@REM Maven Start Up Batch script +@REM +@REM Required ENV vars: +@REM JAVA_HOME - location of a JDK home dir +@REM +@REM Optional ENV vars +@REM M2_HOME - location of maven2's installed home dir +@REM MAVEN_BATCH_ECHO - set to 'on' to enable the echoing of the batch commands +@REM MAVEN_BATCH_PAUSE - set to 'on' to wait for a keystroke before ending +@REM MAVEN_OPTS - parameters passed to the Java VM when running Maven +@REM e.g. to debug Maven itself, use +@REM set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000 +@REM MAVEN_SKIP_RC - flag to disable loading of mavenrc files +@REM ---------------------------------------------------------------------------- + +@REM Begin all REM lines with '@' in case MAVEN_BATCH_ECHO is 'on' +@echo off +@REM set title of command window +title %0 +@REM enable echoing by setting MAVEN_BATCH_ECHO to 'on' +@if "%MAVEN_BATCH_ECHO%" == "on" echo %MAVEN_BATCH_ECHO% + +@REM set %HOME% to equivalent of $HOME +if "%HOME%" == "" (set "HOME=%HOMEDRIVE%%HOMEPATH%") + +@REM Execute a user defined script before this one +if not "%MAVEN_SKIP_RC%" == "" goto skipRcPre +@REM check for pre script, once with legacy .bat ending and once with .cmd ending +if exist "%HOME%\mavenrc_pre.bat" call "%HOME%\mavenrc_pre.bat" +if exist "%HOME%\mavenrc_pre.cmd" call "%HOME%\mavenrc_pre.cmd" +:skipRcPre + +@setlocal + +set ERROR_CODE=0 + +@REM To isolate internal variables from possible post scripts, we use another setlocal +@setlocal + +@REM ==== START VALIDATION ==== +if not "%JAVA_HOME%" == "" goto OkJHome + +echo. +echo Error: JAVA_HOME not found in your environment. >&2 +echo Please set the JAVA_HOME variable in your environment to match the >&2 +echo location of your Java installation. >&2 +echo. +goto error + +:OkJHome +if exist "%JAVA_HOME%\bin\java.exe" goto init + +echo. +echo Error: JAVA_HOME is set to an invalid directory. >&2 +echo JAVA_HOME = "%JAVA_HOME%" >&2 +echo Please set the JAVA_HOME variable in your environment to match the >&2 +echo location of your Java installation. >&2 +echo. +goto error + +@REM ==== END VALIDATION ==== + +:init + +@REM Find the project base dir, i.e. the directory that contains the folder ".mvn". +@REM Fallback to current working directory if not found. + +set MAVEN_PROJECTBASEDIR=%MAVEN_BASEDIR% +IF NOT "%MAVEN_PROJECTBASEDIR%"=="" goto endDetectBaseDir + +set EXEC_DIR=%CD% +set WDIR=%EXEC_DIR% +:findBaseDir +IF EXIST "%WDIR%"\.mvn goto baseDirFound +cd .. +IF "%WDIR%"=="%CD%" goto baseDirNotFound +set WDIR=%CD% +goto findBaseDir + +:baseDirFound +set MAVEN_PROJECTBASEDIR=%WDIR% +cd "%EXEC_DIR%" +goto endDetectBaseDir + +:baseDirNotFound +set MAVEN_PROJECTBASEDIR=%EXEC_DIR% +cd "%EXEC_DIR%" + +:endDetectBaseDir + +IF NOT EXIST "%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config" goto endReadAdditionalConfig + +@setlocal EnableExtensions EnableDelayedExpansion +for /F "usebackq delims=" %%a in ("%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config") do set JVM_CONFIG_MAVEN_PROPS=!JVM_CONFIG_MAVEN_PROPS! %%a +@endlocal & set JVM_CONFIG_MAVEN_PROPS=%JVM_CONFIG_MAVEN_PROPS% + +:endReadAdditionalConfig + +SET MAVEN_JAVA_EXE="%JAVA_HOME%\bin\java.exe" +set WRAPPER_JAR="%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.jar" +set WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain + +set DOWNLOAD_URL="https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar" + +FOR /F "tokens=1,2 delims==" %%A IN ("%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.properties") DO ( + IF "%%A"=="wrapperUrl" SET DOWNLOAD_URL=%%B +) + +@REM Extension to allow automatically downloading the maven-wrapper.jar from Maven-central +@REM This allows using the maven wrapper in projects that prohibit checking in binary data. +if exist %WRAPPER_JAR% ( + if "%MVNW_VERBOSE%" == "true" ( + echo Found %WRAPPER_JAR% + ) +) else ( + if not "%MVNW_REPOURL%" == "" ( + SET DOWNLOAD_URL="%MVNW_REPOURL%/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar" + ) + if "%MVNW_VERBOSE%" == "true" ( + echo Couldn't find %WRAPPER_JAR%, downloading it ... + echo Downloading from: %DOWNLOAD_URL% + ) + + powershell -Command "&{"^ + "$webclient = new-object System.Net.WebClient;"^ + "if (-not ([string]::IsNullOrEmpty('%MVNW_USERNAME%') -and [string]::IsNullOrEmpty('%MVNW_PASSWORD%'))) {"^ + "$webclient.Credentials = new-object System.Net.NetworkCredential('%MVNW_USERNAME%', '%MVNW_PASSWORD%');"^ + "}"^ + "[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; $webclient.DownloadFile('%DOWNLOAD_URL%', '%WRAPPER_JAR%')"^ + "}" + if "%MVNW_VERBOSE%" == "true" ( + echo Finished downloading %WRAPPER_JAR% + ) +) +@REM End of extension + +@REM Provide a "standardized" way to retrieve the CLI args that will +@REM work with both Windows and non-Windows executions. +set MAVEN_CMD_LINE_ARGS=%* + +%MAVEN_JAVA_EXE% %JVM_CONFIG_MAVEN_PROPS% %MAVEN_OPTS% %MAVEN_DEBUG_OPTS% -classpath %WRAPPER_JAR% "-Dmaven.multiModuleProjectDirectory=%MAVEN_PROJECTBASEDIR%" %WRAPPER_LAUNCHER% %MAVEN_CONFIG% %* +if ERRORLEVEL 1 goto error +goto end + +:error +set ERROR_CODE=1 + +:end +@endlocal & set ERROR_CODE=%ERROR_CODE% + +if not "%MAVEN_SKIP_RC%" == "" goto skipRcPost +@REM check for post script, once with legacy .bat ending and once with .cmd ending +if exist "%HOME%\mavenrc_post.bat" call "%HOME%\mavenrc_post.bat" +if exist "%HOME%\mavenrc_post.cmd" call "%HOME%\mavenrc_post.cmd" +:skipRcPost + +@REM pause the script if MAVEN_BATCH_PAUSE is set to 'on' +if "%MAVEN_BATCH_PAUSE%" == "on" pause + +if "%MAVEN_TERMINATE_CMD%" == "on" exit %ERROR_CODE% + +exit /B %ERROR_CODE% diff --git a/pom.xml b/pom.xml index 8a13fa0..aa7ac7e 100644 --- a/pom.xml +++ b/pom.xml @@ -1,11 +1,10 @@ - + 4.0.0 com.unicenta unicentaopos - 5.3.1 + 5.3.2 jar UTF-8 @@ -115,7 +114,13 @@ org.apache.poi poi - 3.10.1 + 3.17 + + + + org.apache.poi + poi-ooxml + 3.17 net.sf.barcode4j @@ -250,11 +255,11 @@ derbytools ${derby.version} - - - - - + + org.apache.derby + derbyshared + ${derby.version} + xml-apis xml-apis @@ -356,7 +361,7 @@ com.unicenta unicenta-plugins - 1.2.8-SNAPSHOT + 1.2.7 com.gluonhq diff --git a/src/main/java/com/unicenta/pos/forms/AppLocal.java b/src/main/java/com/unicenta/pos/forms/AppLocal.java index e4b7557..75a66d0 100644 --- a/src/main/java/com/unicenta/pos/forms/AppLocal.java +++ b/src/main/java/com/unicenta/pos/forms/AppLocal.java @@ -30,7 +30,7 @@ public class AppLocal { public static final String APP_NAME = "uniCenta oPOS"; public static final String APP_ID = "unicentaopos"; - public static final String APP_VERSION = "5.3.1"; + public static final String APP_VERSION = "5.3.2"; private static final LocaleResources m_resources; diff --git a/src/main/java/com/unicenta/pos/imports/CustomerCSVImport.java b/src/main/java/com/unicenta/pos/imports/CustomerCSVImport.java index 8fe269b..3242413 100644 --- a/src/main/java/com/unicenta/pos/imports/CustomerCSVImport.java +++ b/src/main/java/com/unicenta/pos/imports/CustomerCSVImport.java @@ -41,6 +41,8 @@ import java.sql.SQLException; import java.util.ArrayList; import java.util.List; import java.util.UUID; +import java.util.concurrent.ExecutorService; +import java.util.concurrent.Executors; /** @@ -276,6 +278,7 @@ public class CustomerCSVImport extends JPanel implements JPanelView { * the UI responsiveness. */ private void setWorker() { + ExecutorService customExecutor = Executors.newCachedThreadPool(); progress = 0; webPBar.setStringPainted(true); @@ -304,7 +307,8 @@ public class CustomerCSVImport extends JPanel implements JPanelView { } } }; - pbWorker.execute(); + // pbWorker.execute(); + customExecutor.submit(pbWorker); } /** diff --git a/src/main/java/com/unicenta/pos/imports/JPanelCSVImport.java b/src/main/java/com/unicenta/pos/imports/JPanelCSVImport.java index 348cc65..95edf35 100644 --- a/src/main/java/com/unicenta/pos/imports/JPanelCSVImport.java +++ b/src/main/java/com/unicenta/pos/imports/JPanelCSVImport.java @@ -44,6 +44,8 @@ import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.UUID; +import java.util.concurrent.ExecutorService; +import java.util.concurrent.Executors; /** @@ -292,6 +294,7 @@ public class JPanelCSVImport extends JPanel implements JPanelView { * the UI responsiveness. */ private void setWorker() { + ExecutorService customExecutor = Executors.newCachedThreadPool(); progress = 0; webPBar.setStringPainted(true); @@ -320,7 +323,8 @@ public class JPanelCSVImport extends JPanel implements JPanelView { } } }; - pbWorker.execute(); + //pbWorker.execute(); + customExecutor.submit(pbWorker); } /** diff --git a/src/main/java/com/unicenta/pos/imports/StockQtyImport.java b/src/main/java/com/unicenta/pos/imports/StockQtyImport.java index 9eb914b..9b6c8a6 100644 --- a/src/main/java/com/unicenta/pos/imports/StockQtyImport.java +++ b/src/main/java/com/unicenta/pos/imports/StockQtyImport.java @@ -43,6 +43,8 @@ import java.sql.SQLException; import java.util.List; import java.util.Properties; import java.util.UUID; +import java.util.concurrent.ExecutorService; +import java.util.concurrent.Executors; /** @@ -511,6 +513,7 @@ public class StockQtyImport extends JPanel implements JPanelView { * the UI responsiveness. */ private void setWorker() { + ExecutorService customExecutor = Executors.newCachedThreadPool(); progress = 0; webPBar.setStringPainted(true); @@ -539,7 +542,8 @@ public class StockQtyImport extends JPanel implements JPanelView { } } }; - pbWorker.execute(); + //pbWorker.execute(); + customExecutor.submit(pbWorker); } /** diff --git a/src/main/java/com/unicenta/pos/payment/JPaymentSelect.java b/src/main/java/com/unicenta/pos/payment/JPaymentSelect.java index d90ee7c..a908d93 100644 --- a/src/main/java/com/unicenta/pos/payment/JPaymentSelect.java +++ b/src/main/java/com/unicenta/pos/payment/JPaymentSelect.java @@ -19,6 +19,7 @@ package com.unicenta.pos.payment; +import com.unicenta.basic.BasicException; import com.unicenta.format.Formats; import com.unicenta.pos.customers.CustomerInfoExt; import com.unicenta.pos.customers.DataLogicCustomers; @@ -26,19 +27,22 @@ import com.unicenta.pos.forms.AppLocal; import com.unicenta.pos.forms.AppView; import com.unicenta.pos.forms.DataLogicSales; import com.unicenta.pos.forms.DataLogicSystem; +import lombok.extern.slf4j.Slf4j; import java.awt.*; import java.awt.event.KeyEvent; import java.util.HashMap; import java.util.List; import java.util.Map; -import javax.swing.JFrame; -import javax.swing.SwingWorker; +import java.util.concurrent.ExecutorService; +import java.util.concurrent.Executors; +import javax.swing.*; /** * * @author adrianromero */ +@Slf4j public abstract class JPaymentSelect extends javax.swing.JDialog implements JPaymentNotifier { @@ -720,27 +724,37 @@ public abstract class JPaymentSelect extends javax.swing.JDialog private void m_jButtonOKActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_m_jButtonOKActionPerformed - SwingWorker worker = new SwingWorker() { - @Override - protected Object doInBackground() throws Exception { - m_jButtonOK.setEnabled(false); - setReturnPayment(((JPaymentInterface) m_jTabPayment.getSelectedComponent()).executePayment()); - return null; - } + ExecutorService customExecutor = Executors.newCachedThreadPool(); - @Override - public void done() { - m_jButtonOK.setEnabled(true); - m_jButtonCancel.setEnabled(true); - if (returnPayment != null) { - m_aPaymentInfo.add(returnPayment); - accepted = true; - dispose(); + try { + SwingWorker worker = new SwingWorker() { + + @Override + protected Object doInBackground() { + m_jButtonOK.setEnabled(false); + setReturnPayment(((JPaymentInterface) m_jTabPayment.getSelectedComponent()).executePayment()); + return null; } - } - }; - worker.execute(); + @Override + public void done() { + m_jButtonOK.setEnabled(true); + m_jButtonCancel.setEnabled(true); + if (returnPayment != null) { + m_aPaymentInfo.add(returnPayment); + accepted = true; + dispose(); + } + } + }; + + //worker.execute(); + customExecutor.submit(worker); + } + catch (Exception ex) { + System.out.println(ex.getMessage()); + } + }//GEN-LAST:event_m_jButtonOKActionPerformed private void m_jButtonCancelActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_m_jButtonCancelActionPerformed diff --git a/src/main/java/com/unicenta/pos/sales/JPanelTicketSales.java b/src/main/java/com/unicenta/pos/sales/JPanelTicketSales.java index 4bf2af0..70bee99 100644 --- a/src/main/java/com/unicenta/pos/sales/JPanelTicketSales.java +++ b/src/main/java/com/unicenta/pos/sales/JPanelTicketSales.java @@ -23,6 +23,8 @@ import com.unicenta.pos.catalog.CatalogSelector; import com.unicenta.pos.catalog.JCatalog; import com.unicenta.pos.forms.AppView; import com.unicenta.pos.ticket.ProductInfoExt; +import lombok.extern.slf4j.Slf4j; + import java.awt.Component; import java.awt.Dimension; import java.awt.event.ActionEvent; @@ -34,6 +36,7 @@ import javax.swing.event.ListSelectionListener; * * @author JG uniCenta */ +@Slf4j public class JPanelTicketSales extends JPanelTicket { private CatalogSelector m_cat; @@ -95,6 +98,7 @@ public class JPanelTicketSales extends JPanelTicket { */ @Override protected JTicketsBag getJTicketsBag() { + log.debug("Get JTickets Bag"); return JTicketsBag.createTicketsBag(m_App.getProperties().getProperty("machine.ticketsbag"), m_App, this); } diff --git a/src/main/java/com/unicenta/pos/sales/shared/JTicketsBagShared.java b/src/main/java/com/unicenta/pos/sales/shared/JTicketsBagShared.java index eea189b..a924e82 100644 --- a/src/main/java/com/unicenta/pos/sales/shared/JTicketsBagShared.java +++ b/src/main/java/com/unicenta/pos/sales/shared/JTicketsBagShared.java @@ -37,6 +37,8 @@ import lombok.extern.slf4j.Slf4j; import java.util.List; import java.util.UUID; +import java.util.concurrent.ExecutorService; +import java.util.concurrent.Executors; import javax.swing.*; /** @@ -51,6 +53,7 @@ public class JTicketsBagShared extends JTicketsBag { private DataLogicSales dlSales = null; private final DataLogicSystem dlSystem; private Boolean showList; + private int existingOrderCount; /** Creates new form JTicketsBagShared @@ -78,7 +81,8 @@ public class JTicketsBagShared extends JTicketsBag { log.debug("Loading Sales screen! "+this.getClass()); - SwingWorker reloadLayaway = new SwingWorker() { + ExecutorService customExecutor = Executors.newCachedThreadPool(); + SwingWorker reloadLayaway = new SwingWorker<>() { @Override protected String doInBackground() throws Exception { while (true) { @@ -91,7 +95,8 @@ public class JTicketsBagShared extends JTicketsBag { } }; - reloadLayaway.execute(); + //reloadLayaway.execute(); + customExecutor.submit(reloadLayaway); m_sCurrentTicket = null; @@ -128,7 +133,7 @@ public class JTicketsBagShared extends JTicketsBag { m_App.getAppUserView().getUser().getName(), "Void", "Ticket Deleted", - (Object) 0.0 + 0.0 }); m_sCurrentTicket = null; @@ -136,12 +141,26 @@ public class JTicketsBagShared extends JTicketsBag { } public void updateCount() { + + /* + 1. Need to get / set the existing count + 2. When count increases show dialog + */ try { List l = dlReceipts.getSharedTicketList(); int count = l.size(); + + if (count > existingOrderCount) { + log.info("New Order Received from the API!"); + // show Order Window +// List ticketInfoList= dlSales.getReprintTicketList(); +// JTicketsReprintList listDialog = JTicketsReprintList.newJDialog(JTicketsBagShared.this); +// String id = listDialog.showTicketsList(ticketInfoList, dlSales); + } if (count > 0) { m_jListTickets.setText(Integer.toString(count)); + existingOrderCount = count; } else { m_jListTickets.setText(""); } @@ -226,7 +245,7 @@ public class JTicketsBagShared extends JTicketsBag { m_jListTickets.setText(""); newTicket(); } else { - showList = (Boolean) m_App.getAppUserView().getUser().hasPermission("sales.ShowList"); + showList = m_App.getAppUserView().getUser().hasPermission("sales.ShowList"); if (showList) { m_jListTickets.doClick(); } @@ -423,6 +442,10 @@ public class JTicketsBagShared extends JTicketsBag { ((JRootApp)m_App).closeAppView(); }//GEN-LAST:event_m_jHoldActionPerformed + private void showOrderWindow() { + + } + private void m_jReprintTicketsActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_m_jReprintTicketsActionPerformed SwingUtilities.invokeLater(new Runnable() { @Override diff --git a/src/main/java/com/unicenta/pos/sales/shared/JTicketsReprintList.java b/src/main/java/com/unicenta/pos/sales/shared/JTicketsReprintList.java index f9defc1..ba6f022 100644 --- a/src/main/java/com/unicenta/pos/sales/shared/JTicketsReprintList.java +++ b/src/main/java/com/unicenta/pos/sales/shared/JTicketsReprintList.java @@ -96,7 +96,7 @@ public class JTicketsReprintList extends javax.swing.JDialog { m_ticket = null; m_ticketCopy = null; -ReprintTicketInfo m_Ticket = null; + ReprintTicketInfo m_Ticket = null; for (ReprintTicketInfo aticket : atickets) { m_jtickets.add(new JButtonTicket(aticket, dlSales)); diff --git a/src/main/java/com/unicenta/pos/transfer/Transfer.java b/src/main/java/com/unicenta/pos/transfer/Transfer.java index 3901ec9..6d95309 100644 --- a/src/main/java/com/unicenta/pos/transfer/Transfer.java +++ b/src/main/java/com/unicenta/pos/transfer/Transfer.java @@ -43,6 +43,8 @@ import java.sql.*; import java.util.ArrayList; import java.util.List; import java.util.Properties; +import java.util.concurrent.ExecutorService; +import java.util.concurrent.Executors; import java.util.regex.Matcher; /** @@ -2721,6 +2723,7 @@ public final class Transfer extends JPanel implements JPanelView { JOptionPane.YES_NO_OPTION, JOptionPane.QUESTION_MESSAGE) == JOptionPane.YES_OPTION) { + ExecutorService customExecutor = Executors.newCachedThreadPool(); SwingWorker worker = new SwingWorker() { @Override @@ -2731,7 +2734,8 @@ public final class Transfer extends JPanel implements JPanelView { } }; - worker.execute(); + //worker.execute(); + customExecutor.submit(worker); } System.gc(); diff --git a/src/main/resources/pos_messages.properties b/src/main/resources/pos_messages.properties index c32bde3..03c48ca 100644 --- a/src/main/resources/pos_messages.properties +++ b/src/main/resources/pos_messages.properties @@ -881,7 +881,7 @@ message.email=Desktop email app' not found message.emptycustomer=Customer cannot be empty message.emptynumber=Number cannot be empty message.enterbuyprice=Enter new Buy Price -message.eolupdate=

Version 5.3.1 Upgrade!


Your current database version is {0}


For version 5.3 click YES

For any other version click NO and get to 5.3 first

+message.eolupdate=

Version 5.3.2 Upgrade!


Your current database version is {0}


For version 5.3 click YES

For any other version click NO and get to 5.3 first

message.ibuttonassign=
Get the iButton ID
Place iButton onto the reader then click OK message.ibuttonnotassign=
The iButton used is not yet assigned to anyone message.ibuttonnotfound=No iButton adapter found. Key fobs will be disabled. diff --git a/src/test/java/com/unicenta/pos/util/QRCodeTest.java b/src/test/java/com/unicenta/pos/util/QRCodeTest.java index f637feb..3f38d47 100644 --- a/src/test/java/com/unicenta/pos/util/QRCodeTest.java +++ b/src/test/java/com/unicenta/pos/util/QRCodeTest.java @@ -66,7 +66,7 @@ class QRCodeTest { BufferedImage bufferedImage = MatrixToImageWriter.toBufferedImage(bitMatrix); - File outputfile = new File(""); + File outputfile = new File("test.jpg"); assert ImageIO.write(bufferedImage, "jpg", outputfile); }