diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 40928ea2..656b342c 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -39,7 +39,7 @@ jobs: - name: Run PMD uses: pmd/pmd-github-action@main with: - rulesets: 'pmd-rulesets.xml' + rulesets: 'src/main/resources/pmd-ruleset.xml' sourcePath: 'plugin/src/main/java' analyzeModifiedFilesOnly: true diff --git a/plugin/pom.xml b/plugin/pom.xml index 65bb61c7..9b5ee268 100644 --- a/plugin/pom.xml +++ b/plugin/pom.xml @@ -1,125 +1,143 @@ - 4.0.0 + 4.0.0 - - io.snyk - parent - 3.0.0-SNAPSHOT - - - - ${project.parent.basedir} - + + io.snyk + parent + 3.0.0-SNAPSHOT + io.snyk.eclipse.plugin - https://snyk.io/ide-plugins/ - eclipse-plugin + https://snyk.io/ide-plugins/ + eclipse-plugin - - - com.fasterxml.jackson.core - jackson-annotations - 2.16.2 - jar - - - com.fasterxml.jackson.core - jackson-core - 2.16.2 - jar - - - com.fasterxml.jackson.core - jackson-databind - 2.16.2 - jar - - - org.apache.commons - commons-lang3 - 3.12.0 - jar - - - org.apache.httpcomponents - httpcore - 4.4.16 - - - org.apache.httpcomponents - httpclient - 4.5.14 - - - - commons-codec - commons-codec - - - - - commons-codec - commons-codec - 1.17.0 - - - javax.inject - javax.inject - 1 - - + + + com.fasterxml.jackson.core + jackson-annotations + 2.16.2 + jar + + + com.fasterxml.jackson.core + jackson-core + 2.16.2 + jar + + + com.fasterxml.jackson.core + jackson-databind + 2.16.2 + jar + + + org.apache.commons + commons-lang3 + 3.12.0 + jar + + + org.apache.httpcomponents + httpcore + 4.4.16 + + + org.apache.httpcomponents + httpclient + 4.5.14 + + + + commons-codec + commons-codec + + + + + commons-codec + commons-codec + 1.17.0 + + + javax.inject + javax.inject + 1 + + - - src/main/java - - - - org.eclipse.tycho - tycho-p2-director-plugin - ${tycho.version} - - - - - - - org.apache.maven.plugins - maven-dependency-plugin - 3.2.0 - - - copy-dependencies - - copy-dependencies - - - org.eclipse - runtime - false - - - - - - org.eclipse.tycho - target-platform-configuration - ${tycho-version} - - - - - p2-installable-unit - org.eclipse.platform.ide - 0.0.0 - - - - - - - + + src/main/java + + + + org.eclipse.tycho + tycho-p2-director-plugin + ${tycho.version} + + + + + + + org.apache.maven.plugins + maven-dependency-plugin + 3.2.0 + + + copy-dependencies + + copy-dependencies + + + org.eclipse + runtime + false + + + + + + org.eclipse.tycho + target-platform-configuration + ${tycho-version} + + + + + p2-installable-unit + org.eclipse.platform.ide + 0.0.0 + + + + + + + org.apache.maven.plugins + maven-pmd-plugin + 3.26.0 + + 4 + false + true + + src/main/resources/pmd-ruleset.xml + + + + + + check + cpd-check + + verify + + + + + diff --git a/pmd-ruleset.xml b/plugin/src/main/resources/pmd-ruleset.xml similarity index 100% rename from pmd-ruleset.xml rename to plugin/src/main/resources/pmd-ruleset.xml diff --git a/pom.xml b/pom.xml index 80abb4be..b8bc4458 100644 --- a/pom.xml +++ b/pom.xml @@ -26,28 +26,6 @@ - - org.apache.maven.plugins - maven-pmd-plugin - 3.26.0 - - 1 - true - true - - ${pmdRuleDir}/pmd-ruleset.xml - - - - - - check - cpd-check - - verify - - - org.eclipse.tycho tycho-maven-plugin diff --git a/target-platform/pom.xml b/target-platform/pom.xml index 55a6ef67..8b06814c 100644 --- a/target-platform/pom.xml +++ b/target-platform/pom.xml @@ -6,8 +6,5 @@ parent 3.0.0-SNAPSHOT - - ${project.parent.basedir} - eclipse-target-definition diff --git a/tests/pom.xml b/tests/pom.xml index e0b21b50..fa57ca65 100644 --- a/tests/pom.xml +++ b/tests/pom.xml @@ -6,9 +6,6 @@ parent 3.0.0-SNAPSHOT - - ${project.parent.basedir} - io.snyk.eclipse.plugin.tests eclipse-test-plugin diff --git a/update-site/pom.xml b/update-site/pom.xml index 16814fc0..b01631fd 100644 --- a/update-site/pom.xml +++ b/update-site/pom.xml @@ -8,10 +8,6 @@ 3.0.0-SNAPSHOT eclipse-repository - - ${project.parent.basedir} - -