Merge pull request #23609 from kaido207/23608
Fix #23608 Add properties file to resources-runtime
diff --git a/appserver/pom.xml b/appserver/pom.xml
index d369396..4ae2c8e 100644
--- a/appserver/pom.xml
+++ b/appserver/pom.xml
@@ -94,7 +94,7 @@
<!-- Jakarta WebSocket -->
<websocket-api.version>2.0.0</websocket-api.version>
- <tyrus.version>2.0.0</tyrus.version>
+ <tyrus.version>2.0.1</tyrus.version>
<!-- Jakarta Concurrency -->
<concurrent-api.version>2.0.0</concurrent-api.version>
diff --git a/appserver/tests/tck/authorization/pom.xml b/appserver/tests/tck/authorization/pom.xml
index fddc316..9cee646 100644
--- a/appserver/tests/tck/authorization/pom.xml
+++ b/appserver/tests/tck/authorization/pom.xml
@@ -196,7 +196,7 @@
<arg value="start-domain"/>
</exec>
- <echo message="Start running all tests" />
+ <echo level="info" message="Start running all tests" />
<exec executable="${ant.home}/bin/ant"
dir="${tck.tests.home}" resultproperty="testResult">
<arg value="deploy"/>
diff --git a/nucleus/admin/config-api/src/main/java/org/glassfish/config/support/DefaultConfigUpgrade.java b/nucleus/admin/config-api/src/main/java/org/glassfish/config/support/DefaultConfigUpgrade.java
index c8c99f0..6646ae2 100644
--- a/nucleus/admin/config-api/src/main/java/org/glassfish/config/support/DefaultConfigUpgrade.java
+++ b/nucleus/admin/config-api/src/main/java/org/glassfish/config/support/DefaultConfigUpgrade.java
@@ -102,7 +102,7 @@
ZipEntry domEnt = templatezip.getEntry("config/domain.xml");
if (domEnt == null) {
throw new RuntimeException(localStrings.getLocalString("DefaultConfigUpgrade.cannotGetDomainXmlTemplate",
- "DefaultConfigUpgrade failed. Cannot get default domain.xml from {0)", templatefile.getAbsolutePath()));
+ "DefaultConfigUpgrade failed. Cannot get default domain.xml from {0}", templatefile.getAbsolutePath()));
}
template = templatezip.getInputStream(domEnt);
@@ -139,7 +139,7 @@
logger.log(Level.SEVERE, defaultConfigUpgradeFailure, ex);
} catch (IOException ex) {
throw new RuntimeException(localStrings.getLocalString("DefaultConfigUpgrade.cannotGetDomainXmlTemplate",
- "DefaultConfigUpgrade failed. Cannot get default domain.xml from {0)", templatefile.getAbsolutePath()), ex);
+ "DefaultConfigUpgrade failed. Cannot get default domain.xml from {0}", templatefile.getAbsolutePath()), ex);
} finally {
try {
if (parser != null) {
diff --git a/nucleus/admin/config-api/src/main/java/org/glassfish/config/support/LocalStrings.properties b/nucleus/admin/config-api/src/main/java/org/glassfish/config/support/LocalStrings.properties
index 9ac595a..15af396 100644
--- a/nucleus/admin/config-api/src/main/java/org/glassfish/config/support/LocalStrings.properties
+++ b/nucleus/admin/config-api/src/main/java/org/glassfish/config/support/LocalStrings.properties
@@ -61,7 +61,7 @@
DefaultConfigUpgrade.runningDefaultConfigUpgrade=default-config not detected during upgrade. Running DefaultConfigUpgrade to create default-config.
DefaultConfigUpgrade.cantFindInstallRoot=DefaultConfigUpgrade failed. Can't find domain.xml template. Install root system property, {0}, is null.
## DefaultConfigUpgrade failed. Missing domain.xml template here {installRoot/lib/templates/domain.xml).
-DefaultConfigUpgrade.cannotGetDomainXmlTemplate=DefaultConfigUpgrade failed. Cannot get default domain.xml from {0).
+DefaultConfigUpgrade.cannotGetDomainXmlTemplate=DefaultConfigUpgrade failed. Cannot get default domain.xml from {0}.
DefaultConfigUpgrade.failure=Failure during upgrade - could not create default-config
# {0}=maximum number of substitutions, {1}=offending property value
