diff --git a/build.gradle b/build.gradle index 04555000..4b1ad019 100644 --- a/build.gradle +++ b/build.gradle @@ -23,13 +23,13 @@ subprojects { apply plugin: 'java' apply plugin: 'info.solidsoft.pitest' - sourceCompatibility = '1.7' - targetCompatibility = '1.7' + sourceCompatibility = '1.8' + targetCompatibility = '1.8' [compileJava, compileTestJava]*.options*.encoding = 'UTF-8' group = "co.paralleluniverse" - version = "1.0.4-SNAPSHOT" + version = "1.0.4-ullink3-SNAPSHOT" status = "integration" description = "Simple Java deployment" ext.url = "https://github.com/puniverse/capsule" @@ -112,9 +112,9 @@ subprojects { // xml.destination = "${buildDir}/reports/jacoco/test/jacocoTestReport_${project.name}.xml" } } - + // check.dependsOn jacocoTestReport - + javadoc { options.links = [ "http://docs.oracle.com/javase/7/docs/api/" ] } @@ -133,19 +133,21 @@ subprojects { // options.compilerArgs << "-Xlint:unchecked" << "-Xlint:deprecation" // } - task javancss(dependsOn: 'classes') << { - ant { - logging.level = LogLevel.INFO - taskdef(name:'javancss', classname:'javancss.JavancssAntTask', classpath: configurations.javancss.asPath) - javancss( - srcdir:'src/main/java', - abortOnFail:'true', - generateReport:'true', - packageMetrics:'true', - classMetrics:'false', - functionMetrics:'false' - // outputFile: reportName, - ) + task javancss(dependsOn: 'classes') { + doLast { + ant { + logging.level = LogLevel.INFO + taskdef(name: 'javancss', classname: 'javancss.JavancssAntTask', classpath: configurations.javancss.asPath) + javancss( + srcdir: 'src/main/java', + abortOnFail: 'true', + generateReport: 'true', + packageMetrics: 'true', + classMetrics: 'false', + functionMetrics: 'false' + // outputFile: reportName, + ) + } } } @@ -249,7 +251,7 @@ task jacocoRootReport(type: org.gradle.testing.jacoco.tasks.JacocoReport) { html.enabled = true xml.enabled = true csv.enabled = false - xml.destination = "${buildDir}/reports/jacoco/test/jacocoTestReport.xml" + //xml.destination = "${buildDir}/reports/jacoco/test/jacocoTestReport.xml" } } diff --git a/capsule/src/main/java/Capsule.java b/capsule/src/main/java/Capsule.java index b0b099b7..514eecb2 100644 --- a/capsule/src/main/java/Capsule.java +++ b/capsule/src/main/java/Capsule.java @@ -68,6 +68,7 @@ import java.util.Map; import java.util.Map.Entry; import java.util.Objects; +import java.util.Optional; import java.util.Set; import java.util.StringTokenizer; import java.util.jar.Attributes; @@ -382,7 +383,7 @@ public static final void main(String[] args) { /** * Alternative main entry point that is not using System.exit(), thus avoiding callers to be terminated - * in an unexpected way. + * in an unexpected way. * * @param args0 the command line arguments * @return the exit code @@ -1274,10 +1275,10 @@ private static void printHelp(boolean simple) { } } } - + void introspect(List args) { STDERR.println("Capsule " + VERSION); - + final List> caplets = getCaplets(); STDERR.println("Caplets: "); if (caplets.isEmpty()) @@ -1291,9 +1292,9 @@ void introspect(List args) { STDERR.println(" " + sb); } } - + STDERR.println(); - + STDERR.println("Attributes"); for (Map.Entry entry : ATTRIBS.entrySet()) { final String attrib = entry.getKey(); @@ -1303,7 +1304,7 @@ void introspect(List args) { if (entry.getValue()[ATTRIB_DESC] != null) sb.append(" (").append(entry.getValue()[ATTRIB_DESC]).append(')'); sb.append(": "); - + sb.append("\n\t"); final Entry attr = attr(attrib); final Object value = getAttributeNoLookup(attr); @@ -2176,10 +2177,13 @@ private boolean testAppCacheUpToDate(Path dir) throws IOException { Path extractedFile = dir.resolve(TIMESTAMP_FILE_NAME); if (!Files.exists(extractedFile)) return false; + Optional extractedTimeOptional = Files.readAllLines(extractedFile).stream().findFirst(); + if (!extractedTimeOptional.isPresent()) + return false; + final FileTime extractedTime = FileTime.fromMillis(Long.decode(extractedTimeOptional.get())); final FileTime jarTime = Files.getLastModifiedTime(getJarFile()); - final FileTime extractedTime = Files.getLastModifiedTime(extractedFile); - final boolean fresh = extractedTime.compareTo(jarTime) >= 0; - log(LOG_DEBUG, "JAR timestamp: " + jarTime + " Cache timestamp: " + extractedTime + " (" + (fresh ? "fresh" : "stale") + ")"); + final boolean fresh = extractedTime.compareTo(jarTime) != 0; + log(LOG_VERBOSE, "JAR timestamp: " + jarTime + " Cache timestamp: " + extractedTime + " (" + (fresh ? "fresh" : "stale") + ")"); return fresh; } @@ -2210,7 +2214,12 @@ private void markCache() throws IOException { if (!oc.plainCache || oc.appDir == null || oc.cacheUpToDate) return; if (Files.isWritable(oc.appDir)) - Files.createFile(oc.appDir.resolve(TIMESTAMP_FILE_NAME)); + { + Path timestampFile = oc.appDir.resolve(TIMESTAMP_FILE_NAME); + Files.createFile(timestampFile); + long jarTime = Files.getLastModifiedTime(getJarFile()).toMillis(); + Files.write(timestampFile, Collections.singleton(String.valueOf(jarTime))); + } } private void lockAppCache(Path dir) throws IOException { @@ -2536,14 +2545,47 @@ private List buildJVMArgs() { for (String a : getAttribute(ATTR_JVM_ARGS)) { a = a.trim(); if (!a.isEmpty() && !a.startsWith("-Xbootclasspath:") && !a.startsWith("-javaagent:")) - addJvmArg(toNativePath(expand(a)), jvmArgs); + a = expand(a); + if (!addJava9ModulesJvmArg(a, jvmArgs)) { + a = toNativePath(a); + jvmArgs.put(getJvmArgKey(a), a); + } } return new ArrayList(jvmArgs.values()); } - private static void addJvmArg(String a, Map args) { - args.put(getJvmArgKey(a), a); + private void addJvmArg(String a, Map args) { + if (!addJava9ModulesJvmArg(a, args)) + args.put(getJvmArgKey(a), a); + } + + private static final Pattern JAVA_9_MODULES_ARGS_REGEX = Pattern.compile("--add-((modules)|(opens)|(exports)|(reads))(=(.*))?"); + private String firstPartJava9ModulesArg = null; + /** + * Handle Java 9 Modules options with formats "--add-opens=java.base/java.lang=ALL-UNNAMED" + * or "--add-opens java.base/java.lang=ALL-UNNAMED". In this last case it will be 2 arguments + * to recombine. + * @return true if the argument is for Java 9 modules (for options that begin with "--add-") + */ + private boolean addJava9ModulesJvmArg(String arg, Map args) + { + Matcher matcher = JAVA_9_MODULES_ARGS_REGEX.matcher(arg); + if (matcher.matches()) { + boolean oneArgWithModuleAndPackage = matcher.group(7) != null; + if (oneArgWithModuleAndPackage) + args.put(arg, arg); + else + firstPartJava9ModulesArg = arg; + return true; + } + if (firstPartJava9ModulesArg != null) { + String fullArg = firstPartJava9ModulesArg + "=" + arg; + args.put(fullArg, fullArg); + firstPartJava9ModulesArg = null; + return true; + } + return false; } private static String getJvmArgKey(String a) { @@ -2818,7 +2860,7 @@ protected final T getAttributeNoLookup(Entry attr) { throw new RuntimeException("Exception while getting attribute " + name(attr), e); } } - + protected final T getAttributeDefaultValue(Entry attr) { final Object[] conf = ATTRIBS.get(name(attr)); final T type = type(attr); @@ -3462,7 +3504,7 @@ protected final List resolve(Object x) { if (res == null) throw new RuntimeException("Could not resolve " + x); if (res.isEmpty()) - log(LOG_VERBOSE, "WARNING resolve " + x + " was empty"); + log(LOG_VERBOSE, "resolve " + x + " was empty"); return res; } @@ -4589,11 +4631,11 @@ static List parseCommandLineArguments(final String str) { final int NORMAL = 0, IN_QUOTE = 1, IN_DOUBLE_QUOTE = 2; - + final StringTokenizer tok = new StringTokenizer(str, "\"\'\\ ", true); final ArrayList result = new ArrayList<>(); final StringBuilder current = new StringBuilder(); - + int state = NORMAL; boolean lastTokenHasBeenQuoted = false; while (tok.hasMoreTokens()) { @@ -5557,10 +5599,10 @@ else if (method.getName().startsWith("getClassLoader")) private void overridePlatformMBeanServer() { try { MBeanServer platformMBeanServer = ManagementFactory.getPlatformMBeanServer(); - + if (platformMBeanServer instanceof com.sun.jmx.mbeanserver.JmxMBeanServer) { final MBeanServer interceptor = (MBeanServer) Proxy.newProxyInstance(MY_CLASSLOADER, new Class[]{MBeanServer.class}, this); - + Field interceptorField = accessible(com.sun.jmx.mbeanserver.JmxMBeanServer.class.getDeclaredField("mbsInterceptor")); // this.origMBeanServer = ((com.sun.jmx.mbeanserver.JmxMBeanServer) platformMBeanServer).getMBeanServerInterceptor(); this.origMBeanServer = (MBeanServer) interceptorField.get(platformMBeanServer); @@ -5779,7 +5821,7 @@ private static String getCapsuleVersion(Class cls) { cls = cls.getSuperclass(); return getClassVersion(cls); } - + private static String getClassVersion(Class cls) { if (cls == null) return null; diff --git a/capsule/src/test/java/CapsuleTest.java b/capsule/src/test/java/CapsuleTest.java index ca73a42d..33e213f4 100644 --- a/capsule/src/test/java/CapsuleTest.java +++ b/capsule/src/test/java/CapsuleTest.java @@ -646,6 +646,29 @@ public void testJVMArgs() throws Exception { assertTrue(getJvmArgs(pb).contains("-Xbar:120")); } + @Test + public void testJava9JVMArgs() throws Exception { + props.setProperty("capsule.jvm.args", "--add-opens=java.base/java.security=ALL-UNNAMED --add-exports java.base/java.lang=ALL-UNNAMED"); + + Jar jar = newCapsuleJar() + .setAttribute("Application-Class", "com.acme.Foo") + .setAttribute("JVM-Args", "--add-opens java.base/java.lang.reflect=ALL-UNNAMED --add-opens=java.base/java.net=ALL-UNNAMED") + .addEntry("foo.jar", emptyInputStream()); + + List args = list("hi", "there"); + List cmdLine = list("--add-exports=java.base/java.nio=ALL-UNNAMED"); + + Capsule capsule = newCapsule(jar); + ProcessBuilder pb = capsule.prepareForLaunch(cmdLine, args); + + assert_().that(getJvmArgs(pb)).containsSequence(list( + "--add-opens=java.base/java.lang.reflect=ALL-UNNAMED", + "--add-opens=java.base/java.net=ALL-UNNAMED", + "--add-opens=java.base/java.security=ALL-UNNAMED", + "--add-exports=java.base/java.lang=ALL-UNNAMED", + "--add-exports=java.base/java.nio=ALL-UNNAMED")); + } + @Test public void testAgents() throws Exception { Jar jar = newCapsuleJar() diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 00000000..87b738cb Binary files /dev/null and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 00000000..570f5c2a --- /dev/null +++ b/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,6 @@ +#Thu Mar 26 18:44:20 CET 2020 +distributionUrl=https\://services.gradle.org/distributions/gradle-5.2.1-all.zip +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +zipStorePath=wrapper/dists +zipStoreBase=GRADLE_USER_HOME diff --git a/gradlew b/gradlew new file mode 100644 index 00000000..af6708ff --- /dev/null +++ b/gradlew @@ -0,0 +1,172 @@ +#!/usr/bin/env sh + +############################################################################## +## +## Gradle start up script for UN*X +## +############################################################################## + +# 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\"`/" >/dev/null +APP_HOME="`pwd -P`" +cd "$SAVED" >/dev/null + +APP_NAME="Gradle" +APP_BASE_NAME=`basename "$0"` + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m"' + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD="maximum" + +warn () { + echo "$*" +} + +die () { + echo + echo "$*" + echo + exit 1 +} + +# 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 + ;; + MINGW* ) + msys=true + ;; + NONSTOP* ) + nonstop=true + ;; +esac + +CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + +# Determine the Java command to use to start the JVM. +if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD="$JAVA_HOME/jre/sh/java" + 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" + which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." +fi + +# Increase the maximum file descriptors if we can. +if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then + MAX_FD_LIMIT=`ulimit -H -n` + if [ $? -eq 0 ] ; then + if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then + MAX_FD="$MAX_FD_LIMIT" + fi + ulimit -n $MAX_FD + if [ $? -ne 0 ] ; then + warn "Could not set maximum file descriptor limit: $MAX_FD" + fi + else + warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" + fi +fi + +# For Darwin, add options to specify how the application appears in the dock +if $darwin; then + GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" +fi + +# For Cygwin, switch paths to Windows format before running java +if $cygwin ; then + APP_HOME=`cygpath --path --mixed "$APP_HOME"` + CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` + JAVACMD=`cygpath --unix "$JAVACMD"` + + # We build the pattern for arguments to be converted via cygpath + ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` + SEP="" + for dir in $ROOTDIRSRAW ; do + ROOTDIRS="$ROOTDIRS$SEP$dir" + SEP="|" + done + OURCYGPATTERN="(^($ROOTDIRS))" + # Add a user-defined pattern to the cygpath arguments + if [ "$GRADLE_CYGPATTERN" != "" ] ; then + OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" + fi + # Now convert the arguments - kludge to limit ourselves to /bin/sh + i=0 + for arg in "$@" ; do + CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` + CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option + + if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition + eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` + else + eval `echo args$i`="\"$arg\"" + fi + i=$((i+1)) + done + case $i in + (0) set -- ;; + (1) set -- "$args0" ;; + (2) set -- "$args0" "$args1" ;; + (3) set -- "$args0" "$args1" "$args2" ;; + (4) set -- "$args0" "$args1" "$args2" "$args3" ;; + (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; + (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; + (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; + (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; + (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; + esac +fi + +# Escape application args +save () { + for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done + echo " " +} +APP_ARGS=$(save "$@") + +# Collect all arguments for the java command, following the shell quoting and substitution rules +eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS" + +# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong +if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then + cd "$(dirname "$0")" +fi + +exec "$JAVACMD" "$@" diff --git a/gradlew.bat b/gradlew.bat new file mode 100644 index 00000000..6d57edc7 --- /dev/null +++ b/gradlew.bat @@ -0,0 +1,84 @@ +@if "%DEBUG%" == "" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +set DIRNAME=%~dp0 +if "%DIRNAME%" == "" set DIRNAME=. +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@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" + +@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 + +echo. +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto init + +echo. +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:init +@rem Get command-line arguments, handling Windows variants + +if not "%OS%" == "Windows_NT" goto win9xME_args + +:win9xME_args +@rem Slurp the command line arguments. +set CMD_LINE_ARGS= +set _SKIP=2 + +:win9xME_args_slurp +if "x%~1" == "x" goto execute + +set CMD_LINE_ARGS=%* + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS% + +:end +@rem End local scope for the variables with windows NT shell +if "%ERRORLEVEL%"=="0" goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 +exit /b 1 + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega