From 91aa8dfd1ac3943b777f18f6bd54f404b3c42139 Mon Sep 17 00:00:00 2001 From: "Erik C. Thauvin" Date: Sat, 4 Nov 2023 13:25:32 -0700 Subject: [PATCH] Commented out calls to unreleased bld changes --- src/bld/java/rife/bld/extension/SpringBootBuild.java | 10 +++++----- src/main/java/rife/bld/extension/BootWarOperation.java | 3 ++- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/src/bld/java/rife/bld/extension/SpringBootBuild.java b/src/bld/java/rife/bld/extension/SpringBootBuild.java index 5a1f322..90939a7 100644 --- a/src/bld/java/rife/bld/extension/SpringBootBuild.java +++ b/src/bld/java/rife/bld/extension/SpringBootBuild.java @@ -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(); } -} \ No newline at end of file +} diff --git a/src/main/java/rife/bld/extension/BootWarOperation.java b/src/main/java/rife/bld/extension/BootWarOperation.java index 1298ed4..ba03365 100644 --- a/src/main/java/rife/bld/extension/BootWarOperation.java +++ b/src/main/java/rife/bld/extension/BootWarOperation.java @@ -115,7 +115,8 @@ public class BootWarOperation extends AbstractBootOperation { 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()); }