You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jackrabbit.apache.org by re...@apache.org on 2023/06/17 14:07:39 UTC
svn commit: r1910469 - in /jackrabbit/trunk: jackrabbit-parent/pom.xml jackrabbit-standalone-components/pom.xml jackrabbit-standalone-components/src/main/java/org/apache/jackrabbit/standalone/Main.java
Author: reschke
Date: Sat Jun 17 14:07:39 2023
New Revision: 1910469
URL: http://svn.apache.org/viewvc?rev=1910469&view=rev
Log:
JCR-4308: update Jetty to 9.4.* (patch by Manfred Baedke)
Modified:
jackrabbit/trunk/jackrabbit-parent/pom.xml
jackrabbit/trunk/jackrabbit-standalone-components/pom.xml
jackrabbit/trunk/jackrabbit-standalone-components/src/main/java/org/apache/jackrabbit/standalone/Main.java
Modified: jackrabbit/trunk/jackrabbit-parent/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-parent/pom.xml?rev=1910469&r1=1910468&r2=1910469&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-parent/pom.xml (original)
+++ jackrabbit/trunk/jackrabbit-parent/pom.xml Sat Jun 17 14:07:39 2023
@@ -50,7 +50,7 @@
<oak-jackrabbit-api.version.implemented>1.48.0</oak-jackrabbit-api.version.implemented>
<!-- OAK version used in componenents that *use* oak-jackrabbit-api -->
<oak-jackrabbit-api.version.used>1.22.15</oak-jackrabbit-api.version.used>
- <jetty.version>9.2.30.v20200428</jetty.version>
+ <jetty.version>9.4.51.v20230217</jetty.version>
<tika.version>2.4.1</tika.version>
<project.reporting.outputEncoding>${project.build.sourceEncoding}</project.reporting.outputEncoding>
<slf4j.api.version>1.7.36</slf4j.api.version>
@@ -605,7 +605,7 @@
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-jsp</artifactId>
+ <artifactId>apache-jsp</artifactId>
<version>${jetty.version}</version>
</dependency>
<dependency>
Modified: jackrabbit/trunk/jackrabbit-standalone-components/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-standalone-components/pom.xml?rev=1910469&r1=1910468&r2=1910469&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-standalone-components/pom.xml (original)
+++ jackrabbit/trunk/jackrabbit-standalone-components/pom.xml Sat Jun 17 14:07:39 2023
@@ -130,20 +130,7 @@
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-jsp</artifactId>
- <exclusions>
- <exclusion>
- <!-- https://issues.apache.org/jira/browse/JCR-4626 -->
- <groupId>org.glassfish</groupId>
- <artifactId>javax.el</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <!-- https://issues.apache.org/jira/browse/JCR-4626 -->
- <groupId>org.glassfish</groupId>
- <artifactId>javax.el</artifactId>
- <version>3.0.0</version>
+ <artifactId>apache-jsp</artifactId>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
Modified: jackrabbit/trunk/jackrabbit-standalone-components/src/main/java/org/apache/jackrabbit/standalone/Main.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-standalone-components/src/main/java/org/apache/jackrabbit/standalone/Main.java?rev=1910469&r1=1910468&r2=1910469&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-standalone-components/src/main/java/org/apache/jackrabbit/standalone/Main.java (original)
+++ jackrabbit/trunk/jackrabbit-standalone-components/src/main/java/org/apache/jackrabbit/standalone/Main.java Sat Jun 17 14:07:39 2023
@@ -45,6 +45,7 @@ import org.eclipse.jetty.server.Server;
import org.eclipse.jetty.server.ServerConnector;
import org.eclipse.jetty.server.handler.RequestLogHandler;
import org.eclipse.jetty.servlet.ServletHolder;
+import org.eclipse.jetty.webapp.Configuration;
import org.eclipse.jetty.webapp.WebAppContext;
/**
@@ -280,6 +281,12 @@ public class Main {
webapp.setExtractWAR(true);
webapp.setTempDirectory(tmp);
+ Configuration.ClassList classlist = Configuration.ClassList
+ .setServerDefault(server);
+ classlist.addBefore(
+ "org.eclipse.jetty.webapp.JettyWebXmlConfiguration",
+ "org.eclipse.jetty.annotations.AnnotationConfiguration");
+
ServletHolder servlet =
new ServletHolder(JackrabbitRepositoryServlet.class);
servlet.setInitOrder(1);