Compare commits

..

No commits in common. "dc7270faf694ebd39ab1fb8a4a38f6861c73c164" and "c7e6248772e80d7fa1d4596a3d728858a9e27c94" have entirely different histories.

6 changed files with 11 additions and 10 deletions

View file

@ -1,7 +1,7 @@
bld.downloadExtensionJavadoc=false
bld.downloadExtensionSources=true
bld.downloadLocation=
bld.extension-boot=com.uwyn.rife2:bld-spring-boot:0.9.6
bld.extension-boot=com.uwyn.rife2:bld-spring-boot:0.9.5
bld.repositories=MAVEN_LOCAL,MAVEN_CENTRAL,RIFE2_SNAPSHOTS,RIFE2_RELEASES
bld.sourceDirectories=
bld.version=1.9.1

View file

@ -1,7 +1,7 @@
bld.downloadExtensionJavadoc=false
bld.downloadExtensionSources=true
bld.downloadLocation=
bld.extension-pmd=com.uwyn.rife2:bld-pmd:1.1.0
bld.extension-pmd=com.uwyn.rife2:bld-pmd:1.0.1
bld.repositories=MAVEN_CENTRAL,MAVEN_LOCAL,RIFE2_RELEASES
bld.sourceDirectories=
bld.version=1.9.1

View file

@ -33,10 +33,10 @@ public class SpringBootBuild extends Project {
public SpringBootBuild() {
pkg = "rife.bld.extension";
name = "bld-spring-boot";
version = version(0, 9, 6);
version = version(0, 9, 5);
javaRelease = 17;
downloadSources = true;
autoDownloadPurge = true;

View file

@ -17,6 +17,8 @@
package rife.bld.extension;
import rife.bld.Project;
import rife.tools.FileUtils;
import rife.tools.exceptions.FileUtilsErrorException;
import java.io.File;
import java.io.IOException;

View file

@ -139,7 +139,6 @@ public class BootWarOperation extends AbstractBootOperation<BootWarOperation> {
.providedLibs(project.providedClasspathJars())
.sourceDirectories(project.buildMainDirectory(), project.srcMainResourcesDirectory());
}
/**
* Provides libraries that will be used for the WAR creation in {@code /WEB-INF/lib-provided}.
*

View file

@ -24,6 +24,7 @@ import rife.tools.FileUtils;
import java.io.File;
import java.io.IOException;
import java.nio.file.Files;
import java.nio.file.Path;
import java.util.Enumeration;
import java.util.List;
import java.util.jar.JarEntry;
@ -276,12 +277,10 @@ class BootJarOperationTest {
void testProject() throws IOException {
var tmp_dir = Files.createTempDirectory("bootprjtmp").toFile();
var project = new CustomProject(tmp_dir);
var bootJar = new BootJarOperation().fromProject(project).sourceDirectories("src/main/java");
var bootJar = new BootJarOperation().fromProject(project);
assertThat(bootJar.mainClass()).as("mainClass").isEqualTo(MAIN_CLASS);
assertThat(bootJar.sourceDirectories()).as("sourceDirectories.size").hasSize(3)
.containsExactly(project.buildMainDirectory(), project.srcMainResourcesDirectory(),
new File("src/main/java"));
assertThat(bootJar.sourceDirectories()).as("sourceDirectories.size").hasSize(2);
assertThat(bootJar.manifestAttributes()).as("manifestAttributes.size").hasSize(3);
assertThat(bootJar.manifestAttributes().get("Manifest-Version")).as("Manifest-Version").isEqualTo("1.0");
assertThat(bootJar.manifestAttributes().get("Main-Class")).as("Main-Class").endsWith("JarLauncher");
@ -289,7 +288,8 @@ class BootJarOperationTest {
assertThat(bootJar.manifestAttribute("Manifest-Test", "tsst")
.manifestAttributes().get("Manifest-Test")).as("Manifest-Test").isEqualTo("tsst");
assertThat(bootJar.destinationDirectory()).as("destinationDirectory").isDirectory();
assertThat(bootJar.destinationDirectory()).isEqualTo(project.buildDistDirectory());
assertThat(bootJar.destinationDirectory().getAbsolutePath()).as("destinationDirectory")
.isEqualTo(Path.of(tmp_dir.getPath(), "build", "dist").toString());
assertThat(bootJar.infLibs()).as("infoLibs").isEmpty();
assertThat(bootJar.launcherLibs()).as("launcherJars").isEmpty();
assertThat(bootJar.destinationFileName()).isEqualTo("test_project-0.0.1-boot.jar");