|
46 | 46 | class BootOperationTests { |
47 | 47 |
|
48 | 48 | 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"; |
58 | 50 | private static final String EXAMPLES_DIR = "examples/4.0.x"; |
59 | 51 | private static final String EXAMPLES_LIB_COMPILE = EXAMPLES_DIR + "/lib/compile/"; |
60 | 52 | private static final String EXAMPLES_LIB_RUNTIME = EXAMPLES_DIR + "/lib/runtime/"; |
61 | 53 | private static final String EXAMPLES_LIB_STANDALONE = EXAMPLES_DIR + "/lib/standalone/"; |
62 | 54 | private static final String FOO_JAR = "foo.jar"; |
63 | 55 | 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; |
66 | 56 | private static final String JSR305_VERSION = "3.0.2"; |
67 | 57 | private static final String LAUNCHER_JARS = """ |
68 | 58 | org/ |
@@ -190,7 +180,18 @@ class BootOperationTests { |
190 | 180 | private static final String SPRING_BOOT_LOADER_JAR = "spring-boot-loader-" + BOOT_VERSION + ".jar"; |
191 | 181 | private static final String SRC_MAIN_JAVA = "src/main/java"; |
192 | 182 | 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; |
193 | 192 | 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; |
194 | 195 | private final Logger logger = Logger.getLogger("BootOperation"); |
195 | 196 | private TestLogHandler logHandler; |
196 | 197 |
|
|
0 commit comments