diff --git a/docs/pages/release_notes.md b/docs/pages/release_notes.md index ffff5533c4..81cf92963b 100644 --- a/docs/pages/release_notes.md +++ b/docs/pages/release_notes.md @@ -263,6 +263,8 @@ The following previously deprecated classes have been removed: * The method `getNameSpace()` in {%jdoc apex::lang.apex.ast.ApexQualifiedName %} has been removed. * The class `net.sourceforge.pmd.lang.apex.ast.ASTBridgeMethodCreator` has been removed. This was a node that has been generated by the old Jorje parser only. +* pmd-apex-jorje + * With the switch from Jorje to Summit AST, this maven module is no longer needed and has been removed. * pmd-java * The interface `FinalizableNode` (introduced in 7.0.0-rc1) has been removed. Its method `isFinal()` has been moved down to the diff --git a/pmd-apex-jorje/pom.xml b/pmd-apex-jorje/pom.xml deleted file mode 100644 index be917d3a6c..0000000000 --- a/pmd-apex-jorje/pom.xml +++ /dev/null @@ -1,130 +0,0 @@ - - - 4.0.0 - pmd-apex-jorje - PMD Apex Jorje Parser Library - pom - - - net.sourceforge.pmd - pmd - 7.0.0-SNAPSHOT - ../pom.xml - - - - 2023-06-05-c27a5d - - - - - - org.codehaus.mojo - build-helper-maven-plugin - 3.0.0 - - - attach-apex-jorje - package - - attach-artifact - - - - - ${basedir}/repo/apex/apex-jorje-lsp-minimized/${apex.jorje.version}/apex-jorje-lsp-minimized-${apex.jorje.version}.jar - jar - lib - - - - - - - - - - - - cglib - cglib - 3.3.0 - - - com.google.code.findbugs - jsr305 - 3.0.2 - - - com.google.code.gson - gson - - - - com.google.errorprone - error_prone_annotations - 2.1.3 - - - com.google.guava - guava - - - - com.google.j2objc - j2objc-annotations - 1.1 - - - org.antlr - antlr-runtime - - 3.5.2 - - - org.antlr - stringtemplate - 3.2.1 - - - org.apache.commons - commons-lang3 - 3.0 - - - org.codehaus.mojo - animal-sniffer-annotations - 1.14 - - - org.slf4j - slf4j-api - - - - - - aopalliance - aopalliance - 1.0 - - - javax.inject - javax.inject - 1 - - - org.ow2.asm - asm - 5.0.3 - runtime - - - diff --git a/pmd-apex-jorje/repo/README.md b/pmd-apex-jorje/repo/README.md deleted file mode 100644 index 8abe76cd2a..0000000000 --- a/pmd-apex-jorje/repo/README.md +++ /dev/null @@ -1,14 +0,0 @@ -# Local Maven Repo for the Apex Jorje Parser library - -You can download the needed libraries from: - - -Apex Reference: - - - - -In order to download the jar file, minimize it and add the jar files to the local repo, use the following script: - - ./create-local-repo.sh - diff --git a/pmd-apex-jorje/repo/apex/apex-jorje-lsp-minimized/2023-06-05-c27a5d/_remote.repositories b/pmd-apex-jorje/repo/apex/apex-jorje-lsp-minimized/2023-06-05-c27a5d/_remote.repositories deleted file mode 100644 index 5019af613b..0000000000 --- a/pmd-apex-jorje/repo/apex/apex-jorje-lsp-minimized/2023-06-05-c27a5d/_remote.repositories +++ /dev/null @@ -1,4 +0,0 @@ -#NOTE: This is a Maven Resolver internal implementation file, its format can be changed without prior notice. -#Sat Jun 24 18:50:10 CEST 2023 -apex-jorje-lsp-minimized-2023-06-05-c27a5d.jar>= -apex-jorje-lsp-minimized-2023-06-05-c27a5d.pom>= diff --git a/pmd-apex-jorje/repo/apex/apex-jorje-lsp-minimized/2023-06-05-c27a5d/apex-jorje-lsp-minimized-2023-06-05-c27a5d.jar b/pmd-apex-jorje/repo/apex/apex-jorje-lsp-minimized/2023-06-05-c27a5d/apex-jorje-lsp-minimized-2023-06-05-c27a5d.jar deleted file mode 100644 index ff0cda8617..0000000000 Binary files a/pmd-apex-jorje/repo/apex/apex-jorje-lsp-minimized/2023-06-05-c27a5d/apex-jorje-lsp-minimized-2023-06-05-c27a5d.jar and /dev/null differ diff --git a/pmd-apex-jorje/repo/apex/apex-jorje-lsp-minimized/2023-06-05-c27a5d/apex-jorje-lsp-minimized-2023-06-05-c27a5d.pom b/pmd-apex-jorje/repo/apex/apex-jorje-lsp-minimized/2023-06-05-c27a5d/apex-jorje-lsp-minimized-2023-06-05-c27a5d.pom deleted file mode 100644 index 50f43125a0..0000000000 --- a/pmd-apex-jorje/repo/apex/apex-jorje-lsp-minimized/2023-06-05-c27a5d/apex-jorje-lsp-minimized-2023-06-05-c27a5d.pom +++ /dev/null @@ -1,9 +0,0 @@ - - - 4.0.0 - apex - apex-jorje-lsp-minimized - 2023-06-05-c27a5d - POM was created from install:install-file - diff --git a/pmd-apex-jorje/repo/apex/apex-jorje-lsp-minimized/maven-metadata-local.xml b/pmd-apex-jorje/repo/apex/apex-jorje-lsp-minimized/maven-metadata-local.xml deleted file mode 100644 index f5e570899c..0000000000 --- a/pmd-apex-jorje/repo/apex/apex-jorje-lsp-minimized/maven-metadata-local.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - apex - apex-jorje-lsp-minimized - - 2023-06-05-c27a5d - - 2023-06-05-c27a5d - - 20230624165009 - - diff --git a/pmd-apex-jorje/repo/create-local-repo.sh b/pmd-apex-jorje/repo/create-local-repo.sh deleted file mode 100755 index 6e0da0ec1b..0000000000 --- a/pmd-apex-jorje/repo/create-local-repo.sh +++ /dev/null @@ -1,94 +0,0 @@ -#!/bin/bash - -LAST_COMMIT_INFO=$(curl -s "https://api.github.com/repos/forcedotcom/salesforcedx-vscode/commits?sha=develop&path=packages%2Fsalesforcedx-vscode-apex%2Fout%2Fapex-jorje-lsp.jar&page=1&per_page=1") -LAST_COMMIT_DATE=$(echo $LAST_COMMIT_INFO | jq -r '.[0].commit.committer.date') -LAST_COMMIT_SHA=$(echo $LAST_COMMIT_INFO | jq -r '.[0].sha') - -VERSION=${LAST_COMMIT_DATE%T*}-${LAST_COMMIT_SHA:0:6} - -URL=https://raw.githubusercontent.com/forcedotcom/salesforcedx-vscode/${LAST_COMMIT_SHA}/packages/salesforcedx-vscode-apex/out/apex-jorje-lsp.jar -FILENAME=apex-jorje-lsp-${VERSION}.jar -FILENAME_MINIMIZED=apex-jorje-lsp-minimized-${VERSION}.jar - -REPOPATH=$(dirname $0) - -function deleteoldrepo() { - git rm -r ${REPOPATH}/apex/apex-jorje-lsp-minimized/* -} - -function install() { - mvn install:install-file -Dfile=${FILENAME_MINIMIZED} \ - -DgroupId=apex \ - -DartifactId=apex-jorje-lsp-minimized \ - -Dversion=${VERSION} \ - -Dpackaging=jar \ - -DlocalRepositoryPath=${REPOPATH} - git add ${REPOPATH} -} - -function download() { - curl -o $FILENAME $URL -} - - -# -# Unfortunately, jorje is provided as a blob, which seems to be a jar-with-dependencies -# kind of thing. We try to keep only the apex related classes and delete anything that has -# been added into the big apex-jorje-lsp-jar. The deleted classes will be added as dependencies again. -# -# We unfortunately need to keep some classes in com.google.common (guava), since jorje seems -# to have added classes there, which are not in the official guava packages. -# -function minimize() { - unzip -d temp ${FILENAME} - pushd temp - find . -type f \ - -and -not -path "./apex/*" \ - -and -not -path "./StandardApex*" \ - -and -not -path "./messages*" \ - -and -not -path "./com/google/common/collect/ConcatenatedLists*" \ - -and -not -path "./com/google/common/collect/MoreLists*" \ - -and -not -path "./com/google/common/collect/MoreMaps*" \ - -and -not -path "./com/google/common/collect/MoreSets*" \ - -and -not -path "./com/google/common/collect/PairList*" \ - -and -not -path "./com/google/common/collect/SingleAppendList*" \ - -and -not -path "./com/google/common/collect/SinglePrependList*" \ - -and -not -path "./com/google/common/collect/WellBehavedMap*" \ - -and -not -path "./com/google/common/graph/ConfigurableMutableGraph*" \ - -and -not -path "./com/google/common/graph/ConfigurableMutableNetwork*" \ - -and -not -path "./com/google/common/graph/ConfigurableMutableValueGraph*" \ - -and -not -path "./com/google/common/graph/ConfigurableNetwork*" \ - -and -not -path "./com/google/common/graph/ConfigurableValueGraph*" \ - -and -not -path "./com/google/common/reflect/Element*" \ - -and -not -path "./com/google/common/util/concurrent/AbstractCheckedFuture*" \ - -print0 | xargs -0 rm -rf - # delete empty directories - find . -depth -type d -empty -delete - popd - jar --create --file ${FILENAME_MINIMIZED} -C temp/ . - rm -rf temp -} - -function cleanup() { - rm ${FILENAME} - rm ${FILENAME_MINIMIZED} -} - -function updateversion() { - sed -i -e "s/\(\).*\(<\/apex\.jorje\.version>\)/\1${VERSION}\2/" $(dirname $0)/../pom.xml - git add $(dirname $0)/../pom.xml -} - -function diffstat() { - echo "Ready to commit:" - git diff --cached --stat -} - -download -minimize -deleteoldrepo -install -updateversion -cleanup -diffstat - diff --git a/pom.xml b/pom.xml index a690fb3576..ccd41af1b2 100644 --- a/pom.xml +++ b/pom.xml @@ -1197,7 +1197,6 @@ - pmd-apex-jorje pmd-apex pmd-coco pmd-core