You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by ss...@apache.org on 2024/12/12 14:19:08 UTC
(sling-org-apache-sling-jcr-api) branch master updated (7f3c2a7 -> 9588b66)
This is an automated email from the ASF dual-hosted git repository.
sseifert pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-jcr-api.git
from 7f3c2a7 SLING-12459 - Redirect sonarcloud notifications to commits@apache.sling.org
new b311015 SLING-12555 Update to parent 62
new 9588b66 SLING-12555 apply spotless formatting
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.sling-module.json | 5 +++++
pom.xml | 13 ++++++-------
src/main/java/org/apache/sling/jcr/api/SlingRepository.java | 13 +++++++++----
.../org/apache/sling/jcr/api/TooManySessionsException.java | 1 -
src/main/java/org/apache/sling/jcr/api/package-info.java | 1 -
5 files changed, 20 insertions(+), 13 deletions(-)
create mode 100644 .sling-module.json
(sling-org-apache-sling-jcr-api) 02/02: SLING-12555 apply spotless formatting
Posted by ss...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
sseifert pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-jcr-api.git
commit 9588b66500345eea3b753f9fa2df20ca892dcb22
Author: Stefan Seifert <st...@users.noreply.github.com>
AuthorDate: Thu Dec 12 15:13:12 2024 +0100
SLING-12555 apply spotless formatting
---
pom.xml | 10 ++++------
src/main/java/org/apache/sling/jcr/api/SlingRepository.java | 13 +++++++++----
.../org/apache/sling/jcr/api/TooManySessionsException.java | 1 -
src/main/java/org/apache/sling/jcr/api/package-info.java | 1 -
4 files changed, 13 insertions(+), 12 deletions(-)
diff --git a/pom.xml b/pom.xml
index c433d2f..9c59472 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?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
@@ -31,17 +31,15 @@
<version>2.4.1-SNAPSHOT</version>
<name>Apache Sling JCR API</name>
- <description>
- This OSGi bundle provides the JCR packages as
+ <description>This OSGi bundle provides the JCR packages as
well as a helper service interface to be implemented and
- provided by repository providers.
- </description>
+ provided by repository providers.</description>
<scm>
<connection>scm:git:https://gitbox.apache.org/repos/asf/sling-org-apache-sling-jcr-api.git</connection>
<developerConnection>scm:git:https://gitbox.apache.org/repos/asf/sling-org-apache-sling-jcr-api.git</developerConnection>
- <url>https://github.com/apache/sling-org-apache-sling-jcr-api.git</url>
<tag>HEAD</tag>
+ <url>https://github.com/apache/sling-org-apache-sling-jcr-api.git</url>
</scm>
<properties>
diff --git a/src/main/java/org/apache/sling/jcr/api/SlingRepository.java b/src/main/java/org/apache/sling/jcr/api/SlingRepository.java
index 9d54ce8..79c740c 100644
--- a/src/main/java/org/apache/sling/jcr/api/SlingRepository.java
+++ b/src/main/java/org/apache/sling/jcr/api/SlingRepository.java
@@ -54,7 +54,8 @@ public interface SlingRepository extends Repository {
*
* @return null if the configured default workspace name is empty, SLING-256
*/
- @Nullable String getDefaultWorkspace();
+ @Nullable
+ String getDefaultWorkspace();
/**
* Returns a session to the given workspace which has administrative powers.
@@ -84,7 +85,8 @@ public interface SlingRepository extends Repository {
* the {@link #loginService(String, String)} instead.
*/
@Deprecated
- @NotNull Session loginAdministrative(String workspace) throws LoginException, RepositoryException;
+ @NotNull
+ Session loginAdministrative(String workspace) throws LoginException, RepositoryException;
/**
* Returns a session to the given workspace with privileges assigned to the
@@ -107,7 +109,8 @@ public interface SlingRepository extends Repository {
* href="http://sling.apache.org/documentation/the-sling-engine/service-authentication.html">Service
* Authentication</a>
*/
- @NotNull Session loginService(String subServiceName, String workspace) throws LoginException, RepositoryException;
+ @NotNull
+ Session loginService(String subServiceName, String workspace) throws LoginException, RepositoryException;
/**
* Impersonates the service session provided by the calling bundle (and further
@@ -137,5 +140,7 @@ public interface SlingRepository extends Repository {
* @throws RepositoryException If another error occurs.
* @since 2.3
*/
- @NotNull Session impersonateFromService(String subServiceName, @NotNull Credentials credentials, String workspaceName) throws LoginException, RepositoryException;
+ @NotNull
+ Session impersonateFromService(String subServiceName, @NotNull Credentials credentials, String workspaceName)
+ throws LoginException, RepositoryException;
}
diff --git a/src/main/java/org/apache/sling/jcr/api/TooManySessionsException.java b/src/main/java/org/apache/sling/jcr/api/TooManySessionsException.java
index f6d9005..044fbfe 100644
--- a/src/main/java/org/apache/sling/jcr/api/TooManySessionsException.java
+++ b/src/main/java/org/apache/sling/jcr/api/TooManySessionsException.java
@@ -44,5 +44,4 @@ public class TooManySessionsException extends LoginException {
public TooManySessionsException(String message, Throwable t) {
super(message, t);
}
-
}
diff --git a/src/main/java/org/apache/sling/jcr/api/package-info.java b/src/main/java/org/apache/sling/jcr/api/package-info.java
index 8f3d284..5ba5f7c 100644
--- a/src/main/java/org/apache/sling/jcr/api/package-info.java
+++ b/src/main/java/org/apache/sling/jcr/api/package-info.java
@@ -21,4 +21,3 @@
package org.apache.sling.jcr.api;
import org.osgi.annotation.versioning.Version;
-
(sling-org-apache-sling-jcr-api) 01/02: SLING-12555 Update to parent 62
Posted by ss...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
sseifert pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-jcr-api.git
commit b311015e44dae8dcf5f0873c9aadccf1b43c700f
Author: Stefan Seifert <st...@users.noreply.github.com>
AuthorDate: Thu Dec 12 15:11:58 2024 +0100
SLING-12555 Update to parent 62
---
.sling-module.json | 5 +++++
pom.xml | 3 ++-
2 files changed, 7 insertions(+), 1 deletion(-)
diff --git a/.sling-module.json b/.sling-module.json
new file mode 100644
index 0000000..cfad4d2
--- /dev/null
+++ b/.sling-module.json
@@ -0,0 +1,5 @@
+{
+ "jenkins": {
+ "jdks": [17, 21]
+ }
+}
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index 0defd16..c433d2f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.sling</groupId>
<artifactId>sling-bundle-parent</artifactId>
- <version>47</version>
+ <version>62</version>
<relativePath />
</parent>
@@ -53,6 +53,7 @@
<dependency>
<groupId>javax.jcr</groupId>
<artifactId>jcr</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.jetbrains</groupId>