Skip to content

Commit ed318c9

Browse files
authored
Merge pull request #45163 from gsmet/3.15.3-backports-3
[3.15] 3.15.3 backports 3
2 parents daf47b0 + 1e52cec commit ed318c9

File tree

18 files changed

+135
-24
lines changed

18 files changed

+135
-24
lines changed

bom/application/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -162,7 +162,7 @@
162162
<dekorate.version>4.1.4</dekorate.version> <!-- Please check with Java Operator SDK team before updating -->
163163
<maven-invoker.version>3.2.0</maven-invoker.version>
164164
<awaitility.version>4.2.2</awaitility.version>
165-
<jboss-logmanager.version>3.0.6.Final</jboss-logmanager.version>
165+
<jboss-logmanager.version>3.1.1.Final</jboss-logmanager.version>
166166
<flyway.version>10.17.3</flyway.version>
167167
<yasson.version>3.0.4</yasson.version>
168168
<!-- liquibase-mongodb is not released everytime with liquibase anymore, but the two versions need to be compatible -->
@@ -220,7 +220,7 @@
220220
<mime4j.version>0.8.11</mime4j.version>
221221
<mutiny-zero.version>1.1.0</mutiny-zero.version>
222222
<pulsar-client.version>3.3.0</pulsar-client.version>
223-
<async-http-client.version>2.12.3</async-http-client.version>
223+
<async-http-client.version>2.12.4</async-http-client.version>
224224
<!-- keep in-sync, if possible, with Micrometer registry Prometheus -->
225225
<prometheus.version>0.16.0</prometheus.version>
226226
<!-- Dev UI -->

core/devmode-spi/src/main/java/io/quarkus/dev/console/QuarkusConsole.java

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,17 @@ public synchronized static void uninstallRedirects() {
104104
redirectsInstalled = false;
105105
}
106106

107+
private static void checkAndSetJdkConsole() {
108+
// the JLine console in JDK 23+ causes significant startup slowdown,
109+
// so we avoid it unless the user opted into it
110+
String res = System.getProperty("jdk.console");
111+
if (res == null) {
112+
System.setProperty("jdk.console", "java.base");
113+
}
114+
}
115+
107116
public static boolean hasColorSupport() {
117+
checkAndSetJdkConsole();
108118
if (Boolean.getBoolean(FORCE_COLOR_SUPPORT)) {
109119
return true; //assume the IDE run window has color support
110120
}

extensions/spring-data-jpa/deployment/src/main/java/io/quarkus/spring/data/deployment/SpringDataJPAProcessor.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -103,6 +103,7 @@ void registerReflection(BuildProducer<ReflectiveClassBuildItem> producer) {
103103
"org.springframework.data.domain.Page",
104104
"org.springframework.data.domain.Slice",
105105
"org.springframework.data.domain.PageImpl",
106+
"org.springframework.data.domain.Pageable",
106107
"org.springframework.data.domain.SliceImpl",
107108
"org.springframework.data.domain.Sort",
108109
"org.springframework.data.domain.Chunk",

extensions/web-dependency-locator/deployment/src/main/java/io/quarkus/webdependency/locator/deployment/WebDependencyLocatorProcessor.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -85,6 +85,7 @@ public void findRelevantFiles(BuildProducer<GeneratedStaticResourceBuildItem> ge
8585
webstream.forEach(path -> {
8686
if (Files.isRegularFile(path)) {
8787
String endpoint = SLASH + web.relativize(path);
88+
endpoint = endpoint.replace('\\', '/');
8889
try {
8990
if (path.toString().endsWith(DOT_HTML)) {
9091
generatedStaticProducer.produce(new GeneratedStaticResourceBuildItem(endpoint,

independent-projects/bootstrap/app-model/src/main/java/io/quarkus/util/GlobUtil.java

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,8 +75,13 @@ private static int glob(String glob, int i, int length, String stopChars, String
7575
switch (current) {
7676
case '*':
7777
if (i < length && glob.charAt(i) == '*') {
78-
result.append(".*");
7978
i++;
79+
if (i < length && glob.charAt(i) == '/') {
80+
result.append("([^/]*/)*");
81+
i++;
82+
} else {
83+
result.append(".*");
84+
}
8085
} else {
8186
result.append("[^/]*");
8287
}

independent-projects/bootstrap/app-model/src/test/java/io/quarkus/util/GlobUtilTest.java

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,14 @@ void doubleStar() {
3434
assertMatch("a**/b", Arrays.asList("a/b", "axy/b", "a/x/b"), Arrays.asList("a", "b", "a/bc", "bc/b"));
3535
assertMatch("a**b", Arrays.asList("ab", "axb", "axyb", "a/b", "a/x/b"), Arrays.asList("abc", "1ab"));
3636
assertMatch("a**b**/c", Arrays.asList("axbx/c", "axbx/c", "a/x/xbx/c", "axbx/xxx/c"), Arrays.asList("axbx/cc"));
37+
assertMatch("**/*.txt", Arrays.asList("/test.txt", "test.txt", "/path/to/a.txt", "relative/path/to/a.txt"),
38+
Arrays.asList("/test.py", "test.json", "/path/to/a.js", "relative/path/to/a.exe"));
39+
assertMatch("foo/**/test.json",
40+
Arrays.asList("foo/a/b/vd/test.json", "foo/test.json", "foo/42/test.json"),
41+
Arrays.asList("/foo/path/to/test.json", "/test.py", "test.json", "/path/foo/test.json", "path/foo/test.json"));
42+
assertMatch("foo/**/*.json",
43+
Arrays.asList("foo/a/b/vd/a.json", "foo/dsa.json", "foo/32/test2.json"),
44+
Arrays.asList("/foo/path/to/aasf.json", "/test.py", "test.json", "/path/foo/test.json", "path/foo/test.json"));
3745
}
3846

3947
@Test

independent-projects/bootstrap/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@
6262
<guava.failureaccess.version>1.0.1</guava.failureaccess.version><!-- keep in sync with guava.version -->
6363
<j2objc.annotations.version>2.8</j2objc.annotations.version><!-- keep in sync with guava.version -->
6464
<shrinkwrap-depchain.version>1.2.6</shrinkwrap-depchain.version>
65-
<jboss-logmanager.version>3.0.6.Final</jboss-logmanager.version>
65+
<jboss-logmanager.version>3.1.1.Final</jboss-logmanager.version>
6666
<slf4j-jboss-logmanager.version>1.1.0.Final</slf4j-jboss-logmanager.version>
6767
<slf4j-api.version>2.0.6</slf4j-api.version>
6868
<graal-sdk.version>23.1.0</graal-sdk.version>

independent-projects/resteasy-reactive/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@
5151
<maven.version>3.9.8</maven.version>
5252
<assertj.version>3.26.3</assertj.version>
5353
<jboss-logging.version>3.6.0.Final</jboss-logging.version>
54-
<jboss-logmanager.version>3.0.6.Final</jboss-logmanager.version>
54+
<jboss-logmanager.version>3.1.1.Final</jboss-logmanager.version>
5555
<jakarta.annotation-api.version>3.0.0</jakarta.annotation-api.version>
5656
<gizmo.version>1.8.0</gizmo.version>
5757
<jakarta.persistence-api.version>3.1.0</jakarta.persistence-api.version>

independent-projects/tools/base-codestarts/src/main/resources/codestarts/quarkus-extension/code/devmode-test/java/deployment/src/test/java/{package-name.dir}/test/{class-name-base}DevModeTest.tpl.qute.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ public class {class-name-base}DevModeTest {
1313
// Start hot reload (DevMode) test with your extension loaded
1414
@RegisterExtension
1515
static final QuarkusDevModeTest devModeTest = new QuarkusDevModeTest()
16-
.setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class));
16+
.setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class));
1717

1818
@Test
1919
public void writeYourOwnDevModeTest() {

independent-projects/tools/base-codestarts/src/main/resources/codestarts/quarkus-extension/code/unit-test/java/deployment/src/test/java/{package-name.dir}/test/{class-name-base}Test.tpl.qute.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ public class {class-name-base}Test {
1313
// Start unit test with your extension loaded
1414
@RegisterExtension
1515
static final QuarkusUnitTest unitTest = new QuarkusUnitTest()
16-
.setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class));
16+
.setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class));
1717

1818
@Test
1919
public void writeYourOwnUnitTest() {

0 commit comments

Comments
 (0)