rife2/bld-spring-boot
rife2/bld-spring-boot
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Commented out calls to unreleased bld changes

Browse source
This commit is contained in:
Erik C. Thauvin 2023-11-04 13:25:32 -07:00
parent 3e3d6dafec
commit 91aa8dfd1a
2 changed files with 7 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/bld/java/rife/bld/extension/SpringBootBuild.java
View file

@ -24,8 +24,7 @@ import rife.bld.publish.PublishScm;
import java.util.List;
import static rife.bld.dependencies.Repository.MAVEN_CENTRAL;
import static rife.bld.dependencies.Repository.RIFE2_RELEASES;
import static rife.bld.dependencies.Repository.*;
import static rife.bld.dependencies.Scope.compile;
import static rife.bld.dependencies.Scope.test;
import static rife.bld.operations.JavadocOptions.DocLinkOption.NO_MISSING;
@ -39,10 +38,10 @@ public class SpringBootBuild extends Project {
javaRelease = 17;
downloadSources = true;
autoDownloadPurge = true;
repositories = List.of(MAVEN_CENTRAL, RIFE2_RELEASES);
repositories = List.of(MAVEN_LOCAL, MAVEN_CENTRAL, RIFE2_RELEASES);
scope(compile)
.include(dependency("com.uwyn.rife2", "bld", version(1, 7, 5)));
.include(dependency("com.uwyn.rife2", "bld", version(1, 7, 6, "SNAPSHOT")));
scope(test)
.include(dependency("org.junit.jupiter", "junit-jupiter", version(5, 10, 0)))
.include(dependency("org.junit.platform", "junit-platform-console-standalone", version(1, 10, 0)))
@ -50,6 +49,7 @@ public class SpringBootBuild extends Project {
javadocOperation()
.javadocOptions()
.author()
.docLint(NO_MISSING)
.link("https://rife2.github.io/bld/");
@ -83,4 +83,4 @@ public class SpringBootBuild extends Project {
.ruleSets("config/pmd.xml")
.execute();
}
}
}

3
src/main/java/rife/bld/extension/BootWarOperation.java
View file

@ -115,7 +115,8 @@ public class BootWarOperation extends AbstractBootOperation<BootWarOperation> {
new BootManifestAttribute("Main-Class", launcherClass()),
new BootManifestAttribute("Start-Class", mainClass())
))
.providedLibs(project.providedClasspathJars())
// TODO enable when bld 1.7.6 is available
// .providedLibs(project.providedClasspathJars())
.sourceDirectories(project.buildMainDirectory(), project.srcMainResourcesDirectory());
}