This is an automated email from the ASF dual-hosted git repository. cziegeler pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-scripting-core.git
commit c066254ef4fc2e10569e2c81838a21bf56ff4860 Author: Carsten Ziegeler <[email protected]> AuthorDate: Wed Jun 25 09:17:48 2025 +0200 Fix javadoc --- pom.xml.releaseBackup | 368 +++++++++++++++++++++ release.properties | 27 ++ .../apache/sling/scripting/core/ScriptHelper.java | 12 +- 3 files changed, 400 insertions(+), 7 deletions(-) diff --git a/pom.xml.releaseBackup b/pom.xml.releaseBackup new file mode 100644 index 0000000..4a13602 --- /dev/null +++ b/pom.xml.releaseBackup @@ -0,0 +1,368 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + 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. +--> +<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> + + <modelVersion>4.0.0</modelVersion> + <parent> + <groupId>org.apache.sling</groupId> + <artifactId>sling-bundle-parent</artifactId> + <version>62</version> + <relativePath /> + </parent> + + <artifactId>org.apache.sling.scripting.core</artifactId> + <version>3.0.0-SNAPSHOT</version> + + <name>Apache Sling Scripting Core</name> + <description>Sling Scripting core functionality</description> + + <scm> + <connection>scm:git:https://gitbox.apache.org/repos/asf/sling-org-apache-sling-scripting-core.git</connection> + <developerConnection>scm:git:https://gitbox.apache.org/repos/asf/sling-org-apache-sling-scripting-core.git</developerConnection> + <tag>HEAD</tag> + <url>https://github.com/apache/sling-org-apache-sling-scripting-core.git</url> + </scm> + + <properties> + <org.ops4j.pax.exam.version>4.14.0</org.ops4j.pax.exam.version> + <sling.java.version>17</sling.java.version> + <project.build.outputTimestamp>1725252814</project.build.outputTimestamp> + </properties> + + <dependencies> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-api</artifactId> + <version>2.0.17</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>javax.servlet</groupId> + <artifactId>javax.servlet-api</artifactId> + <version>4.0.1</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>jakarta.servlet</groupId> + <artifactId>jakarta.servlet-api</artifactId> + <version>6.1.0</version> + <scope>provided</scope> + </dependency> + <!-- Apache Sling --> + <dependency> + <groupId>org.apache.sling</groupId> + <artifactId>org.apache.sling.api</artifactId> + <version>3.0.0</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.apache.felix</groupId> + <artifactId>org.apache.felix.http.wrappers</artifactId> + <version>6.1.0</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.apache.sling</groupId> + <artifactId>org.apache.sling.commons.mime</artifactId> + <version>2.2.4</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.osgi</groupId> + <artifactId>org.osgi.util.converter</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.apache.sling</groupId> + <artifactId>org.apache.sling.scripting.api</artifactId> + <version>2.1.12</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.apache.sling</groupId> + <artifactId>org.apache.sling.scripting.spi</artifactId> + <version>2.0.0</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.apache.sling</groupId> + <artifactId>org.apache.sling.commons.threads</artifactId> + <version>3.1.0</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.osgi</groupId> + <artifactId>org.osgi.annotation.bundle</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.osgi</groupId> + <artifactId>org.osgi.service.component.annotations</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.osgi</groupId> + <artifactId>org.osgi.service.metatype.annotations</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>commons-io</groupId> + <artifactId>commons-io</artifactId> + <version>2.18.0</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.apache.sling</groupId> + <artifactId>org.apache.sling.commons.compiler</artifactId> + <version>2.4.0</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.apache.sling</groupId> + <artifactId>org.apache.sling.serviceusermapper</artifactId> + <version>1.5.8</version> + <scope>provided</scope> + </dependency> + <!-- OSGi --> + <dependency> + <groupId>org.osgi</groupId> + <artifactId>org.osgi.annotation.versioning</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.osgi</groupId> + <artifactId>org.osgi.framework</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.osgi</groupId> + <artifactId>org.osgi.resource</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.osgi</groupId> + <artifactId>org.osgi.util.tracker</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.osgi</groupId> + <artifactId>org.osgi.service.http.whiteboard</artifactId> + <scope>provided</scope> + </dependency> + <!-- for serializing to JSON, must be after osgi.core to make Maven use the correct osgi.core version --> + <dependency> + <groupId>org.apache.felix</groupId> + <artifactId>org.apache.felix.utils</artifactId> + <version>1.9.0</version> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>org.apache.felix</groupId> + <artifactId>org.apache.felix.webconsole</artifactId> + <version>4.9.10</version> + <scope>provided</scope> + </dependency> + + <dependency> + <groupId>org.jetbrains</groupId> + <artifactId>annotations</artifactId> + <scope>provided</scope> + </dependency> + + <!-- Testing --> + <dependency> + <groupId>javax.inject</groupId> + <artifactId>javax.inject</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.apache.commons</groupId> + <artifactId>commons-lang3</artifactId> + <version>3.17.0</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.apache.sling</groupId> + <artifactId>org.apache.sling.resource.presence</artifactId> + <version>0.0.2</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.apache.sling</groupId> + <artifactId>org.apache.sling.testing.paxexam</artifactId> + <version>4.1.2</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-simple</artifactId> + <version>2.0.17</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.apache.sling</groupId> + <artifactId>org.apache.sling.commons.testing</artifactId> + <version>2.1.2</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.apache.felix</groupId> + <artifactId>org.apache.felix.framework</artifactId> + <version>7.0.5</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.apache.httpcomponents</groupId> + <artifactId>httpclient-osgi</artifactId> + <version>4.5.8</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.apache.sling</groupId> + <artifactId>org.apache.sling.testing.osgi-mock.junit4</artifactId> + <version>3.2.2</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.apache.sling</groupId> + <artifactId>org.apache.sling.testing.sling-mock.junit4</artifactId> + <version>3.2.2</version> + <scope>test</scope> + <exclusions> + <exclusion> + <groupId>org.apache.sling</groupId> + <artifactId>org.apache.sling.scripting.core</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.mockito</groupId> + <artifactId>mockito-core</artifactId> + <version>5.3.1</version> + <scope>test</scope> + </dependency> + <!-- jsoup --> + <dependency> + <groupId>org.jsoup</groupId> + <artifactId>jsoup</artifactId> + <version>1.15.3</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.awaitility</groupId> + <artifactId>awaitility</artifactId> + <version>3.1.6</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.ops4j.pax.exam</groupId> + <artifactId>pax-exam</artifactId> + <version>${org.ops4j.pax.exam.version}</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.ops4j.pax.exam</groupId> + <artifactId>pax-exam-cm</artifactId> + <version>${org.ops4j.pax.exam.version}</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.ops4j.pax.exam</groupId> + <artifactId>pax-exam-container-forked</artifactId> + <version>${org.ops4j.pax.exam.version}</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.ops4j.pax.exam</groupId> + <artifactId>pax-exam-junit4</artifactId> + <version>${org.ops4j.pax.exam.version}</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.ops4j.pax.exam</groupId> + <artifactId>pax-exam-link-mvn</artifactId> + <version>${org.ops4j.pax.exam.version}</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.apache.sling</groupId> + <artifactId>org.apache.sling.auth.core</artifactId> + <version>2.0.0</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.apache.sling</groupId> + <artifactId>org.apache.sling.resourceresolver</artifactId> + <version>2.0.0</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.apache.sling</groupId> + <artifactId>org.apache.sling.engine</artifactId> + <version>3.0.0</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.apache.sling</groupId> + <artifactId>org.apache.sling.servlets.resolver</artifactId> + <version>3.0.0</version> + <scope>test</scope> + </dependency> + </dependencies> + + <build> + <plugins> + <plugin> + <groupId>org.apache.servicemix.tooling</groupId> + <artifactId>depends-maven-plugin</artifactId> + </plugin> + <plugin> + <artifactId>maven-failsafe-plugin</artifactId> + <configuration> + <redirectTestOutputToFile>true</redirectTestOutputToFile> + <systemPropertyVariables combine.children="append"> + <bundle.filename>${basedir}/target/${project.build.finalName}.jar</bundle.filename> + </systemPropertyVariables> + </configuration> + <executions> + <execution> + <goals> + <goal>integration-test</goal> + <goal>verify</goal> + </goals> + </execution> + </executions> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-javadoc-plugin</artifactId> + <configuration> + <!-- No javadocs --> + <excludePackageNames>org.apache.sling.scripting.core.impl:org.apache.sling.scripting.core.impl.bundled:org.apache.sling.scripting.core.impl.helper:org.apache.sling.scripting.core.impl.jsr223</excludePackageNames> + </configuration> + </plugin> + </plugins> + </build> +</project> diff --git a/release.properties b/release.properties new file mode 100644 index 0000000..a941dc6 --- /dev/null +++ b/release.properties @@ -0,0 +1,27 @@ +#release configuration +#Wed Jun 25 09:12:16 CEST 2025 +projectVersionPolicyId=OddEvenVersionPolicy +scm.branchCommitComment=@{prefix} prepare branch @{releaseLabel} +pinExternals=false +projectVersionPolicyConfig=<projectVersionPolicyConfig>${projectVersionPolicyConfig}</projectVersionPolicyConfig>\n +project.dev.org.apache.sling\:org.apache.sling.scripting.core=3.0.1-SNAPSHOT +exec.activateProfiles=general,artifactory-corp +pushChanges=true +project.rel.org.apache.sling\:org.apache.sling.scripting.core=3.0.0 +project.scm.org.apache.sling\:org.apache.sling.scripting.core.tag=HEAD +scm.rollbackCommitComment=@{prefix} rollback the release of @{releaseLabel} +remoteTagging=true +scm.commentPrefix=[maven-release-plugin] +releaseStrategyId=default +completedPhase=end-release +scm.url=scm\:git\:https\://gitbox.apache.org/repos/asf/sling-org-apache-sling-scripting-core.git +project.scm.org.apache.sling\:org.apache.sling.scripting.core.connection=scm\:git\:https\://gitbox.apache.org/repos/asf/sling-org-apache-sling-scripting-core.git +scm.developmentCommitComment=@{prefix} prepare for next development iteration +scm.tagNameFormat=@{project.artifactId}-@{project.version} +project.scm.org.apache.sling\:org.apache.sling.scripting.core.url=https\://github.com/apache/sling-org-apache-sling-scripting-core.git +project.scm.org.apache.sling\:org.apache.sling.scripting.core.developerConnection=scm\:git\:https\://gitbox.apache.org/repos/asf/sling-org-apache-sling-scripting-core.git +scm.tag=org.apache.sling.scripting.core-3.0.0 +exec.snapshotReleasePluginAllowed=false +preparationGoals=clean verify +scm.releaseCommitComment=@{prefix} prepare release @{releaseLabel} +exec.pomFileName=pom.xml diff --git a/src/main/java/org/apache/sling/scripting/core/ScriptHelper.java b/src/main/java/org/apache/sling/scripting/core/ScriptHelper.java index 7f1bd18..176045d 100644 --- a/src/main/java/org/apache/sling/scripting/core/ScriptHelper.java +++ b/src/main/java/org/apache/sling/scripting/core/ScriptHelper.java @@ -116,21 +116,19 @@ public class ScriptHelper implements SlingScriptHelper { * @param script The script, must not be <code>null</code>. * @param request The request, may be <code>null</code>. * @param response The response, may be <code>null</code>. - * @param jakartaRequest The Jakarta request, may be <code>null</code>. - * @param jakartaResponse The Jakarta response, may be <code>null</code>. * @since 2.2.0 */ public ScriptHelper( final BundleContext ctx, final SlingScript script, - final SlingJakartaHttpServletRequest jakartaRequest, - final SlingJakartaHttpServletResponse jakartaResponse) { + final SlingJakartaHttpServletRequest request, + final SlingJakartaHttpServletResponse response) { if (ctx == null) { throw new IllegalArgumentException("Bundle context must not be null."); } this.script = script; - this.jakartaRequest = wrapIfNeeded(jakartaRequest); - this.jakartaResponse = wrapIfNeeded(jakartaResponse); + this.jakartaRequest = wrapIfNeeded(request); + this.jakartaResponse = wrapIfNeeded(response); this.bundleContext = ctx; } @@ -141,7 +139,7 @@ public class ScriptHelper implements SlingScriptHelper { * @param script The script, must not be <code>null</code>. * @param request The request, may be <code>null</code>. * @param response The response, may be <code>null</code>. - * @deprecated Use {@link #ScriptHelper(BundleContext, SlingScript, SlingHttpServletRequest, SlingHttpServletResponse, SlingJakartaHttpServletRequest, SlingJakartaHttpServletResponse)} + * @deprecated Use {@link #ScriptHelper(BundleContext, SlingScript, SlingJakartaHttpServletRequest, SlingJakartaHttpServletResponse)} */ @Deprecated public ScriptHelper(
