Skip to content

Commit 0ed77d0

Browse files
offtherailzofftherailz
committed
Fix project templates for Spring 7 / Jakarta EE 10
Replace leftover javax servlet/jaxws artifacts with jakarta equivalents, drop commons-pool and httpclient pins whose properties were removed, align http_proxy version with the main pom and ship cargo logging.properties.
1 parent 4c0f2b2 commit 0ed77d0

3 files changed

Lines changed: 86 additions & 24 deletions

File tree

‎project/standard/templates/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
<!-- MapStore‑specific -->
3232
<mapstore-services.version>1.12-SNAPSHOT</mapstore-services.version>
3333
<geostore-webapp.version>2.7-SNAPSHOT</geostore-webapp.version>
34-
<http_proxy.version>1.6-SNAPSHOT</http_proxy.version>
34+
<http_proxy.version>1.7-SNAPSHOT</http_proxy.version>
3535
<print-lib.version>2.5-SNAPSHOT</print-lib.version>
3636
</properties>
3737

‎project/standard/templates/web/cargo/logging.properties‎

Lines changed: 79 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,79 @@
1+
# Licensed to the Apache Software Foundation (ASF) under one or more
2+
# contributor license agreements. See the NOTICE file distributed with
3+
# this work for additional information regarding copyright ownership.
4+
# The ASF licenses this file to You under the Apache License, Version 2.0
5+
# (the "License"); you may not use this file except in compliance with
6+
# the License. You may obtain a copy of the License at
7+
#
8+
# http://www.apache.org/licenses/LICENSE-2.0
9+
#
10+
# Unless required by applicable law or agreed to in writing, software
11+
# distributed under the License is distributed on an "AS IS" BASIS,
12+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
# See the License for the specific language governing permissions and
14+
# limitations under the License.
15+
16+
handlers = 1catalina.org.apache.juli.AsyncFileHandler, 2localhost.org.apache.juli.AsyncFileHandler, 3manager.org.apache.juli.AsyncFileHandler, 4host-manager.org.apache.juli.AsyncFileHandler, java.util.logging.ConsoleHandler
17+
18+
.handlers = 1catalina.org.apache.juli.AsyncFileHandler, java.util.logging.ConsoleHandler
19+
20+
############################################################
21+
# Handler specific properties.
22+
# Describes specific configuration info for Handlers.
23+
############################################################
24+
25+
1catalina.org.apache.juli.AsyncFileHandler.level = ALL
26+
1catalina.org.apache.juli.AsyncFileHandler.directory = ${catalina.base}/logs
27+
1catalina.org.apache.juli.AsyncFileHandler.prefix = catalina.
28+
1catalina.org.apache.juli.AsyncFileHandler.maxDays = 90
29+
1catalina.org.apache.juli.AsyncFileHandler.encoding = UTF-8
30+
31+
2localhost.org.apache.juli.AsyncFileHandler.level = ALL
32+
2localhost.org.apache.juli.AsyncFileHandler.directory = ${catalina.base}/logs
33+
2localhost.org.apache.juli.AsyncFileHandler.prefix = localhost.
34+
2localhost.org.apache.juli.AsyncFileHandler.maxDays = 90
35+
2localhost.org.apache.juli.AsyncFileHandler.encoding = UTF-8
36+
37+
3manager.org.apache.juli.AsyncFileHandler.level = ALL
38+
3manager.org.apache.juli.AsyncFileHandler.directory = ${catalina.base}/logs
39+
3manager.org.apache.juli.AsyncFileHandler.prefix = manager.
40+
3manager.org.apache.juli.AsyncFileHandler.maxDays = 90
41+
3manager.org.apache.juli.AsyncFileHandler.encoding = UTF-8
42+
43+
4host-manager.org.apache.juli.AsyncFileHandler.level = ALL
44+
4host-manager.org.apache.juli.AsyncFileHandler.directory = ${catalina.base}/logs
45+
4host-manager.org.apache.juli.AsyncFileHandler.prefix = host-manager.
46+
4host-manager.org.apache.juli.AsyncFileHandler.maxDays = 90
47+
4host-manager.org.apache.juli.AsyncFileHandler.encoding = UTF-8
48+
49+
java.util.logging.ConsoleHandler.level = ALL
50+
java.util.logging.ConsoleHandler.formatter = org.apache.juli.OneLineFormatter
51+
java.util.logging.ConsoleHandler.encoding = UTF-8
52+
53+
54+
############################################################
55+
# Facility specific properties.
56+
# Provides extra control for each logger.
57+
############################################################
58+
59+
org.apache.catalina.core.ContainerBase.[Catalina].[localhost].level = INFO
60+
org.apache.catalina.core.ContainerBase.[Catalina].[localhost].handlers = 2localhost.org.apache.juli.AsyncFileHandler
61+
62+
org.apache.catalina.core.ContainerBase.[Catalina].[localhost].[/manager].level = INFO
63+
org.apache.catalina.core.ContainerBase.[Catalina].[localhost].[/manager].handlers = 3manager.org.apache.juli.AsyncFileHandler
64+
65+
org.apache.catalina.core.ContainerBase.[Catalina].[localhost].[/host-manager].level = INFO
66+
org.apache.catalina.core.ContainerBase.[Catalina].[localhost].[/host-manager].handlers = 4host-manager.org.apache.juli.AsyncFileHandler
67+
68+
# For example, set the org.apache.catalina.util.LifecycleBase logger to log
69+
# each component that extends LifecycleBase changing state:
70+
#org.apache.catalina.util.LifecycleBase.level = FINE
71+
72+
# To see debug messages for HTTP/2 handling, uncomment the following line:
73+
#org.apache.coyote.http2.level = FINE
74+
75+
# To see debug messages for WebSocket handling, uncomment the following line:
76+
#org.apache.tomcat.websocket.level = FINE
77+
78+
# MapStore debugging
79+
#org.apache.catalina.core.StandardContext.level = FINE

‎project/standard/templates/web/pom.xml‎

Lines changed: 6 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -59,16 +59,10 @@
5959
</dependency>
6060
<!-- servlet -->
6161
<dependency>
62-
<groupId>javax.servlet</groupId>
63-
<artifactId>javax.servlet-api</artifactId>
62+
<groupId>jakarta.servlet</groupId>
63+
<artifactId>jakarta.servlet-api</artifactId>
6464
<version>${jakarta.servlet-api.version}</version>
6565
</dependency>
66-
<!-- misc -->
67-
<dependency>
68-
<groupId>commons-pool</groupId>
69-
<artifactId>commons-pool</artifactId>
70-
<version>${commons-pool.version}</version>
71-
</dependency>
7266
</dependencies>
7367
<build>
7468
<finalName>mapstore</finalName>
@@ -467,11 +461,6 @@
467461
</build>
468462
<dependencyManagement>
469463
<dependencies>
470-
<dependency>
471-
<groupId>org.apache.httpcomponents</groupId>
472-
<artifactId>httpclient</artifactId>
473-
<version>${httpclient.version}</version>
474-
</dependency>
475464
<!-- JUnit -->
476465
<dependency>
477466
<groupId>junit</groupId>
@@ -487,19 +476,13 @@
487476
</dependency>
488477
<!-- servlet -->
489478
<dependency>
490-
<groupId>javax.servlet</groupId>
491-
<artifactId>javax.servlet-api</artifactId>
479+
<groupId>jakarta.servlet</groupId>
480+
<artifactId>jakarta.servlet-api</artifactId>
492481
<version>${jakarta.servlet-api.version}</version>
493482
</dependency>
494-
<!-- misc -->
495-
<dependency>
496-
<groupId>commons-pool</groupId>
497-
<artifactId>commons-pool</artifactId>
498-
<version>${commons-pool.version}</version>
499-
</dependency>
500483
<dependency>
501-
<groupId>javax.xml.ws</groupId>
502-
<artifactId>jaxws-api</artifactId>
484+
<groupId>jakarta.xml.ws</groupId>
485+
<artifactId>jakarta.xml.ws-api</artifactId>
503486
<version>${jaxws-api.version}</version>
504487
</dependency>
505488
</dependencies>

0 commit comments

Comments
 (0)