Upgraded dependencies
This commit is contained in:
parent
9a2647e7f4
commit
c80ea7b7d3
4 changed files with 18 additions and 20 deletions
4
.idea/misc.xml
generated
4
.idea/misc.xml
generated
|
@ -2,6 +2,10 @@
|
||||||
<component name="EntryPointsManager">
|
<component name="EntryPointsManager">
|
||||||
<pattern value="net.thauvin.erik.httpstatus.HttpStatusBuild" />
|
<pattern value="net.thauvin.erik.httpstatus.HttpStatusBuild" />
|
||||||
<pattern value="net.thauvin.erik.httpstatus.HttpStatusBuild" method="pmd" />
|
<pattern value="net.thauvin.erik.httpstatus.HttpStatusBuild" method="pmd" />
|
||||||
|
<pattern value="net.thauvin.erik.httpstatus.HttpStatusBuild" method="jacoco" />
|
||||||
|
<pattern value="net.thauvin.erik.httpstatus.taglibs.XmlSupport" method="setDefault" />
|
||||||
|
<pattern value="net.thauvin.erik.httpstatus.taglibs.XmlSupport" method="setEscapeXml" />
|
||||||
|
<pattern value="net.thauvin.erik.httpstatus.taglibs.ReasonTag" method="setCode" />
|
||||||
</component>
|
</component>
|
||||||
<component name="PDMPlugin">
|
<component name="PDMPlugin">
|
||||||
<option name="customRuleSets">
|
<option name="customRuleSets">
|
||||||
|
|
1
.idea/modules.xml
generated
1
.idea/modules.xml
generated
|
@ -2,7 +2,6 @@
|
||||||
<project version="4">
|
<project version="4">
|
||||||
<component name="ProjectModuleManager">
|
<component name="ProjectModuleManager">
|
||||||
<modules>
|
<modules>
|
||||||
<module fileurl="file://$PROJECT_DIR$/.idea/app.iml" filepath="$PROJECT_DIR$/.idea/app.iml" />
|
|
||||||
<module fileurl="file://$PROJECT_DIR$/.idea/bld.iml" filepath="$PROJECT_DIR$/.idea/bld.iml" />
|
<module fileurl="file://$PROJECT_DIR$/.idea/bld.iml" filepath="$PROJECT_DIR$/.idea/bld.iml" />
|
||||||
</modules>
|
</modules>
|
||||||
</component>
|
</component>
|
||||||
|
|
Binary file not shown.
|
@ -34,18 +34,14 @@ package net.thauvin.erik.httpstatus;
|
||||||
|
|
||||||
import rife.bld.BuildCommand;
|
import rife.bld.BuildCommand;
|
||||||
import rife.bld.Project;
|
import rife.bld.Project;
|
||||||
import rife.bld.dependencies.Dependency;
|
|
||||||
import rife.bld.extension.JacocoReportOperation;
|
import rife.bld.extension.JacocoReportOperation;
|
||||||
import rife.bld.extension.PmdOperation;
|
import rife.bld.extension.PmdOperation;
|
||||||
import rife.bld.publish.PublishDeveloper;
|
import rife.bld.operations.JUnitOperation;
|
||||||
import rife.bld.publish.PublishInfo;
|
import rife.bld.publish.*;
|
||||||
import rife.bld.publish.PublishLicense;
|
import rife.tools.FileUtils;
|
||||||
import rife.bld.publish.PublishScm;
|
|
||||||
|
|
||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
import java.nio.file.Files;
|
|
||||||
import java.nio.file.Path;
|
import java.nio.file.Path;
|
||||||
import java.nio.file.StandardCopyOption;
|
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
import static rife.bld.dependencies.Repository.*;
|
import static rife.bld.dependencies.Repository.*;
|
||||||
|
@ -75,8 +71,8 @@ public class HttpStatusBuild extends Project {
|
||||||
.include(dependency("jakarta.el", "jakarta.el-api", version(5, 0, 1)));
|
.include(dependency("jakarta.el", "jakarta.el-api", version(5, 0, 1)));
|
||||||
scope(test)
|
scope(test)
|
||||||
.include(dependency("org.assertj", "assertj-joda-time", version(2, 2, 0)))
|
.include(dependency("org.assertj", "assertj-joda-time", version(2, 2, 0)))
|
||||||
.include(dependency("org.junit.jupiter", "junit-jupiter", version(5, 9, 3)))
|
.include(dependency("org.junit.jupiter", "junit-jupiter", version(5, 10, 0)))
|
||||||
.include(dependency("org.junit.platform", "junit-platform-console-standalone", version(1, 9, 3)));
|
.include(dependency("org.junit.platform", "junit-platform-console-standalone", version(1, 10, 0)));
|
||||||
|
|
||||||
javadocOperation().javadocOptions()
|
javadocOperation().javadocOptions()
|
||||||
.docTitle(description + ' ' + version.toString())
|
.docTitle(description + ' ' + version.toString())
|
||||||
|
@ -93,6 +89,7 @@ public class HttpStatusBuild extends Project {
|
||||||
.groupId(pkg)
|
.groupId(pkg)
|
||||||
.artifactId(name.toLowerCase())
|
.artifactId(name.toLowerCase())
|
||||||
.name(name)
|
.name(name)
|
||||||
|
.version(version)
|
||||||
.description(description)
|
.description(description)
|
||||||
.url(url)
|
.url(url)
|
||||||
.developer(new PublishDeveloper().id("ethauvin").name("Erik C. Thauvin").email("erik@thauvin.net")
|
.developer(new PublishDeveloper().id("ethauvin").name("Erik C. Thauvin").email("erik@thauvin.net")
|
||||||
|
@ -110,16 +107,7 @@ public class HttpStatusBuild extends Project {
|
||||||
new HttpStatusBuild().start(args);
|
new HttpStatusBuild().start(args);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@BuildCommand(summary = "Generates JaCoCo Reports")
|
||||||
public void publish() throws Exception {
|
|
||||||
super.publish();
|
|
||||||
var pomPath = Path.of(MAVEN_LOCAL.getArtifactLocation(new Dependency(pkg, name.toLowerCase(), version)),
|
|
||||||
version.toString(),
|
|
||||||
name.toLowerCase() + '-' + version + ".pom");
|
|
||||||
Files.copy(pomPath, Path.of(workDirectory.getAbsolutePath(), "pom.xml"), StandardCopyOption.REPLACE_EXISTING);
|
|
||||||
}
|
|
||||||
|
|
||||||
@BuildCommand(summary = "Generates Jacoco Reports")
|
|
||||||
public void jacoco() throws IOException {
|
public void jacoco() throws IOException {
|
||||||
new JacocoReportOperation()
|
new JacocoReportOperation()
|
||||||
.fromProject(this)
|
.fromProject(this)
|
||||||
|
@ -134,4 +122,11 @@ public class HttpStatusBuild extends Project {
|
||||||
.ruleSets("config/pmd.xml")
|
.ruleSets("config/pmd.xml")
|
||||||
.execute();
|
.execute();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void publish() throws Exception {
|
||||||
|
super.publish();
|
||||||
|
var xml = new PomBuilder().info(publishOperation().info()).dependencies(dependencies).build();
|
||||||
|
FileUtils.writeString(xml, Path.of(workDirectory.getPath(), "pom.xml").toFile());
|
||||||
|
}
|
||||||
}
|
}
|
Loading…
Add table
Add a link
Reference in a new issue