JCR-5238: Release Jackrabbit 2.22.4

.asf.yaml

@@ -28,4 +28,6 @@ github:
     - JCR
     - JCRVLT
     - SLING
-    - FELIX
+    - FELIX
+  protected_branches:
+    trunk: {}

.github/workflows/build.yml

@@ -0,0 +1,100 @@
+#  ~ Licensed to the Apache Software Foundation (ASF) under one
+#  ~ or more contributor license agreements.  See the NOTICE file
+#  ~ distributed with this work for additional information
+#  ~ regarding copyright ownership.  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.
+
+name: Build
+on:
+  push:
+    branches:
+      - trunk
+  pull_request:
+    types: [opened, synchronize, reopened]
+jobs:
+  build:
+    name: Maven Build
+    runs-on: ubuntu-latest
+    steps:
+      - name: Git clone
+        uses: actions/checkout@v6
+      - name: Set up JDK 11
+        uses: actions/setup-java@v5
+        with:
+          java-version: 11
+          distribution: temurin
+          cache: maven
+          server-id: apache.snapshots.https # Value of the distributionManagement/repository/id field of the pom.xml
+          server-username: MAVEN_APACHE_NEXUS_USERNAME # env variable for username in deploy
+          server-password: MAVEN_APACHE_NEXUS_PASSWORD # env variable for token in deploy
+      # sets environment variables to be used in subsequent steps: https://docs.github.com/en/actions/reference/workflow-commands-for-github-actions#setting-an-environment-variable
+      - name: Set environment variables
+        shell: bash
+        run: |
+          if [ "${{github.ref}}" = "refs/heads/trunk" ] && [ "${{github.event_name}}" = "push" ] && [ "${{github.repository_owner}}" = "apache" ]; then
+            echo 'Running on main branch of the canonical repo'
+            echo "MVN_ADDITIONAL_OPTS=-DdeployAtEnd=true" >> $GITHUB_ENV
+            echo "MVN_GOAL=deploy" >> $GITHUB_ENV
+            echo "MAVEN_APACHE_NEXUS_USERNAME=${{ secrets.NEXUS_USER }}" >> $GITHUB_ENV
+            echo "MAVEN_APACHE_NEXUS_PASSWORD=${{ secrets.NEXUS_PW }}" >> $GITHUB_ENV
+          else
+            echo 'Running outside main branch/canonical repo'
+            echo "MVN_ADDITIONAL_OPTS=" >> $GITHUB_ENV
+            echo "MVN_GOAL=install" >> $GITHUB_ENV
+          fi
+      - name: Build
+        # executing ITs requires installing artifacts to the local repository
+        run: mvn -B ${{ env.MVN_GOAL }} ${{ env.MVN_ADDITIONAL_OPTS }} -Pcoverage,integrationTesting,javadoc -Dorg.ops4j.pax.url.mvn.repositories="https://repo1.maven.org/maven2@id=central"
+      - name: Upload build result
+        uses: actions/upload-artifact@v6
+        with:
+          name: compiled-classes-and-coverage
+          # compare with https://docs.sonarsource.com/sonarqube-cloud/advanced-setup/languages/java/#java-analysis-and-bytecode
+          path: |
+            **/target/**/*.class
+            **/target/site/jacoco*/*.xml
+
+  # execute analysis in a separate job for better visualization and usage of matrix builds
+  # https://docs.sonarsource.com/sonarcloud/advanced-setup/ci-based-analysis/sonarscanner-for-maven/#invoking-the-goal
+  sonar:
+    name: SonarQube Analysis
+    runs-on: ubuntu-latest
+    needs: build
+    # not supported on forks, https://portal.productboard.com/sonarsource/1-sonarqube-cloud/c/50-sonarcloud-analyzes-external-pull-request
+    if: ${{ github.repository == 'apache/jackrabbit' }}
+    steps:
+      - uses: actions/checkout@v6
+        with:
+          fetch-depth: 0  # Shallow clones should be disabled for a better relevancy of analysis
+      - name: Set up JDK 21
+        uses: actions/setup-java@v5
+        with:
+          java-version: 21
+          distribution: temurin
+          cache: maven
+      - name: Download compiled classes
+        uses: actions/download-artifact@v4
+        with:
+          name: compiled-classes-and-coverage
+      - name: Cache SonarQube packages
+        uses: actions/cache@v5
+        with:
+          path: ~/.sonar/cache
+          key: ${{ runner.os }}-sonar
+          restore-keys: ${{ runner.os }}-sonar
+      - name: Analyze with SonarQube
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}  # Needed to get PR information, if any
+          SONAR_TOKEN: ${{ secrets.SONARCLOUD_TOKEN }}
+        run: SONAR_SCANNER_JAVA_OPTS="-Xmx8g" mvn -B org.sonarsource.scanner.maven:sonar-maven-plugin:5.5.0.6356:sonar -Dsonar.projectKey=apache_jackrabbit -Dsonar.organization=apache -Dsonar.scanner.skipJreProvisioning=true

.mvn/README.md

@@ -0,0 +1 @@
+Used for determining [`maven.multiModuleProjectDirectory`](https://issues.apache.org/jira/browse/MNG-5786).

AGENTS.md

@@ -0,0 +1,13 @@
+# Agent guidance
+
+This file is read by automated agents (security scanners, code
+analyzers, AI assistants) operating on this repository. It points
+them at the human-authored references they should consult before
+producing output.
+
+## Security
+
+Security model: [SECURITY.md](./SECURITY.md)
+
+Agents that scan this repository should consult `SECURITY.md` and the
+threat model it links before reporting issues.

README.txt

@@ -65,3 +65,11 @@ Credits
 
 See http://jackrabbit.apache.org/jackrabbit-team.html for the list of 
 Jackrabbit committers and main contributors.
+
+SonarQube Cloud
+===========
+
+The CI builds automatically checks the code with SonarQube Cloud. The results
+are accessible at 
+
+    https://sonarcloud.io/project/overview?id=apache_jackrabbit

RELEASE-NOTES.txt

@@ -1,44 +1,32 @@
-Release Notes -- Apache Jackrabbit -- Version 2.21.27-beta
+Release Notes -- Apache Jackrabbit -- Version 2.23.5-beta
 
 Introduction
 ------------
 
-This is Apache Jackrabbit(TM) 2.21.27-beta, a fully compliant implementation of the
+This is Apache Jackrabbit(TM) 2.23.5-beta, a fully compliant implementation of the
 Content Repository for Java(TM) Technology API, version 2.0 (JCR 2.0) as
 specified in the Java Specification Request 283 (JSR 283).
 
-Apache Jackrabbit 2.21.27-beta is an unstable release cut directly from
+Apache Jackrabbit 2.23.5-beta is an unstable release cut directly from
 Jackrabbit trunk, with a focus on new features and other
-improvements. For production use we recommend the latest stable 2.20.x
+improvements. For production use we recommend the latest stable 2.22.x
 release.
 
-Changes in Jackrabbit 2.21.27-beta
+Changes in Jackrabbit 2.23.5-beta
 ----------------------------------
 
-Task
-
-    [JCR-4972] - Remove RMI support
-    [JCR-5028] - jackrabbit-jcr-rmi: remove
-    [JCR-5042] - jackrabbit-jcr-servlet: remove RMI support
-    [JCR-5044] - Update tomcat dependency to 9.0.87
-    [JCR-5045] - Update commons-io dependency to 2.16.0
-    [JCR-5046] - Update oak-jackrabbit-api.version.implemented in trunk to Oak 1.62.0
-    [JCR-5047] - Update to jacoco version 0.8.12
-    [JCR-5052] - Update commons-io dependency to 2.16.1
-    [JCR-5053] - Update commons-cli dependency to 1.7.0
-    [JCR-5054] - vfs-ext: update hadoop-hdfs-client dependency to 3.4.0
-    [JCR-5055] - update Apache parent pom to version 32
-    [JCR-5056] - Update maven-jar-plugin to 3.4.1
-    [JCR-5057] - Update pmd-plugin dependency to 3.22.0
-    [JCR-5058] - Update spotbugs-maven-plugin to 4.8.5.0
-    [JCR-5059] - set baseline comparisonVersion to latest stable (2.20.16)
-    [JCR-5060] - Update oak-jackrabbit-api.version.used in trunk and 2.20 to Oak 1.22.20
-    [JCR-5063] - Update build-helper-maven-plugin to version 3.6.0
-    [JCR-5064] - Update mockito dependency to 5.12.0
-    [JCR-5068] - update aws java sdk version to 1.12.730
-    [JCR-5069] - Update commons-cli dependency to 1.8.0
-    [JCR-5070] - Update tomcat dependency to 9.0.89
-    [JCR-5071] - Update oak-jackrabbit-api.version.implemented in trunk to Oak 1.64.0
+** Sub-task
+    * [JCR-5244] - improve test coverage for HttpMultipartPost
+
+** Improvement
+    * [JCR-5249] - jackrabbit-spi-commons: add broken namepace names / prefixes to exception message
+
+** Task
+    * [JCR-5233] - commons-fileupload (1.6) restricts header size in upload parts
+    * [JCR-5242] - Update Jackrabbit Trunk to Oak 2.2.0
+    * [JCR-5243] - Update oak-jackrabbit-api.version.used to Oak 1.22.24
+    * [JCR-5246] - webapp: update tomcat dependency to 9.0.118
+    * [JCR-5247] - update Apache parent pom to version 39
 
 
 For more detailed information about all the changes in this and other
@@ -86,4 +74,3 @@ Trademarks
 
 Apache Jackrabbit, Jackrabbit, Apache, the Apache feather logo, and the Apache
 Jackrabbit project logo are trademarks of The Apache Software Foundation.
-

SECURITY.md

@@ -0,0 +1,34 @@
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements.  See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership.  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.
+-->
+
+# Security Policy
+
+## Reporting a Vulnerability
+
+Apache Jackrabbit follows the [Apache Software Foundation security
+process](https://www.apache.org/security/). Please report suspected
+vulnerabilities privately to `security@apache.org` (the Jackrabbit PMC
+is reachable via `private@jackrabbit.apache.org`). Do not open public
+GitHub issues or pull requests for security reports.
+
+## Threat Model
+
+What the project treats as in scope and out of scope, the security
+properties it provides and disclaims, the adversary model, and how
+findings are triaged are documented in [THREAT_MODEL.md](./THREAT_MODEL.md).