From 6aed5e8db95950ad827479c2c0ce8471e52d9e39 Mon Sep 17 00:00:00 2001 From: cezary-witkowski Date: Tue, 30 Sep 2025 14:17:59 +0200 Subject: [PATCH 1/3] [ACS-10385] sendError method javadoc says: "After using this method, the response should be considered to be committed and should not be written to". Looks like Tomcat 10 is stricter with this method's contract. --- .../springframework/extensions/surf/mvc/FeedController.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/surf/spring-surf/spring-surf/src/main/java/org/springframework/extensions/surf/mvc/FeedController.java b/surf/spring-surf/spring-surf/src/main/java/org/springframework/extensions/surf/mvc/FeedController.java index 8b95ed3..e662f64 100644 --- a/surf/spring-surf/spring-surf/src/main/java/org/springframework/extensions/surf/mvc/FeedController.java +++ b/surf/spring-surf/spring-surf/src/main/java/org/springframework/extensions/surf/mvc/FeedController.java @@ -153,8 +153,8 @@ protected ModelAndView handleRequestInternal(HttpServletRequest req, HttpServlet } private void authorizedResponseStatus(HttpServletResponse res) throws IOException { + res.setHeader("WWW-Authenticate", "Basic realm=\"Alfresco\""); res.sendError(HttpServletResponse.SC_UNAUTHORIZED, "Requested endpoint requires authentication."); - res.setHeader("WWW-Authenticate", "Basic realm=\"Alfresco\""); } -} \ No newline at end of file +} From b51a234fc5703d14aa2119c29b235ee6d12154db Mon Sep 17 00:00:00 2001 From: cezary-witkowski Date: Tue, 30 Sep 2025 14:32:31 +0200 Subject: [PATCH 2/3] [ACS-10385] Bumped actions/cache --- .github/workflows/build.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 40b7c02..d3eb35f 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -121,7 +121,7 @@ jobs: cp -v surf/_ci/settings.xml ${HOME}/.m2/ || cp -v surf/_ci/.travis.settings.xml ${HOME}/.m2/settings.xml - name: "Cache the Maven packages to speed up build" - uses: actions/cache@v1 + uses: actions/cache@v4 with: path: ~/.m2 key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }} @@ -145,4 +145,4 @@ jobs: - name: "Skip building of release commits" run: | cd surf - mvn --batch-mode -q -DscmCommentPrefix="[maven-release-plugin][skip ci] " -Dusername="${GIT_USERNAME}" -Dpassword="${GIT_PASSWORD}" -DskipTests -Darguments=-DskipTests -Darguments=-Dmaven.javadoc.skip=true release:clean release:prepare release:perform \ No newline at end of file + mvn --batch-mode -q -DscmCommentPrefix="[maven-release-plugin][skip ci] " -Dusername="${GIT_USERNAME}" -Dpassword="${GIT_PASSWORD}" -DskipTests -Darguments=-DskipTests -Darguments=-Dmaven.javadoc.skip=true release:clean release:prepare release:perform From 8fd92a77d0fa45d6b1b6b490df611486fbbcb687 Mon Sep 17 00:00:00 2001 From: cezary-witkowski Date: Tue, 30 Sep 2025 14:33:23 +0200 Subject: [PATCH 3/3] [ACS-10385] Bumped actions/cache --- .github/workflows/build.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index d3eb35f..b03c903 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -56,7 +56,7 @@ jobs: cp -v surf/_ci/settings.xml ${HOME}/.m2/ || cp -v surf/_ci/.travis.settings.xml ${HOME}/.m2/settings.xml - name: "Cache the Maven packages to speed up build" - uses: actions/cache@v1 + uses: actions/cache@v4 with: path: ~/.m2 key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }} @@ -82,7 +82,7 @@ jobs: server-password: MAVEN_PASSWORD - name: "Cache the Maven packages to speed up build" - uses: actions/cache@v1 + uses: actions/cache@v4 with: path: ~/.m2 key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}