This is an automated email from the ASF dual-hosted git repository.
ahuber pushed a commit to branch spring6
in repository https://gitbox.apache.org/repos/asf/causeway.git
The following commit(s) were added to refs/heads/spring6 by this push:
new 2e4a9da154 CAUSEWAY-3699: Lower v3 Baseline from Java 21 to 17
2e4a9da154 is described below
commit 2e4a9da15479eb37cb3a13e57bd9166c3c32b1d8
Author: Andi Huber <[email protected]>
AuthorDate: Thu Mar 21 08:57:13 2024 +0100
CAUSEWAY-3699: Lower v3 Baseline from Java 21 to 17
---
bom/pom.xml | 4 ++--
.../java/org/apache/causeway/commons/internal/debug/_Probe.java | 2 +-
.../org/apache/causeway/commons/internal/debug/xray/XrayModel.java | 6 +++---
.../causeway/core/config/environment/CausewayLocaleInitializer.java | 4 ++--
starters/pom.xml | 2 +-
testing/pom.xml | 2 +-
viewers/graphql/testsupport/pom.xml | 2 +-
7 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/bom/pom.xml b/bom/pom.xml
index ff3f8c28e2..ef6a86d150 100644
--- a/bom/pom.xml
+++ b/bom/pom.xml
@@ -58,8 +58,8 @@ It is therefore a copy of org.apache:apache, with
customisations clearly identif
<sourceReleaseAssemblyDescriptor>source-release</sourceReleaseAssemblyDescriptor>
<gpg.useagent>true</gpg.useagent>
<minimalMavenBuildVersion>3.8.8</minimalMavenBuildVersion> <!-- latest
from github actions/setup-java@v3 -->
- <minimalJavaBuildVersion>21</minimalJavaBuildVersion>
- <maven.compiler.release>21</maven.compiler.release>
+ <minimalJavaBuildVersion>17</minimalJavaBuildVersion>
+ <maven.compiler.release>17</maven.compiler.release>
<!-- for m-plugin-p and maven-plugin-annotations -->
<assembly.tarLongFileMode>posix</assembly.tarLongFileMode>
diff --git
a/commons/src/main/java/org/apache/causeway/commons/internal/debug/_Probe.java
b/commons/src/main/java/org/apache/causeway/commons/internal/debug/_Probe.java
index 04182875b3..c01552d0f8 100644
---
a/commons/src/main/java/org/apache/causeway/commons/internal/debug/_Probe.java
+++
b/commons/src/main/java/org/apache/causeway/commons/internal/debug/_Probe.java
@@ -202,7 +202,7 @@ public class _Probe {
public static String currentThreadId() {
val ct = Thread.currentThread();
- return String.format("Thread[%s (%d)])", ct.getName(), ct.threadId());
+ return String.format("Thread[%s (%d)])", ct.getName(), ct.getId());
}
public static void sysOut(final String format, final Object... args) {
diff --git
a/commons/src/main/java/org/apache/causeway/commons/internal/debug/xray/XrayModel.java
b/commons/src/main/java/org/apache/causeway/commons/internal/debug/xray/XrayModel.java
index c8ee7f01cf..7da5fe0fe1 100644
---
a/commons/src/main/java/org/apache/causeway/commons/internal/debug/xray/XrayModel.java
+++
b/commons/src/main/java/org/apache/causeway/commons/internal/debug/xray/XrayModel.java
@@ -103,9 +103,9 @@ public interface XrayModel {
public static ThreadMemento fromCurrentThread() {
val ct = Thread.currentThread();
return ThreadMemento.of(
- String.format("thread-%d-%s", ct.threadId(), ct.getName()),
- String.format("Thread-%d [%s]", ct.threadId(),
ct.getName()),
- String.format("Thread-%d\n%s", ct.threadId(),
ct.getName()));
+ String.format("thread-%d-%s", ct.getId(), ct.getName()),
+ String.format("Thread-%d [%s]", ct.getId(), ct.getName()),
+ String.format("Thread-%d\n%s", ct.getId(), ct.getName()));
}
}
diff --git
a/core/config/src/main/java/org/apache/causeway/core/config/environment/CausewayLocaleInitializer.java
b/core/config/src/main/java/org/apache/causeway/core/config/environment/CausewayLocaleInitializer.java
index da19c63977..5f04214e81 100644
---
a/core/config/src/main/java/org/apache/causeway/core/config/environment/CausewayLocaleInitializer.java
+++
b/core/config/src/main/java/org/apache/causeway/core/config/environment/CausewayLocaleInitializer.java
@@ -49,11 +49,11 @@ public class CausewayLocaleInitializer {
final int pos = localeSpec.indexOf('_');
Locale locale;
if (pos == -1) {
- locale = Locale.of(localeSpec);
+ locale = new Locale(localeSpec, "");
} else {
final String language = localeSpec.substring(0, pos);
final String country = localeSpec.substring(pos + 1);
- locale = Locale.of(language, country);
+ locale = new Locale(language, country);
}
return locale;
}
diff --git a/starters/pom.xml b/starters/pom.xml
index 9cea26f12f..69230136f2 100644
--- a/starters/pom.xml
+++ b/starters/pom.xml
@@ -46,7 +46,7 @@
<properties>
- <maven.compiler.release>21</maven.compiler.release>
+ <maven.compiler.release>17</maven.compiler.release>
<spring-boot.version>3.2.3</spring-boot.version>
<approvaltests.version>23.0.0</approvaltests.version>
diff --git a/testing/pom.xml b/testing/pom.xml
index 81130b7066..965f9b0410 100644
--- a/testing/pom.xml
+++ b/testing/pom.xml
@@ -40,7 +40,7 @@
<packaging>pom</packaging>
<properties>
- <maven.compiler.release>21</maven.compiler.release>
+ <maven.compiler.release>17</maven.compiler.release>
<jar-plugin.automaticModuleName>org.apache.causeway.testing</jar-plugin.automaticModuleName>
<git-plugin.propertiesDir>org/apache/causeway/testing</git-plugin.propertiesDir>
diff --git a/viewers/graphql/testsupport/pom.xml
b/viewers/graphql/testsupport/pom.xml
index 7d7cf63088..4eebf55701 100644
--- a/viewers/graphql/testsupport/pom.xml
+++ b/viewers/graphql/testsupport/pom.xml
@@ -36,7 +36,7 @@
<jar-plugin.automaticModuleName>org.apache.causeway.viewer.graphql.testsupport</jar-plugin.automaticModuleName>
<git-plugin.propertiesDir>org/apache/causeway/viewer/graphql/testsupport</git-plugin.propertiesDir>
- <maven.compiler.release>21</maven.compiler.release>
+ <maven.compiler.release>17</maven.compiler.release>
<datasource-proxy-spring-boot-starter.version>1.9.1</datasource-proxy-spring-boot-starter.version>
<sql-formatter.version>2.0.4</sql-formatter.version>
