Skip to content

Commit 77955f8

Browse files
committed
Bump Spring Boot to version 4.0.4
1 parent 3dfc118 commit 77955f8

7 files changed

Lines changed: 30 additions & 26 deletions

File tree

.idea/runConfigurations/BootOperationTests.xml

Lines changed: 0 additions & 9 deletions
This file was deleted.

.idea/runConfigurations/Run_Tests.xml

Lines changed: 12 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ or
6868

6969
```java
7070
scope(standalone)
71-
.include(dependency("org.springframework.boot:spring-boot-loader:4.0.3"));
71+
.include(dependency("org.springframework.boot:spring-boot-loader:4.0.4"));
7272
```
7373

7474
Please check the [BootJarOperation documentation](https://rife2.github.io/bld-spring-boot/rife/bld/extension/BootJarOperation.html#method-summary)

examples/4.0.x/src/bld/java/com/example/demo/DemoApplicationBuild.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,9 @@ public DemoApplicationBuild() {
2020
autoDownloadPurge = true;
2121
downloadSources = true;
2222

23-
repositories = List.of(MAVEN_CENTRAL, RIFE2_RELEASES);
23+
repositories = List.of(MAVEN_CENTRAL, RIFE2_RELEASES, RIFE2_SNAPSHOTS);
2424

25-
var boot = version(4, 0, 3);
25+
var boot = version(4, 0, 4);
2626
var junit = version(6, 0, 3);
2727
scope(compile)
2828
.include(dependency("org.springframework.boot", "spring-boot-starter", boot))

lib/bld/bld-wrapper.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,6 @@ bld.extension-exec=com.uwyn.rife2:bld-exec:1.2.0-SNAPSHOT
55
bld.extension-pmd=com.uwyn.rife2:bld-pmd:1.4.3
66
bld.extension-reporter=com.uwyn.rife2:bld-junit-reporter:0.9.3-SNAPSHOT
77
bld.extension-spotbugs=com.uwyn.rife2:bld-spotbugs:0.9.1-SNAPSHOT
8-
bld.repositories=MAVEN_LOCAL,RIFE2_RELEASES,MAVEN_CENTRAL,RIFE2_SNAPSHOTS
8+
bld.repositories=RIFE2_RELEASES,MAVEN_CENTRAL,RIFE2_SNAPSHOTS
99
bld.sourceDirectories=
1010
bld.version=2.3.1-SNAPSHOT

src/bld/java/rife/bld/extension/SpringBootBuild.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,12 +41,12 @@ public SpringBootBuild() {
4141
downloadSources = true;
4242
autoDownloadPurge = true;
4343

44-
repositories = List.of(MAVEN_CENTRAL, CENTRAL_SNAPSHOTS, RIFE2_RELEASES);
44+
repositories = List.of(MAVEN_CENTRAL, CENTRAL_SNAPSHOTS, RIFE2_RELEASES, RIFE2_SNAPSHOTS);
4545

4646
var junit = version(6, 0, 3);
4747
scope(compile)
4848
.include(dependency("com.uwyn.rife2", "bld-extensions-tools",
49-
version(0, 9, 0)))
49+
version(0, 9, 1, "SNAPSHOT")))
5050
.include(dependency("com.uwyn.rife2", "bld",
5151
version(2, 3, 1, "SNAPSHOT")));
5252
scope(provided)

src/test/java/rife/bld/extension/BootOperationTests.java

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -46,23 +46,13 @@
4646
class BootOperationTests {
4747

4848
private static final String BLD_EXTENSIONS_TOOLS = "bld-extensions-tools";
49-
private static final String BLD_EXTENSIONS_TOOLS_PATTERN = BLD_EXTENSIONS_TOOLS
50-
+ "-\\d+\\.\\d+\\.\\d+(-SNAPSHOT)?\\.jar";
51-
private static final String BOOT_INF_LIB_BLD_EXTENSIONS_TOOLS_PATTERN = "BOOT-INF/lib/"
52-
+ BLD_EXTENSIONS_TOOLS_PATTERN;
53-
private static final String WEB_INF_LIB_BLD_EXTENSIONS_TOOLS_PATTERN = "WEB-INF/lib/"
54-
+ BLD_EXTENSIONS_TOOLS_PATTERN;
55-
private static final String BLD_PATTERN = "bld-\\d+\\.\\d+\\.\\d+(-SNAPSHOT|-\\d{8}\\.\\d{6}-\\d+)?\\.jar";
56-
private static final String BOOT_INF_LIB_BLD_PATTERN = "BOOT-INF/lib/" + BLD_PATTERN;
57-
private static final String BOOT_VERSION = "4.0.3";
49+
private static final String BOOT_VERSION = "4.0.4";
5850
private static final String EXAMPLES_DIR = "examples/4.0.x";
5951
private static final String EXAMPLES_LIB_COMPILE = EXAMPLES_DIR + "/lib/compile/";
6052
private static final String EXAMPLES_LIB_RUNTIME = EXAMPLES_DIR + "/lib/runtime/";
6153
private static final String EXAMPLES_LIB_STANDALONE = EXAMPLES_DIR + "/lib/standalone/";
6254
private static final String FOO_JAR = "foo.jar";
6355
private static final String JSR305 = "jsr305";
64-
private static final String JSR305_PATTERN = JSR305 + "-\\d+\\.\\d+\\.\\d+\\.jar";
65-
private static final String WEB_INF_LIB_PROVIDED_JSR305_PATTERN = "WEB-INF/lib-provided/" + JSR305_PATTERN;
6656
private static final String JSR305_VERSION = "3.0.2";
6757
private static final String LAUNCHER_JARS = """
6858
org/
@@ -190,7 +180,18 @@ class BootOperationTests {
190180
private static final String SPRING_BOOT_LOADER_JAR = "spring-boot-loader-" + BOOT_VERSION + ".jar";
191181
private static final String SRC_MAIN_JAVA = "src/main/java";
192182
private static final String SRC_TEST_JAVA = "src/test/java";
183+
private static final String VERSION_PATTERN = "-\\d+\\.\\d+\\.\\d+(-SNAPSHOT|-\\d{8}\\.\\d{6}-\\d+)?";
184+
private static final String BLD_EXTENSIONS_TOOLS_PATTERN = BLD_EXTENSIONS_TOOLS
185+
+ VERSION_PATTERN + "\\.jar";
186+
private static final String BOOT_INF_LIB_BLD_EXTENSIONS_TOOLS_PATTERN = "BOOT-INF/lib/"
187+
+ BLD_EXTENSIONS_TOOLS_PATTERN;
188+
private static final String WEB_INF_LIB_BLD_EXTENSIONS_TOOLS_PATTERN = "WEB-INF/lib/"
189+
+ BLD_EXTENSIONS_TOOLS_PATTERN;
190+
private static final String BLD_PATTERN = "bld" + VERSION_PATTERN + "\\.jar";
191+
private static final String BOOT_INF_LIB_BLD_PATTERN = "BOOT-INF/lib/" + BLD_PATTERN;
193192
private static final String WEB_INF_LIB_BLD_PATTERN = "WEB-INF/lib/" + BLD_PATTERN;
193+
private static final String JSR305_PATTERN = JSR305 + VERSION_PATTERN + "\\.jar";
194+
private static final String WEB_INF_LIB_PROVIDED_JSR305_PATTERN = "WEB-INF/lib-provided/" + JSR305_PATTERN;
194195
private final Logger logger = Logger.getLogger("BootOperation");
195196
private TestLogHandler logHandler;
196197

0 commit comments

Comments
 (0)