This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 10.1.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/10.1.x by this push:
new 81cdc12036 Fix warnings during native image compilation
81cdc12036 is described below
commit 81cdc12036dd0d9b3d18d46d8b0d4032f55133cc
Author: Mark Thomas <[email protected]>
AuthorDate: Fri Nov 29 14:21:10 2024 +0000
Fix warnings during native image compilation
---
res/graal/README.md | 4 ++--
.../native-image/native-image.properties | 16 ----------------
.../{tomcat-reflection.json => reflect-config.json} | 0
.../{tomcat-resource.json => resource-config.json} | 0
.../tomcat-embed-el/native-image/native-image.properties | 16 ----------------
.../{tomcat-reflection.json => reflect-config.json} | 0
.../{tomcat-resource.json => resource-config.json} | 0
.../native-image/native-image.properties | 16 ----------------
.../{tomcat-reflection.json => reflect-config.json} | 0
.../{tomcat-resource.json => resource-config.json} | 0
.../native-image/native-image.properties | 16 ----------------
.../{tomcat-reflection.json => reflect-config.json} | 0
.../{tomcat-resource.json => resource-config.json} | 0
.../native-image/native-image.properties | 16 ----------------
.../{tomcat-reflection.json => reflect-config.json} | 0
.../{tomcat-resource.json => resource-config.json} | 0
webapps/docs/changelog.xml | 8 ++++++++
17 files changed, 10 insertions(+), 82 deletions(-)
diff --git a/res/graal/README.md b/res/graal/README.md
index 717c761c18..ab787a5306 100644
--- a/res/graal/README.md
+++ b/res/graal/README.md
@@ -30,11 +30,11 @@ Reflection Directives
===
This directory contains directives to the compiler on what classes use
reflection.
-These are currently stored in a file called `tomcat-reflection.json` in the
`META-INF/native-image/groupId/artifactId`
+These are currently stored in a file called `reflect-config.json` in the
`META-INF/native-image/groupId/artifactId`
location.
This directory also contains resource directives, so that resource files
normally included in a JAR file
also get compiled into the executable image.
-These are currently stored in a file called `tomcat-resource.json` in the
`META-INF/native-image/groupId/artifactId`
+These are currently stored in a file called `resource-config.json` in the
`META-INF/native-image/groupId/artifactId`
location.
diff --git a/res/graal/tomcat-embed-core/native-image/native-image.properties
b/res/graal/tomcat-embed-core/native-image/native-image.properties
deleted file mode 100644
index 894470185e..0000000000
--- a/res/graal/tomcat-embed-core/native-image/native-image.properties
+++ /dev/null
@@ -1,16 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-Args = -H:ReflectionConfigurationResources=${.}/tomcat-reflection.json
-H:ResourceConfigurationResources=${.}/tomcat-resource.json
diff --git a/res/graal/tomcat-embed-core/native-image/tomcat-reflection.json
b/res/graal/tomcat-embed-core/native-image/reflect-config.json
similarity index 100%
rename from res/graal/tomcat-embed-core/native-image/tomcat-reflection.json
rename to res/graal/tomcat-embed-core/native-image/reflect-config.json
diff --git a/res/graal/tomcat-embed-core/native-image/tomcat-resource.json
b/res/graal/tomcat-embed-core/native-image/resource-config.json
similarity index 100%
rename from res/graal/tomcat-embed-core/native-image/tomcat-resource.json
rename to res/graal/tomcat-embed-core/native-image/resource-config.json
diff --git a/res/graal/tomcat-embed-el/native-image/native-image.properties
b/res/graal/tomcat-embed-el/native-image/native-image.properties
deleted file mode 100644
index 29b501fac1..0000000000
--- a/res/graal/tomcat-embed-el/native-image/native-image.properties
+++ /dev/null
@@ -1,16 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-Args = -H:ReflectionConfigurationResources=${.}/tomcat-reflection.json
-H:ResourceConfigurationResources=${.}/tomcat-resource.json
\ No newline at end of file
diff --git a/res/graal/tomcat-embed-el/native-image/tomcat-reflection.json
b/res/graal/tomcat-embed-el/native-image/reflect-config.json
similarity index 100%
rename from res/graal/tomcat-embed-el/native-image/tomcat-reflection.json
rename to res/graal/tomcat-embed-el/native-image/reflect-config.json
diff --git a/res/graal/tomcat-embed-el/native-image/tomcat-resource.json
b/res/graal/tomcat-embed-el/native-image/resource-config.json
similarity index 100%
rename from res/graal/tomcat-embed-el/native-image/tomcat-resource.json
rename to res/graal/tomcat-embed-el/native-image/resource-config.json
diff --git a/res/graal/tomcat-embed-jasper/native-image/native-image.properties
b/res/graal/tomcat-embed-jasper/native-image/native-image.properties
deleted file mode 100644
index 29b501fac1..0000000000
--- a/res/graal/tomcat-embed-jasper/native-image/native-image.properties
+++ /dev/null
@@ -1,16 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-Args = -H:ReflectionConfigurationResources=${.}/tomcat-reflection.json
-H:ResourceConfigurationResources=${.}/tomcat-resource.json
\ No newline at end of file
diff --git a/res/graal/tomcat-embed-jasper/native-image/tomcat-reflection.json
b/res/graal/tomcat-embed-jasper/native-image/reflect-config.json
similarity index 100%
rename from res/graal/tomcat-embed-jasper/native-image/tomcat-reflection.json
rename to res/graal/tomcat-embed-jasper/native-image/reflect-config.json
diff --git a/res/graal/tomcat-embed-jasper/native-image/tomcat-resource.json
b/res/graal/tomcat-embed-jasper/native-image/resource-config.json
similarity index 100%
rename from res/graal/tomcat-embed-jasper/native-image/tomcat-resource.json
rename to res/graal/tomcat-embed-jasper/native-image/resource-config.json
diff --git
a/res/graal/tomcat-embed-programmatic/native-image/native-image.properties
b/res/graal/tomcat-embed-programmatic/native-image/native-image.properties
deleted file mode 100644
index 29b501fac1..0000000000
--- a/res/graal/tomcat-embed-programmatic/native-image/native-image.properties
+++ /dev/null
@@ -1,16 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-Args = -H:ReflectionConfigurationResources=${.}/tomcat-reflection.json
-H:ResourceConfigurationResources=${.}/tomcat-resource.json
\ No newline at end of file
diff --git
a/res/graal/tomcat-embed-programmatic/native-image/tomcat-reflection.json
b/res/graal/tomcat-embed-programmatic/native-image/reflect-config.json
similarity index 100%
rename from
res/graal/tomcat-embed-programmatic/native-image/tomcat-reflection.json
rename to res/graal/tomcat-embed-programmatic/native-image/reflect-config.json
diff --git
a/res/graal/tomcat-embed-programmatic/native-image/tomcat-resource.json
b/res/graal/tomcat-embed-programmatic/native-image/resource-config.json
similarity index 100%
rename from
res/graal/tomcat-embed-programmatic/native-image/tomcat-resource.json
rename to res/graal/tomcat-embed-programmatic/native-image/resource-config.json
diff --git
a/res/graal/tomcat-embed-websocket/native-image/native-image.properties
b/res/graal/tomcat-embed-websocket/native-image/native-image.properties
deleted file mode 100644
index 29b501fac1..0000000000
--- a/res/graal/tomcat-embed-websocket/native-image/native-image.properties
+++ /dev/null
@@ -1,16 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-Args = -H:ReflectionConfigurationResources=${.}/tomcat-reflection.json
-H:ResourceConfigurationResources=${.}/tomcat-resource.json
\ No newline at end of file
diff --git
a/res/graal/tomcat-embed-websocket/native-image/tomcat-reflection.json
b/res/graal/tomcat-embed-websocket/native-image/reflect-config.json
similarity index 100%
rename from res/graal/tomcat-embed-websocket/native-image/tomcat-reflection.json
rename to res/graal/tomcat-embed-websocket/native-image/reflect-config.json
diff --git a/res/graal/tomcat-embed-websocket/native-image/tomcat-resource.json
b/res/graal/tomcat-embed-websocket/native-image/resource-config.json
similarity index 100%
rename from res/graal/tomcat-embed-websocket/native-image/tomcat-resource.json
rename to res/graal/tomcat-embed-websocket/native-image/resource-config.json
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 72fb9bb090..23fbee63fc 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -244,6 +244,14 @@
</fix>
</changelog>
</subsection>
+ <subsection name = "Other">
+ <changelog>
+ <fix>
+ <bug>69465</bug>: Fix warnings during native image compilation using
the
+ Tomcat embedded JARs. (markt)
+ </fix>
+ </changelog>
+ </subsection>
</section>
<section name="Tomcat 10.1.33 (schultz)" rtext="release in progress">
<subsection name="Other">
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
