pmd-bin 1.37.0 → 2.0.0

package/download-java.js

@@ -14,7 +14,11 @@ async function installJava() {
 }
 
 async function main() {
-  await installJava();
+  if (process.env["PMD_BIN_SKIP_JAVA_DOWNLOAD"] === "true") {
+    console.log("skipped downloading Java");
+  } else {
+    await installJava();
+  }
 }
 
 main();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pmd-bin",
-  "version": "1.37.0",
+  "version": "2.0.0",
   "description": "Standalone PMD (static code analyzer) with its own JRE",
   "author": "Matthias Rolke <mr.amtrack@gmail.com>",
   "bin": {
@@ -10,8 +10,7 @@
     "node-java-connector": "1.1.1"
   },
   "devDependencies": {
-    "adm-zip": "^0.5.10",
-    "got": "^11.8.6"
+    "adm-zip": "^0.5.10"
   },
   "files": [
     "/dist",
@@ -21,7 +20,7 @@
   "license": "BSD",
   "main": "pmd",
   "pmd": {
-    "version": "6.55.0"
+    "version": "7.0.0"
   },
   "repository": {
     "type": "git",

package/pmd

@@ -4,7 +4,7 @@ const path = require("path");
 const jre = require("node-java-connector");
 
 async function main() {
-  const className = "net.sourceforge.pmd.PMD";
+  const className = "net.sourceforge.pmd.cli.PmdCli";
   const classPath = [
     path.resolve(__dirname, "dist", "pmd-bin", "lib", "*"),
   ];

package/dist/pmd-bin/bin/ast-dump.bat

@@ -1,6 +0,0 @@
-@echo off
-set TOPDIR="%~dp0.."
-set OPTS=
-set MAIN_CLASS=net.sourceforge.pmd.util.treeexport.TreeExportCli
-
-java %PMD_JAVA_OPTS% -classpath %TOPDIR%\lib\* %OPTS% %MAIN_CLASS% %*

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

@@ -1,6 +0,0 @@
-@echo off
-set TOPDIR="%~dp0.."
-set OPTS=
-set MAIN_CLASS=net.sourceforge.pmd.util.viewer.Viewer
-
-java %PMD_JAVA_OPTS% -classpath %TOPDIR%\lib\* %OPTS% %MAIN_CLASS% %*

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

@@ -1,6 +0,0 @@
-@echo off
-set TOPDIR="%~dp0.."
-set OPTS=
-set MAIN_CLASS=net.sourceforge.pmd.cpd.CPD
-
-java %PMD_JAVA_OPTS% -classpath %TOPDIR%\lib\* %OPTS% %MAIN_CLASS% %*

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

@@ -1,6 +0,0 @@
-@echo off
-set TOPDIR="%~dp0.."
-set OPTS=
-set MAIN_CLASS=net.sourceforge.pmd.cpd.GUI
-
-java %PMD_JAVA_OPTS% -classpath %TOPDIR%\lib\* %OPTS% %MAIN_CLASS% %*

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

@@ -1,57 +0,0 @@
-@echo off
-set TOPDIR="%~dp0.."
-set OPTS=
-set MAIN_CLASS=net.sourceforge.pmd.util.fxdesigner.DesignerStarter
-
-
-:: 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=%%k0"
-  ) else (
-    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% == java (
-    if %jver% GEQ 90 (
-        if %jver% LSS 110 (
-            :: enable reflection
-            set jreopts=--add-opens javafx.controls/javafx.scene.control.skin=ALL-UNNAMED
-        )
-    )
-)
-
-set "_needjfxlib=0"
-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 100 (
-        echo For openjfx at least java 10 is required.
-        pause
-        exit
-    )
-    if [%JAVAFX_HOME%] EQU [] (
-        echo The environment variable JAVAFX_HOME is missing.
-        pause
-        exit
-    )
-    set classpath=%TOPDIR%\lib\*;%JAVAFX_HOME%\lib\*
-) else (
-    set classpath=%TOPDIR%\lib\*
-)
-
-
-java %PMD_JAVA_OPTS% %jreopts% -classpath %classpath% %OPTS% %MAIN_CLASS% %*

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

@@ -1,6 +0,0 @@
-@echo off
-set TOPDIR="%~dp0.."
-set OPTS=
-set MAIN_CLASS=net.sourceforge.pmd.util.designer.Designer
-
-java %PMD_JAVA_OPTS% -classpath %TOPDIR%\lib\* %OPTS% %MAIN_CLASS% %*

package/dist/pmd-bin/lib/pmd-apex-jorje-6.55.0.pom

@@ -1,144 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-  <artifactId>pmd-apex-jorje</artifactId>
-  <name>PMD Apex Jorje Parser Library</name>
-  <packaging>pom</packaging>
-
-  <parent>
-    <groupId>net.sourceforge.pmd</groupId>
-    <artifactId>pmd</artifactId>
-    <version>6.55.0</version>
-    <relativePath>../pom.xml</relativePath>
-  </parent>
-
-  <properties>
-    <java.version>8</java.version>
-    <apex.jorje.version>2021-10-08-631b8c</apex.jorje.version>
-  </properties>
-
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.codehaus.mojo</groupId>
-        <artifactId>build-helper-maven-plugin</artifactId>
-        <version>3.0.0</version>
-        <executions>
-            <execution>
-                <id>attach-apex-jorje</id>
-                <phase>package</phase>
-                <goals>
-                    <goal>attach-artifact</goal>
-                </goals>
-                <configuration>
-                    <artifacts>
-                        <artifact>
-                            <file>${basedir}/repo/apex/apex-jorje-lsp-minimized/${apex.jorje.version}/apex-jorje-lsp-minimized-${apex.jorje.version}.jar</file>
-                            <type>jar</type>
-                            <classifier>lib</classifier>
-                        </artifact>
-                    </artifacts>
-                </configuration>
-            </execution>
-        </executions>
-      </plugin>
-    </plugins>
-  </build>
-  <dependencies>
-    <!-- transitive dependencies of apex-jorje -->
-    <dependency>
-        <groupId>cglib</groupId>
-        <artifactId>cglib</artifactId>
-        <version>3.3.0</version> <!-- apex jorje actually depends on 3.2.0 (https://github.com/forcedotcom/salesforcedx-vscode/commit/631b8cfb85cff5e989bfea13bca681b6cedcb003) -->
-    </dependency>
-    <dependency>
-        <groupId>ch.qos.logback</groupId>
-        <artifactId>logback-classic</artifactId>
-        <version>1.2.9</version> <!-- apex jorje actually depends on 1.1.7 (https://github.com/forcedotcom/salesforcedx-vscode/commit/631b8cfb85cff5e989bfea13bca681b6cedcb003) -->
-    </dependency>
-    <dependency>
-        <groupId>ch.qos.logback</groupId>
-        <artifactId>logback-core</artifactId>
-        <version>1.2.9</version> <!-- apex jorje actually depends on 1.1.7 (https://github.com/forcedotcom/salesforcedx-vscode/commit/631b8cfb85cff5e989bfea13bca681b6cedcb003) -->
-    </dependency>
-    <dependency>
-        <groupId>com.google.code.findbugs</groupId>
-        <artifactId>jsr305</artifactId>
-        <version>3.0.2</version>
-    </dependency>
-    <dependency>
-        <groupId>com.google.code.gson</groupId>
-        <artifactId>gson</artifactId>
-        <!-- apex jorje actually depends on 2.7 (https://github.com/forcedotcom/salesforcedx-vscode/commit/631b8cfb85cff5e989bfea13bca681b6cedcb003) -->
-    </dependency>
-    <dependency>
-        <groupId>com.google.errorprone</groupId>
-        <artifactId>error_prone_annotations</artifactId>
-        <version>2.1.3</version>
-    </dependency>
-    <dependency>
-        <groupId>com.google.guava</groupId>
-        <artifactId>guava</artifactId>
-        <!-- apex jorje actually depends on 26.0-jre (https://github.com/forcedotcom/salesforcedx-vscode/commit/631b8cfb85cff5e989bfea13bca681b6cedcb003) -->
-    </dependency>
-    <dependency>
-        <groupId>com.google.j2objc</groupId>
-        <artifactId>j2objc-annotations</artifactId>
-        <version>1.1</version>
-    </dependency>
-    <dependency>
-        <groupId>org.antlr</groupId>
-        <artifactId>antlr-runtime</artifactId>
-    </dependency>
-    <dependency>
-        <groupId>org.antlr</groupId>
-        <artifactId>stringtemplate</artifactId>
-        <version>3.2.1</version>
-    </dependency>
-    <dependency>
-        <groupId>org.apache.commons</groupId>
-        <artifactId>commons-lang3</artifactId>
-        <version>3.0</version>
-    </dependency>
-    <dependency>
-        <groupId>org.codehaus.mojo</groupId>
-        <artifactId>animal-sniffer-annotations</artifactId>
-        <version>1.14</version>
-    </dependency>
-    <dependency>
-        <groupId>org.openjdk.jol</groupId>
-        <artifactId>jol-core</artifactId>
-        <version>0.4</version>
-    </dependency>
-    <dependency>
-        <groupId>org.slf4j</groupId>
-        <artifactId>slf4j-api</artifactId>
-        <!-- apex jorje actually depends on 1.7.20 (https://github.com/forcedotcom/salesforcedx-vscode/commit/631b8cfb85cff5e989bfea13bca681b6cedcb003) -->
-    </dependency>
-    <!-- apex jorje actually depends on 1.17 (https://github.com/forcedotcom/salesforcedx-vscode/commit/631b8cfb85cff5e989bfea13bca681b6cedcb003)
-      however, it is not really needed, so we don't add it here as a dependency,
-      so that it doesn't end up in pmd-dist
-     -->
-    <!--<dependency>
-        <groupId>org.yaml</groupId>
-        <artifactId>snakeyaml</artifactId>
-    </dependency>
-    -->
-    <dependency>
-        <groupId>aopalliance</groupId>
-        <artifactId>aopalliance</artifactId>
-        <version>1.0</version>
-    </dependency>
-    <dependency>
-        <groupId>javax.inject</groupId>
-        <artifactId>javax.inject</artifactId>
-        <version>1</version>
-    </dependency>
-    <dependency>
-        <groupId>org.ow2.asm</groupId>
-        <artifactId>asm</artifactId>
-        <version>5.0.3</version>
-        <scope>runtime</scope>
-    </dependency>
-  </dependencies>
-</project>