Updated dependencies

This commit is contained in:
Erik C. Thauvin 2023-06-26 16:41:19 -07:00
parent 29a4fb243a
commit 662b6b1b63
7 changed files with 61 additions and 27 deletions

View file

@ -2,11 +2,11 @@
<library name="bld"> <library name="bld">
<CLASSES> <CLASSES>
<root url="file://$PROJECT_DIR$/lib/bld" /> <root url="file://$PROJECT_DIR$/lib/bld" />
<root url="jar://$USER_HOME$/.rife2/dist/rife2-1.6.1.jar!/" /> <root url="jar://$USER_HOME$/.bld/dist/bld-1.7.0.jar!/" />
</CLASSES> </CLASSES>
<JAVADOC /> <JAVADOC />
<SOURCES> <SOURCES>
<root url="jar://$USER_HOME$/.rife2/dist/rife2-1.6.1-sources.jar!/" /> <root url="jar://$USER_HOME$/.bld/dist/bld-1.7.0-sources.jar!/" />
</SOURCES> </SOURCES>
<excluded> <excluded>
<root url="jar://$PROJECT_DIR$/lib/bld/bld-wrapper.jar!/" /> <root url="jar://$PROJECT_DIR$/lib/bld/bld-wrapper.jar!/" />

33
.idea/misc.xml generated
View file

@ -1,6 +1,39 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<project version="4"> <project version="4">
<component name="EntryPointsManager">
<entry_points version="2.0">
<entry_point TYPE="field" FQNAME="rife.bld.extension.PmdOperation languageVersions" />
<entry_point TYPE="field" FQNAME="rife.bld.extension.PmdOperation reportFile" />
<entry_point TYPE="field" FQNAME="rife.bld.extension.PmdOperation RULE_SET_DEFAULT" />
</entry_points>
<pattern value="rife.bld.extension.PmdOperation" method="addInputPath" />
<pattern value="rife.bld.extension.PmdOperation" method="addRelativizeRoot" />
<pattern value="rife.bld.extension.PmdOperation" method="addRuleSet" />
<pattern value="rife.bld.extension.PmdOperation" method="cache" />
<pattern value="rife.bld.extension.PmdOperation" method="debug" />
<pattern value="rife.bld.extension.PmdOperation" method="defaultLanguage" />
<pattern value="rife.bld.extension.PmdOperation" method="encoding" />
<pattern value="rife.bld.extension.PmdOperation" method="failOnViolation" />
<pattern value="rife.bld.extension.PmdOperation" method="forceVersion" />
<pattern value="rife.bld.extension.PmdOperation" method="fromProject" />
<pattern value="rife.bld.extension.PmdOperation" method="ignoreFile" />
<pattern value="rife.bld.extension.PmdOperation" />
<pattern value="rife.bld.extension.PmdOperation" method="incrementalAnalysis" />
<pattern value="rife.bld.extension.PmdOperation" method="inputPaths" />
<pattern value="rife.bld.extension.PmdOperation" method="relativizeRoots" />
<pattern value="rife.bld.extension.PmdOperation" method="reportFormat" />
<pattern value="rife.bld.extension.PmdOperation" method="ruleSets" />
<pattern value="rife.bld.extension.PmdOperation" method="showSuppressed" />
<pattern value="rife.bld.extension.PmdOperation" method="suppressedMarker" />
<pattern value="rife.bld.extension.PmdOperation" method="threads" />
<pattern value="rife.bld.extension.PmdOperation" method="uri" />
</component>
<component name="PDMPlugin"> <component name="PDMPlugin">
<option name="customRuleSets">
<list>
<option value="K:\java\semver\config\pmd.xml" />
</list>
</option>
<option name="skipTestSources" value="false" /> <option name="skipTestSources" value="false" />
</component> </component>
<component name="ProjectRootManager" version="2" languageLevel="JDK_17" project-jdk-name="17" project-jdk-type="JavaSDK"> <component name="ProjectRootManager" version="2" languageLevel="JDK_17" project-jdk-name="17" project-jdk-type="JavaSDK">

View file

@ -7,7 +7,7 @@
], ],
"java.configuration.updateBuildConfiguration": "automatic", "java.configuration.updateBuildConfiguration": "automatic",
"java.project.referencedLibraries": [ "java.project.referencedLibraries": [
"${HOME}/.rife2/dist/rife2-1.6.1.jar", "${HOME}bld-1.7.0-SNAPSHOT.jar",
"lib/compile/*.jar", "lib/compile/*.jar",
"lib/runtime/*.jar", "lib/runtime/*.jar",
"lib/test/*.jar" "lib/test/*.jar"

Binary file not shown.

View file

@ -2,5 +2,5 @@ bld.downloadExtensionJavadoc=false
bld.downloadExtensionSources=true bld.downloadExtensionSources=true
bld.extensions= bld.extensions=
bld.repositories=MAVEN_CENTRAL,RIFE2 bld.repositories=MAVEN_CENTRAL,RIFE2
rife2.downloadLocation= bld.downloadLocation=
rife2.version=1.6.1 bld.version=1.7.0

View file

@ -19,23 +19,25 @@ public class PmdOperationBuild extends Project {
public PmdOperationBuild() { public PmdOperationBuild() {
pkg = "rife.bld.extension"; pkg = "rife.bld.extension";
name = "bld-pmd"; name = "bld-pmd";
version = version(0, 9, 1); version = version(0, 9, 2, "SNAPSHOT");
javaRelease = 17; javaRelease = 17;
downloadSources = true; downloadSources = true;
autoDownloadPurge = true; autoDownloadPurge = true;
repositories = List.of(MAVEN_CENTRAL, RIFE2_RELEASES); repositories = List.of(MAVEN_CENTRAL, RIFE2_RELEASES);
var pmd = version(7, 0, 0, "rc1"); var pmd = version(7, 0, 0, "rc2");
var rife2 = version(1,7,0);
scope(compile) scope(compile)
.include(dependency("com.uwyn.rife2", "rife2", version(1, 6, 1))) .include(dependency("com.uwyn.rife2", "rife2", rife2))
.include(dependency("com.uwyn.rife2", "bld", rife2))
.include(dependency("net.sourceforge.pmd", "pmd-java", pmd)); .include(dependency("net.sourceforge.pmd", "pmd-java", pmd));
scope(runtime) scope(runtime)
.include(dependency("net.sourceforge.pmd", "pmd-java", pmd)) .include(dependency("net.sourceforge.pmd", "pmd-java", pmd))
.include(dependency("org.slf4j", "slf4j-simple", version(2,0,7))); .include(dependency("org.slf4j", "slf4j-simple", version(2,0,7)));
scope(test) scope(test)
.include(dependency("org.junit.jupiter", "junit-jupiter", version(5, 9, 2))) .include(dependency("org.junit.jupiter", "junit-jupiter", version(5, 9, 3)))
.include(dependency("org.junit.platform", "junit-platform-console-standalone", version(1, 9, 2))) .include(dependency("org.junit.platform", "junit-platform-console-standalone", version(1, 9, 3)))
.include(dependency("org.assertj:assertj-joda-time:2.2.0")); .include(dependency("org.assertj:assertj-joda-time:2.2.0"));
javadocOperation() javadocOperation()

View file

@ -46,7 +46,22 @@ public class PmdOperation extends AbstractOperation<PmdOperation> {
public static final String RULE_SET_DEFAULT = "rulesets/java/quickstart.xml"; public static final String RULE_SET_DEFAULT = "rulesets/java/quickstart.xml";
private static final Logger LOGGER = Logger.getLogger(PmdOperation.class.getName()); private static final Logger LOGGER = Logger.getLogger(PmdOperation.class.getName());
private static final String PMD_DIR = "pmd"; private static final String PMD_DIR = "pmd";
/**
* The input paths (source) list.
*/
final List<Path> inputPaths = new ArrayList<>();
/**
* The relative roots paths.
*/
final List<Path> relativizeRoots = new ArrayList<>();
/**
* The rule priority.
*/
final RulePriority rulePriority = RulePriority.LOW;
/**
* The rule sets list.
*/
final List<String> ruleSets = new ArrayList<>();
/** /**
* The cache location. * The cache location.
*/ */
@ -75,10 +90,6 @@ public class PmdOperation extends AbstractOperation<PmdOperation> {
* The incremental analysis toggle. * The incremental analysis toggle.
*/ */
boolean incrementalAnalysis = true; boolean incrementalAnalysis = true;
/**
* The input paths (source) list.
*/
List<Path> inputPaths = new ArrayList<>();
/** /**
* The input URI. * The input URI.
*/ */
@ -87,10 +98,6 @@ public class PmdOperation extends AbstractOperation<PmdOperation> {
* The default language version(s). * The default language version(s).
*/ */
List<LanguageVersion> languageVersions; List<LanguageVersion> languageVersions;
/**
* The relative roots paths.
*/
List<Path> relativizeRoots = new ArrayList<>();
/** /**
* The path to the report page. * The path to the report page.
*/ */
@ -99,14 +106,6 @@ public class PmdOperation extends AbstractOperation<PmdOperation> {
* The report format. * The report format.
*/ */
String reportFormat = "text"; String reportFormat = "text";
/**
* The rule priority.
*/
RulePriority rulePriority = RulePriority.LOW;
/**
* The rule sets list.
*/
List<String> ruleSets = new ArrayList<>();
/** /**
* The show suppressed flag. * The show suppressed flag.
*/ */