|
52 | 52 | </configuration> |
53 | 53 | </plugin> |
54 | 54 | <plugin> |
55 | | - <groupId>${jetty.maven.groupid}</groupId> |
56 | | - <artifactId>jetty-maven-plugin</artifactId> |
| 55 | + <groupId>org.eclipse.jetty.ee9</groupId> |
| 56 | + <artifactId>jetty-ee9-maven-plugin</artifactId> |
57 | 57 | <version>${jetty-version}</version> |
58 | 58 | <configuration> |
59 | | - <connectors> |
60 | | - <connector implementation="org.eclipse.jetty.server.ServerConnector"> |
61 | | - <port>${jetty.port}</port> |
62 | | - <maxIdleTime>60000</maxIdleTime> |
63 | | - </connector> |
64 | | - </connectors> |
65 | | - |
66 | | - <webAppConfig> |
| 59 | + <httpConnector> |
| 60 | + <port>${jetty.port}</port> |
| 61 | + <idleTimeout>60000</idleTimeout> |
| 62 | + </httpConnector> |
| 63 | + <scan>10</scan> |
| 64 | + <webApp> |
67 | 65 | <contextPath>/</contextPath> |
68 | | - </webAppConfig> |
| 66 | + </webApp> |
69 | 67 |
|
70 | 68 | <systemProperties> |
71 | 69 | <!-- enable easy connection to JConsole --> |
|
100 | 98 | </systemProperty> |
101 | 99 | --> |
102 | 100 | </systemProperties> |
103 | | - <scanIntervalSeconds>10</scanIntervalSeconds> |
104 | 101 | </configuration> |
105 | 102 | </plugin> |
106 | 103 | <plugin> |
|
288 | 285 | <scope>provided</scope> |
289 | 286 | </dependency> |
290 | 287 |
|
291 | | - <!-- Tag Libs --> |
| 288 | + <!-- Tag Libs --> |
| 289 | + <!-- |
| 290 | + These two should be available either in the WAR itself or from the container. We can't configure |
| 291 | + jetty-ee9-maven-plugin with <useProvidedScope>true</useProvidedScope> because we don't need ALL provided |
| 292 | + dependencies. But we shouldn't build the WAR with these two included either, because _full_ web container |
| 293 | + may provide own taglibs... Not me to decide ;) |
| 294 | + --> |
292 | 295 | <dependency> |
293 | 296 | <groupId>jakarta.servlet.jsp.jstl</groupId> |
294 | 297 | <artifactId>jakarta.servlet.jsp.jstl-api</artifactId> |
295 | 298 | <version>3.0.0</version> |
296 | | - <scope>provided</scope> |
| 299 | +<!-- <scope>provided</scope>--> |
297 | 300 | </dependency> |
298 | 301 | <dependency> |
299 | 302 | <groupId>org.glassfish.web</groupId> |
300 | 303 | <artifactId>jakarta.servlet.jsp.jstl</artifactId> |
301 | 304 | <version>3.0.1</version> |
302 | | - <scope>provided</scope> |
| 305 | +<!-- <scope>provided</scope>--> |
303 | 306 | </dependency> |
304 | 307 | <!-- |
305 | 308 | <dependency> |
|
0 commit comments