mraible commented on code in PR #154:
URL: https://github.com/apache/roller/pull/154#discussion_r3772175555
##########
app/pom.xml:
##########
@@ -46,21 +45,20 @@ limitations under the License.
<commons-codec.version>1.18.0</commons-codec.version>
<commons-text.version>1.13.0</commons-text.version>
<commons-lang3.version>3.17.0</commons-lang3.version>
- <eclipse-link.version>4.0.5</eclipse-link.version>
+ <eclipse-link.version>5.0.1</eclipse-link.version>
<guice.version>7.0.0</guice.version>
<log4j2.version>2.24.3</log4j2.version>
<lucene.version>9.12.1</lucene.version> <!-- lucene 10 requires JDK 21
-->
- <oauth-core.version>20100527</oauth-core.version>
- <maven-war.version>3.4.0</maven-war.version>
+<maven-war.version>3.4.0</maven-war.version>
<maven-surefire.version>3.5.2</maven-surefire.version>
<maven-antrun.version>1.0b3</maven-antrun.version>
<rome.version>1.19.0</rome.version> <!-- locked in place since next
version removes popono -->
<slf4j.version>2.0.16</slf4j.version>
- <spring.version>5.3.39</spring.version>
- <spring.security.version>5.8.14</spring.security.version>
- <struts.version>2.5.29</struts.version> <!-- .30+ breaks selenium
tests -->
+ <spring.version>7.0.8</spring.version>
+ <spring.security.version>7.0.6</spring.security.version>
Review Comment:
Good catch. The PR now targets EE 11: Servlet API 6.1.0, the ee11 flavor of
the Jetty plugin at 12.1.12, and Tomcat 11 in the Docker image (JSP was already
at 4.0). All 157 unit tests and the full browser suite from the stacked
Playwright PR pass on Jetty 12.1. The PR title and description are updated
accordingly.
##########
app/src/main/java/org/apache/roller/weblogger/webservices/atomprotocol/RollerAtomRequestImpl.java:
##########
@@ -0,0 +1,135 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. 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.
+ */
+/*
+ * Derived from com.rometools.propono.atom.server.AtomRequestImpl.
+ * Forked to use jakarta.servlet instead of javax.servlet.
+ */
+package org.apache.roller.weblogger.webservices.atomprotocol;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.security.Principal;
+import java.util.Enumeration;
+import java.util.Map;
+
+import jakarta.servlet.http.HttpServletRequest;
+
+import com.rometools.propono.atom.server.AtomRequest;
+
+public class RollerAtomRequestImpl implements AtomRequest {
+
+ private final HttpServletRequest wrapped;
+
+ public RollerAtomRequestImpl(HttpServletRequest request) {
+ this.wrapped = request;
+ }
+
+ @Override
+ public String getPathInfo() {
+ return wrapped.getPathInfo();
+ }
Review Comment:
Confirmed against the original: rome-propono's AtomRequestImpl normalizes a
null path info to an empty string, and the fork dropped that. Restored, and the
web services smoke test in the stacked Playwright PR now requests the exact
/roller-services/app mapping so this stays covered.
##########
docker-compose.yml:
##########
@@ -19,12 +19,10 @@
# Example Docker Compose setup for running Roller and PostgreSQL locally
-version: '3.7'
-
services:
postgresql:
- image: "postgres:10.0"
+ image: "postgres:16"
Review Comment:
docker-compose now binds ./docker/postgresql-16-data with a comment
explaining that PostgreSQL 16 cannot start on a data directory from the old
PostgreSQL 10 image, so existing checkouts keep their old data untouched
instead of failing on it.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
