pmd-bin 1.31.0 → 1.32.0

package/dist/pmd-bin/bin/designer.bat

@@ -4,35 +4,41 @@ set OPTS=
 set MAIN_CLASS=net.sourceforge.pmd.util.fxdesigner.DesignerStarter
 
 
-:: sets the jver variable to the java version, eg 901 for 9.0.1+x or 180 for 1.8.0_171-b11
+:: sets the jver variable to the java version, eg 90 for 9.0.1+x or 80 for 1.8.0_171-b11 or 110 for 11.0.6.1
 :: sets the jvendor variable to either java (oracle) or openjdk
 for /f tokens^=1^,3^,4^,5^ delims^=.-_+^"^  %%j in ('java -version 2^>^&1 ^| find "version"') do (
   set jvendor=%%j
   if %%l EQU ea (
-    set /A "jver=%%k00"
+    set /A "jver=%%k0"
   ) else (
-    set /A jver=%%k%%l%%m
+    if %%k EQU 1 (
+      :: for java version 1.7.x, 1.8.x, ignore the first 1.
+      set /A "jver=%%l%%m"
+    ) else (
+      set /A "jver=%%k%%l"
+    )
   )
 )
 
+
 Set "jreopts="
 :: oracle java 9 and 10 has javafx included as a module
-if /I "%jvendor%" EQU "java" (
-    if %jver% GEQ 900 (
-        if %jver% LSS 1100 (
+if /I %jvendor% == java (
+    if %jver% GEQ 90 (
+        if %jver% LSS 110 (
             :: enable reflection
-            Set jreopts=--add-opens javafx.controls/javafx.scene.control.skin=ALL-UNNAMED
+            set jreopts=--add-opens javafx.controls/javafx.scene.control.skin=ALL-UNNAMED
         )
     )
 )
 
 set "_needjfxlib=0"
-if /I "%jvendor%" EQU "openjdk" set _needjfxlib=1
-if /I "%jvendor%" EQU "java" (
-    if %jver% GEQ 1100 set _needjfxlib=1
+if /I %jvendor% == openjdk set _needjfxlib=1
+if /I %jvendor% == java (
+    if %jver% GEQ 110 set _needjfxlib=1
 )
 if %_needjfxlib% EQU 1 (
-    if %jver% LSS 1000 (
+    if %jver% LSS 100 (
         echo For openjfx at least java 10 is required.
         pause
         exit

package/dist/pmd-bin/bin/run.sh

@@ -2,7 +2,7 @@
 
 usage() {
     echo "Usage:"
-    echo "    $(basename $0) <application-name> [-h|-v] ..."
+    echo "    $(basename "$0") <application-name> [-h|-v] ..."
     echo ""
     echo "application-name: valid options are: $(valid_app_options)"
     echo "-h print this help"
@@ -60,9 +60,9 @@ java_heapsize_settings() {
 
 
 set_lib_dir() {
-  if [ -z ${LIB_DIR} ]; then
+  if [ -z "${LIB_DIR}" ]; then
     # Allow for symlinks to this script
-    if [ -L $0 ]; then
+    if [ -L "$0" ]; then
       local script_real_loc=$(readlink "$0")
     else
       local script_real_loc=$0
@@ -83,23 +83,25 @@ check_lib_dir() {
 }
 
 function script_exit() {
-    echo $1 >&2
+    echo "$1" >&2
     exit 1
 }
 
 determine_java_version() {
     local full_ver=$(java -version 2>&1)
-    # java_ver is eg "18" for java 1.8, "90" for java 9.0, "100" for java 10.0.x
-    readonly java_ver=$(echo $full_ver | sed -n '{
+    # java_ver is eg "80" for java 1.8, "90" for java 9.0, "100" for java 10.0.x
+    readonly java_ver=$(echo "$full_ver" | sed -n '{
         # replace early access versions, e.g. 11-ea with 11.0.0
         s/-ea/.0.0/
         # replace versions such as 10 with 10.0.0
         s/version "\([0-9]\{1,\}\)"/version "\1.0.0"/
+        # replace old java versions 1.x.* (java 1.7, java 1.8) with x.*
+        s/version "1\.\(.*\)"/version "\1"/
         # extract the major and minor parts of the version
-        s/^.* version "\(.*\)\.\(.*\)\..*".*$/\1\2/p
+        s/^.* version "\([0-9]\{1,\}\)\.\([0-9]\{1,\}\).*".*$/\1\2/p
     }')
     # java_vendor is either java (oracle) or openjdk
-    readonly java_vendor=$(echo $full_ver | sed -n -e 's/^\(.*\) version .*$/\1/p')
+    readonly java_vendor=$(echo "$full_ver" | sed -n -e 's/^\(.*\) version .*$/\1/p')
 }
 
 jre_specific_vm_options() {
@@ -197,7 +199,7 @@ case "${APPNAME}" in
     readonly CLASSNAME="net.sourceforge.pmd.util.treeexport.TreeExportCli"
     ;;
   *)
-    echo "${APPNAME} is NOT a valid application name, valid options are:$(valid_app_options)"
+    echo "${APPNAME} is NOT a valid application name, valid options are: $(valid_app_options)"
     ;;
 esac
 

package/dist/pmd-bin/lib/{pmd-apex-jorje-6.49.0.pom → pmd-apex-jorje-6.50.0.pom}

@@ -8,7 +8,7 @@
   <parent>
     <groupId>net.sourceforge.pmd</groupId>
     <artifactId>pmd</artifactId>
-    <version>6.49.0</version>
+    <version>6.50.0</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pmd-bin",
-  "version": "1.31.0",
+  "version": "1.32.0",
   "description": "Standalone PMD (static code analyzer) with its own JRE",
   "author": "Matthias Rolke <mr.amtrack@gmail.com>",
   "bin": {
@@ -21,7 +21,7 @@
   "license": "BSD",
   "main": "pmd",
   "pmd": {
-    "version": "6.49.0"
+    "version": "6.50.0"
   },
   "repository": {
     "type": "git",