diff --git a/.idea/copyright/Apache_License.xml b/.idea/copyright/Apache_License.xml
index 15687f4..ade80da 100644
--- a/.idea/copyright/Apache_License.xml
+++ b/.idea/copyright/Apache_License.xml
@@ -1,6 +1,6 @@
-
+
-
\ No newline at end of file
+
diff --git a/.idea/libraries/bld.xml b/.idea/libraries/bld.xml
index be6063a..f74ec7f 100644
--- a/.idea/libraries/bld.xml
+++ b/.idea/libraries/bld.xml
@@ -2,12 +2,12 @@
-
+
-
+
diff --git a/README.md b/README.md
index 77e7189..6223c1e 100644
--- a/README.md
+++ b/README.md
@@ -31,7 +31,7 @@ To create a [Spring Boot executable Web Archive](https://docs.spring.io/spring-b
(WAR) from the current project:
```java
-@BuildCommand(summary = "Create an executable WAR for the project")
+@BuildCommand(summary = "Creates an executable WAR for the project")
public void bootwar() throws Exception {
new BootWarOperation()
.fromProject(this)
diff --git a/examples/.idea/misc.xml b/examples/.idea/misc.xml
index 53b6f53..fdc3b6b 100644
--- a/examples/.idea/misc.xml
+++ b/examples/.idea/misc.xml
@@ -1,4 +1,10 @@
+
+
+
+
+
+
diff --git a/examples/lib/bld/bld-wrapper.properties b/examples/lib/bld/bld-wrapper.properties
index 075e951..dd025a2 100644
--- a/examples/lib/bld/bld-wrapper.properties
+++ b/examples/lib/bld/bld-wrapper.properties
@@ -4,4 +4,4 @@ bld.extensions=com.uwyn.rife2:bld-spring-boot:0.9.0-SNAPSHOT
bld.repositories=MAVEN_LOCAL,MAVEN_CENTRAL,RIFE2_SNAPSHOTS,RIFE2_RELEASES
bld.downloadLocation=
bld.sourceDirectories=
-bld.version=1.7.5
+bld.version=1.8.0-SNAPSHOT
diff --git a/examples/src/bld/java/com/example/demo/DemoApplicationBuild.java b/examples/src/bld/java/com/example/demo/DemoApplicationBuild.java
index ec79a98..b78ef7e 100644
--- a/examples/src/bld/java/com/example/demo/DemoApplicationBuild.java
+++ b/examples/src/bld/java/com/example/demo/DemoApplicationBuild.java
@@ -57,7 +57,7 @@ public class DemoApplicationBuild extends WebProject {
.execute();
}
- @BuildCommand(summary = "Create an executable WAR for the project")
+ @BuildCommand(summary = "Creates an executable WAR for the project")
public void bootwar() throws Exception {
new BootWarOperation()
.fromProject(this)
diff --git a/lib/bld/bld-wrapper.properties b/lib/bld/bld-wrapper.properties
index 777383e..e15a7e8 100644
--- a/lib/bld/bld-wrapper.properties
+++ b/lib/bld/bld-wrapper.properties
@@ -4,4 +4,4 @@ bld.extension-pmd=com.uwyn.rife2:bld-pmd:0.9.4
bld.repositories=MAVEN_LOCAL,MAVEN_CENTRAL,RIFE2_RELEASES
bld.downloadLocation=
bld.sourceDirectories=
-bld.version=1.7.5
+bld.version=1.8.0-SNAPSHOT
diff --git a/src/bld/java/rife/bld/extension/SpringBootBuild.java b/src/bld/java/rife/bld/extension/SpringBootBuild.java
index d96eb32..cb0759d 100644
--- a/src/bld/java/rife/bld/extension/SpringBootBuild.java
+++ b/src/bld/java/rife/bld/extension/SpringBootBuild.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2023 the original author or authors.
+ * Copyright 2023-2024 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -39,14 +39,14 @@ public class SpringBootBuild extends Project {
downloadSources = true;
autoDownloadPurge = true;
- repositories = List.of(MAVEN_LOCAL, MAVEN_CENTRAL, RIFE2_RELEASES);
+ repositories = List.of(MAVEN_LOCAL, MAVEN_CENTRAL, RIFE2_RELEASES, RIFE2_SNAPSHOTS);
scope(compile)
- .include(dependency("com.uwyn.rife2", "bld", version(1, 7, 5)));
+ .include(dependency("com.uwyn.rife2", "bld", version(1, 8, 0, "SNAPSHOT")));
scope(test)
.include(dependency("org.junit.jupiter", "junit-jupiter", version(5, 10, 1)))
.include(dependency("org.junit.platform", "junit-platform-console-standalone", version(1, 10, 1)))
- .include(dependency("org.assertj", "assertj-core", version(3, 24, 2)));
+ .include(dependency("org.assertj", "assertj-core", version(3, 25, 1)));
javadocOperation()
.javadocOptions()
diff --git a/src/main/java/rife/bld/extension/AbstractBootOperation.java b/src/main/java/rife/bld/extension/AbstractBootOperation.java
index 4510821..4709c5f 100644
--- a/src/main/java/rife/bld/extension/AbstractBootOperation.java
+++ b/src/main/java/rife/bld/extension/AbstractBootOperation.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2023 the original author or authors.
+ * Copyright 2023-2024 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/src/main/java/rife/bld/extension/BootJarOperation.java b/src/main/java/rife/bld/extension/BootJarOperation.java
index c3bfcbd..5667bfd 100644
--- a/src/main/java/rife/bld/extension/BootJarOperation.java
+++ b/src/main/java/rife/bld/extension/BootJarOperation.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2023 the original author or authors.
+ * Copyright 2023-2024 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -22,6 +22,7 @@ import rife.tools.FileUtils;
import java.io.File;
import java.io.IOException;
import java.nio.file.Files;
+import java.util.Collection;
import java.util.List;
import java.util.logging.Level;
import java.util.logging.Logger;
@@ -76,6 +77,23 @@ public class BootJarOperation extends AbstractBootOperation {
/**
* Configures the operation from a {@link Project}.
+ *
+ * Sets the following:
+ *
+ *
The {@link #destinationFileName(String) destination file name} to
+ * {@link Project#archiveBaseName() archiveBaseName} and {@link Project#version() version}
+ *
The {@link #infLibs(File...) INF libs} to {@link Project#compileClasspathJars() compileClasspathJars}
+ * and {@link Project#runtimeClasspathJars() runtimeClasspathJars}
+ *
The {@link #launcherClass(String) launcher class} to {@code JarLauncher}
+ *
The {@link #launcherLibs(Collection) launcher libs} to
+ * {@link Project#standaloneClasspathJars() standaloneClasspathJars}
+ *
The {@link #mainClass(String) main class} to {@link Project#mainClass() mainClass}
+ *
The {@code Manifest-Version}, {@code Main-Class} and {@code Start-Class}
+ * {@link #manifestAttributes(Collection) manifest attributes}
+ *
The {@link #sourceDirectories(File...) source directories} to
+ * {@link Project#buildMainDirectory() buildMainDirectory} and
+ * {@link Project#srcMainResourcesDirectory() srcMainResourcesDirectory}
+ *
*
* @param project the project
* @return this operation instance
@@ -96,4 +114,4 @@ public class BootJarOperation extends AbstractBootOperation {
))
.sourceDirectories(project.buildMainDirectory(), project.srcMainResourcesDirectory());
}
-}
\ No newline at end of file
+}
diff --git a/src/main/java/rife/bld/extension/BootManifestAttribute.java b/src/main/java/rife/bld/extension/BootManifestAttribute.java
index 15b5cfc..beac96d 100644
--- a/src/main/java/rife/bld/extension/BootManifestAttribute.java
+++ b/src/main/java/rife/bld/extension/BootManifestAttribute.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2023 the original author or authors.
+ * Copyright 2023-2024 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/src/main/java/rife/bld/extension/BootUtils.java b/src/main/java/rife/bld/extension/BootUtils.java
index 4959c2a..dfdfee9 100644
--- a/src/main/java/rife/bld/extension/BootUtils.java
+++ b/src/main/java/rife/bld/extension/BootUtils.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2023 the original author or authors.
+ * Copyright 2023-2024 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/src/main/java/rife/bld/extension/BootWarOperation.java b/src/main/java/rife/bld/extension/BootWarOperation.java
index 8b429ad..7ee8db7 100644
--- a/src/main/java/rife/bld/extension/BootWarOperation.java
+++ b/src/main/java/rife/bld/extension/BootWarOperation.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2023 the original author or authors.
+ * Copyright 2023-2024 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -99,6 +99,24 @@ public class BootWarOperation extends AbstractBootOperation {
/**
* Configures the operation from a {@link Project}.
+ *
+ * Sets the following:
+ *
+ *
The {@link #destinationFileName(String) destination file name} to
+ * {@link Project#archiveBaseName() archiveBaseName} and {@link Project#version() version}
+ *
The {@link #infLibs(File...) INF libs} to {@link Project#compileClasspathJars() compileClasspathJars},
+ * {@link Project#runtimeClasspathJars() runtimeClasspathJars} and
+ * {@link Project#buildDistDirectory() buildDistDirectory}
+ *
The {@link #launcherClass(String) launcher class} to {@code WarLauncher}
+ *
The {@link #launcherLibs(Collection) launcher libs} to
+ * {@link Project#standaloneClasspathJars() standaloneClasspathJars}
+ *
The {@link #mainClass(String) main class} to {@link Project#mainClass() mainClass}
+ *
The {@code Manifest-Version}, {@code Main-Class} and {@code Start-Class}
+ * {@link #manifestAttributes(Collection) manifest attributes}
+ *
The {@link #sourceDirectories(File...) source directories} to
+ * {@link Project#buildMainDirectory() buildMainDirectory} and
+ * {@link Project#srcMainResourcesDirectory() srcMainResourcesDirectory}
+ *
*
* @param project the project
* @return this operation instance
@@ -118,11 +136,9 @@ public class BootWarOperation extends AbstractBootOperation {
new BootManifestAttribute("Main-Class", launcherClass()),
new BootManifestAttribute("Start-Class", mainClass())
))
- // TODO enable when bld 1.7.6 is available
- // .providedLibs(project.providedClasspathJars())
+ .providedLibs(project.providedClasspathJars())
.sourceDirectories(project.buildMainDirectory(), project.srcMainResourcesDirectory());
}
-
/**
* Provides libraries that will be used for the WAR creation in {@code /WEB-INF/lib-provided}.
*
@@ -144,4 +160,4 @@ public class BootWarOperation extends AbstractBootOperation {
providedLibs_.addAll(List.of(jars));
return this;
}
-}
\ No newline at end of file
+}
diff --git a/src/test/java/rife/bld/extension/BootJarOperationTest.java b/src/test/java/rife/bld/extension/BootJarOperationTest.java
index 47b9cf2..5c34c02 100644
--- a/src/test/java/rife/bld/extension/BootJarOperationTest.java
+++ b/src/test/java/rife/bld/extension/BootJarOperationTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2023 the original author or authors.
+ * Copyright 2023-2024 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -34,7 +34,7 @@ import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThatCode;
class BootJarOperationTest {
- private static final String BLD = "bld-1.7.5.jar";
+ private static final String BLD = "bld-1.8.0-20240107.042858-1.jar";
private static final String EXAMPLES_LIB_COMPILE = "examples/lib/compile/";
private static final String EXAMPLES_LIB_RUNTIME = "examples/lib/runtime/";
private static final String EXAMPLES_LIB_STANDALONE = "examples/lib/standalone/";
@@ -343,4 +343,4 @@ class BootJarOperationTest {
mainClass = MAIN_CLASS;
}
}
-}
\ No newline at end of file
+}