(sling-site) branch master updated: Fix typo
This is an automated email from the ASF dual-hosted git repository. kwin pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/sling-site.git The following commit(s) were added to refs/heads/master by this push: new 8fb7d6fbd Fix typo 8fb7d6fbd is described below commit 8fb7d6fbdf8503bdcca99bfbb91ad5ebd16e6927 Author: Konrad Windszus AuthorDate: Tue Sep 10 12:41:28 2024 +0200 Fix typo --- .../content/documentation/bundles/internationalization-support-i18n.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/jbake/content/documentation/bundles/internationalization-support-i18n.md b/src/main/jbake/content/documentation/bundles/internationalization-support-i18n.md index f50228154..c56d71e6d 100644 --- a/src/main/jbake/content/documentation/bundles/internationalization-support-i18n.md +++ b/src/main/jbake/content/documentation/bundles/internationalization-support-i18n.md @@ -52,7 +52,7 @@ Two different types of storage formats are supported for the individual dictiona The (direct) child nodes of the `mix:language` node must have the `jcr:primaryType` set to `sling:MessageEntry` and must contain two special properties naming the key string and the message: * `sling:key` -- The `sling:key` property is a string property being the key for which the node contains the message(s). This property is optional. If it is not set the key is determined by the name of this `sling:messageEntry` resource. - * `sling:message` -- The `sling:message` property represents the resource for the key. + * `sling:message` -- The `sling:message` property represents the string for the key. It is only required that the message nodes are located below `mix:language` nodes. Such structures may also be scattered in the repository to allow storing message resources next to where they are most likely used, such as request scripts.
(sling-org-apache-sling-i18n) branch master updated (525ad5c -> 8bb5671)
This is an automated email from the ASF dual-hosted git repository. kwin pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-i18n.git from 525ad5c [maven-release-plugin] prepare for next development iteration new 47b6394 SLING-12416 Update to sling-bundle-parent 60 new 8bb5671 SLING-12416 Formatting with spotless-m-p 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 | 8 + pom.xml| 152 .../apache/sling/i18n/DefaultLocaleResolver.java | 6 +- .../java/org/apache/sling/i18n/LocaleResolver.java | 1 - .../apache/sling/i18n/RequestLocaleResolver.java | 5 +- .../apache/sling/i18n/ResourceBundleProvider.java | 1 - .../java/org/apache/sling/i18n/impl/Config.java| 43 +++-- .../org/apache/sling/i18n/impl/I18NFilter.java | 110 ++-- .../apache/sling/i18n/impl/JcrResourceBundle.java | 61 --- .../sling/i18n/impl/JcrResourceBundleProvider.java | 193 - .../org/apache/sling/i18n/impl/LocatorPaths.java | 48 +++-- .../sling/i18n/impl/LocatorPathsTracker.java | 44 ++--- .../sling/i18n/impl/LocatorPathsVisitor.java | 5 +- .../org/apache/sling/i18n/impl/PathFilter.java | 2 +- .../i18n/impl/PotentialLanguageRootCheck.java | 7 +- .../sling/i18n/impl/ResourceBundleEnumeration.java | 18 +- .../java/org/apache/sling/i18n/package-info.java | 2 - .../ConcurrentJcrResourceBundleLoadingTest.java| 79 + .../i18n/impl/JcrResourceBundleProviderTest.java | 38 ++-- .../impl/JcrResourceBundleProvider_KeyTest.java| 6 +- .../sling/i18n/impl/JcrResourceBundleTest.java | 48 ++--- .../apache/sling/i18n/impl/LocatorPathsTest.java | 6 +- .../java/org/apache/sling/i18n/impl/Message.java | 1 - .../org/apache/sling/i18n/impl/PathFilterTest.java | 4 +- .../org/apache/sling/i18n/it/I18nTestSupport.java | 42 +++-- .../sling/i18n/it/ResourceBundleLocatorIT.java | 104 ++- .../sling/i18n/it/ResourceBundleProviderIT.java| 16 +- 27 files changed, 568 insertions(+), 482 deletions(-) create mode 100644 .sling-module.json
(sling-org-apache-sling-i18n) branch feature/parent-60 updated (b8bf49b -> 6193a98)
This is an automated email from the ASF dual-hosted git repository. kwin pushed a change to branch feature/parent-60 in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-i18n.git omit b8bf49b Formatting with spotless-m-p omit 2841044 Update to sling-bundle-parent 60 add 8f5223a SLING-12416 Update to sling-bundle-parent 60 add 6193a98 SLING-12416 Formatting with spotless-m-p This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (b8bf49b) \ N -- N -- N refs/heads/feature/parent-60 (6193a98) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. No new revisions were added by this update. Summary of changes:
(sling-org-apache-sling-i18n) 02/02: SLING-12416 Formatting with spotless-m-p
This is an automated email from the ASF dual-hosted git repository.
kwin pushed a commit to branch master
in repository
https://gitbox.apache.org/repos/asf/sling-org-apache-sling-i18n.git
commit 8bb567187653f5974cc865bff714b7fdffecd5d0
Author: Konrad Windszus
AuthorDate: Thu Aug 29 10:18:26 2024 +0200
SLING-12416 Formatting with spotless-m-p
---
pom.xml| 116 ++---
.../apache/sling/i18n/DefaultLocaleResolver.java | 6 +-
.../java/org/apache/sling/i18n/LocaleResolver.java | 1 -
.../apache/sling/i18n/RequestLocaleResolver.java | 5 +-
.../apache/sling/i18n/ResourceBundleProvider.java | 1 -
.../java/org/apache/sling/i18n/impl/Config.java| 43 +++--
.../org/apache/sling/i18n/impl/I18NFilter.java | 110 ++--
.../apache/sling/i18n/impl/JcrResourceBundle.java | 61 ---
.../sling/i18n/impl/JcrResourceBundleProvider.java | 193 -
.../org/apache/sling/i18n/impl/LocatorPaths.java | 48 +++--
.../sling/i18n/impl/LocatorPathsTracker.java | 44 ++---
.../sling/i18n/impl/LocatorPathsVisitor.java | 5 +-
.../org/apache/sling/i18n/impl/PathFilter.java | 2 +-
.../i18n/impl/PotentialLanguageRootCheck.java | 7 +-
.../sling/i18n/impl/ResourceBundleEnumeration.java | 18 +-
.../java/org/apache/sling/i18n/package-info.java | 2 -
.../ConcurrentJcrResourceBundleLoadingTest.java| 79 +
.../i18n/impl/JcrResourceBundleProviderTest.java | 38 ++--
.../impl/JcrResourceBundleProvider_KeyTest.java| 6 +-
.../sling/i18n/impl/JcrResourceBundleTest.java | 48 ++---
.../apache/sling/i18n/impl/LocatorPathsTest.java | 6 +-
.../java/org/apache/sling/i18n/impl/Message.java | 1 -
.../org/apache/sling/i18n/impl/PathFilterTest.java | 4 +-
.../org/apache/sling/i18n/it/I18nTestSupport.java | 42 +++--
.../sling/i18n/it/ResourceBundleLocatorIT.java | 104 ++-
.../sling/i18n/it/ResourceBundleProviderIT.java| 16 +-
26 files changed, 545 insertions(+), 461 deletions(-)
diff --git a/pom.xml b/pom.xml
index 6df012d..ae9093e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -34,6 +34,13 @@
Apache Sling I18N Support
Support for creating Java I18N ResourceBundles from
repository resources.
+
+
scm:git:https://gitbox.apache.org/repos/asf/sling-org-apache-sling-i18n.git
+
scm:git:https://gitbox.apache.org/repos/asf/sling-org-apache-sling-i18n.git
+HEAD
+https://github.com/apache/sling-org-apache-sling-i18n.git
+
+
2024-08-20T12:35:28Z
4.13.3
@@ -42,65 +49,6 @@
8
-
-
scm:git:https://gitbox.apache.org/repos/asf/sling-org-apache-sling-i18n.git
-
scm:git:https://gitbox.apache.org/repos/asf/sling-org-apache-sling-i18n.git
-https://github.com/apache/sling-org-apache-sling-i18n.git
-HEAD
-
-
-
-
-
-org.apache.rat
-apache-rat-plugin
-
-
-**/*.json.props
-
-
-
-
-org.apache.maven.plugins
-maven-javadoc-plugin
-
-
-org.apache.sling.i18n.impl
-
-
-
-
-org.apache.maven.plugins
-maven-surefire-plugin
-
-true
-
-
-
-org.apache.maven.plugins
-maven-failsafe-plugin
-
-
-
-integration-test
-verify
-
-
-
-
-true
-
-
${basedir}/target/${project.build.finalName}.jar
-
-
-
-
-org.apache.servicemix.tooling
-depends-maven-plugin
-
-
-
-
@@ -287,4 +235,54 @@
test
+
+
+
+
+org.apache.rat
+apache-rat-plugin
+
+
+**/*.json.props
+
+
+
+
+org.apache.maven.plugins
+maven-javadoc-plugin
+
+
org.apache.sling.i18n.impl
+
+
+
+org.apache.maven.plugins
+maven-surefire-plugin
+
+true
+
+
+
+org.apache.maven.plugins
+maven-failsafe-plugin
(sling-org-apache-sling-i18n) branch feature/parent-60 updated: Formatting with spotless-m-p
This is an automated email from the ASF dual-hosted git repository.
kwin pushed a commit to branch feature/parent-60
in repository
https://gitbox.apache.org/repos/asf/sling-org-apache-sling-i18n.git
The following commit(s) were added to refs/heads/feature/parent-60 by this push:
new b8bf49b Formatting with spotless-m-p
b8bf49b is described below
commit b8bf49b920f39f15f858427ea9bd69dab7cfbb3d
Author: Konrad Windszus
AuthorDate: Thu Aug 29 10:18:26 2024 +0200
Formatting with spotless-m-p
---
pom.xml| 116 ++---
.../apache/sling/i18n/DefaultLocaleResolver.java | 6 +-
.../java/org/apache/sling/i18n/LocaleResolver.java | 1 -
.../apache/sling/i18n/RequestLocaleResolver.java | 5 +-
.../apache/sling/i18n/ResourceBundleProvider.java | 1 -
.../java/org/apache/sling/i18n/impl/Config.java| 43 +++--
.../org/apache/sling/i18n/impl/I18NFilter.java | 110 ++--
.../apache/sling/i18n/impl/JcrResourceBundle.java | 61 ---
.../sling/i18n/impl/JcrResourceBundleProvider.java | 193 -
.../org/apache/sling/i18n/impl/LocatorPaths.java | 48 +++--
.../sling/i18n/impl/LocatorPathsTracker.java | 44 ++---
.../sling/i18n/impl/LocatorPathsVisitor.java | 5 +-
.../org/apache/sling/i18n/impl/PathFilter.java | 2 +-
.../i18n/impl/PotentialLanguageRootCheck.java | 7 +-
.../sling/i18n/impl/ResourceBundleEnumeration.java | 18 +-
.../java/org/apache/sling/i18n/package-info.java | 2 -
.../ConcurrentJcrResourceBundleLoadingTest.java| 79 +
.../i18n/impl/JcrResourceBundleProviderTest.java | 38 ++--
.../impl/JcrResourceBundleProvider_KeyTest.java| 6 +-
.../sling/i18n/impl/JcrResourceBundleTest.java | 48 ++---
.../apache/sling/i18n/impl/LocatorPathsTest.java | 6 +-
.../java/org/apache/sling/i18n/impl/Message.java | 1 -
.../org/apache/sling/i18n/impl/PathFilterTest.java | 4 +-
.../org/apache/sling/i18n/it/I18nTestSupport.java | 42 +++--
.../sling/i18n/it/ResourceBundleLocatorIT.java | 104 ++-
.../sling/i18n/it/ResourceBundleProviderIT.java| 16 +-
26 files changed, 545 insertions(+), 461 deletions(-)
diff --git a/pom.xml b/pom.xml
index 6df012d..ae9093e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -34,6 +34,13 @@
Apache Sling I18N Support
Support for creating Java I18N ResourceBundles from
repository resources.
+
+
scm:git:https://gitbox.apache.org/repos/asf/sling-org-apache-sling-i18n.git
+
scm:git:https://gitbox.apache.org/repos/asf/sling-org-apache-sling-i18n.git
+HEAD
+https://github.com/apache/sling-org-apache-sling-i18n.git
+
+
2024-08-20T12:35:28Z
4.13.3
@@ -42,65 +49,6 @@
8
-
-
scm:git:https://gitbox.apache.org/repos/asf/sling-org-apache-sling-i18n.git
-
scm:git:https://gitbox.apache.org/repos/asf/sling-org-apache-sling-i18n.git
-https://github.com/apache/sling-org-apache-sling-i18n.git
-HEAD
-
-
-
-
-
-org.apache.rat
-apache-rat-plugin
-
-
-**/*.json.props
-
-
-
-
-org.apache.maven.plugins
-maven-javadoc-plugin
-
-
-org.apache.sling.i18n.impl
-
-
-
-
-org.apache.maven.plugins
-maven-surefire-plugin
-
-true
-
-
-
-org.apache.maven.plugins
-maven-failsafe-plugin
-
-
-
-integration-test
-verify
-
-
-
-
-true
-
-
${basedir}/target/${project.build.finalName}.jar
-
-
-
-
-org.apache.servicemix.tooling
-depends-maven-plugin
-
-
-
-
@@ -287,4 +235,54 @@
test
+
+
+
+
+org.apache.rat
+apache-rat-plugin
+
+
+**/*.json.props
+
+
+
+
+org.apache.maven.plugins
+maven-javadoc-plugin
+
+
org.apache.sling.i18n.impl
+
+
+
+org.apache.maven.plugins
+maven-surefire-plugin
(sling-org-apache-sling-i18n) branch feature/parent-60 created (now 2841044)
This is an automated email from the ASF dual-hosted git repository. kwin pushed a change to branch feature/parent-60 in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-i18n.git at 2841044 Update to sling-bundle-parent 60 This branch includes the following new commits: new 2841044 Update to sling-bundle-parent 60 The 1 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.
(sling-org-apache-sling-i18n) 01/01: Update to sling-bundle-parent 60
This is an automated email from the ASF dual-hosted git repository.
kwin pushed a commit to branch feature/parent-60
in repository
https://gitbox.apache.org/repos/asf/sling-org-apache-sling-i18n.git
commit 28410449452f7ea8964eb2d984a7146ecff5d130
Author: Konrad Windszus
AuthorDate: Thu Aug 29 10:16:38 2024 +0200
Update to sling-bundle-parent 60
Fix reproducible build issues (due to newer depends-m-p)
---
.sling-module.json | 8
pom.xml| 36 +++-
2 files changed, 23 insertions(+), 21 deletions(-)
diff --git a/.sling-module.json b/.sling-module.json
new file mode 100644
index 000..d4268ec
--- /dev/null
+++ b/.sling-module.json
@@ -0,0 +1,8 @@
+{
+ "jenkins": {
+"jdks": [
+ 17,
+ 21
+]
+ }
+}
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index 3cd47c7..6df012d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -24,7 +24,7 @@
org.apache.sling
sling-bundle-parent
-46
+60
@@ -39,6 +39,7 @@
4.13.3
2.20.0
1.22
+8
@@ -59,14 +60,6 @@
-
-biz.aQute.bnd
-bnd-maven-plugin
-
-
-biz.aQute.bnd
-bnd-baseline-maven-plugin
-
org.apache.maven.plugins
maven-javadoc-plugin
@@ -76,10 +69,6 @@
-
-org.apache.maven.plugins
-maven-source-plugin
-
org.apache.maven.plugins
maven-surefire-plugin
@@ -114,11 +103,6 @@
-
-javax.inject
-javax.inject
-test
-
javax.servlet
javax.servlet-api
@@ -132,7 +116,12 @@
org.osgi
-osgi.core
+org.osgi.framework
+provided
+
+
+org.osgi
+org.osgi.util.tracker
provided
@@ -143,7 +132,6 @@
org.osgi
org.osgi.service.http.whiteboard
-1.0.0
provided
@@ -182,6 +170,7 @@
org.slf4j
slf4j-api
+provided
org.apache.sling
@@ -195,6 +184,7 @@
1.4.6
provided
+
org.apache.sling
org.apache.sling.testing.paxexam
@@ -208,7 +198,11 @@
7.0.5
test
-
+
+javax.inject
+javax.inject
+test
+
javax.jcr
jcr
(sling-org-apache-sling-models-impl) branch feature/use-java-lang-reflect-parameter deleted (was 1689b52)
This is an automated email from the ASF dual-hosted git repository. kwin pushed a change to branch feature/use-java-lang-reflect-parameter in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-models-impl.git was 1689b52 Merge branch 'master' into feature/use-java-lang-reflect-parameter The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
(sling-org-apache-sling-models-impl) branch master updated: SLING-11917 Evaluate constructor parameter names via reflection (#45)
This is an automated email from the ASF dual-hosted git repository.
kwin pushed a commit to branch master
in repository
https://gitbox.apache.org/repos/asf/sling-org-apache-sling-models-impl.git
The following commit(s) were added to refs/heads/master by this push:
new e8ca837 SLING-11917 Evaluate constructor parameter names via
reflection (#45)
e8ca837 is described below
commit e8ca8371c1fbf264f7051eb2e6e5ca1d09796652
Author: Konrad Windszus
AuthorDate: Tue Jun 25 14:37:29 2024 +0200
SLING-11917 Evaluate constructor parameter names via reflection (#45)
This is available if compiled accordingly (with javac flag -parameters,
https://docs.oracle.com/en/java/javase/17/docs/specs/man/javac.html#option-parameters)
Co-authored-by: Stefan Seifert
---
.../sling/models/impl/ModelAdapterFactory.java | 22 +++--
.../models/impl/model/ConstructorParameter.java| 38 +-
.../models/impl/model/ModelClassConstructor.java | 22 -
.../models/impl/injectors/SelfInjectorTest.java| 2 ++
4 files changed, 57 insertions(+), 27 deletions(-)
diff --git
a/src/main/java/org/apache/sling/models/impl/ModelAdapterFactory.java
b/src/main/java/org/apache/sling/models/impl/ModelAdapterFactory.java
index 9a73bac..44e8ca3 100644
--- a/src/main/java/org/apache/sling/models/impl/ModelAdapterFactory.java
+++ b/src/main/java/org/apache/sling/models/impl/ModelAdapterFactory.java
@@ -27,8 +27,24 @@ import javax.servlet.ServletRequestWrapper;
import java.lang.ref.PhantomReference;
import java.lang.ref.ReferenceQueue;
import java.lang.ref.SoftReference;
-import java.lang.reflect.*;
-import java.util.*;
+import java.lang.reflect.InvocationHandler;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.lang.reflect.ParameterizedType;
+import java.lang.reflect.Proxy;
+import java.lang.reflect.Type;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Hashtable;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+import java.util.WeakHashMap;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ConcurrentMap;
@@ -1103,7 +1119,7 @@ public class ModelAdapterFactory implements
AdapterFactory, Runnable, ModelFacto
ConstructorParameter constructorParameter, List
parameterValues, Object value) {
if (constructorParameter.getParameterType() instanceof Class) {
Result result = adaptIfNecessary(
-value, (Class) constructorParameter.getParameterType(),
constructorParameter.getGenericType());
+value, (Class) constructorParameter.getParameterType(),
constructorParameter.getType());
if (result.wasSuccessful()) {
parameterValues.set(constructorParameter.getParameterIndex(),
result.getValue());
return null;
diff --git
a/src/main/java/org/apache/sling/models/impl/model/ConstructorParameter.java
b/src/main/java/org/apache/sling/models/impl/model/ConstructorParameter.java
index 5394dbd..0205098 100644
--- a/src/main/java/org/apache/sling/models/impl/model/ConstructorParameter.java
+++ b/src/main/java/org/apache/sling/models/impl/model/ConstructorParameter.java
@@ -20,10 +20,12 @@ package org.apache.sling.models.impl.model;
import java.lang.annotation.Annotation;
import java.lang.reflect.AnnotatedElement;
+import java.lang.reflect.Parameter;
import java.lang.reflect.Type;
import java.util.Arrays;
import org.apache.sling.models.annotations.DefaultInjectionStrategy;
+import org.apache.sling.models.impl.ReflectionUtil;
import
org.apache.sling.models.spi.injectorspecific.StaticInjectAnnotationProcessorFactory;
/**
@@ -34,34 +36,54 @@ import
org.apache.sling.models.spi.injectorspecific.StaticInjectAnnotationProces
public class ConstructorParameter extends AbstractInjectableElement {
private final Type parameterType;
-private final Type genericType;
private final boolean isPrimitive;
private final int parameterIndex;
+/**
+ * Try to extract parameter names according to
https://openjdk.org/jeps/118 (requires javac flag -parameters)
+ * @param parameter
+ * @param parameterIndex
+ * @param processorFactories
+ * @param defaultInjectionStrategy
+ */
+public static ConstructorParameter of(
+Parameter parameter,
+int parameterIndex,
+StaticInjectAnnotationProcessorFactory[] processorFactories,
+DefaultInjectionStrategy defaultInjectionStrategy) {
+Type genericType =
ReflectionUtil.mapPrimitiveClasses(parameter.getParameterizedType());
+boolean isPrimitive = (parameter.getParameterizedType() !=
genericType);
+return new ConstructorParameter
(sling-org-apache-sling-feature-cpconverter) branch feature/document-start-level deleted (was e000b39)
This is an automated email from the ASF dual-hosted git repository. kwin pushed a change to branch feature/document-start-level in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-feature-cpconverter.git was e000b39 Update README.md The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
(sling-org-apache-sling-feature-cpconverter) branch master updated: Clarify support for start levels (#177)
This is an automated email from the ASF dual-hosted git repository.
kwin pushed a commit to branch master
in repository
https://gitbox.apache.org/repos/asf/sling-org-apache-sling-feature-cpconverter.git
The following commit(s) were added to refs/heads/master by this push:
new dfa789b Clarify support for start levels (#177)
dfa789b is described below
commit dfa789bb1e399094a0e39b59c240cfbf9c9d2f3e
Author: Konrad Windszus
AuthorDate: Sat Jun 22 19:20:44 2024 +0200
Clarify support for start levels (#177)
Document how run mode and start level is determined
---
README.md | 11 +--
1 file changed, 9 insertions(+), 2 deletions(-)
diff --git a/README.md b/README.md
index f64e0b0..fdbdeff 100644
--- a/README.md
+++ b/README.md
@@ -258,7 +258,14 @@ During the conversion process, all these formats will be
parsed and then added i
### Run Modes
As shown above, run modes in the path lead the tool to create a dedicated
_Apache Sling Feature_ model file containing all interested OSGi
configurations/bundles. Run modes are determined according to the RunModePolicy
which by default for backwards compatiblity reasons is DIRECT_ONLY.
-For DIRECT_ONLY only the direct path leading up to the artifact, while
PREPEND_INHERITED makes sure that run modes are inherited downwards and
deduplicated (only new ones added)
+For DIRECT_ONLY only the direct path leading up to the artifact, while
PREPEND_INHERITED makes sure that run modes are inherited downwards and
deduplicated (only new ones added).
+Run modes are supported for both OSGi configurations and OSGi bundles.
+The run mode is extracted from the group named `runmode` from the bundles path
applied to the regular expression
`/jcr_root/(?:apps|libs)/.+/(?install|config)(?:\\.(?[^/]+))?/(?:(?[0-9]+)/)?.+\\.jar`.
For OSGi configuration the following regular expression is used:
`/jcr_root/(?:apps|libs)/.+/(?config|install)(\\.(?[^/]+))?(.*)/(?[^\\/]*)\\."
+ extension + ("(?.dir(/\\.content\\.xml)?)?$`.
+
+### Start Level/Order
+
+For bundles the start order can also be configured.
+The start order is extracted from the group named `startlevel` from the
bundles path applied to the regular expression
`/jcr_root/(?:apps|libs)/.+/(?install|config)(?:\\.(?[^/]+))?/(?:(?[0-9]+)/)?.+\\.jar`.
If there is no start level specified in the path name, the default start order
(given via CLI parameter ` --bundles-start-order`) is used.
### Known limitations
@@ -566,7 +573,7 @@ Apache Sling Content Package to Sling Feature converter
The output directory where the artifacts will be
deployed.
-b, --bundles-start-order=
-The order to start detected bundles.
+The default start order in which to start detected
bundles.
-D, --define=
Define a system property
-e, --exports-to-region=
(sling-org-apache-sling-feature-cpconverter) branch feature/document-start-level updated (34e3412 -> e000b39)
This is an automated email from the ASF dual-hosted git repository. kwin pushed a change to branch feature/document-start-level in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-feature-cpconverter.git from 34e3412 Update README.md add e000b39 Update README.md No new revisions were added by this update. Summary of changes: README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
(sling-org-apache-sling-feature-cpconverter) branch feature/document-start-level updated (8b8863b -> 34e3412)
This is an automated email from the ASF dual-hosted git repository. kwin pushed a change to branch feature/document-start-level in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-feature-cpconverter.git from 8b8863b Clarify support for start levels add 34e3412 Update README.md No new revisions were added by this update. Summary of changes: README.md | 8 1 file changed, 4 insertions(+), 4 deletions(-)
(sling-org-apache-sling-feature-cpconverter) 01/01: Clarify support for start levels
This is an automated email from the ASF dual-hosted git repository.
kwin pushed a commit to branch feature/document-start-level
in repository
https://gitbox.apache.org/repos/asf/sling-org-apache-sling-feature-cpconverter.git
commit 8b8863bd9a38498fb3daae771dc33c6ebc1871b7
Author: Konrad Windszus
AuthorDate: Fri Jun 21 11:22:57 2024 +0200
Clarify support for start levels
Document how run mode and start level is determined
---
README.md | 9 -
1 file changed, 8 insertions(+), 1 deletion(-)
diff --git a/README.md b/README.md
index f64e0b0..c546619 100644
--- a/README.md
+++ b/README.md
@@ -258,7 +258,14 @@ During the conversion process, all these formats will be
parsed and then added i
### Run Modes
As shown above, run modes in the path lead the tool to create a dedicated
_Apache Sling Feature_ model file containing all interested OSGi
configurations/bundles. Run modes are determined according to the RunModePolicy
which by default for backwards compatiblity reasons is DIRECT_ONLY.
-For DIRECT_ONLY only the direct path leading up to the artifact, while
PREPEND_INHERITED makes sure that run modes are inherited downwards and
deduplicated (only new ones added)
+For DIRECT_ONLY only the direct path leading up to the artifact, while
PREPEND_INHERITED makes sure that run modes are inherited downwards and
deduplicated (only new ones added).
+Run modes are supported for both OSGi configurations and OSGi bundles.
+The run mode is extracted from the group named `runmode` from the bundles path
applied to the regular expression
`/jcr_root/(?:apps|libs)/.+/(?install|config)(?:\\.(?[^/]+))?/(?:(?[0-9]+)/)?.+\\.jar`.
For OSGi configuration the following regular expression is used:
`/jcr_root/(?:apps|libs)/.+/(?config|install)(\\.(?[^/]+))?(.*)/(?[^\\/]*)\\."
+ extension + ("(?.dir(/\\.content\\.xml)?)?$`.
+
+### Start Level
+
+For bundles the start level can also be configured.
+The start level is extracted from the group named `startlevel` from the
bundles path applied to the regular expression
`/jcr_root/(?:apps|libs)/.+/(?install|config)(?:\\.(?[^/]+))?/(?:(?[0-9]+)/)?.+\\.jar`.
If there is no start level specific in the path name, the default start level
is used.
### Known limitations
(sling-org-apache-sling-feature-cpconverter) branch feature/document-start-level created (now 8b8863b)
This is an automated email from the ASF dual-hosted git repository. kwin pushed a change to branch feature/document-start-level in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-feature-cpconverter.git at 8b8863b Clarify support for start levels This branch includes the following new commits: new 8b8863b Clarify support for start levels The 1 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.
(sling-org-apache-sling-scripting-sightly-compiler) branch master updated (19acf85 -> 69de23f)
This is an automated email from the ASF dual-hosted git repository. kwin pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-scripting-sightly-compiler.git from 19acf85 SLING-12094 - Use GitHub for the Maven scm.url value add 49d67db SLING-12350 - Make the build work on more recent JDKs add a4da38f SLING-12350 - Apply code formatting by spotless-maven-plugin add e9e669e SLING-12350 - Ignore code reformat commit when blaming new 69de23f SLING-12350 - Make the build work on more recent JDKs The 1 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: .git-blame-ignore-revs | 1 + .sling-module.json | 5 + pom.xml| 243 + .../sightly/compiler/CompilationResult.java| 5 +- .../sightly/compiler/CompilationUnit.java | 5 +- .../sightly/compiler/CompilerMessage.java | 4 +- .../sightly/compiler/RuntimeFunction.java | 31 +- .../sightly/compiler/SightlyCompiler.java | 33 +- .../sightly/compiler/SightlyCompilerException.java | 30 +- .../sightly/compiler/backend/BackendCompiler.java | 5 +- .../compiler/commands/AbstractCommandVisitor.java | 52 +- .../sightly/compiler/commands/Command.java | 5 +- .../sightly/compiler/commands/CommandHandler.java | 5 +- .../sightly/compiler/commands/CommandStream.java | 11 +- .../sightly/compiler/commands/CommandVisitor.java | 4 +- .../sightly/compiler/commands/Conditional.java | 14 +- .../scripting/sightly/compiler/commands/Loop.java | 31 +- .../sightly/compiler/commands/OutText.java | 8 +- .../sightly/compiler/commands/OutputVariable.java | 8 +- .../sightly/compiler/commands/Procedure.java | 8 +- .../sightly/compiler/commands/StatefulVisitor.java | 33 +- .../sightly/compiler/commands/VariableBinding.java | 15 +- .../sightly/compiler/expression/Expression.java| 9 +- .../compiler/expression/ExpressionNode.java| 5 +- .../sightly/compiler/expression/MarkupContext.java | 31 +- .../sightly/compiler/expression/NodeVisitor.java | 6 +- .../compiler/expression/SideEffectVisitor.java | 5 +- .../compiler/expression/nodes/ArrayLiteral.java| 4 +- .../sightly/compiler/expression/nodes/Atom.java| 7 +- .../compiler/expression/nodes/BinaryOperation.java | 20 +- .../compiler/expression/nodes/BinaryOperator.java | 37 +- .../compiler/expression/nodes/BooleanConstant.java | 10 +- .../compiler/expression/nodes/Identifier.java | 10 +- .../compiler/expression/nodes/MapLiteral.java | 8 +- .../compiler/expression/nodes/NullLiteral.java | 7 +- .../compiler/expression/nodes/NumericConstant.java | 9 +- .../compiler/expression/nodes/PropertyAccess.java | 10 +- .../compiler/expression/nodes/RuntimeCall.java | 9 +- .../compiler/expression/nodes/StringConstant.java | 8 +- .../compiler/expression/nodes/TernaryOperator.java | 14 +- .../compiler/expression/nodes/UnaryOperation.java | 10 +- .../compiler/expression/nodes/UnaryOperator.java | 7 +- .../sightly/compiler/expression/package-info.java | 1 - .../sightly/compiler/util/ObjectModel.java | 37 +- .../sightly/compiler/util/VariableTracker.java | 30 +- .../sightly/compiler/util/package-info.java| 1 - .../impl/compiler/CompilationResultImpl.java | 4 +- .../sightly/impl/compiler/CompilerMessageImpl.java | 4 +- .../scripting/sightly/impl/compiler/Patterns.java | 6 +- .../sightly/impl/compiler/PushStream.java | 4 +- .../scripting/sightly/impl/compiler/Syntax.java| 5 +- .../impl/compiler/debug/LoggingHandler.java| 7 +- .../sightly/impl/compiler/debug/SanityChecker.java | 15 +- .../impl/compiler/frontend/CompilerContext.java| 12 +- .../impl/compiler/frontend/ElementContext.java | 10 +- .../impl/compiler/frontend/ExpressionParser.java | 5 +- .../impl/compiler/frontend/ExpressionWrapper.java | 22 +- .../sightly/impl/compiler/frontend/Fragment.java | 14 +- .../impl/compiler/frontend/Interpolation.java | 10 +- .../impl/compiler/frontend/ParserHelper.java | 5 +- .../frontend/SightlyParserErrorListener.java | 18 +- .../impl/compiler/frontend/SimpleFrontend.java | 4 +- .../compiler/optimization/CoalescingWrites.java| 7 +- .../optimization/CommandVariableUsage.java | 8 +- .../compiler/optimization/DeadCodeRemoval.java | 18 +- .../optimization/SequenceStreamTransformer.java| 4 +- .../compiler/optimization/StreamTransformer.java | 6 +- .../compiler/optimization/SyntheticM
(sling-org-apache-sling-scripting-sightly-compiler) 01/01: SLING-12350 - Make the build work on more recent JDKs
This is an automated email from the ASF dual-hosted git repository. kwin pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-scripting-sightly-compiler.git commit 69de23f3eb41c02fb5d2bd47e869617c3c34ee57 Merge: 19acf85 e9e669e Author: Konrad Windszus AuthorDate: Thu Jun 6 14:51:15 2024 +0200 SLING-12350 - Make the build work on more recent JDKs Update parent POM, reformat with spotless .git-blame-ignore-revs | 1 + .sling-module.json | 5 + pom.xml| 243 + .../sightly/compiler/CompilationResult.java| 5 +- .../sightly/compiler/CompilationUnit.java | 5 +- .../sightly/compiler/CompilerMessage.java | 4 +- .../sightly/compiler/RuntimeFunction.java | 31 +- .../sightly/compiler/SightlyCompiler.java | 33 +- .../sightly/compiler/SightlyCompilerException.java | 30 +- .../sightly/compiler/backend/BackendCompiler.java | 5 +- .../compiler/commands/AbstractCommandVisitor.java | 52 +- .../sightly/compiler/commands/Command.java | 5 +- .../sightly/compiler/commands/CommandHandler.java | 5 +- .../sightly/compiler/commands/CommandStream.java | 11 +- .../sightly/compiler/commands/CommandVisitor.java | 4 +- .../sightly/compiler/commands/Conditional.java | 14 +- .../scripting/sightly/compiler/commands/Loop.java | 31 +- .../sightly/compiler/commands/OutText.java | 8 +- .../sightly/compiler/commands/OutputVariable.java | 8 +- .../sightly/compiler/commands/Procedure.java | 8 +- .../sightly/compiler/commands/StatefulVisitor.java | 33 +- .../sightly/compiler/commands/VariableBinding.java | 15 +- .../sightly/compiler/expression/Expression.java| 9 +- .../compiler/expression/ExpressionNode.java| 5 +- .../sightly/compiler/expression/MarkupContext.java | 31 +- .../sightly/compiler/expression/NodeVisitor.java | 6 +- .../compiler/expression/SideEffectVisitor.java | 5 +- .../compiler/expression/nodes/ArrayLiteral.java| 4 +- .../sightly/compiler/expression/nodes/Atom.java| 7 +- .../compiler/expression/nodes/BinaryOperation.java | 20 +- .../compiler/expression/nodes/BinaryOperator.java | 37 +- .../compiler/expression/nodes/BooleanConstant.java | 10 +- .../compiler/expression/nodes/Identifier.java | 10 +- .../compiler/expression/nodes/MapLiteral.java | 8 +- .../compiler/expression/nodes/NullLiteral.java | 7 +- .../compiler/expression/nodes/NumericConstant.java | 9 +- .../compiler/expression/nodes/PropertyAccess.java | 10 +- .../compiler/expression/nodes/RuntimeCall.java | 9 +- .../compiler/expression/nodes/StringConstant.java | 8 +- .../compiler/expression/nodes/TernaryOperator.java | 14 +- .../compiler/expression/nodes/UnaryOperation.java | 10 +- .../compiler/expression/nodes/UnaryOperator.java | 7 +- .../sightly/compiler/expression/package-info.java | 1 - .../sightly/compiler/util/ObjectModel.java | 37 +- .../sightly/compiler/util/VariableTracker.java | 30 +- .../sightly/compiler/util/package-info.java| 1 - .../impl/compiler/CompilationResultImpl.java | 4 +- .../sightly/impl/compiler/CompilerMessageImpl.java | 4 +- .../scripting/sightly/impl/compiler/Patterns.java | 6 +- .../sightly/impl/compiler/PushStream.java | 4 +- .../scripting/sightly/impl/compiler/Syntax.java| 5 +- .../impl/compiler/debug/LoggingHandler.java| 7 +- .../sightly/impl/compiler/debug/SanityChecker.java | 15 +- .../impl/compiler/frontend/CompilerContext.java| 12 +- .../impl/compiler/frontend/ElementContext.java | 10 +- .../impl/compiler/frontend/ExpressionParser.java | 5 +- .../impl/compiler/frontend/ExpressionWrapper.java | 22 +- .../sightly/impl/compiler/frontend/Fragment.java | 14 +- .../impl/compiler/frontend/Interpolation.java | 10 +- .../impl/compiler/frontend/ParserHelper.java | 5 +- .../frontend/SightlyParserErrorListener.java | 18 +- .../impl/compiler/frontend/SimpleFrontend.java | 4 +- .../compiler/optimization/CoalescingWrites.java| 7 +- .../optimization/CommandVariableUsage.java | 8 +- .../compiler/optimization/DeadCodeRemoval.java | 18 +- .../optimization/SequenceStreamTransformer.java| 4 +- .../compiler/optimization/StreamTransformer.java | 6 +- .../compiler/optimization/SyntheticMapRemoval.java | 17 +- .../optimization/UnusedVariableRemoval.java| 34 +- .../impl/compiler/optimization/VariableFinder.java | 18 +- .../optimization/reduce/ConstantFolding.java | 19 +- .../compiler/optimization/reduce/EvalResult.java | 4 +- .../optimization/reduce/ExpressionReducer.java | 28 +- .../impl/compiler/util/SymbolGenerator.java| 7 +- .../compiler/util
(sling-org-apache-sling-providertype-bnd-plugin) branch master updated: Update readme.md
This is an automated email from the ASF dual-hosted git repository. kwin pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-providertype-bnd-plugin.git The following commit(s) were added to refs/heads/master by this push: new b1b1f4b Update readme.md b1b1f4b is described below commit b1b1f4b9f6f7eed20a4d979b8755b9ab64b78d6d Author: Konrad Windszus AuthorDate: Tue Apr 16 10:18:07 2024 +0200 Update readme.md Clarify lookup of `META-INF/api-info.json` --- readme.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/readme.md b/readme.md index 2a1f571..8369abf 100644 --- a/readme.md +++ b/readme.md @@ -62,7 +62,7 @@ Multiple attributes must be separated with `;` according to [OSGi Common Header ## Provider Type Information The information whether a type (i.e. a class or interface) is designed to be extended/implemented only by providers or also by consumers is determined originally from the the annotations [`@org.osgi.annotation.versioning.ProviderType`][provider-type] or [`@org.osgi.annotation.versioning.ConsumerType`][consumer-type]. -In order to speed up the check [the annotation is evaluated and extracted into a dedicated JSON file named `META-INF/api-info.json` when generating the apis jar][api-info.json] and being looked up from there within this plugin. Only as fallback and on demand this plugin evaluates the annotations from the classpath directly. +In order to speed up the check [the annotation is evaluated and extracted into a dedicated JSON file named `META-INF/api-info.json` when generating the apis jar][api-info.json] and being looked up from this resource in the Bnd classpath within this plugin. Only as fallback and on demand this plugin evaluates the annotations from the classpath directly. ### Remarks
(sling-org-apache-sling-providertype-bnd-plugin) branch master updated: Update readme.md
This is an automated email from the ASF dual-hosted git repository. kwin pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-providertype-bnd-plugin.git The following commit(s) were added to refs/heads/master by this push: new 426190e Update readme.md 426190e is described below commit 426190e567d5ca05bc97d1797a8dc1030844fd97 Author: Konrad Windszus AuthorDate: Thu Apr 11 14:02:10 2024 +0200 Update readme.md bnd-maven-plugin does not have any extensions --- readme.md | 1 - 1 file changed, 1 deletion(-) diff --git a/readme.md b/readme.md index f67c516..2a1f571 100644 --- a/readme.md +++ b/readme.md @@ -22,7 +22,6 @@ For usage with Maven the Bnd plugin has to be added to the plugin dependencies o biz.aQute.bnd bnd-maven-plugin -true org.apache.sling
(sling-org-apache-sling-models-api) branch master updated: SLING-12271 Remove Java <= 8 bytecode restriction
This is an automated email from the ASF dual-hosted git repository.
kwin pushed a commit to branch master
in repository
https://gitbox.apache.org/repos/asf/sling-org-apache-sling-models-api.git
The following commit(s) were added to refs/heads/master by this push:
new 6d6b560 SLING-12271 Remove Java <= 8 bytecode restriction
6d6b560 is described below
commit 6d6b5609fe11ad1f4a5014ce2b9254ba1c836147
Author: Konrad Windszus
AuthorDate: Thu Mar 21 13:03:12 2024 +0100
SLING-12271 Remove Java <= 8 bytecode restriction
---
.../sling/models/annotations/apt/ValidatingAnnotationProcessor.java| 3 ---
1 file changed, 3 deletions(-)
diff --git
a/src/main/java/org/apache/sling/models/annotations/apt/ValidatingAnnotationProcessor.java
b/src/main/java/org/apache/sling/models/annotations/apt/ValidatingAnnotationProcessor.java
index f84563f..3d25ab6 100644
---
a/src/main/java/org/apache/sling/models/annotations/apt/ValidatingAnnotationProcessor.java
+++
b/src/main/java/org/apache/sling/models/annotations/apt/ValidatingAnnotationProcessor.java
@@ -21,8 +21,6 @@ package org.apache.sling.models.annotations.apt;
import javax.annotation.processing.AbstractProcessor;
import javax.annotation.processing.RoundEnvironment;
import javax.annotation.processing.SupportedAnnotationTypes;
-import javax.annotation.processing.SupportedSourceVersion;
-import javax.lang.model.SourceVersion;
import javax.lang.model.element.Element;
import javax.lang.model.element.ElementKind;
import javax.lang.model.element.Modifier;
@@ -40,7 +38,6 @@ import org.apache.sling.models.annotations.Model;
"javax.inject.Inject",
"org.apache.sling.models.annotations.injectorspecific.*",
})
-@SupportedSourceVersion(SourceVersion.RELEASE_8)
public class ValidatingAnnotationProcessor extends AbstractProcessor {
@Override
(sling-org-apache-sling-models-api) branch bugfix/SLING-12271-remove-java8-bytecode-restriction deleted (was c0b8bec)
This is an automated email from the ASF dual-hosted git repository. kwin pushed a change to branch bugfix/SLING-12271-remove-java8-bytecode-restriction in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-models-api.git was c0b8bec SLING-12271 Remove Java <= 8 bytecode restriction The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
(sling-org-apache-sling-models-api) branch bugfix/SLING-12271-remove-java8-bytecode-restriction updated (66a22c8 -> c0b8bec)
This is an automated email from the ASF dual-hosted git repository. kwin pushed a change to branch bugfix/SLING-12271-remove-java8-bytecode-restriction in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-models-api.git omit 66a22c8 SLING-12271 Remove Java <= 8 bytecode restriction add fbfb295 SLING-12273 Update to sling-bundle-parent 60 add 2b015f5 Fix formatting with spotless-m-p add f10c02a ignore formatting changes in git blame add c0b8bec SLING-12271 Remove Java <= 8 bytecode restriction This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (66a22c8) \ N -- N -- N refs/heads/bugfix/SLING-12271-remove-java8-bytecode-restriction (c0b8bec) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. No new revisions were added by this update. Summary of changes: .git-blame-ignore-revs | 1 + .sling-module.json | 8 +++ pom.xml| 70 +++--- .../apache/sling/models/annotations/Default.java | 29 - .../annotations/DefaultInjectionStrategy.java | 31 +- .../apache/sling/models/annotations/Exporter.java | 27 + .../sling/models/annotations/ExporterOption.java | 26 .../apache/sling/models/annotations/Exporters.java | 26 .../apache/sling/models/annotations/Filter.java| 33 +- .../org/apache/sling/models/annotations/Model.java | 32 +- .../apache/sling/models/annotations/Optional.java | 32 +- .../org/apache/sling/models/annotations/Path.java | 34 ++- .../apache/sling/models/annotations/Required.java | 32 +- .../apache/sling/models/annotations/Source.java| 32 +- .../models/annotations/ValidationStrategy.java | 32 +- .../org/apache/sling/models/annotations/Via.java | 31 +- .../sling/models/annotations/ViaProviderType.java | 29 - .../apt/ValidatingAnnotationProcessor.java | 67 - .../injectorspecific/ChildResource.java| 39 ++-- .../injectorspecific/InjectionStrategy.java| 26 .../annotations/injectorspecific/OSGiService.java | 38 ++-- .../injectorspecific/RequestAttribute.java | 38 ++-- .../annotations/injectorspecific/ResourcePath.java | 39 ++-- .../injectorspecific/ScriptVariable.java | 38 ++-- .../models/annotations/injectorspecific/Self.java | 39 ++-- .../annotations/injectorspecific/SlingObject.java | 39 ++-- .../injectorspecific/ValueMapValue.java| 38 ++-- .../sling/models/annotations/via/BeanProperty.java | 29 - .../models/annotations/via/ChildResource.java | 29 - .../models/annotations/via/ForcedResourceType.java | 29 - .../annotations/via/OriginalResourceType.java | 29 - .../models/annotations/via/ResourceSuperType.java | 29 - .../sling/models/annotations/via/package-info.java | 2 +- .../sling/models/export/spi/ModelExporter.java | 35 ++- .../sling/models/factory/ExportException.java | 26 .../models/factory/InvalidAdaptableException.java | 2 +- .../models/factory/InvalidModelException.java | 27 + .../models/factory/MissingElementException.java| 1 - .../models/factory/MissingElementsException.java | 10 ++-- .../models/factory/MissingExporterException.java | 26 .../sling/models/factory/ModelClassException.java | 6 +- .../apache/sling/models/factory/ModelFactory.java | 53 +--- .../models/factory/PostConstructException.java | 1 - .../sling/models/factory/ValidationException.java | 27 + .../apache/sling/models/spi/AcceptsNullName.java | 3 +- .../apache/sling/models/spi/DisposalCallback.java | 27 + .../sling/models/spi/DisposalCallbackRegistry.java | 31 +- .../sling/models/spi/ImplementationPicker.java | 18 +++--- .../java/org/apache/sling/models/spi/Injector.java | 37 +++- .../apache/sling/models/spi/ModelValidation.java | 31 +- .../org/apache/sling/models/spi/ValuePreparer.java | 29 + .../org/apache/sling/models/spi/ViaProvider.java | 26 .../AbstractInjectAnnotationProcessor.java | 26 .../AbstractInjectAnnotationProcessor2.java
(sling-org-apache-sling-models-api) branch bugfix/update-parent deleted (was efa96b0)
This is an automated email from the ASF dual-hosted git repository. kwin pushed a change to branch bugfix/update-parent in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-models-api.git was efa96b0 ignore formatting changes in git blame The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
(sling-org-apache-sling-models-api) 03/03: ignore formatting changes in git blame
This is an automated email from the ASF dual-hosted git repository. kwin pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-models-api.git commit f10c02a20d915be0646dbb06f0bde44df55d575f Author: Konrad Windszus AuthorDate: Thu Mar 21 13:37:31 2024 +0100 ignore formatting changes in git blame --- .git-blame-ignore-revs | 1 + 1 file changed, 1 insertion(+) diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs new file mode 100644 index 000..6f72492 --- /dev/null +++ b/.git-blame-ignore-revs @@ -0,0 +1 @@ +b53121e51c7e985d9a09b94644849a3485af3807 \ No newline at end of file
(sling-org-apache-sling-models-api) branch master updated (3a2bfd7 -> f10c02a)
This is an automated email from the ASF dual-hosted git repository. kwin pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-models-api.git from 3a2bfd7 SLING-12094 - Use GitHub for the Maven scm.url value new fbfb295 SLING-12273 Update to sling-bundle-parent 60 new 2b015f5 Fix formatting with spotless-m-p new f10c02a ignore formatting changes in git blame The 3 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: .git-blame-ignore-revs | 1 + .sling-module.json | 8 +++ pom.xml| 70 +++--- .../apache/sling/models/annotations/Default.java | 29 - .../annotations/DefaultInjectionStrategy.java | 31 +- .../apache/sling/models/annotations/Exporter.java | 27 + .../sling/models/annotations/ExporterOption.java | 26 .../apache/sling/models/annotations/Exporters.java | 26 .../apache/sling/models/annotations/Filter.java| 33 +- .../org/apache/sling/models/annotations/Model.java | 32 +- .../apache/sling/models/annotations/Optional.java | 32 +- .../org/apache/sling/models/annotations/Path.java | 34 ++- .../apache/sling/models/annotations/Required.java | 32 +- .../apache/sling/models/annotations/Source.java| 32 +- .../models/annotations/ValidationStrategy.java | 32 +- .../org/apache/sling/models/annotations/Via.java | 31 +- .../sling/models/annotations/ViaProviderType.java | 29 - .../apt/ValidatingAnnotationProcessor.java | 67 - .../injectorspecific/ChildResource.java| 39 ++-- .../injectorspecific/InjectionStrategy.java| 26 .../annotations/injectorspecific/OSGiService.java | 38 ++-- .../injectorspecific/RequestAttribute.java | 38 ++-- .../annotations/injectorspecific/ResourcePath.java | 39 ++-- .../injectorspecific/ScriptVariable.java | 38 ++-- .../models/annotations/injectorspecific/Self.java | 39 ++-- .../annotations/injectorspecific/SlingObject.java | 39 ++-- .../injectorspecific/ValueMapValue.java| 38 ++-- .../sling/models/annotations/via/BeanProperty.java | 29 - .../models/annotations/via/ChildResource.java | 29 - .../models/annotations/via/ForcedResourceType.java | 29 - .../annotations/via/OriginalResourceType.java | 29 - .../models/annotations/via/ResourceSuperType.java | 29 - .../sling/models/annotations/via/package-info.java | 2 +- .../sling/models/export/spi/ModelExporter.java | 35 ++- .../sling/models/factory/ExportException.java | 26 .../models/factory/InvalidAdaptableException.java | 2 +- .../models/factory/InvalidModelException.java | 27 + .../models/factory/MissingElementException.java| 1 - .../models/factory/MissingElementsException.java | 10 ++-- .../models/factory/MissingExporterException.java | 26 .../sling/models/factory/ModelClassException.java | 6 +- .../apache/sling/models/factory/ModelFactory.java | 53 +--- .../models/factory/PostConstructException.java | 1 - .../sling/models/factory/ValidationException.java | 27 + .../apache/sling/models/spi/AcceptsNullName.java | 3 +- .../apache/sling/models/spi/DisposalCallback.java | 27 + .../sling/models/spi/DisposalCallbackRegistry.java | 31 +- .../sling/models/spi/ImplementationPicker.java | 18 +++--- .../java/org/apache/sling/models/spi/Injector.java | 37 +++- .../apache/sling/models/spi/ModelValidation.java | 31 +- .../org/apache/sling/models/spi/ValuePreparer.java | 29 + .../org/apache/sling/models/spi/ViaProvider.java | 26 .../AbstractInjectAnnotationProcessor.java | 26 .../AbstractInjectAnnotationProcessor2.java| 30 +- .../spi/injectorspecific/InjectAnnotation.java | 38 ++-- .../InjectAnnotationProcessor.java | 39 ++-- .../InjectAnnotationProcessor2.java| 44 +++--- .../InjectAnnotationProcessorFactory.java | 31 +- .../InjectAnnotationProcessorFactory2.java | 30 +- .../StaticInjectAnnotationProcessorFactory.java| 29 - .../factory/MissingElementsExceptionTest.java | 9 ++- 61 files changed, 924 insertions(+), 821 deletions(-) create mode 100644 .git-blame-ignore-revs create mode 100644 .sling-module.json
(sling-org-apache-sling-models-api) 01/03: SLING-12273 Update to sling-bundle-parent 60
This is an automated email from the ASF dual-hosted git repository.
kwin pushed a commit to branch master
in repository
https://gitbox.apache.org/repos/asf/sling-org-apache-sling-models-api.git
commit fbfb295c90b08336e75cfb2d59ebbcd09a329da9
Author: Konrad Windszus
AuthorDate: Thu Mar 21 13:35:33 2024 +0100
SLING-12273 Update to sling-bundle-parent 60
This allows building with Java 21
---
.sling-module.json | 8
pom.xml| 2 +-
2 files changed, 9 insertions(+), 1 deletion(-)
diff --git a/.sling-module.json b/.sling-module.json
new file mode 100644
index 000..d4268ec
--- /dev/null
+++ b/.sling-module.json
@@ -0,0 +1,8 @@
+{
+ "jenkins": {
+"jdks": [
+ 17,
+ 21
+]
+ }
+}
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index a6fda15..badc038 100644
--- a/pom.xml
+++ b/pom.xml
@@ -22,7 +22,7 @@
org.apache.sling
sling-bundle-parent
-49
+60
(sling-org-apache-sling-event) branch feature/add-queue-config-ranking-tests deleted (was 6daf897)
This is an automated email from the ASF dual-hosted git repository. kwin pushed a change to branch feature/add-queue-config-ranking-tests in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-event.git was 6daf897 Add tests for multiple applicable configs The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
(sling-org-apache-sling-event) branch master updated: Add tests for multiple applicable configs
This is an automated email from the ASF dual-hosted git repository.
kwin pushed a commit to branch master
in repository
https://gitbox.apache.org/repos/asf/sling-org-apache-sling-event.git
The following commit(s) were added to refs/heads/master by this push:
new 71c6d4b Add tests for multiple applicable configs
71c6d4b is described below
commit 71c6d4b3219adb640fa5628fb31cad84d31eff2b
Author: Konrad Windszus
AuthorDate: Thu Feb 29 16:55:48 2024 +0100
Add tests for multiple applicable configs
---
.../config/InternalQueueConfigurationTest.java | 17 --
.../jobs/config/QueueConfigurationManagerTest.java | 64 ++
2 files changed, 76 insertions(+), 5 deletions(-)
diff --git
a/src/test/java/org/apache/sling/event/impl/jobs/config/InternalQueueConfigurationTest.java
b/src/test/java/org/apache/sling/event/impl/jobs/config/InternalQueueConfigurationTest.java
index 948d953..b6aa5e4 100644
---
a/src/test/java/org/apache/sling/event/impl/jobs/config/InternalQueueConfigurationTest.java
+++
b/src/test/java/org/apache/sling/event/impl/jobs/config/InternalQueueConfigurationTest.java
@@ -31,21 +31,28 @@ import java.util.Map;
public class InternalQueueConfigurationTest {
-private InternalQueueConfiguration.Config createConfig(final double
maxParallel) {
+static InternalQueueConfiguration.Config createConfig(final double
maxParallel) {
return createConfig(null, "QueueConfigurationTest", maxParallel);
}
-private InternalQueueConfiguration.Config createConfig(final String[]
topics) {
+static InternalQueueConfiguration.Config createConfig(final String[]
topics) {
return createConfig(topics, "QueueConfigurationTest",
ConfigurationConstants.DEFAULT_MAX_PARALLEL);
}
-private InternalQueueConfiguration.Config createConfig(final String[]
topics, final String name) {
+static InternalQueueConfiguration.Config createConfig(final String[]
topics, final String name) {
return createConfig(topics, name,
ConfigurationConstants.DEFAULT_MAX_PARALLEL);
}
-private InternalQueueConfiguration.Config createConfig(final String[]
topics,
+static InternalQueueConfiguration.Config createConfig(final String[]
topics,
final String name,
final double maxParallel) {
+return createConfig(topics, name, maxParallel, 0);
+}
+
+static InternalQueueConfiguration.Config createConfig(final String[]
topics,
+final String name,
+final double maxParallel,
+final int ranking) {
return new InternalQueueConfiguration.Config() {
@Override
@@ -105,7 +112,7 @@ public class InternalQueueConfigurationTest {
@Override
public int service_ranking() {
-return 0;
+return ranking;
}
@Override
diff --git
a/src/test/java/org/apache/sling/event/impl/jobs/config/QueueConfigurationManagerTest.java
b/src/test/java/org/apache/sling/event/impl/jobs/config/QueueConfigurationManagerTest.java
new file mode 100644
index 000..9eb4b5a
--- /dev/null
+++
b/src/test/java/org/apache/sling/event/impl/jobs/config/QueueConfigurationManagerTest.java
@@ -0,0 +1,64 @@
+/*
+ * 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.
+ */
+package org.apache.sling.event.impl.jobs.config;
+
+import static org.junit.Assert.assertEquals;
+
+import java.util.Collections;
+
+import
org.apache.sling.event.impl.jobs.config.QueueConfigurationManager.QueueInfo;
+import org.junit.Test;
+
+public class QueueConfigurationManagerTest {
+
+@Test
+public void testMultipleMatchingConfigsWithSameRankingAndSameTopic() {
+QueueConfigurationManager configMgr = new QueueConfigurationManager();
+
configMgr.bindConfig(InternalQueueConfiguration.fromConfiguration(Collections.emptyMap(),
+InternalQueueConfigurationTest.createConfig(new String[]
{"topic1"}, "queue1", 2, 0)));
+
configMgr.bindConfig(InternalQueueConfiguration.fromConfiguration(Collections.emptyMap(),
+InternalQueueConfigurati
(sling-site) branch master updated: Clarify queue ranking
This is an automated email from the ASF dual-hosted git repository. kwin pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/sling-site.git The following commit(s) were added to refs/heads/master by this push: new d6c455983 Clarify queue ranking d6c455983 is described below commit d6c455983b11be9fd3b579d62acbc0a3d84b6a76 Author: Konrad Windszus AuthorDate: Thu Feb 29 17:02:37 2024 +0100 Clarify queue ranking Make clear that the highest rank wins --- .../documentation/bundles/apache-sling-eventing-and-job-handling.md| 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/jbake/content/documentation/bundles/apache-sling-eventing-and-job-handling.md b/src/main/jbake/content/documentation/bundles/apache-sling-eventing-and-job-handling.md index ca7d2b686..9b21a15a9 100644 --- a/src/main/jbake/content/documentation/bundles/apache-sling-eventing-and-job-handling.md +++ b/src/main/jbake/content/documentation/bundles/apache-sling-eventing-and-job-handling.md @@ -197,7 +197,8 @@ A queue configuration can have the following properties: | `queue.priority` | The thread priority: NORM, MIN, or MAX | | `service.ranking` | A ranking for this configuration.| -The configurations are processed in order of their service ranking. The first matching queue configuration is used for the job. +The configurations are processed in descending order of their service ranking (same as in [`BundleContext.getServiceReference(...)`](https://docs.osgi.org/javadoc/osgi.core/7.0.0/org/osgi/framework/BundleContext.html#getServiceReference-java.lang.Class-). In case of a tie in the service ranking the config which was registered earlier is processed before the config which was registered later. +The first matching queue configuration is used for the job. Ordered Queues
(sling-site) branch clarify-job-queue-ranking deleted (was 1fa546c8a)
This is an automated email from the ASF dual-hosted git repository. kwin pushed a change to branch clarify-job-queue-ranking in repository https://gitbox.apache.org/repos/asf/sling-site.git was 1fa546c8a Clarify queue ranking The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
(sling-site) branch feature/split-up-bundles-and-jars deleted (was 27d4e67d9)
This is an automated email from the ASF dual-hosted git repository. kwin pushed a change to branch feature/split-up-bundles-and-jars in repository https://gitbox.apache.org/repos/asf/sling-site.git was 27d4e67d9 SLING-12263 Separate non-bundles from bundles The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
(sling-site) branch master updated: SLING-12263 Separate non-bundles from bundles
This is an automated email from the ASF dual-hosted git repository. kwin pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/sling-site.git The following commit(s) were added to refs/heads/master by this push: new a3a3f7ac0 SLING-12263 Separate non-bundles from bundles a3a3f7ac0 is described below commit a3a3f7ac0ce021b6a9816251a5ccdf0bc9e88dce Author: Konrad Windszus AuthorDate: Thu Mar 7 11:46:37 2024 +0100 SLING-12263 Separate non-bundles from bundles Move some more deprecated Sling modules into the deprecated section --- src/main/jbake/templates/downloads.tpl | 101 + 1 file changed, 65 insertions(+), 36 deletions(-) diff --git a/src/main/jbake/templates/downloads.tpl b/src/main/jbake/templates/downloads.tpl index c325ed87d..f8c4b3499 100644 --- a/src/main/jbake/templates/downloads.tpl +++ b/src/main/jbake/templates/downloads.tpl @@ -56,8 +56,6 @@ def bndPlugins=[ def bundles=[ "Adapter|org.apache.sling.adapter|2.2.0|Y|jar", - "Adapter Annotations (JSON) 1.x|adapter-annotations|1.0.0|Y|jar", - "Adapter Annotations 2.x|org.apache.sling.adapter.annotations|2.0.0|Y|jar", "API|org.apache.sling.api|2.27.2|Y|jar", "Auth Core|org.apache.sling.auth.core|1.7.0|Y|jar", "Form Based Authentication|org.apache.sling.auth.form|1.0.24|Y|jar", @@ -99,7 +97,6 @@ def bundles=[ "Commons Scheduler|org.apache.sling.commons.scheduler|2.7.12|Y|jar", "Commons Testing|org.apache.sling.commons.testing|2.1.2|Y|jar", "Commons Threads|org.apache.sling.commons.threads|3.2.22|Y|jar", - "Connection Timeout Agent|org.apache.sling.connection-timeout-agent|1.0.2|Y|jar", "Content Detection Support|org.apache.sling.commons.contentdetection|1.0.4|Y|jar", "Content Parser API|org.apache.sling.contentparser.api|2.0.0|Y|jar", "Content Parser JSON|org.apache.sling.contentparser.json|2.0.0|Y|jar", @@ -110,12 +107,6 @@ def bundles=[ "Context-Aware Configuration Impl|org.apache.sling.caconfig.impl|1.6.0|Y|jar", "Context-Aware Configuration Mock Plugin|org.apache.sling.testing.caconfig-mock-plugin|1.5.4|Y|jar", "Context-Aware Configuration SPI|org.apache.sling.caconfig.spi|1.4.0|Y|jar", - "Crankstart API|org.apache.sling.crankstart.api|1.0.0|N|jar", - "Crankstart API Fragment|org.apache.sling.crankstart.api.fragment|1.0.2|N|jar", - "Crankstart Core|org.apache.sling.crankstart.core|1.0.0|N|jar", - "Crankstart Launcher|org.apache.sling.crankstart.launcher|1.0.0|Y|jar", - "Crankstart Launcher Sling Extensions|org.apache.sling.crankstart.sling.extensions|1.0.0|Y|jar", - "Crankstart Launcher Test Services|org.apache.sling.crankstart.test.services|1.0.0|Y|jar", "DataSource Provider|org.apache.sling.datasource|1.0.4|Y|jar", "Discovery API|org.apache.sling.discovery.api|1.0.4|Y|jar", "Discovery Impl|org.apache.sling.discovery.impl|1.2.12|Y|jar", @@ -151,8 +142,6 @@ def bundles=[ "GraphQL Core|org.apache.sling.graphql.core|0.0.30|Y|jar", "I18n|org.apache.sling.i18n|2.6.2|Y|jar", "HApi|org.apache.sling.hapi|1.1.0|Y|jar", - "Health Check API|org.apache.sling.hc.api|1.0.4|Y|jar", - "Health Check Support|org.apache.sling.hc.support|1.0.10|Y|jar", "Health Check JUnit Bridge|org.apache.sling.hc.junit.bridge|1.0.2|Y|jar", "Installer Core|org.apache.sling.installer.core|3.14.0|Y|jar", "Installer Configuration Support|org.apache.sling.installer.factory.configuration|1.4.4|Y|jar", @@ -162,7 +151,6 @@ def bundles=[ "Installer File Provider|org.apache.sling.installer.provider.file|1.3.4|Y|jar", "Installer Health Checks|org.apache.sling.installer.hc|2.1.0|Y|jar", "Installer JCR Provider|org.apache.sling.installer.provider.jcr|3.3.0|Y|jar", - "Installer Vault Package Install Hook|org.apache.sling.installer.provider.installhook|1.1.0|Y|jar", "javax activation|org.apache.sling.javax.activation|0.3.0|Y|jar", "JCR API|org.apache.sling.jcr.api|2.4.0|Y|jar", "JCR API Wrapper|org.apache.sling.jcr.jcr-wrapper|2.0.0|Y|jar", @@ -187,7 +175,6 @@ def bundles=[ "JUnit Scriptable Tests Provider|org.apache.sling.junit.scriptable|1.0.14|Y|jar", "JUnit Tests Teleporter|org.apache.sling.junit.teleporter|1.0.22|Y|jar", "JUnit Health Checks|org.apache.sling.junit.healthcheck|1.0.6|Y|jar", - "Kickstart Project|org.apache.sling.kickstart|0.0.12|Y|jar", "Launchpad API|org.apache.sling.launchpad.api|1.2.0|Y|jar", "Launchpad Base|org.apache.sling.launchpad.base|7.0.5-2.7.8|Y|jar", "Launchpad Base
(sling-org-apache-sling-models-api) branch bugfix/update-parent updated (49c5453 -> efa96b0)
This is an automated email from the ASF dual-hosted git repository. kwin pushed a change to branch bugfix/update-parent in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-models-api.git omit 49c5453 ignore formatting changes in git blame omit b53121e Fix formatting with spotless-m-p omit 0c8a910 SLING-12273 Update to sling-bundle-parent 60 add 8bac2ca SLING-12273 Update to sling-bundle-parent 60 add a92f0ae Fix formatting with spotless-m-p add efa96b0 ignore formatting changes in git blame This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (49c5453) \ N -- N -- N refs/heads/bugfix/update-parent (efa96b0) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. No new revisions were added by this update. Summary of changes: .sling-module.json | 1 + 1 file changed, 1 insertion(+)
(sling-org-apache-sling-models-api) 03/03: ignore formatting changes in git blame
This is an automated email from the ASF dual-hosted git repository. kwin pushed a commit to branch bugfix/update-parent in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-models-api.git commit 49c5453a2475375a0e494fbe2f3cecdbf448d8ef Author: Konrad Windszus AuthorDate: Thu Mar 21 13:37:31 2024 +0100 ignore formatting changes in git blame --- .git-blame-ignore-revs | 1 + 1 file changed, 1 insertion(+) diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs new file mode 100644 index 000..6f72492 --- /dev/null +++ b/.git-blame-ignore-revs @@ -0,0 +1 @@ +b53121e51c7e985d9a09b94644849a3485af3807 \ No newline at end of file
(sling-org-apache-sling-models-api) branch bugfix/update-parent created (now 49c5453)
This is an automated email from the ASF dual-hosted git repository. kwin pushed a change to branch bugfix/update-parent in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-models-api.git at 49c5453 ignore formatting changes in git blame This branch includes the following new commits: new 0c8a910 SLING-12273 Update to sling-bundle-parent 60 new b53121e Fix formatting with spotless-m-p new 49c5453 ignore formatting changes in git blame The 3 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.
(sling-org-apache-sling-models-api) 01/03: SLING-12273 Update to sling-bundle-parent 60
This is an automated email from the ASF dual-hosted git repository.
kwin pushed a commit to branch bugfix/update-parent
in repository
https://gitbox.apache.org/repos/asf/sling-org-apache-sling-models-api.git
commit 0c8a91073306b916c3ae1c0437ba45150bac2045
Author: Konrad Windszus
AuthorDate: Thu Mar 21 13:35:33 2024 +0100
SLING-12273 Update to sling-bundle-parent 60
This allows building with Java 21
---
.sling-module.json | 7 +++
pom.xml| 2 +-
2 files changed, 8 insertions(+), 1 deletion(-)
diff --git a/.sling-module.json b/.sling-module.json
new file mode 100644
index 000..b4ec6be
--- /dev/null
+++ b/.sling-module.json
@@ -0,0 +1,7 @@
+{
+ "jenkins": {
+"jdks": [
+ 17,
+ 21
+]
+}
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index a6fda15..badc038 100644
--- a/pom.xml
+++ b/pom.xml
@@ -22,7 +22,7 @@
org.apache.sling
sling-bundle-parent
-49
+60
(sling-org-apache-sling-models-api) branch bugfix/SLING-12271-remove-java8-bytecode-restriction created (now 66a22c8)
This is an automated email from the ASF dual-hosted git repository. kwin pushed a change to branch bugfix/SLING-12271-remove-java8-bytecode-restriction in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-models-api.git at 66a22c8 SLING-12271 Remove Java <= 8 bytecode restriction This branch includes the following new commits: new 66a22c8 SLING-12271 Remove Java <= 8 bytecode restriction The 1 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.
(sling-org-apache-sling-models-api) 01/01: SLING-12271 Remove Java <= 8 bytecode restriction
This is an automated email from the ASF dual-hosted git repository.
kwin pushed a commit to branch
bugfix/SLING-12271-remove-java8-bytecode-restriction
in repository
https://gitbox.apache.org/repos/asf/sling-org-apache-sling-models-api.git
commit 66a22c84641fcff8a577dc9959353825befa35e7
Author: Konrad Windszus
AuthorDate: Thu Mar 21 13:03:12 2024 +0100
SLING-12271 Remove Java <= 8 bytecode restriction
---
.../sling/models/annotations/apt/ValidatingAnnotationProcessor.java| 3 ---
1 file changed, 3 deletions(-)
diff --git
a/src/main/java/org/apache/sling/models/annotations/apt/ValidatingAnnotationProcessor.java
b/src/main/java/org/apache/sling/models/annotations/apt/ValidatingAnnotationProcessor.java
index 08ff759..cbdf62d 100644
---
a/src/main/java/org/apache/sling/models/annotations/apt/ValidatingAnnotationProcessor.java
+++
b/src/main/java/org/apache/sling/models/annotations/apt/ValidatingAnnotationProcessor.java
@@ -21,8 +21,6 @@ import java.util.Set;
import javax.annotation.processing.AbstractProcessor;
import javax.annotation.processing.RoundEnvironment;
import javax.annotation.processing.SupportedAnnotationTypes;
-import javax.annotation.processing.SupportedSourceVersion;
-import javax.lang.model.SourceVersion;
import javax.lang.model.element.Element;
import javax.lang.model.element.ElementKind;
import javax.lang.model.element.Modifier;
@@ -38,7 +36,6 @@ import org.apache.sling.models.annotations.Model;
"javax.inject.Inject",
"org.apache.sling.models.annotations.injectorspecific.*",
})
-@SupportedSourceVersion(SourceVersion.RELEASE_8)
public class ValidatingAnnotationProcessor extends AbstractProcessor {
@Override
(sling-site) branch feature/split-up-bundles-and-jars created (now 27d4e67d9)
This is an automated email from the ASF dual-hosted git repository. kwin pushed a change to branch feature/split-up-bundles-and-jars in repository https://gitbox.apache.org/repos/asf/sling-site.git at 27d4e67d9 SLING-12263 Separate non-bundles from bundles This branch includes the following new commits: new 27d4e67d9 SLING-12263 Separate non-bundles from bundles The 1 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.
(sling-site) 01/01: SLING-12263 Separate non-bundles from bundles
This is an automated email from the ASF dual-hosted git repository. kwin pushed a commit to branch feature/split-up-bundles-and-jars in repository https://gitbox.apache.org/repos/asf/sling-site.git commit 27d4e67d97511063d1e33b58e80847c80a357743 Author: Konrad Windszus AuthorDate: Thu Mar 7 11:46:37 2024 +0100 SLING-12263 Separate non-bundles from bundles Move some more deprecated Sling modules into the deprecated section --- src/main/jbake/templates/downloads.tpl | 101 + 1 file changed, 65 insertions(+), 36 deletions(-) diff --git a/src/main/jbake/templates/downloads.tpl b/src/main/jbake/templates/downloads.tpl index c325ed87d..f8c4b3499 100644 --- a/src/main/jbake/templates/downloads.tpl +++ b/src/main/jbake/templates/downloads.tpl @@ -56,8 +56,6 @@ def bndPlugins=[ def bundles=[ "Adapter|org.apache.sling.adapter|2.2.0|Y|jar", - "Adapter Annotations (JSON) 1.x|adapter-annotations|1.0.0|Y|jar", - "Adapter Annotations 2.x|org.apache.sling.adapter.annotations|2.0.0|Y|jar", "API|org.apache.sling.api|2.27.2|Y|jar", "Auth Core|org.apache.sling.auth.core|1.7.0|Y|jar", "Form Based Authentication|org.apache.sling.auth.form|1.0.24|Y|jar", @@ -99,7 +97,6 @@ def bundles=[ "Commons Scheduler|org.apache.sling.commons.scheduler|2.7.12|Y|jar", "Commons Testing|org.apache.sling.commons.testing|2.1.2|Y|jar", "Commons Threads|org.apache.sling.commons.threads|3.2.22|Y|jar", - "Connection Timeout Agent|org.apache.sling.connection-timeout-agent|1.0.2|Y|jar", "Content Detection Support|org.apache.sling.commons.contentdetection|1.0.4|Y|jar", "Content Parser API|org.apache.sling.contentparser.api|2.0.0|Y|jar", "Content Parser JSON|org.apache.sling.contentparser.json|2.0.0|Y|jar", @@ -110,12 +107,6 @@ def bundles=[ "Context-Aware Configuration Impl|org.apache.sling.caconfig.impl|1.6.0|Y|jar", "Context-Aware Configuration Mock Plugin|org.apache.sling.testing.caconfig-mock-plugin|1.5.4|Y|jar", "Context-Aware Configuration SPI|org.apache.sling.caconfig.spi|1.4.0|Y|jar", - "Crankstart API|org.apache.sling.crankstart.api|1.0.0|N|jar", - "Crankstart API Fragment|org.apache.sling.crankstart.api.fragment|1.0.2|N|jar", - "Crankstart Core|org.apache.sling.crankstart.core|1.0.0|N|jar", - "Crankstart Launcher|org.apache.sling.crankstart.launcher|1.0.0|Y|jar", - "Crankstart Launcher Sling Extensions|org.apache.sling.crankstart.sling.extensions|1.0.0|Y|jar", - "Crankstart Launcher Test Services|org.apache.sling.crankstart.test.services|1.0.0|Y|jar", "DataSource Provider|org.apache.sling.datasource|1.0.4|Y|jar", "Discovery API|org.apache.sling.discovery.api|1.0.4|Y|jar", "Discovery Impl|org.apache.sling.discovery.impl|1.2.12|Y|jar", @@ -151,8 +142,6 @@ def bundles=[ "GraphQL Core|org.apache.sling.graphql.core|0.0.30|Y|jar", "I18n|org.apache.sling.i18n|2.6.2|Y|jar", "HApi|org.apache.sling.hapi|1.1.0|Y|jar", - "Health Check API|org.apache.sling.hc.api|1.0.4|Y|jar", - "Health Check Support|org.apache.sling.hc.support|1.0.10|Y|jar", "Health Check JUnit Bridge|org.apache.sling.hc.junit.bridge|1.0.2|Y|jar", "Installer Core|org.apache.sling.installer.core|3.14.0|Y|jar", "Installer Configuration Support|org.apache.sling.installer.factory.configuration|1.4.4|Y|jar", @@ -162,7 +151,6 @@ def bundles=[ "Installer File Provider|org.apache.sling.installer.provider.file|1.3.4|Y|jar", "Installer Health Checks|org.apache.sling.installer.hc|2.1.0|Y|jar", "Installer JCR Provider|org.apache.sling.installer.provider.jcr|3.3.0|Y|jar", - "Installer Vault Package Install Hook|org.apache.sling.installer.provider.installhook|1.1.0|Y|jar", "javax activation|org.apache.sling.javax.activation|0.3.0|Y|jar", "JCR API|org.apache.sling.jcr.api|2.4.0|Y|jar", "JCR API Wrapper|org.apache.sling.jcr.jcr-wrapper|2.0.0|Y|jar", @@ -187,7 +175,6 @@ def bundles=[ "JUnit Scriptable Tests Provider|org.apache.sling.junit.scriptable|1.0.14|Y|jar", "JUnit Tests Teleporter|org.apache.sling.junit.teleporter|1.0.22|Y|jar", "JUnit Health Checks|org.apache.sling.junit.healthcheck|1.0.6|Y|jar", - "Kickstart Project|org.apache.sling.kickstart|0.0.12|Y|jar", "Launchpad API|org.apache.sling.launchpad.api|1.2.0|Y|jar", "Launchpad Base|org.apache.sling.launchpad.base|7.0.5-2.7.8|Y|jar", "Launchpad Base - Application Launcher|org.apache.sling.launchpad.base|7.0.5-2.7.8|Y|war", @@ -195,9 +182,6 @@ def bundles=[ "Launchpad Installer|org.apach
(sling-site) branch master updated: Release Resource Observation Annotations 1.0.0
This is an automated email from the ASF dual-hosted git repository. kwin pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/sling-site.git The following commit(s) were added to refs/heads/master by this push: new 496fd35a5 Release Resource Observation Annotations 1.0.0 496fd35a5 is described below commit 496fd35a5ab1d96041a523432022644d946d9c3c Author: Konrad Windszus AuthorDate: Thu Mar 7 11:08:59 2024 +0100 Release Resource Observation Annotations 1.0.0 --- src/main/jbake/content/releases.md | 1 + src/main/jbake/templates/downloads.tpl | 1 + 2 files changed, 2 insertions(+) diff --git a/src/main/jbake/content/releases.md b/src/main/jbake/content/releases.md index 572441361..748b5fd0b 100644 --- a/src/main/jbake/content/releases.md +++ b/src/main/jbake/content/releases.md @@ -8,6 +8,7 @@ This is a list of all our releases, available from our [downloads](/downloads.cg ## March 2024 +* Resource Observation Annotations 1.0.0 (7th) * Content-Package to Feature Model Converter 1.3.6 (4th) ## February 2024 diff --git a/src/main/jbake/templates/downloads.tpl b/src/main/jbake/templates/downloads.tpl index d713be021..c325ed87d 100644 --- a/src/main/jbake/templates/downloads.tpl +++ b/src/main/jbake/templates/downloads.tpl @@ -224,6 +224,7 @@ def bundles=[ "Resource Filter|org.apache.sling.resource.filter|1.0.0|Y|jar", "Resource Inventory|org.apache.sling.resource.inventory|1.0.8|Y|jar", "Resource Merger|org.apache.sling.resourcemerger|1.4.4|Y|jar", + "Resource Observation Annotations|org.apache.sling.resource.observation.annotations|1.0.0|Y|jar", "Resource Presence|org.apache.sling.resource.presence|0.0.2|Y|jar", "Resource Resolver|org.apache.sling.resourceresolver|1.11.6|Y|jar", "Rewriter|org.apache.sling.rewriter|1.3.10|Y|jar",
(sling-site) branch master updated: SLING-12247 Document Component Property Type for ResourceChangeListener (#157)
This is an automated email from the ASF dual-hosted git repository.
kwin pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-site.git
The following commit(s) were added to refs/heads/master by this push:
new a18e518ae SLING-12247 Document Component Property Type for
ResourceChangeListener (#157)
a18e518ae is described below
commit a18e518ae799df6e155c8308389934b3da18c1a4
Author: Konrad Windszus
AuthorDate: Thu Mar 7 10:58:24 2024 +0100
SLING-12247 Document Component Property Type for ResourceChangeListener
(#157)
---
.../documentation/the-sling-engine/resources.md| 34 --
1 file changed, 31 insertions(+), 3 deletions(-)
diff --git a/src/main/jbake/content/documentation/the-sling-engine/resources.md
b/src/main/jbake/content/documentation/the-sling-engine/resources.md
index 3217f42e0..dd38c17d4 100644
--- a/src/main/jbake/content/documentation/the-sling-engine/resources.md
+++ b/src/main/jbake/content/documentation/the-sling-engine/resources.md
@@ -231,6 +231,34 @@ Property | Description
[ResourceChangeListener.CHANGES](https://sling.apache.org/apidocs/sling11/org/apache/sling/api/resource/observation/ResourceChangeListener.html#CHANGES)|
the type of changes you are interested in (optional)
[ResourceChangeListener.PROPERTY_NAMES_HINT](https://sling.apache.org/apidocs/sling11/org/apache/sling/api/resource/observation/ResourceChangeListener.html#PROPERTY_NAMES_HINT)|
filter only for events affecting the properties with the given names (optional)
+ OSGi Component Property Type
+
+In order to ease creating `ResourceChangeListener`s, there is an according
[OSGi component property
type](https://docs.osgi.org/specification/osgi.cmpn/7.0.0/service.component.html#service.component-component.property.types)
provided through artifact
+
+org.apache.sling
+org.apache.sling.resource.observation.annotations
+
+It can be used like this:
+
+::java
+import org.apache.sling.api.resource.observation.ResourceChange;
+import org.apache.sling.api.resource.observation.ResourceChange.ChangeType;
+import org.apache.sling.api.resource.observation.ResourceChangeListener;
+import org.osgi.service.component.annotations.Component;
+
+@Component
+@SlingResourceChangeListener(
+paths = "/examplepath",
+change_types = {ChangeType.ADDED, ChangeType.REMOVED})
+public class SampleResourceChangeListener implements
ResourceChangeListener {
+
+@Override
+public void onChange(List changes) {
+// Do something here
+}
+}
+
+This will generate the necessary service properties automatically (with the
help of the Bnd plugin, compare with [Sling Servlet
Annotations](./servlets.html#registering-a-servlet-using-java-annotations)).
### OSGi Event based resource changes (deprecated)
@@ -247,9 +275,9 @@ This approach is deprecated in favor of the
ResourceChangeListener described abo
The Sling API provides an easy way to wrap or decorate a resource before
returning. Details see [Wrap or Decorate
Resources](/documentation/the-sling-engine/wrap-or-decorate-resources.html).
- [1]:
http://sling.apache.org/apidocs/sling8/org/apache/sling/api/resource/ResourceMetadata.html
- [2]:
http://sling.apache.org/apidocs/sling8/org/apache/sling/api/resource/Resource.html
- [3]:
http://sling.apache.org/apidocs/sling8/org/apache/sling/api/resource/AbstractResource.html
+ [1]:
https://sling.apache.org/apidocs/sling12/org/apache/sling/api/resource/ResourceMetadata.html
+ [2]:
https://sling.apache.org/apidocs/sling12/org/apache/sling/api/resource/Resource.html
+ [3]:
https://sling.apache.org/apidocs/sling12/org/apache/sling/api/resource/AbstractResource.html
[4]:
https://github.com/apache/sling-org-apache-sling-launchpad-test-services/tree/master/src/main/java/org/apache/sling/launchpad/testservices/resourceprovider
[5]:
https://github.com/apache/sling-org-apache-sling-launchpad-test-services/blob/master/src/main/java/org/apache/sling/launchpad/testservices/serversidetests/WriteableResourcesTest.java
[6]:
https://github.com/apache/sling-org-apache-sling-api/blob/master/src/main/java/org/apache/sling/api/resource/observation/ResourceChangeListener.java
(sling-site) branch feature/document-resource-observation-property-types deleted (was eac98daa5)
This is an automated email from the ASF dual-hosted git repository. kwin pushed a change to branch feature/document-resource-observation-property-types in repository https://gitbox.apache.org/repos/asf/sling-site.git was eac98daa5 SLING-12247 Document Component Property Type for ResourceChangeListener The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
svn commit: r67775 - /release/sling/
Author: kwin Date: Thu Mar 7 09:56:21 2024 New Revision: 67775 Log: Release org.apache.sling.resource.observation.annotations-1.0.0 Added: release/sling/org.apache.sling.resource.observation.annotations-1.0.0-javadoc.jar (with props) release/sling/org.apache.sling.resource.observation.annotations-1.0.0-javadoc.jar.asc release/sling/org.apache.sling.resource.observation.annotations-1.0.0-javadoc.jar.md5 release/sling/org.apache.sling.resource.observation.annotations-1.0.0-javadoc.jar.sha1 release/sling/org.apache.sling.resource.observation.annotations-1.0.0-source-release.zip (with props) release/sling/org.apache.sling.resource.observation.annotations-1.0.0-source-release.zip.asc release/sling/org.apache.sling.resource.observation.annotations-1.0.0-source-release.zip.md5 release/sling/org.apache.sling.resource.observation.annotations-1.0.0-source-release.zip.sha1 release/sling/org.apache.sling.resource.observation.annotations-1.0.0-source-release.zip.sha512 release/sling/org.apache.sling.resource.observation.annotations-1.0.0-sources.jar (with props) release/sling/org.apache.sling.resource.observation.annotations-1.0.0-sources.jar.asc release/sling/org.apache.sling.resource.observation.annotations-1.0.0-sources.jar.md5 release/sling/org.apache.sling.resource.observation.annotations-1.0.0-sources.jar.sha1 release/sling/org.apache.sling.resource.observation.annotations-1.0.0.jar (with props) release/sling/org.apache.sling.resource.observation.annotations-1.0.0.jar.asc release/sling/org.apache.sling.resource.observation.annotations-1.0.0.jar.md5 release/sling/org.apache.sling.resource.observation.annotations-1.0.0.jar.sha1 release/sling/org.apache.sling.resource.observation.annotations-1.0.0.pom release/sling/org.apache.sling.resource.observation.annotations-1.0.0.pom.asc release/sling/org.apache.sling.resource.observation.annotations-1.0.0.pom.md5 release/sling/org.apache.sling.resource.observation.annotations-1.0.0.pom.sha1 Added: release/sling/org.apache.sling.resource.observation.annotations-1.0.0-javadoc.jar == Binary file - no diff available. Propchange: release/sling/org.apache.sling.resource.observation.annotations-1.0.0-javadoc.jar -- svn:mime-type = application/octet-stream Added: release/sling/org.apache.sling.resource.observation.annotations-1.0.0-javadoc.jar.asc == --- release/sling/org.apache.sling.resource.observation.annotations-1.0.0-javadoc.jar.asc (added) +++ release/sling/org.apache.sling.resource.observation.annotations-1.0.0-javadoc.jar.asc Thu Mar 7 09:56:21 2024 @@ -0,0 +1,11 @@ +-BEGIN PGP SIGNATURE- + +iQEzBAABCgAdFiEEuRq30hIdxrCmGqGC13QtWEVezHwFAmXhwtUACgkQ13QtWEVe +zHx3SggAj5ehA4jRE+rco2W4NckU4vy2i71VjD82WVc5QRR0JYXXzzeZNIZkT/Tw +yKqR0W1+R4BPKnOSyVR52XsvGrMNlhZzzTsZ5rJoeiUiHYLKBwgADQfD/zoM80DC +8AsPvSKkzEFvvVdTuVdJb4hO/CSXTAQFXdtmBdlrQIetTU8wuY4QWNgnIpAO/0ws +IP+FdMYTL3JtGP1gRfWX7tktiP64fg3n23oUylVN9wyLaEkqhghuVSXG9/XnersV +Uj0Hqp4JCOB/AE8r8wb1ixmj3yAXQD73C/triXsavsA29WxTTUAXLlNqG+Liigh9 +FM40AGJrUvDhE7vQrTchUZN5W7twMg== +=6UrY +-END PGP SIGNATURE- Added: release/sling/org.apache.sling.resource.observation.annotations-1.0.0-javadoc.jar.md5 == --- release/sling/org.apache.sling.resource.observation.annotations-1.0.0-javadoc.jar.md5 (added) +++ release/sling/org.apache.sling.resource.observation.annotations-1.0.0-javadoc.jar.md5 Thu Mar 7 09:56:21 2024 @@ -0,0 +1 @@ +8abd4083bbfe6f89069662a14ab24b49 \ No newline at end of file Added: release/sling/org.apache.sling.resource.observation.annotations-1.0.0-javadoc.jar.sha1 == --- release/sling/org.apache.sling.resource.observation.annotations-1.0.0-javadoc.jar.sha1 (added) +++ release/sling/org.apache.sling.resource.observation.annotations-1.0.0-javadoc.jar.sha1 Thu Mar 7 09:56:21 2024 @@ -0,0 +1 @@ +a69f86658bcf2d8c65d979fdcac3ff22abec1904 \ No newline at end of file Added: release/sling/org.apache.sling.resource.observation.annotations-1.0.0-source-release.zip == Binary file - no diff available. Propchange: release/sling/org.apache.sling.resource.observation.annotations-1.0.0-source-release.zip -- svn:mime-type = application/octet-stream Added: release/sling/org.apache.sling.resource.observation.annotations-1.0.0-source-release.zip.asc == --- release/sling
(sling-org-apache-sling-event) branch feature/update-parent updated (657534f -> 8991465)
This is an automated email from the ASF dual-hosted git repository. kwin pushed a change to branch feature/update-parent in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-event.git from 657534f SLING-12261 fix formatting of files with spotless:apply add 8991465 Some more POM cleanup No new revisions were added by this update. Summary of changes: .sling-module.json | 5 + pom.xml| 48 ++-- 2 files changed, 7 insertions(+), 46 deletions(-) create mode 100644 .sling-module.json
(sling-org-apache-sling-event) 01/02: SLING-12261 Update to sling-bundle-parent 60
This is an automated email from the ASF dual-hosted git repository. kwin pushed a commit to branch feature/update-parent in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-event.git commit aa9842bbba6990cf8b4dfb8fdf321b56fef01731 Author: Konrad Windszus AuthorDate: Fri Mar 1 16:58:42 2024 +0100 SLING-12261 Update to sling-bundle-parent 60 Fix dependencies --- pom.xml | 57 - 1 file changed, 28 insertions(+), 29 deletions(-) diff --git a/pom.xml b/pom.xml index 8b8a7be..3644b17 100644 --- a/pom.xml +++ b/pom.xml @@ -24,7 +24,7 @@ org.apache.sling sling-bundle-parent -48 +60 @@ -38,7 +38,6 @@ scm:git:https://gitbox.apache.org/repos/asf/sling-org-apache-sling-event.git scm:git:https://gitbox.apache.org/repos/asf/sling-org-apache-sling-event.git https://github.com/apache/sling-org-apache-sling-event.git -org.apache.sling.event-4.3.12 @@ -46,6 +45,7 @@ 4.13.3 37000 37999 +11 2023-10-05T16:16:32Z @@ -142,6 +142,12 @@ org.osgi org.osgi.service.component.annotations +provided + + +org.osgi +org.osgi.service.metatype.annotations +provided org.jetbrains @@ -163,14 +169,17 @@ org.slf4j slf4j-api +provided org.osgi -osgi.core +org.osgi.framework +provided org.osgi -osgi.cmpn +org.osgi.service.event +provided org.apache.sling @@ -181,13 +190,19 @@ org.apache.sling org.apache.sling.api -2.11.0 +2.22.0 +provided + + +org.apache.sling +org.apache.sling.event.api +1.0.4 provided org.apache.sling org.apache.sling.commons.osgi -2.1.0 +2.4.0 provided @@ -211,7 +226,7 @@ org.apache.sling org.apache.sling.serviceusermapper -1.2.0 +1.5.4 provided @@ -230,11 +245,13 @@ javax.servlet javax.servlet-api +provided org.slf4j slf4j-simple +test org.osgi @@ -261,14 +278,14 @@ org.apache.sling -org.apache.sling.testing.sling-mock -2.2.6 +org.apache.sling.testing.sling-mock-oak +3.1.0-1.40.0 test org.apache.sling -org.apache.sling.testing.sling-mock-oak -3.1.0-1.40.0 +org.apache.sling.testing.sling-mock +3.4.18 test @@ -295,17 +312,6 @@ javax.inject test - -org.apache.sling -org.apache.sling.event.api -1.0.4 - - - -org.apache.sling -org.apache.sling.commons.testing -2.0.10 - org.apache.sling org.apache.sling.testing.paxexam @@ -330,13 +336,6 @@ junit junit test -4.13.1 - - -org.jmock -jmock-junit4 -2.8.2 -test
(sling-org-apache-sling-event) branch feature/update-parent created (now 657534f)
This is an automated email from the ASF dual-hosted git repository. kwin pushed a change to branch feature/update-parent in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-event.git at 657534f SLING-12261 fix formatting of files with spotless:apply This branch includes the following new commits: new aa9842b SLING-12261 Update to sling-bundle-parent 60 new 657534f SLING-12261 fix formatting of files with spotless:apply 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.
(sling-org-apache-sling-event) 01/01: SLING-12260 Increase Mockito to 5.11.0 to support building on Java 21
This is an automated email from the ASF dual-hosted git repository.
kwin pushed a commit to branch feature/java21-compat
in repository
https://gitbox.apache.org/repos/asf/sling-org-apache-sling-event.git
commit fdae56a22035d8a868594c18f6cdde53b23dda18
Author: Konrad Windszus
AuthorDate: Fri Mar 1 16:42:39 2024 +0100
SLING-12260 Increase Mockito to 5.11.0 to support building on Java 21
---
pom.xml| 3 ++-
.../sling/event/impl/jobs/queues/JobExecutionContextImplTest.java | 2 +-
.../org/apache/sling/event/impl/jobs/queues/TestTopicHalting.java | 2 +-
.../sling/event/impl/jobs/tasks/HistoryCleanUpRemovedJobsTest.java | 7 +--
.../apache/sling/event/impl/jobs/tasks/HistoryCleanUpTaskTest.java | 2 +-
5 files changed, 6 insertions(+), 10 deletions(-)
diff --git a/pom.xml b/pom.xml
index 8b8a7be..29b02af 100644
--- a/pom.xml
+++ b/pom.xml
@@ -47,6 +47,7 @@
37000
37999
2023-10-05T16:16:32Z
+11
@@ -244,7 +245,7 @@
org.mockito
mockito-core
-3.11.0
+5.11.0
test
diff --git
a/src/test/java/org/apache/sling/event/impl/jobs/queues/JobExecutionContextImplTest.java
b/src/test/java/org/apache/sling/event/impl/jobs/queues/JobExecutionContextImplTest.java
index 6c23060..0e3fa32 100644
---
a/src/test/java/org/apache/sling/event/impl/jobs/queues/JobExecutionContextImplTest.java
+++
b/src/test/java/org/apache/sling/event/impl/jobs/queues/JobExecutionContextImplTest.java
@@ -88,10 +88,10 @@ public class JobExecutionContextImplTest {
context.registerService(JobManagerConfiguration.class, configuration);
context.registerService(TopologyCapabilities.class, capabilities);
context.registerService(QueueConfigurationManager.class,
queueConfigMgr);
+context.registerService(ThreadPoolManager.class, threadPoolManager);
context.registerService(MetricRegistry.class, metric);
context.registerService(QueueManager.class, qManager);
context.registerService(JobConsumerManager.class, jobConsumerManager);
-context.registerService(ThreadPoolManager.class, threadPoolManager);
context.registerService(StatisticsManager.class, statisticsManager);
context.registerService(QueuesMBean.class, queuesMBean);
context.registerService(Scheduler.class, scheduler);
diff --git
a/src/test/java/org/apache/sling/event/impl/jobs/queues/TestTopicHalting.java
b/src/test/java/org/apache/sling/event/impl/jobs/queues/TestTopicHalting.java
index a75c92d..75736e0 100644
---
a/src/test/java/org/apache/sling/event/impl/jobs/queues/TestTopicHalting.java
+++
b/src/test/java/org/apache/sling/event/impl/jobs/queues/TestTopicHalting.java
@@ -72,7 +72,7 @@ import org.junit.runner.RunWith;
import org.mockito.Mock;
import org.mockito.Mockito;
import org.mockito.invocation.InvocationOnMock;
-import org.mockito.runners.MockitoJUnitRunner;
+import org.mockito.junit.MockitoJUnitRunner;
import org.mockito.stubbing.Answer;
import org.osgi.framework.BundleContext;
import org.osgi.service.component.ComponentContext;
diff --git
a/src/test/java/org/apache/sling/event/impl/jobs/tasks/HistoryCleanUpRemovedJobsTest.java
b/src/test/java/org/apache/sling/event/impl/jobs/tasks/HistoryCleanUpRemovedJobsTest.java
index 6860ae2..a54cc93 100644
---
a/src/test/java/org/apache/sling/event/impl/jobs/tasks/HistoryCleanUpRemovedJobsTest.java
+++
b/src/test/java/org/apache/sling/event/impl/jobs/tasks/HistoryCleanUpRemovedJobsTest.java
@@ -23,25 +23,20 @@ import static org.junit.Assert.assertNull;
import java.text.SimpleDateFormat;
import java.util.Calendar;
-import java.util.Map;
import org.apache.sling.api.resource.Resource;
import org.apache.sling.event.impl.jobs.JobImpl;
import org.apache.sling.event.impl.jobs.config.JobManagerConfiguration;
import org.apache.sling.event.impl.jobs.scheduling.JobSchedulerImpl;
import org.apache.sling.event.jobs.Job;
-import org.apache.sling.event.jobs.consumer.JobExecutionContext;
import org.apache.sling.testing.mock.sling.junit.SlingContext;
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
import org.junit.runner.RunWith;
-import org.mockito.Answers;
import org.mockito.Mock;
import org.mockito.Mockito;
-import org.mockito.runners.MockitoJUnitRunner;
-
-import com.google.common.collect.Maps;
+import org.mockito.junit.MockitoJUnitRunner;
@RunWith(MockitoJUnitRunner.class)
public class HistoryCleanUpRemovedJobsTest {
diff --git
a/src/test/java/org/apache/sling/event/impl/jobs/tasks/HistoryCleanUpTaskTest.java
b/src/test/java/org/apache/sling/event/impl/jobs/tasks/HistoryCleanUpTaskTest.java
index 6f92c1d..5599964 100644
---
a/src/test/java/org/apache/sling/event/impl/jobs/tasks/HistoryCleanUpTaskTest.java
+++
b/src/test/java/org/apache/sling/event/impl/jobs/tasks/HistoryCleanUpTaskTest.java
@@ -38,7
(sling-org-apache-sling-event) branch feature/java21-compat created (now fdae56a)
This is an automated email from the ASF dual-hosted git repository. kwin pushed a change to branch feature/java21-compat in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-event.git at fdae56a SLING-12260 Increase Mockito to 5.11.0 to support building on Java 21 This branch includes the following new commits: new fdae56a SLING-12260 Increase Mockito to 5.11.0 to support building on Java 21 The 1 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.
(sling-site) branch feature/document-resource-observation-property-types updated (06ae0c885 -> eac98daa5)
This is an automated email from the ASF dual-hosted git repository. kwin pushed a change to branch feature/document-resource-observation-property-types in repository https://gitbox.apache.org/repos/asf/sling-site.git omit 06ae0c885 SLING-12247 Document Component Property Type for ResourceChangeListener add eac98daa5 SLING-12247 Document Component Property Type for ResourceChangeListener This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (06ae0c885) \ N -- N -- N refs/heads/feature/document-resource-observation-property-types (eac98daa5) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. No new revisions were added by this update. Summary of changes: src/main/jbake/content/documentation/the-sling-engine/resources.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
(sling-site) branch feature/document-resource-observation-property-types created (now 06ae0c885)
This is an automated email from the ASF dual-hosted git repository. kwin pushed a change to branch feature/document-resource-observation-property-types in repository https://gitbox.apache.org/repos/asf/sling-site.git at 06ae0c885 SLING-12247 Document Component Property Type for ResourceChangeListener This branch includes the following new commits: new 06ae0c885 SLING-12247 Document Component Property Type for ResourceChangeListener The 1 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.
(sling-site) 01/01: SLING-12247 Document Component Property Type for ResourceChangeListener
This is an automated email from the ASF dual-hosted git repository.
kwin pushed a commit to branch
feature/document-resource-observation-property-types
in repository https://gitbox.apache.org/repos/asf/sling-site.git
commit 06ae0c88570cd411647445616be98d043ca9d818
Author: Konrad Windszus
AuthorDate: Fri Mar 1 13:18:29 2024 +0100
SLING-12247 Document Component Property Type for ResourceChangeListener
---
.../documentation/the-sling-engine/resources.md| 34 --
1 file changed, 31 insertions(+), 3 deletions(-)
diff --git a/src/main/jbake/content/documentation/the-sling-engine/resources.md
b/src/main/jbake/content/documentation/the-sling-engine/resources.md
index 3217f42e0..94f45 100644
--- a/src/main/jbake/content/documentation/the-sling-engine/resources.md
+++ b/src/main/jbake/content/documentation/the-sling-engine/resources.md
@@ -231,6 +231,34 @@ Property | Description
[ResourceChangeListener.CHANGES](https://sling.apache.org/apidocs/sling11/org/apache/sling/api/resource/observation/ResourceChangeListener.html#CHANGES)|
the type of changes you are interested in (optional)
[ResourceChangeListener.PROPERTY_NAMES_HINT](https://sling.apache.org/apidocs/sling11/org/apache/sling/api/resource/observation/ResourceChangeListener.html#PROPERTY_NAMES_HINT)|
filter only for events affecting the properties with the given names (optional)
+ OSGi Component Property Type
+
+In order to ease creating `ResourceChangeListener`s, there is an according
[OSGi component property
type](https://docs.osgi.org/specification/osgi.cmpn/7.0.0/service.component.html#service.component-component.property.types)
provided through artifact
+
+org.apache.sling
+org.apache.sling.resource.observation.annotations
+
+It can be used like this:
+
+::java
+import org.apache.sling.api.resource.observation.ResourceChange;
+import org.apache.sling.api.resource.observation.ResourceChange.ChangeType;
+import org.apache.sling.api.resource.observation.ResourceChangeListener;
+import org.osgi.service.component.annotations.Component;
+
+@Component
+@SlingResourceChangeListener(
+paths = "/examplepath",
+change_types = {ChangeType.ADDED, ChangeType.REMOVED})
+public class SampleResourceChangeListener implements
ResourceChangeListener {
+
+@Override
+public void onChange(List changes) {
+// Do nothing here
+}
+}
+
+This will generate the necessary service properties automatically (with the
help of the Bnd plugin, compare with [Sling Servlet
Annotations](./servlets.html#registering-a-servlet-using-java-annotations)).
### OSGi Event based resource changes (deprecated)
@@ -247,9 +275,9 @@ This approach is deprecated in favor of the
ResourceChangeListener described abo
The Sling API provides an easy way to wrap or decorate a resource before
returning. Details see [Wrap or Decorate
Resources](/documentation/the-sling-engine/wrap-or-decorate-resources.html).
- [1]:
http://sling.apache.org/apidocs/sling8/org/apache/sling/api/resource/ResourceMetadata.html
- [2]:
http://sling.apache.org/apidocs/sling8/org/apache/sling/api/resource/Resource.html
- [3]:
http://sling.apache.org/apidocs/sling8/org/apache/sling/api/resource/AbstractResource.html
+ [1]:
https://sling.apache.org/apidocs/sling12/org/apache/sling/api/resource/ResourceMetadata.html
+ [2]:
https://sling.apache.org/apidocs/sling12/org/apache/sling/api/resource/Resource.html
+ [3]:
https://sling.apache.org/apidocs/sling12/org/apache/sling/api/resource/AbstractResource.html
[4]:
https://github.com/apache/sling-org-apache-sling-launchpad-test-services/tree/master/src/main/java/org/apache/sling/launchpad/testservices/resourceprovider
[5]:
https://github.com/apache/sling-org-apache-sling-launchpad-test-services/blob/master/src/main/java/org/apache/sling/launchpad/testservices/serversidetests/WriteableResourcesTest.java
[6]:
https://github.com/apache/sling-org-apache-sling-api/blob/master/src/main/java/org/apache/sling/api/resource/observation/ResourceChangeListener.java
(sling-org-apache-sling-resource-observation-annotations) branch master updated: [maven-release-plugin] prepare for next development iteration
This is an automated email from the ASF dual-hosted git repository. kwin pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-resource-observation-annotations.git The following commit(s) were added to refs/heads/master by this push: new dbf457e [maven-release-plugin] prepare for next development iteration dbf457e is described below commit dbf457e7bbc763c0d0c16f81c5b46718b9d4877b Author: Konrad Windszus AuthorDate: Fri Mar 1 12:57:53 2024 +0100 [maven-release-plugin] prepare for next development iteration --- pom.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index b160fb4..db8e346 100644 --- a/pom.xml +++ b/pom.xml @@ -20,7 +20,7 @@ org.apache.sling.resource.observation.annotations -1.0.0 +1.0.1-SNAPSHOT Apache Sling Resource Observation Annotations OSGi DS component property type annotations for Sling resource change listeners @@ -28,13 +28,13 @@ scm:git:https://gitbox.apache.org/repos/asf/sling-org-apache-sling-resource-observation-annotations.git scm:git:https://gitbox.apache.org/repos/asf/sling-org-apache-sling-resource-observation-annotations.git -org.apache.sling.resource.observation.annotations-1.0.0 +HEAD https://github.com/apache/sling-org-apache-sling-resource-observation-annotations 8 - 2024-03-01T11:57:37Z + 2024-03-01T11:57:53Z
(sling-org-apache-sling-resource-observation-annotations) branch master updated: [maven-release-plugin] prepare release org.apache.sling.resource.observation.annotations-1.0.0
This is an automated email from the ASF dual-hosted git repository. kwin pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-resource-observation-annotations.git The following commit(s) were added to refs/heads/master by this push: new 3d9f1ad [maven-release-plugin] prepare release org.apache.sling.resource.observation.annotations-1.0.0 3d9f1ad is described below commit 3d9f1ad5e38e647f64a32466e0e5c41f05d6b821 Author: Konrad Windszus AuthorDate: Fri Mar 1 12:57:46 2024 +0100 [maven-release-plugin] prepare release org.apache.sling.resource.observation.annotations-1.0.0 --- pom.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index e1f7518..b160fb4 100644 --- a/pom.xml +++ b/pom.xml @@ -20,7 +20,7 @@ org.apache.sling.resource.observation.annotations -1.0.0-SNAPSHOT +1.0.0 Apache Sling Resource Observation Annotations OSGi DS component property type annotations for Sling resource change listeners @@ -28,13 +28,13 @@ scm:git:https://gitbox.apache.org/repos/asf/sling-org-apache-sling-resource-observation-annotations.git scm:git:https://gitbox.apache.org/repos/asf/sling-org-apache-sling-resource-observation-annotations.git -HEAD +org.apache.sling.resource.observation.annotations-1.0.0 https://github.com/apache/sling-org-apache-sling-resource-observation-annotations 8 - 2021-06-07T21:11:58Z + 2024-03-01T11:57:37Z
(sling-org-apache-sling-resource-observation-annotations) annotated tag org.apache.sling.resource.observation.annotations-1.0.0 created (now e961f2d)
This is an automated email from the ASF dual-hosted git repository. kwin pushed a change to annotated tag org.apache.sling.resource.observation.annotations-1.0.0 in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-resource-observation-annotations.git at e961f2d (tag) tagging 3d9f1ad5e38e647f64a32466e0e5c41f05d6b821 (commit) by Konrad Windszus on Fri Mar 1 12:57:49 2024 +0100 - Log - [maven-release-plugin] copy for tag org.apache.sling.resource.observation.annotations-1.0.0 --- No new revisions were added by this update.
(sling-org-apache-sling-resource-observation-annotations) branch master updated: SLING-12249 Clarify that events may be received for ancestors of the received paths
This is an automated email from the ASF dual-hosted git repository.
kwin pushed a commit to branch master
in repository
https://gitbox.apache.org/repos/asf/sling-org-apache-sling-resource-observation-annotations.git
The following commit(s) were added to refs/heads/master by this push:
new c5c60bf SLING-12249 Clarify that events may be received for ancestors
of the received paths
c5c60bf is described below
commit c5c60bf0b05879c13b4bea691e6f4d51d3c046fa
Author: Konrad Windszus
AuthorDate: Fri Mar 1 12:51:55 2024 +0100
SLING-12249 Clarify that events may be received for ancestors of the
received paths
That may happen for both "Added" and "Removed"
---
.../annotations/SlingResourceChangeListener.java| 17 -
1 file changed, 8 insertions(+), 9 deletions(-)
diff --git
a/src/main/java/org/apache/sling/resource/observation/annotations/SlingResourceChangeListener.java
b/src/main/java/org/apache/sling/resource/observation/annotations/SlingResourceChangeListener.java
index 440b189..e73692a 100644
---
a/src/main/java/org/apache/sling/resource/observation/annotations/SlingResourceChangeListener.java
+++
b/src/main/java/org/apache/sling/resource/observation/annotations/SlingResourceChangeListener.java
@@ -27,8 +27,7 @@ import
org.osgi.service.component.annotations.ComponentPropertyType;
* https://docs.osgi.org/specification/osgi.cmpn/7.0.0/service.component.html#service.component-component.property.types";>
* Component Property Type (as defined by OSGi DS 1.4) for Sling
(External)ResourceChangeListener services.
* Takes care of writing the relevant service properties as being used by the
Sling Observation API
- * to register the annotated {@link ResourceChangeListener} or {@link
ExternalResourceChangeListener} DS components
- * with the correct restrictions.
+ * to register the annotated {@link ResourceChangeListener} DS components with
the correct restrictions.
*
* @see ResourceChangeListener
* @see ExternalResourceChangeListener
@@ -59,14 +58,14 @@ public @interface SlingResourceChangeListener {
*
*
*
- * In general, it can't be guaranteed that the underlying implementation
of the resources will send a remove
- * event for each removed resource. For example if the root of a tree,
like {@code /foo} is removed, the underlying
+ * In general, it can't be guaranteed that the underlying implementation
of the resources will send a remove/add
+ * event for each removed/added resource. For example if the root of a
tree, like {@code /foo} is removed, the underlying
* implementation might only send a single remove event for {@code /foo}
but not for any child resources.
- * Therefore if a listener is interested in resource remove events, it
might get remove events for resources
- * that not directly match the specified pattern/filters. For example if a
listener is registered for {@code /foo/bar}
- * and {@code /foo} is removed, the listener will get a remove event for
{@code /foo}. The same is true if any pattern is used
- * and any parent of a matching resource is removed. If a listener is
interested in
- * remove events, it will get a remove of any parent resource from the
specified paths or patterns. The listener
+ * Similarly for renaming a subtree from {@code /foo} to {@code /bar} the
add event may only be sent for {@code /bar}
+ * but not for any child resources.
+ * Therefore a listener might get remove/add events for resources that not
directly match the specified paths/path patterns.
+ * For example if a listener is registered for path {@code /foo/bar} and
{@code /foo} is removed, the listener will get a remove event for {@code /foo}.
+ * The same is true if any pattern is used and any parent of a matching
resource is removed/added. The listener
* must handle these events accordingly.
*
* If one of the paths is a sub resource of another specified path, the
sub path is ignored.
(sling-org-apache-sling-jcr-resource) branch feature/test-events-for-move deleted (was 2013037)
This is an automated email from the ASF dual-hosted git repository. kwin pushed a change to branch feature/test-events-for-move in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-jcr-resource.git was 2013037 SLING-12246 Add tests for move and orderBefore operations The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
(sling-org-apache-sling-jcr-resource) branch master updated: SLING-12246 Add tests for move and orderBefore operations (#41)
This is an automated email from the ASF dual-hosted git repository.
kwin pushed a commit to branch master
in repository
https://gitbox.apache.org/repos/asf/sling-org-apache-sling-jcr-resource.git
The following commit(s) were added to refs/heads/master by this push:
new 7660582 SLING-12246 Add tests for move and orderBefore operations
(#41)
7660582 is described below
commit 7660582019bc8b4b0fdda73bdddbde77262159e6
Author: Konrad Windszus
AuthorDate: Fri Mar 1 12:17:55 2024 +0100
SLING-12246 Add tests for move and orderBefore operations (#41)
The move operations are tested with observers on different levels
---
.../resource/internal/JcrResourceListenerTest.java | 153 -
1 file changed, 147 insertions(+), 6 deletions(-)
diff --git
a/src/test/java/org/apache/sling/jcr/resource/internal/JcrResourceListenerTest.java
b/src/test/java/org/apache/sling/jcr/resource/internal/JcrResourceListenerTest.java
index 9389a69..e487b10 100644
---
a/src/test/java/org/apache/sling/jcr/resource/internal/JcrResourceListenerTest.java
+++
b/src/test/java/org/apache/sling/jcr/resource/internal/JcrResourceListenerTest.java
@@ -18,6 +18,7 @@ package org.apache.sling.jcr.resource.internal;
import static java.util.Collections.synchronizedList;
import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
@@ -29,12 +30,17 @@ import java.util.HashSet;
import java.util.List;
import java.util.Set;
+import javax.jcr.AccessDeniedException;
import javax.jcr.Credentials;
import javax.jcr.Node;
import javax.jcr.RepositoryException;
import javax.jcr.Session;
import javax.jcr.Value;
+import javax.jcr.lock.LockException;
+import javax.jcr.nodetype.ConstraintViolationException;
+import javax.jcr.version.VersionException;
+import org.apache.jackrabbit.commons.JcrUtils;
import org.apache.sling.api.resource.observation.ResourceChange;
import org.apache.sling.api.resource.observation.ResourceChange.ChangeType;
import org.apache.sling.api.resource.path.PathSet;
@@ -61,6 +67,8 @@ public class JcrResourceListenerTest {
private final String createdPath = "/test" + System.currentTimeMillis() +
"-create";
+private final String movedPath = "/test" + System.currentTimeMillis() +
"-moved";
+
private final String pathToDelete = "/test" + System.currentTimeMillis() +
"-delete";
private final String pathToModify = "/test" + System.currentTimeMillis() +
"-modify";
@@ -74,7 +82,13 @@ public class JcrResourceListenerTest {
public void setUp() throws Exception {
repository = SlingRepositoryProvider.getRepository();
this.adminSession = repository.loginAdministrative(null);
-ObservationReporter observationReporter = getObservationReporter();
+registerListener("/");
+}
+
+private void registerListener(String paths) throws RepositoryException {
+unregisterListener();
+events.clear();
+ObservationReporter observationReporter =
getObservationReporter(paths);
this.config = new JcrListenerBaseConfig(observationReporter,
new SlingRepository() {
@@ -140,7 +154,6 @@ public class JcrResourceListenerTest {
@Override
public String getDefaultWorkspace() {
-// TODO Auto-generated method stub
return repository.getDefaultWorkspace();
}
});
@@ -149,11 +162,22 @@ public class JcrResourceListenerTest {
}
@After
-public void tearDown() {
+public void tearDown() throws AccessDeniedException, VersionException,
LockException, ConstraintViolationException, RepositoryException {
+unregisterListener();
+if (adminSession.itemExists("/apps")) {
+adminSession.removeItem("/apps");
+}
+if (adminSession.itemExists("/apps2")) {
+adminSession.removeItem("/apps2");
+}
if (adminSession != null) {
+adminSession.save();
adminSession.logout();
adminSession = null;
}
+}
+
+private void unregisterListener() {
if (listener != null) {
listener.close();
listener = null;
@@ -200,6 +224,115 @@ public class JcrResourceListenerTest {
assertTrue("Removed set should contain " + pathToDelete,
removePaths.contains(pathToDelete));
}
+@Test
+public void testMoveOperationsInsideObservedPathOnLeafNode() throws
RepositoryException, InterruptedException {
+createNode(adminSession, createdPath);
+adminSession.move(createdPath, movedPath);
+adminSession.save();
+Thread.sle
(sling-org-apache-sling-jcr-resource) branch feature/test-events-for-move updated (2982a8b -> 2013037)
This is an automated email from the ASF dual-hosted git repository. kwin pushed a change to branch feature/test-events-for-move in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-jcr-resource.git omit 2982a8b SLING-12246 Add tests for move and orderBefore operations add 2013037 SLING-12246 Add tests for move and orderBefore operations This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (2982a8b) \ N -- N -- N refs/heads/feature/test-events-for-move (2013037) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. No new revisions were added by this update. Summary of changes: .../resource/internal/JcrResourceListenerTest.java | 122 +++-- 1 file changed, 114 insertions(+), 8 deletions(-)
(sling-site) 01/01: Clarify queue ranking
This is an automated email from the ASF dual-hosted git repository. kwin pushed a commit to branch clarify-job-queue-ranking in repository https://gitbox.apache.org/repos/asf/sling-site.git commit 1fa546c8aef3e7c8decc8c444b9a76aeb402b891 Author: Konrad Windszus AuthorDate: Thu Feb 29 17:02:37 2024 +0100 Clarify queue ranking Make clear that the highest rank wins --- .../documentation/bundles/apache-sling-eventing-and-job-handling.md| 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/jbake/content/documentation/bundles/apache-sling-eventing-and-job-handling.md b/src/main/jbake/content/documentation/bundles/apache-sling-eventing-and-job-handling.md index ca7d2b686..9b21a15a9 100644 --- a/src/main/jbake/content/documentation/bundles/apache-sling-eventing-and-job-handling.md +++ b/src/main/jbake/content/documentation/bundles/apache-sling-eventing-and-job-handling.md @@ -197,7 +197,8 @@ A queue configuration can have the following properties: | `queue.priority` | The thread priority: NORM, MIN, or MAX | | `service.ranking` | A ranking for this configuration.| -The configurations are processed in order of their service ranking. The first matching queue configuration is used for the job. +The configurations are processed in descending order of their service ranking (same as in [`BundleContext.getServiceReference(...)`](https://docs.osgi.org/javadoc/osgi.core/7.0.0/org/osgi/framework/BundleContext.html#getServiceReference-java.lang.Class-). In case of a tie in the service ranking the config which was registered earlier is processed before the config which was registered later. +The first matching queue configuration is used for the job. Ordered Queues
(sling-site) branch clarify-job-queue-ranking created (now 1fa546c8a)
This is an automated email from the ASF dual-hosted git repository. kwin pushed a change to branch clarify-job-queue-ranking in repository https://gitbox.apache.org/repos/asf/sling-site.git at 1fa546c8a Clarify queue ranking This branch includes the following new commits: new 1fa546c8a Clarify queue ranking The 1 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.
(sling-org-apache-sling-event) branch feature/add-queue-config-ranking-tests created (now 6daf897)
This is an automated email from the ASF dual-hosted git repository. kwin pushed a change to branch feature/add-queue-config-ranking-tests in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-event.git at 6daf897 Add tests for multiple applicable configs This branch includes the following new commits: new 6daf897 Add tests for multiple applicable configs The 1 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.
(sling-org-apache-sling-event) 01/01: Add tests for multiple applicable configs
This is an automated email from the ASF dual-hosted git repository.
kwin pushed a commit to branch feature/add-queue-config-ranking-tests
in repository
https://gitbox.apache.org/repos/asf/sling-org-apache-sling-event.git
commit 6daf89700047098fc09ebf05263cc6584d78c223
Author: Konrad Windszus
AuthorDate: Thu Feb 29 16:55:48 2024 +0100
Add tests for multiple applicable configs
---
.../config/InternalQueueConfigurationTest.java | 17 --
.../jobs/config/QueueConfigurationManagerTest.java | 64 ++
2 files changed, 76 insertions(+), 5 deletions(-)
diff --git
a/src/test/java/org/apache/sling/event/impl/jobs/config/InternalQueueConfigurationTest.java
b/src/test/java/org/apache/sling/event/impl/jobs/config/InternalQueueConfigurationTest.java
index 948d953..b6aa5e4 100644
---
a/src/test/java/org/apache/sling/event/impl/jobs/config/InternalQueueConfigurationTest.java
+++
b/src/test/java/org/apache/sling/event/impl/jobs/config/InternalQueueConfigurationTest.java
@@ -31,21 +31,28 @@ import java.util.Map;
public class InternalQueueConfigurationTest {
-private InternalQueueConfiguration.Config createConfig(final double
maxParallel) {
+static InternalQueueConfiguration.Config createConfig(final double
maxParallel) {
return createConfig(null, "QueueConfigurationTest", maxParallel);
}
-private InternalQueueConfiguration.Config createConfig(final String[]
topics) {
+static InternalQueueConfiguration.Config createConfig(final String[]
topics) {
return createConfig(topics, "QueueConfigurationTest",
ConfigurationConstants.DEFAULT_MAX_PARALLEL);
}
-private InternalQueueConfiguration.Config createConfig(final String[]
topics, final String name) {
+static InternalQueueConfiguration.Config createConfig(final String[]
topics, final String name) {
return createConfig(topics, name,
ConfigurationConstants.DEFAULT_MAX_PARALLEL);
}
-private InternalQueueConfiguration.Config createConfig(final String[]
topics,
+static InternalQueueConfiguration.Config createConfig(final String[]
topics,
final String name,
final double maxParallel) {
+return createConfig(topics, name, maxParallel, 0);
+}
+
+static InternalQueueConfiguration.Config createConfig(final String[]
topics,
+final String name,
+final double maxParallel,
+final int ranking) {
return new InternalQueueConfiguration.Config() {
@Override
@@ -105,7 +112,7 @@ public class InternalQueueConfigurationTest {
@Override
public int service_ranking() {
-return 0;
+return ranking;
}
@Override
diff --git
a/src/test/java/org/apache/sling/event/impl/jobs/config/QueueConfigurationManagerTest.java
b/src/test/java/org/apache/sling/event/impl/jobs/config/QueueConfigurationManagerTest.java
new file mode 100644
index 000..9eb4b5a
--- /dev/null
+++
b/src/test/java/org/apache/sling/event/impl/jobs/config/QueueConfigurationManagerTest.java
@@ -0,0 +1,64 @@
+/*
+ * 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.
+ */
+package org.apache.sling.event.impl.jobs.config;
+
+import static org.junit.Assert.assertEquals;
+
+import java.util.Collections;
+
+import
org.apache.sling.event.impl.jobs.config.QueueConfigurationManager.QueueInfo;
+import org.junit.Test;
+
+public class QueueConfigurationManagerTest {
+
+@Test
+public void testMultipleMatchingConfigsWithSameRankingAndSameTopic() {
+QueueConfigurationManager configMgr = new QueueConfigurationManager();
+
configMgr.bindConfig(InternalQueueConfiguration.fromConfiguration(Collections.emptyMap(),
+InternalQueueConfigurationTest.createConfig(new String[]
{"topic1"}, "queue1", 2, 0)));
+
configMgr.bindConfig(InternalQueueConfiguration.fromConfiguration(Collections.emptyMap(),
+InternalQueueConfigurationTest.createConfig(new String[]
{"topic1"}, "queue2", 2, 0)));
+
config
(sling-parent) branch master updated: SLING-12252 Remove maven-plugin-annotations from dependencyManagement (#43)
This is an automated email from the ASF dual-hosted git repository.
kwin pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-parent.git
The following commit(s) were added to refs/heads/master by this push:
new 0bf3676 SLING-12252 Remove maven-plugin-annotations from
dependencyManagement (#43)
0bf3676 is described below
commit 0bf3676a221c6beea001bea876ca9e50156f5858
Author: Slawomir Jaranowski
AuthorDate: Thu Feb 15 09:39:58 2024 +0100
SLING-12252 Remove maven-plugin-annotations from dependencyManagement (#43)
It is managed in ASF parent
---
sling-parent/pom.xml | 7 ---
1 file changed, 7 deletions(-)
diff --git a/sling-parent/pom.xml b/sling-parent/pom.xml
index 288c717..7436c88 100644
--- a/sling-parent/pom.xml
+++ b/sling-parent/pom.xml
@@ -164,13 +164,6 @@
23.0.0
-
-
-org.apache.maven.plugin-tools
-maven-plugin-annotations
-${maven.plugin.tools.version}
-
-
junit
(sling-org-apache-sling-api) branch feature/resource-changes-outside-path-for-add deleted (was 6780ee0)
This is an automated email from the ASF dual-hosted git repository. kwin pushed a change to branch feature/resource-changes-outside-path-for-add in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-api.git was 6780ee0 SLING-12249 Clarify that both REMOVED and ADDED events may be received for ancestors of registered path. The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
(sling-org-apache-sling-api) branch master updated: SLING-12249 Clarify that both REMOVED and ADDED events may be received (#51)
This is an automated email from the ASF dual-hosted git repository.
kwin pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-api.git
The following commit(s) were added to refs/heads/master by this push:
new 0b81078 SLING-12249 Clarify that both REMOVED and ADDED events may be
received (#51)
0b81078 is described below
commit 0b81078c6977afe27d1f3d069456329a34459134
Author: Konrad Windszus
AuthorDate: Mon Feb 12 16:57:12 2024 +0100
SLING-12249 Clarify that both REMOVED and ADDED events may be received (#51)
for ancestors of registered path.
---
.../resource/observation/ResourceChangeListener.java | 19 ---
1 file changed, 12 insertions(+), 7 deletions(-)
diff --git
a/src/main/java/org/apache/sling/api/resource/observation/ResourceChangeListener.java
b/src/main/java/org/apache/sling/api/resource/observation/ResourceChangeListener.java
index e2caf50..4e1c70e 100644
---
a/src/main/java/org/apache/sling/api/resource/observation/ResourceChangeListener.java
+++
b/src/main/java/org/apache/sling/api/resource/observation/ResourceChangeListener.java
@@ -70,14 +70,14 @@ public interface ResourceChangeListener {
*
*
*
- * In general, it can't be guaranteed that the underlying implementation
of the resources will send a remove
- * event for each removed resource. For example if the root of a tree,
like {@code /foo} is removed, the underlying
+ * In general, it can't be guaranteed that the underlying implementation
of the resources will send a remove/add
+ * event for each removed/added resource. For example if the root of a
tree, like {@code /foo} is removed, the underlying
* implementation might only send a single remove event for {@code /foo}
but not for any child resources.
- * Therefore if a listener is interested in resource remove events, it
might get remove events for resources
- * that not directly match the specified pattern/filters. For example if a
listener is registered for {@code /foo/bar}
- * and {@code /foo} is removed, the listener will get a remove event for
{@code /foo}. The same is true if any pattern is used
- * and any parent of a matching resource is removed. If a listener is
interested in
- * remove events, it will get a remove of any parent resource from the
specified paths or patterns. The listener
+ * Similarly for renaming a subtree from {@code /foo} to {@code /bar} the
add event may only be sent for {@code /bar}
+ * but not for any child resources.
+ * Therefore a listener might get remove/add events for resources that not
directly match the specified paths/path patterns.
+ * For example if a listener is registered for path {@code /foo/bar} and
{@code /foo} is removed, the listener will get a remove event for {@code /foo}.
+ * The same is true if any pattern is used and any parent of a matching
resource is removed/added. The listener
* must handle these events accordingly.
*
* If one of the paths is a sub resource of another specified path, the
sub path is ignored.
@@ -144,6 +144,11 @@ public interface ResourceChangeListener {
/**
* Report resource changes based on the filter properties of this listener.
*
+ * Note that resource changes for paths which are
ancestors of the paths this
+ * listener was registered to may be reported through this method. This is
due to limitations of
+ * certain resource providers to provide events on a more granular level
+ * (e.g. for deletion or movement of resources containing (potentially
nested) child resources).
+ *
* Starting with version 1.2 of this API, an instance of {@code
ResoureChangeList} is passed
* as the parameter to allow passing additional information.
*
(sling-org-apache-sling-jcr-repoinit) branch feature/more-context-for-exceptions-in-repoinitializer deleted (was e450938)
This is an automated email from the ASF dual-hosted git repository. kwin pushed a change to branch feature/more-context-for-exceptions-in-repoinitializer in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-jcr-repoinit.git was e450938 SLING-12237 Extend error message from RepositoryInitializer(Factory) by source reference The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
(sling-org-apache-sling-jcr-repoinit) branch master updated: SLING-12237 Extend error message from RepositoryInitializer(Factory) by (#50)
This is an automated email from the ASF dual-hosted git repository.
kwin pushed a commit to branch master
in repository
https://gitbox.apache.org/repos/asf/sling-org-apache-sling-jcr-repoinit.git
The following commit(s) were added to refs/heads/master by this push:
new 7dcdfa8 SLING-12237 Extend error message from
RepositoryInitializer(Factory) by (#50)
7dcdfa8 is described below
commit 7dcdfa8c6ef967ed579703d8f75286357e6debcc
Author: Konrad Windszus
AuthorDate: Thu Feb 8 15:12:13 2024 +0100
SLING-12237 Extend error message from RepositoryInitializer(Factory) by
(#50)
source reference
---
pom.xml| 5 +++
.../jcr/repoinit/impl/RepositoryInitializer.java | 23 +-
.../impl/RepositoryInitializerFactory.java | 36 ++
.../jcr/repoinit/impl/RetryableOperation.java | 15 ++---
.../jcr/repoinit/RepositoryInitializerTest.java| 14 +++--
.../impl/RepositoryInitializerFactoryTest.java | 4 +--
.../jcr/repoinit/impl/RetryableOperationTest.java | 12
7 files changed, 74 insertions(+), 35 deletions(-)
diff --git a/pom.xml b/pom.xml
index 9af040c..75d1f93 100644
--- a/pom.xml
+++ b/pom.xml
@@ -168,6 +168,11 @@
org.osgi.annotation.versioning
provided
+
+org.osgi
+org.osgi.service.component
+provided
+
org.slf4j
slf4j-api
diff --git
a/src/main/java/org/apache/sling/jcr/repoinit/impl/RepositoryInitializer.java
b/src/main/java/org/apache/sling/jcr/repoinit/impl/RepositoryInitializer.java
index d221c28..d20c6e3 100644
---
a/src/main/java/org/apache/sling/jcr/repoinit/impl/RepositoryInitializer.java
+++
b/src/main/java/org/apache/sling/jcr/repoinit/impl/RepositoryInitializer.java
@@ -16,16 +16,19 @@
*/
package org.apache.sling.jcr.repoinit.impl;
+import java.io.IOException;
import java.io.StringReader;
import java.util.Arrays;
import java.util.List;
+import javax.jcr.RepositoryException;
import javax.jcr.Session;
import org.apache.sling.jcr.api.SlingRepository;
import org.apache.sling.jcr.api.SlingRepositoryInitializer;
import org.apache.sling.jcr.repoinit.JcrRepoInitOpsProcessor;
import org.apache.sling.repoinit.parser.RepoInitParser;
+import org.apache.sling.repoinit.parser.RepoInitParsingException;
import org.apache.sling.repoinit.parser.operations.Operation;
import org.osgi.framework.Constants;
import org.osgi.service.component.annotations.Activate;
@@ -86,7 +89,7 @@ public class RepositoryInitializer implements
SlingRepositoryInitializer {
}
@Override
-public void processRepository(SlingRepository repo) throws Exception {
+public void processRepository(SlingRepository repo) throws
RepositoryException {
if ( config.references() != null && config.references().length > 0 ) {
// loginAdministrative is ok here, definitely an admin operation
@SuppressWarnings("deprecation")
@@ -94,14 +97,18 @@ public class RepositoryInitializer implements
SlingRepositoryInitializer {
try {
final RepoinitTextProvider p = new RepoinitTextProvider();
for(String reference : config.references()) {
-final String repoinitText = p.getRepoinitText(reference);
-final List ops;
-try (StringReader sr = new StringReader(repoinitText)) {
-ops = parser.parse(sr);
+try {
+final String repoinitText =
p.getRepoinitText(reference);
+final List ops;
+try (StringReader sr = new StringReader(repoinitText))
{
+ops = parser.parse(sr);
+}
+log.info("Executing {} repoinit operations from {}",
ops.size(), reference);
+processor.apply(s, ops);
+s.save();
+} catch
(IOException|RuntimeException|RepositoryException|RepoInitParsingException e) {
+throw new RepoInitException("Error executing repoinit
from " + reference, e);
}
-log.info("Executing {} repoinit operations", ops.size());
-processor.apply(s, ops);
-s.save();
}
} finally {
s.logout();
diff --git
a/src/main/java/org/apache/sling/jcr/repoinit/impl/RepositoryInitializerFactory.java
b/src/main/java/org/apache/sling/jcr/repoinit/impl/RepositoryInitializerFactory.java
index 447d7bb..f076dc9 100644
---
a/src/main/java/org/apache/sling/jcr/repoinit/impl/RepositoryInitializerFactory.java
+++
b/src/main/java/org/apache/sling/jcr/repoinit/impl/RepositoryInitializerFactory.java
@@ -19,6 +19,7 @@
(sling-org-apache-sling-api) branch feature/resource-changes-outside-path-for-add updated (a5d5a47 -> 6780ee0)
This is an automated email from the ASF dual-hosted git repository. kwin pushed a change to branch feature/resource-changes-outside-path-for-add in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-api.git omit a5d5a47 SLING-12249 Clarify that both REMOVED and ADDED events may be received for ancestors of registered path. add 6780ee0 SLING-12249 Clarify that both REMOVED and ADDED events may be received for ancestors of registered path. This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (a5d5a47) \ N -- N -- N refs/heads/feature/resource-changes-outside-path-for-add (6780ee0) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. No new revisions were added by this update. Summary of changes: .../apache/sling/api/resource/observation/ResourceChangeListener.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
(sling-org-apache-sling-api) branch feature/resource-changes-outside-path-for-add updated (0dfd14a -> a5d5a47)
This is an automated email from the ASF dual-hosted git repository. kwin pushed a change to branch feature/resource-changes-outside-path-for-add in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-api.git omit 0dfd14a SLING-12249 Clarify that both REMOVED and ADDED events may be received for ancestors of registered path. add a5d5a47 SLING-12249 Clarify that both REMOVED and ADDED events may be received for ancestors of registered path. This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (0dfd14a) \ N -- N -- N refs/heads/feature/resource-changes-outside-path-for-add (a5d5a47) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. No new revisions were added by this update. Summary of changes: .../sling/api/resource/observation/ResourceChangeListener.java | 5 + 1 file changed, 5 insertions(+)
(sling-org-apache-sling-api) 01/01: SLING-12249 Clarify that both REMOVED and ADDED events may be received for ancestors of registered path.
This is an automated email from the ASF dual-hosted git repository.
kwin pushed a commit to branch feature/resource-changes-outside-path-for-add
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-api.git
commit 0dfd14abe0fdea8415b5fff9a33ffec030da
Author: Konrad Windszus
AuthorDate: Wed Feb 7 20:08:39 2024 +0100
SLING-12249 Clarify that both REMOVED and ADDED events may be received
for ancestors of registered path.
---
.../api/resource/observation/ResourceChangeListener.java | 14 +++---
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git
a/src/main/java/org/apache/sling/api/resource/observation/ResourceChangeListener.java
b/src/main/java/org/apache/sling/api/resource/observation/ResourceChangeListener.java
index e2caf50..dcdb954 100644
---
a/src/main/java/org/apache/sling/api/resource/observation/ResourceChangeListener.java
+++
b/src/main/java/org/apache/sling/api/resource/observation/ResourceChangeListener.java
@@ -70,14 +70,14 @@ public interface ResourceChangeListener {
*
*
*
- * In general, it can't be guaranteed that the underlying implementation
of the resources will send a remove
- * event for each removed resource. For example if the root of a tree,
like {@code /foo} is removed, the underlying
+ * In general, it can't be guaranteed that the underlying implementation
of the resources will send a remove/add
+ * event for each removed/added resource. For example if the root of a
tree, like {@code /foo} is removed, the underlying
* implementation might only send a single remove event for {@code /foo}
but not for any child resources.
- * Therefore if a listener is interested in resource remove events, it
might get remove events for resources
- * that not directly match the specified pattern/filters. For example if a
listener is registered for {@code /foo/bar}
- * and {@code /foo} is removed, the listener will get a remove event for
{@code /foo}. The same is true if any pattern is used
- * and any parent of a matching resource is removed. If a listener is
interested in
- * remove events, it will get a remove of any parent resource from the
specified paths or patterns. The listener
+ * Similarly for renaming a subtree from {@code /foo} to {@code /bar} the
add event may only be sent for {@code /bar}
+ * but not for any child resources.
+ * Therefore a listener might get remove/add events for resources that not
directly match the specified pattern/filters.
+ * For example if a listener is registered for {@code /foo/bar} and {@code
/foo} is removed, the listener will get a remove event for {@code /foo}.
+ * The same is true if any pattern is used and any parent of a matching
resource is removed/added. The listener
* must handle these events accordingly.
*
* If one of the paths is a sub resource of another specified path, the
sub path is ignored.
(sling-org-apache-sling-api) branch feature/resource-changes-outside-path-for-add created (now 0dfd14a)
This is an automated email from the ASF dual-hosted git repository. kwin pushed a change to branch feature/resource-changes-outside-path-for-add in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-api.git at 0dfd14a SLING-12249 Clarify that both REMOVED and ADDED events may be received for ancestors of registered path. This branch includes the following new commits: new 0dfd14a SLING-12249 Clarify that both REMOVED and ADDED events may be received for ancestors of registered path. The 1 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.
(sling-org-apache-sling-resource-observation-annotations) branch master updated: Update Sling API dependencies to detect changes being introduced by SLING-6164
This is an automated email from the ASF dual-hosted git repository.
kwin pushed a commit to branch master
in repository
https://gitbox.apache.org/repos/asf/sling-org-apache-sling-resource-observation-annotations.git
The following commit(s) were added to refs/heads/master by this push:
new b1a3855 Update Sling API dependencies to detect changes being
introduced by SLING-6164
b1a3855 is described below
commit b1a38550bb042543d5f80bffc91bd0eb8432b777
Author: Konrad Windszus
AuthorDate: Wed Feb 7 14:49:43 2024 +0100
Update Sling API dependencies to detect changes being introduced by
SLING-6164
---
pom.xml | 4 ++--
.../resource/observation/annotations/SlingResourceChangeListener.java | 3 +++
2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/pom.xml b/pom.xml
index 206ff53..e1f7518 100644
--- a/pom.xml
+++ b/pom.xml
@@ -63,8 +63,8 @@
org.apache.sling
org.apache.sling.api
-
-2.11.0
+
+2.15.0
provided
diff --git
a/src/main/java/org/apache/sling/resource/observation/annotations/SlingResourceChangeListener.java
b/src/main/java/org/apache/sling/resource/observation/annotations/SlingResourceChangeListener.java
index c09cedd..440b189 100644
---
a/src/main/java/org/apache/sling/resource/observation/annotations/SlingResourceChangeListener.java
+++
b/src/main/java/org/apache/sling/resource/observation/annotations/SlingResourceChangeListener.java
@@ -99,8 +99,11 @@ public @interface SlingResourceChangeListener {
* must be prepared that the underlying implementation is not able to
filter
* based on this property. In this case the listener gets all events
* as defined with the other properties.
+ *
+ * This requires Sling API 2.15.0 or newer.
*
* @see ResourceChangeListener#PROPERTY_NAMES_HINT
+ *
*/
String[] property_names_hint() default {};
}
(sling-org-apache-sling-resource-observation-annotations) branch master updated: fix javadoc
This is an automated email from the ASF dual-hosted git repository.
kwin pushed a commit to branch master
in repository
https://gitbox.apache.org/repos/asf/sling-org-apache-sling-resource-observation-annotations.git
The following commit(s) were added to refs/heads/master by this push:
new a189d5b fix javadoc
a189d5b is described below
commit a189d5b40b2ca9d12b446e36524ce15ca3c4eb63
Author: Konrad Windszus
AuthorDate: Wed Feb 7 13:20:19 2024 +0100
fix javadoc
---
.../resource/observation/annotations/SlingResourceChangeListener.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git
a/src/main/java/org/apache/sling/resource/observation/annotations/SlingResourceChangeListener.java
b/src/main/java/org/apache/sling/resource/observation/annotations/SlingResourceChangeListener.java
index fa28ebe..c09cedd 100644
---
a/src/main/java/org/apache/sling/resource/observation/annotations/SlingResourceChangeListener.java
+++
b/src/main/java/org/apache/sling/resource/observation/annotations/SlingResourceChangeListener.java
@@ -84,7 +84,7 @@ public @interface SlingResourceChangeListener {
* and added and removed events for resource providers are reported.
*
* @see ResourceChangeListener#CHANGES
- * @see ResourceChangeType
+ * @see ResourceChange.ChangeType
*/
ResourceChange.ChangeType[] change_types() default {};
(sling-org-apache-sling-resource-observation-annotations) branch master updated: fix badges
This is an automated email from the ASF dual-hosted git repository. kwin pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-resource-observation-annotations.git The following commit(s) were added to refs/heads/master by this push: new 75933ca fix badges 75933ca is described below commit 75933caa370ce90126ed3b447c1c52875abb1bc0 Author: Konrad Windszus AuthorDate: Wed Feb 7 13:18:06 2024 +0100 fix badges --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index e60196d..4a316fe 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ [](https://sling.apache.org) -[](https://ci-builds.apache.org/job/Sling/job/modules/job/sling-org-apache-sling-resourcechangelistener-annotations/job/master/) -[](https://ci-builds.apache.org/job/Sling/job/modules/job/sling-org-apache-sling-resourcechangelistener-annotations/job/master/test/?width=800&height=600) +[](https://ci-builds.apache.org/job/Sling/job/modules/job/sling-org-apache-sling-resource-observation-annotations/job/master/) +[](https://ci-builds.apache.org/job/Sling/job/modules/job/sling-org-apache-sling-resource-observation-annotations/job/master/test/?width=800&height=600) [](https://sonarcloud.io/dashboard?id=apache_sling-org-apache-sling-resource-observation-annotations) [](https://sonarcloud.io/dashboard?id=apache_sling-org-apache-sling-resource-observation-annotations) [](https://www.javadoc.io/doc/org.apache.sling/org.apache.sling.resource.observation.annotations)
(sling-org-apache-sling-resource-observation-annotations) 01/01: SLING-12247 Add DS component property type for ResourceChangeListener properties
This is an automated email from the ASF dual-hosted git repository. kwin pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-resource-observation-annotations.git commit 96391b3ac88f39a276687aead6c74ccfb3cce7b2 Author: Konrad Windszus AuthorDate: Wed Feb 7 13:02:55 2024 +0100 SLING-12247 Add DS component property type for ResourceChangeListener properties --- .asf.yaml | 11 ++ .gitignore | 18 ++ CODE_OF_CONDUCT.md | 22 +++ CONTRIBUTING.md| 24 +++ Jenkinsfile| 20 ++ LICENSE| 202 + README.md | 19 ++ pom.xml| 126 + src/it/annotations-it/README.md| 4 + src/it/annotations-it/invoker.properties | 17 ++ src/it/annotations-it/pom.xml | 78 .../annotations/SampleResourceChangeListener.java | 38 src/it/annotations-it/verify.groovy| 61 +++ src/it/settings.xml| 59 ++ .../annotations/SlingResourceChangeListener.java | 106 +++ 15 files changed, 805 insertions(+) diff --git a/.asf.yaml b/.asf.yaml new file mode 100644 index 000..4db293a --- /dev/null +++ b/.asf.yaml @@ -0,0 +1,11 @@ +github: + autolink_jira: + - "SLING" + - "OAK" + - "JCR" + - "JCRVLT" + - "INFRA" + - "FELIX" + - "MNG" +notifications: + jira_options: "link" diff --git a/.gitignore b/.gitignore new file mode 100644 index 000..658337c --- /dev/null +++ b/.gitignore @@ -0,0 +1,18 @@ +target/ +/.project +/.settings/ +/.classpath +.idea +.metadata +.externalToolBuilders +maven-eclipse.xml +*.swp +*.iml +*.ipr +*.iws +*.bak +.vlt +.DS_Store +jcr.log +atlassian-ide-plugin.xml +.vscode/ diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md new file mode 100644 index 000..0fa18e5 --- /dev/null +++ b/CODE_OF_CONDUCT.md @@ -0,0 +1,22 @@ + +Apache Software Foundation Code of Conduct + + +Being an Apache project, Apache Sling adheres to the Apache Software Foundation's [Code of Conduct](https://www.apache.org/foundation/policies/conduct.html). diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md new file mode 100644 index 000..ac82a1a --- /dev/null +++ b/CONTRIBUTING.md @@ -0,0 +1,24 @@ + +Contributing + + +Thanks for choosing to contribute! + +You will find all the necessary details about how you can do this at https://sling.apache.org/contributing.html. diff --git a/Jenkinsfile b/Jenkinsfile new file mode 100644 index 000..f582519 --- /dev/null +++ b/Jenkinsfile @@ -0,0 +1,20 @@ +/** + * 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. + */ + +slingOsgiBundleBuild() diff --git a/LICENSE b/LICENSE new file mode 100644 index 000..d645695 --- /dev/null +++ b/LICENSE @@ -0,0 +1,202 @@ + + Apache License + Version 2.0, January 2004 +http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii)
(sling-org-apache-sling-resource-observation-annotations) branch master created (now 96391b3)
This is an automated email from the ASF dual-hosted git repository. kwin pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-resource-observation-annotations.git at 96391b3 SLING-12247 Add DS component property type for ResourceChangeListener properties This branch includes the following new commits: new 96391b3 SLING-12247 Add DS component property type for ResourceChangeListener properties The 1 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.
(sling-org-apache-sling-jcr-resource) branch feature/test-events-for-move created (now 2982a8b)
This is an automated email from the ASF dual-hosted git repository. kwin pushed a change to branch feature/test-events-for-move in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-jcr-resource.git at 2982a8b SLING-12246 Add tests for move and orderBefore operations This branch includes the following new commits: new 2982a8b SLING-12246 Add tests for move and orderBefore operations The 1 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.
(sling-org-apache-sling-jcr-resource) 01/01: SLING-12246 Add tests for move and orderBefore operations
This is an automated email from the ASF dual-hosted git repository.
kwin pushed a commit to branch feature/test-events-for-move
in repository
https://gitbox.apache.org/repos/asf/sling-org-apache-sling-jcr-resource.git
commit 2982a8b27ecbf5a3c3a08978c2db9af10040745e
Author: Konrad Windszus
AuthorDate: Wed Feb 7 10:58:34 2024 +0100
SLING-12246 Add tests for move and orderBefore operations
---
.../resource/internal/JcrResourceListenerTest.java | 35 ++
1 file changed, 35 insertions(+)
diff --git
a/src/test/java/org/apache/sling/jcr/resource/internal/JcrResourceListenerTest.java
b/src/test/java/org/apache/sling/jcr/resource/internal/JcrResourceListenerTest.java
index 9389a69..a0a9074 100644
---
a/src/test/java/org/apache/sling/jcr/resource/internal/JcrResourceListenerTest.java
+++
b/src/test/java/org/apache/sling/jcr/resource/internal/JcrResourceListenerTest.java
@@ -61,6 +61,8 @@ public class JcrResourceListenerTest {
private final String createdPath = "/test" + System.currentTimeMillis() +
"-create";
+private final String movedPath = "/test" + System.currentTimeMillis() +
"-moved";
+
private final String pathToDelete = "/test" + System.currentTimeMillis() +
"-delete";
private final String pathToModify = "/test" + System.currentTimeMillis() +
"-modify";
@@ -200,6 +202,39 @@ public class JcrResourceListenerTest {
assertTrue("Removed set should contain " + pathToDelete,
removePaths.contains(pathToDelete));
}
+@Test
+public void testMoveOperations() throws RepositoryException,
InterruptedException {
+createNode(adminSession, createdPath);
+adminSession.save();
+adminSession.move(createdPath, movedPath);
+adminSession.save();
+Thread.sleep(3500);
+
+assertTrue("Events must contain \"added\" for path \"" + movedPath +
"\"",
+events.stream().anyMatch(e -> e.getPath().equals(movedPath) &&
e.getType() == ChangeType.ADDED));
+assertTrue("Events must contain \"removed\" for path \"" + createdPath
+ "\"",
+events.stream().anyMatch(e -> e.getPath().equals(createdPath)
&& e.getType() == ChangeType.REMOVED));
+}
+
+@Test
+public void testOrderBeforeOperations() throws RepositoryException,
InterruptedException {
+Node node = createNode(adminSession, createdPath);
+node.addNode("child1");
+node.addNode("child2");
+
+adminSession.save();
+Thread.sleep(2000);
+events.clear();
+// reorder child1 to appear after child2
+node.orderBefore("child1", null);
+
+adminSession.save();
+Thread.sleep(2000);
+
+// TODO: send events here
+assertEquals("Received: " + events, 0, events.size());
+}
+
@Test
public void testMultiplePaths() throws Exception {
ObserverConfiguration observerConfig = new ObserverConfiguration() {
(sling-whiteboard) 01/01: SLING-12247: Add OSGi component property type annotation for Sling Resource Observation
This is an automated email from the ASF dual-hosted git repository. kwin pushed a commit to branch feature/resourcechangelistener-annotations in repository https://gitbox.apache.org/repos/asf/sling-whiteboard.git commit 786d10a811fe1de0f09414e65dedee42f9621691 Author: Konrad Windszus AuthorDate: Tue Feb 6 14:17:01 2024 +0100 SLING-12247: Add OSGi component property type annotation for Sling Resource Observation --- .../.gitignore | 18 ++ .../CODE_OF_CONDUCT.md | 22 +++ .../CONTRIBUTING.md| 24 +++ .../Jenkinsfile| 20 ++ .../LICENSE| 202 + .../README.md | 12 ++ .../pom.xml| 126 + .../src/it/annotations-it/README.md| 4 + .../src/it/annotations-it/bnd.bnd | 6 + .../src/it/annotations-it/invoker.properties | 17 ++ .../src/it/annotations-it/pom.xml | 77 .../annotations/SampleResourceChangeListener.java | 38 .../src/it/annotations-it/verify.groovy| 61 +++ .../src/it/settings.xml| 59 ++ .../annotations/SlingResourceChangeListener.java | 106 +++ 15 files changed, 792 insertions(+) diff --git a/sling-org-apache-sling-resourcechangelistener-annotations/.gitignore b/sling-org-apache-sling-resourcechangelistener-annotations/.gitignore new file mode 100644 index ..658337c9 --- /dev/null +++ b/sling-org-apache-sling-resourcechangelistener-annotations/.gitignore @@ -0,0 +1,18 @@ +target/ +/.project +/.settings/ +/.classpath +.idea +.metadata +.externalToolBuilders +maven-eclipse.xml +*.swp +*.iml +*.ipr +*.iws +*.bak +.vlt +.DS_Store +jcr.log +atlassian-ide-plugin.xml +.vscode/ diff --git a/sling-org-apache-sling-resourcechangelistener-annotations/CODE_OF_CONDUCT.md b/sling-org-apache-sling-resourcechangelistener-annotations/CODE_OF_CONDUCT.md new file mode 100644 index ..0fa18e59 --- /dev/null +++ b/sling-org-apache-sling-resourcechangelistener-annotations/CODE_OF_CONDUCT.md @@ -0,0 +1,22 @@ + +Apache Software Foundation Code of Conduct + + +Being an Apache project, Apache Sling adheres to the Apache Software Foundation's [Code of Conduct](https://www.apache.org/foundation/policies/conduct.html). diff --git a/sling-org-apache-sling-resourcechangelistener-annotations/CONTRIBUTING.md b/sling-org-apache-sling-resourcechangelistener-annotations/CONTRIBUTING.md new file mode 100644 index ..ac82a1ab --- /dev/null +++ b/sling-org-apache-sling-resourcechangelistener-annotations/CONTRIBUTING.md @@ -0,0 +1,24 @@ + +Contributing + + +Thanks for choosing to contribute! + +You will find all the necessary details about how you can do this at https://sling.apache.org/contributing.html. diff --git a/sling-org-apache-sling-resourcechangelistener-annotations/Jenkinsfile b/sling-org-apache-sling-resourcechangelistener-annotations/Jenkinsfile new file mode 100644 index ..f5825190 --- /dev/null +++ b/sling-org-apache-sling-resourcechangelistener-annotations/Jenkinsfile @@ -0,0 +1,20 @@ +/** + * 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. + */ + +slingOsgiBundleBuild() diff --git a/sling-org-apache-sling-resourcechangelistener-annotations/LICENSE b/sling-org-apache-sling-resourcechangelistener-annotations/LICENSE new file mode 100644 index ..d6456956 --- /dev/null +++ b/sling-org-apache-sling-resourcechangelistener-annotations/LICENSE @@ -0,0 +1,202 @@ + + Apache License + Version 2.0, January 2004 +http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the
(sling-whiteboard) branch feature/resourcechangelistener-annotations created (now 786d10a8)
This is an automated email from the ASF dual-hosted git repository. kwin pushed a change to branch feature/resourcechangelistener-annotations in repository https://gitbox.apache.org/repos/asf/sling-whiteboard.git at 786d10a8 SLING-12247: Add OSGi component property type annotation for Sling Resource Observation This branch includes the following new commits: new 786d10a8 SLING-12247: Add OSGi component property type annotation for Sling Resource Observation The 1 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.
svn commit: r67150 - /release/sling/
Author: kwin
Date: Sat Feb 3 18:27:34 2024
New Revision: 67150
Log:
Release Sling Parent 60
Added:
release/sling/sling-60-site.xml
release/sling/sling-60-site.xml.asc
release/sling/sling-60-site.xml.md5
release/sling/sling-60-site.xml.sha1
release/sling/sling-60-source-release.zip (with props)
release/sling/sling-60-source-release.zip.asc
release/sling/sling-60-source-release.zip.md5
release/sling/sling-60-source-release.zip.sha1
release/sling/sling-60-source-release.zip.sha512
release/sling/sling-60.pom
release/sling/sling-60.pom.asc
release/sling/sling-60.pom.md5
release/sling/sling-60.pom.sha1
Added: release/sling/sling-60-site.xml
==
--- release/sling/sling-60-site.xml (added)
+++ release/sling/sling-60-site.xml Sat Feb 3 18:27:34 2024
@@ -0,0 +1,73 @@
+
+
+
+http://maven.apache.org/DECORATION/1.8.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+xsi:schemaLocation="http://maven.apache.org/DECORATION/1.8.0
http://maven.apache.org/xsd/decoration-1.8.0.xsd";>
+
+org.apache.maven.skins
+maven-fluido-skin
+1.12.0
+
+
+
+
+Apache Sling
+https://sling.apache.org/res/logos/sling.svg
+https://sling.apache.org/
+63px
+123px
+
+
+Apache
+https://sling.apache.org/res/logos/apache.png
+https://apache.org/
+
+${project.scm.url}
+
+
+https://sling.apache.org/"/>
+https://sling.apache.org/components/"/>
+
+
+
+
+
+true
+
+ ${github.project.id}
+ right
+ gray
+
+
+
+6
+https://analytics.apache.org
+
+
+
+
+
+
+
+
Added: release/sling/sling-60-site.xml.asc
==
--- release/sling/sling-60-site.xml.asc (added)
+++ release/sling/sling-60-site.xml.asc Sat Feb 3 18:27:34 2024
@@ -0,0 +1,11 @@
+-BEGIN PGP SIGNATURE-
+
+iQEzBAABCgAdFiEEuRq30hIdxrCmGqGC13QtWEVezHwFAmW48cQACgkQ13QtWEVe
+zHyvRgf/WiByqrNRFb2DUtSQGMU0NtKcV9lsXKIudOmobs1475eKcREo0fbF2uUR
+vypSqzDg0qAtLIiDp37LJIO9xGjzOIkBS86FxfTVkt+WHVNtencAZnTKC+WyIBzL
+LzDgzeCc00pNA3NNuUSCb+BBFG76j+/qBxUs2IjwRIN6hiNpqx7vT4rdQ9nu9cLg
+m9CpDX1SoAALuQ1oEO2CaqgeJTQcB3+P6AaCTcA0ez/WyN7TOq427jFTsP9N0ahA
+mYIRBNM7ve9LUmMU0vs+46fHTOpDkWdyZ6ZbKaLk/XhvYgowa9PY6iPd8mpNtUDC
+dEntYHMmTqIqJ3abDuIaQbBZyY+PIg==
+=JNMT
+-END PGP SIGNATURE-
Added: release/sling/sling-60-site.xml.md5
==
--- release/sling/sling-60-site.xml.md5 (added)
+++ release/sling/sling-60-site.xml.md5 Sat Feb 3 18:27:34 2024
@@ -0,0 +1 @@
+cfd605658d5f338834bf3f91bf302316
\ No newline at end of file
Added: release/sling/sling-60-site.xml.sha1
==
--- release/sling/sling-60-site.xml.sha1 (added)
+++ release/sling/sling-60-site.xml.sha1 Sat Feb 3 18:27:34 2024
@@ -0,0 +1 @@
+126e4935f01d83b2fd0c875136cb90b190c19753
\ No newline at end of file
Added: release/sling/sling-60-source-release.zip
==
Binary file - no diff available.
Propchange: release/sling/sling-60-source-release.zip
--
svn:mime-type = application/octet-stream
Added: release/sling/sling-60-source-release.zip.asc
==
--- release/sling/sling-60-source-release.zip.asc (added)
+++ release/sling/sling-60-source-release.zip.asc Sat Feb 3 18:27:34 2024
@@ -0,0 +1,11 @@
+-BEGIN PGP SIGNATURE-
+
+iQEzBAABCgAdFiEEuRq30hIdxrCmGqGC13QtWEVezHwFAmW48cUACgkQ13QtWEVe
+zHxKvQgA5ui12PVwfSyp4RsSvfGI2yihb1TIu99EXNAynKOMW1M7Y2yUVXISiEs8
+OSBfUT19S7ZC5/s0C/nPXpKDp1ivXK51xsveFV8fCAu/cQoRaRIjA7biF5f6hLJy
+sKbHv0BX82etjanHiYI5+ZjY8NEL6A70ulp1iguygIY6i9INuBQw4mURpP1wN14j
+JjX3nCyBiaQGtrN2DWHnGjAjhLUHn6LseeYkOylDvuTZJGM0uemzsRTjliNP7TNB
++5rSRl3BPuu00Jqd1jveo1V3Z1WOsA0ZADW/KbGbGWmqQbmVDfH2PSFz2stAertb
+qjsCItIxAgxQQKf3fgn87OZT8SYN0g==
+=HMx2
+-END PGP SIGNATURE-
Added: release/sling/sling-60-source-release.zip.md5
==
--- release/sling/sling-60-source-release.zip.md5 (added)
+++ release/sling/sling-60-source-release.zip.md5 Sat Feb 3 18:27:34 2024
@@ -0,0 +1 @@
+f155ccb6db74f026749ac9cfd85c3510
\ No newline at end of file
Added: release/sling/sling-60-source-release.zip.sha1
svn commit: r67149 - /release/sling/
Author: kwin Date: Sat Feb 3 18:26:29 2024 New Revision: 67149 Log: Remove old version sling-bundle-parent 52 Removed: release/sling/sling-bundle-parent-52-source-release.zip release/sling/sling-bundle-parent-52-source-release.zip.asc release/sling/sling-bundle-parent-52-source-release.zip.md5 release/sling/sling-bundle-parent-52-source-release.zip.sha1 release/sling/sling-bundle-parent-52-source-release.zip.sha512 release/sling/sling-bundle-parent-52.pom release/sling/sling-bundle-parent-52.pom.asc release/sling/sling-bundle-parent-52.pom.md5 release/sling/sling-bundle-parent-52.pom.sha1
svn commit: r67151 - /release/sling/
Author: kwin Date: Sat Feb 3 18:28:06 2024 New Revision: 67151 Log: Remove old version Sling Parent 52 Removed: release/sling/sling-52-site.xml release/sling/sling-52-site.xml.asc release/sling/sling-52-site.xml.md5 release/sling/sling-52-site.xml.sha1 release/sling/sling-52-source-release.zip release/sling/sling-52-source-release.zip.asc release/sling/sling-52-source-release.zip.md5 release/sling/sling-52-source-release.zip.sha1 release/sling/sling-52-source-release.zip.sha512 release/sling/sling-52.pom release/sling/sling-52.pom.asc release/sling/sling-52.pom.md5 release/sling/sling-52.pom.sha1
svn commit: r67148 - /release/sling/
Author: kwin Date: Sat Feb 3 18:25:16 2024 New Revision: 67148 Log: Release sling-bundle-parent 60 Added: release/sling/sling-bundle-parent-60-source-release.zip (with props) release/sling/sling-bundle-parent-60-source-release.zip.asc release/sling/sling-bundle-parent-60-source-release.zip.md5 release/sling/sling-bundle-parent-60-source-release.zip.sha1 release/sling/sling-bundle-parent-60-source-release.zip.sha512 release/sling/sling-bundle-parent-60.pom release/sling/sling-bundle-parent-60.pom.asc release/sling/sling-bundle-parent-60.pom.md5 release/sling/sling-bundle-parent-60.pom.sha1 Added: release/sling/sling-bundle-parent-60-source-release.zip == Binary file - no diff available. Propchange: release/sling/sling-bundle-parent-60-source-release.zip -- svn:mime-type = application/octet-stream Added: release/sling/sling-bundle-parent-60-source-release.zip.asc == --- release/sling/sling-bundle-parent-60-source-release.zip.asc (added) +++ release/sling/sling-bundle-parent-60-source-release.zip.asc Sat Feb 3 18:25:16 2024 @@ -0,0 +1,11 @@ +-BEGIN PGP SIGNATURE- + +iQEzBAABCgAdFiEEuRq30hIdxrCmGqGC13QtWEVezHwFAmW48cgACgkQ13QtWEVe +zHx+UggA66XpO4bEuS5f8zNqApcA0WmB+CsBPibGbgxIo1/IXLTmTrbBx5/EDm6W +2vif+WFwqUWiUzZKVZibT3Jhp2EFINIwWdC4H2+w93lf7mJ2cOkMt+22xfy4huT6 +61ZM6p/096jiO+Rnncp3DiXYUjMUve0MzNdgBiNtL0fkY8JFImk7MCEF4kbnOD8X +b6nBgq9Y8GRGtKnJRkU0Pi/LZu2z+xfaDxIgGGmzGc3Otfzj7gLkp6QiWfROwEka +qnYrdFoui0c3wc+mdpf1Vkhh9fPGOM51iqelv3Zh1t7J46Cu3GFCL8WuM+dUkpC0 +mvI1QYV/L1HMR946syl0A/SAw6dEFQ== +=n0ii +-END PGP SIGNATURE- Added: release/sling/sling-bundle-parent-60-source-release.zip.md5 == --- release/sling/sling-bundle-parent-60-source-release.zip.md5 (added) +++ release/sling/sling-bundle-parent-60-source-release.zip.md5 Sat Feb 3 18:25:16 2024 @@ -0,0 +1 @@ +d01e7b7ca1317722077e2e94020c60a5 \ No newline at end of file Added: release/sling/sling-bundle-parent-60-source-release.zip.sha1 == --- release/sling/sling-bundle-parent-60-source-release.zip.sha1 (added) +++ release/sling/sling-bundle-parent-60-source-release.zip.sha1 Sat Feb 3 18:25:16 2024 @@ -0,0 +1 @@ +30781a65e73e79697316ee2017920ca996396634 \ No newline at end of file Added: release/sling/sling-bundle-parent-60-source-release.zip.sha512 == --- release/sling/sling-bundle-parent-60-source-release.zip.sha512 (added) +++ release/sling/sling-bundle-parent-60-source-release.zip.sha512 Sat Feb 3 18:25:16 2024 @@ -0,0 +1 @@ +07df6dcfa8b6fb90ed3da2abfebc32d025ced365b13dc7695d5336e27baef72792fe396e884e6055a8d6b76d2a9c225ad05ac8d6c7b78c6036b7d177205d0c1c \ No newline at end of file Added: release/sling/sling-bundle-parent-60.pom == --- release/sling/sling-bundle-parent-60.pom (added) +++ release/sling/sling-bundle-parent-60.pom Sat Feb 3 18:25:16 2024 @@ -0,0 +1,372 @@ + + +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";> +4.0.0 + + +org.apache.sling +sling +60 +../sling-parent + + +sling-bundle-parent +pom + +Apache Sling (Bundle Parent) +The parent project for Apache Sling bundle modules + + + scm:git:https://gitbox.apache.org/repos/asf/sling-parent.git + scm:git:https://gitbox.apache.org/repos/asf/sling-parent.git +sling-parent-reactor-60 +https://github.com/apache/sling-parent.git + + + +7.0.0 + +17 + + + + + + + + +org.osgi +osgi.core +7.0.0 + + + +org.osgi +osgi.cmpn +7.0.0 + + + + +org.osgi +org.osgi.framework +1.9.0 + + + +org.osgi +org.osgi.util.tracker +1.5.4 + + + +org.osgi +org.osgi.dto +1.1.1 + + + +org.osgi +org.osgi.service.url +1.0.1 + + + +org.osgi +org.osgi.res
(sling-parent) branch master updated: [maven-release-plugin] prepare for next development iteration
This is an automated email from the ASF dual-hosted git repository. kwin pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/sling-parent.git The following commit(s) were added to refs/heads/master by this push: new c61cdd9 [maven-release-plugin] prepare for next development iteration c61cdd9 is described below commit c61cdd9e2d0d56c8b16ebbd762045394fdf5d1c8 Author: Konrad Windszus AuthorDate: Tue Jan 30 13:55:14 2024 +0100 [maven-release-plugin] prepare for next development iteration --- pom.xml | 4 ++-- sling-bundle-parent/pom.xml | 4 ++-- sling-parent/pom.xml| 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pom.xml b/pom.xml index 88a0fdc..12da1b1 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ org.apache.sling sling-parent-reactor pom -60 +61-SNAPSHOT @@ -43,7 +43,7 @@ scm:git:https://gitbox.apache.org/repos/asf/sling-parent.git scm:git:https://gitbox.apache.org/repos/asf/sling-parent.git https://github.com/apache/sling-parent.git -sling-parent-reactor-60 +HEAD diff --git a/sling-bundle-parent/pom.xml b/sling-bundle-parent/pom.xml index c27b897..ef5c00f 100644 --- a/sling-bundle-parent/pom.xml +++ b/sling-bundle-parent/pom.xml @@ -21,7 +21,7 @@ org.apache.sling sling -60 +61-SNAPSHOT ../sling-parent @@ -34,7 +34,7 @@ scm:git:https://gitbox.apache.org/repos/asf/sling-parent.git scm:git:https://gitbox.apache.org/repos/asf/sling-parent.git -sling-parent-reactor-60 +HEAD https://github.com/apache/sling-parent.git diff --git a/sling-parent/pom.xml b/sling-parent/pom.xml index 0d7fbce..288c717 100644 --- a/sling-parent/pom.xml +++ b/sling-parent/pom.xml @@ -27,7 +27,7 @@ org.apache.sling sling -60 +61-SNAPSHOT pom Apache Sling (Parent) @@ -85,7 +85,7 @@ scm:git:https://gitbox.apache.org/repos/asf/sling-parent.git scm:git:https://gitbox.apache.org/repos/asf/sling-parent.git -sling-parent-reactor-60 +HEAD https://github.com/apache/sling-parent.git
(sling-parent) annotated tag sling-parent-reactor-60 created (now e4759b4)
This is an automated email from the ASF dual-hosted git repository. kwin pushed a change to annotated tag sling-parent-reactor-60 in repository https://gitbox.apache.org/repos/asf/sling-parent.git at e4759b4 (tag) tagging c3aec0553d97219e738de226552850e85aa32d90 (commit) replaces sling-parent-reactor-52 by Konrad Windszus on Tue Jan 30 13:55:10 2024 +0100 - Log - [maven-release-plugin] copy for tag sling-parent-reactor-60 --- No new revisions were added by this update.
(sling-parent) branch master updated: [maven-release-plugin] prepare release sling-parent-reactor-60
This is an automated email from the ASF dual-hosted git repository. kwin pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/sling-parent.git The following commit(s) were added to refs/heads/master by this push: new c3aec05 [maven-release-plugin] prepare release sling-parent-reactor-60 c3aec05 is described below commit c3aec0553d97219e738de226552850e85aa32d90 Author: Konrad Windszus AuthorDate: Tue Jan 30 13:54:58 2024 +0100 [maven-release-plugin] prepare release sling-parent-reactor-60 --- pom.xml | 4 ++-- sling-bundle-parent/pom.xml | 4 ++-- sling-parent/pom.xml| 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pom.xml b/pom.xml index dce0fde..88a0fdc 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ org.apache.sling sling-parent-reactor pom -60-SNAPSHOT +60 @@ -43,7 +43,7 @@ scm:git:https://gitbox.apache.org/repos/asf/sling-parent.git scm:git:https://gitbox.apache.org/repos/asf/sling-parent.git https://github.com/apache/sling-parent.git -HEAD +sling-parent-reactor-60 diff --git a/sling-bundle-parent/pom.xml b/sling-bundle-parent/pom.xml index b6560eb..c27b897 100644 --- a/sling-bundle-parent/pom.xml +++ b/sling-bundle-parent/pom.xml @@ -21,7 +21,7 @@ org.apache.sling sling -60-SNAPSHOT +60 ../sling-parent @@ -34,7 +34,7 @@ scm:git:https://gitbox.apache.org/repos/asf/sling-parent.git scm:git:https://gitbox.apache.org/repos/asf/sling-parent.git -HEAD +sling-parent-reactor-60 https://github.com/apache/sling-parent.git diff --git a/sling-parent/pom.xml b/sling-parent/pom.xml index 3e191a4..0d7fbce 100644 --- a/sling-parent/pom.xml +++ b/sling-parent/pom.xml @@ -27,7 +27,7 @@ org.apache.sling sling -60-SNAPSHOT +60 pom Apache Sling (Parent) @@ -85,7 +85,7 @@ scm:git:https://gitbox.apache.org/repos/asf/sling-parent.git scm:git:https://gitbox.apache.org/repos/asf/sling-parent.git -HEAD +sling-parent-reactor-60 https://github.com/apache/sling-parent.git
(sling-parent) branch master updated: require Java 17 for the reactor build
This is an automated email from the ASF dual-hosted git repository. kwin pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/sling-parent.git The following commit(s) were added to refs/heads/master by this push: new cee61f3 require Java 17 for the reactor build cee61f3 is described below commit cee61f333156ed42697054b1eaa57f6f8a3dab45 Author: Konrad Windszus AuthorDate: Tue Jan 30 13:51:35 2024 +0100 require Java 17 for the reactor build --- pom.xml | 5 + 1 file changed, 5 insertions(+) diff --git a/pom.xml b/pom.xml index 006b7b9..dce0fde 100644 --- a/pom.xml +++ b/pom.xml @@ -34,6 +34,11 @@ Apache Sling Parent Reactor The reactor pom to build all Sling parents + + +17 + + scm:git:https://gitbox.apache.org/repos/asf/sling-parent.git scm:git:https://gitbox.apache.org/repos/asf/sling-parent.git
(sling-parent) branch master updated: Add link to wiki page
This is an automated email from the ASF dual-hosted git repository. kwin pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/sling-parent.git The following commit(s) were added to refs/heads/master by this push: new c434c07 Add link to wiki page c434c07 is described below commit c434c078207e3993979c553b613bb825aca506f2 Author: Konrad Windszus AuthorDate: Tue Jan 30 13:10:30 2024 +0100 Add link to wiki page --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index 08e6da5..f54858c 100644 --- a/README.md +++ b/README.md @@ -7,3 +7,5 @@ This module is part of the [Apache Sling](https://sling.apache.org) project. This is the parent project for Apache Sling. + +There are major changes in version 60 which are described in <https://cwiki.apache.org/confluence/x/SI75E>.
(sling-parent) branch master updated: SLING-12186 Update to newest palantir and spotless versions
This is an automated email from the ASF dual-hosted git repository. kwin pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/sling-parent.git The following commit(s) were added to refs/heads/master by this push: new 13eb9de SLING-12186 Update to newest palantir and spotless versions 13eb9de is described below commit 13eb9de620eb092c1d31320163584b9fbe8bc8dc Author: Konrad Windszus AuthorDate: Tue Jan 30 13:08:36 2024 +0100 SLING-12186 Update to newest palantir and spotless versions --- sling-parent/pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sling-parent/pom.xml b/sling-parent/pom.xml index 55469b5..3e191a4 100644 --- a/sling-parent/pom.xml +++ b/sling-parent/pom.xml @@ -270,7 +270,7 @@ com.diffplug.spotless spotless-maven-plugin -2.41.1 +2.43.0 @@ -442,7 +442,7 @@ -2.39.0 +2.40.0
svn commit: r66756 - /release/sling/
Author: kwin Date: Tue Jan 23 12:04:27 2024 New Revision: 66756 Log: Remove old version org.apache.sling.resourceresolver-1.11.4 Removed: release/sling/org.apache.sling.resourceresolver-1.11.4-javadoc.jar release/sling/org.apache.sling.resourceresolver-1.11.4-javadoc.jar.asc release/sling/org.apache.sling.resourceresolver-1.11.4-javadoc.jar.md5 release/sling/org.apache.sling.resourceresolver-1.11.4-javadoc.jar.sha1 release/sling/org.apache.sling.resourceresolver-1.11.4-source-release.zip release/sling/org.apache.sling.resourceresolver-1.11.4-source-release.zip.asc release/sling/org.apache.sling.resourceresolver-1.11.4-source-release.zip.md5 release/sling/org.apache.sling.resourceresolver-1.11.4-source-release.zip.sha1 release/sling/org.apache.sling.resourceresolver-1.11.4-source-release.zip.sha512 release/sling/org.apache.sling.resourceresolver-1.11.4-sources.jar release/sling/org.apache.sling.resourceresolver-1.11.4-sources.jar.asc release/sling/org.apache.sling.resourceresolver-1.11.4-sources.jar.md5 release/sling/org.apache.sling.resourceresolver-1.11.4-sources.jar.sha1 release/sling/org.apache.sling.resourceresolver-1.11.4.jar release/sling/org.apache.sling.resourceresolver-1.11.4.jar.asc release/sling/org.apache.sling.resourceresolver-1.11.4.jar.md5 release/sling/org.apache.sling.resourceresolver-1.11.4.jar.sha1 release/sling/org.apache.sling.resourceresolver-1.11.4.pom release/sling/org.apache.sling.resourceresolver-1.11.4.pom.asc release/sling/org.apache.sling.resourceresolver-1.11.4.pom.md5 release/sling/org.apache.sling.resourceresolver-1.11.4.pom.sha1
svn commit: r66755 - /release/sling/
Author: kwin Date: Tue Jan 23 12:03:25 2024 New Revision: 66755 Log: Release org.apache.sling.resourceresolver-1.11.6 Added: release/sling/org.apache.sling.resourceresolver-1.11.6-javadoc.jar (with props) release/sling/org.apache.sling.resourceresolver-1.11.6-javadoc.jar.asc release/sling/org.apache.sling.resourceresolver-1.11.6-javadoc.jar.md5 release/sling/org.apache.sling.resourceresolver-1.11.6-javadoc.jar.sha1 release/sling/org.apache.sling.resourceresolver-1.11.6-source-release.zip (with props) release/sling/org.apache.sling.resourceresolver-1.11.6-source-release.zip.asc release/sling/org.apache.sling.resourceresolver-1.11.6-source-release.zip.md5 release/sling/org.apache.sling.resourceresolver-1.11.6-source-release.zip.sha1 release/sling/org.apache.sling.resourceresolver-1.11.6-source-release.zip.sha512 release/sling/org.apache.sling.resourceresolver-1.11.6-source-release.zip.sha512.md5 release/sling/org.apache.sling.resourceresolver-1.11.6-source-release.zip.sha512.sha1 release/sling/org.apache.sling.resourceresolver-1.11.6-sources.jar (with props) release/sling/org.apache.sling.resourceresolver-1.11.6-sources.jar.asc release/sling/org.apache.sling.resourceresolver-1.11.6-sources.jar.md5 release/sling/org.apache.sling.resourceresolver-1.11.6-sources.jar.sha1 release/sling/org.apache.sling.resourceresolver-1.11.6.jar (with props) release/sling/org.apache.sling.resourceresolver-1.11.6.jar.asc release/sling/org.apache.sling.resourceresolver-1.11.6.jar.md5 release/sling/org.apache.sling.resourceresolver-1.11.6.jar.sha1 release/sling/org.apache.sling.resourceresolver-1.11.6.pom release/sling/org.apache.sling.resourceresolver-1.11.6.pom.asc release/sling/org.apache.sling.resourceresolver-1.11.6.pom.md5 release/sling/org.apache.sling.resourceresolver-1.11.6.pom.sha1 Added: release/sling/org.apache.sling.resourceresolver-1.11.6-javadoc.jar == Binary file - no diff available. Propchange: release/sling/org.apache.sling.resourceresolver-1.11.6-javadoc.jar -- svn:mime-type = application/octet-stream Added: release/sling/org.apache.sling.resourceresolver-1.11.6-javadoc.jar.asc == --- release/sling/org.apache.sling.resourceresolver-1.11.6-javadoc.jar.asc (added) +++ release/sling/org.apache.sling.resourceresolver-1.11.6-javadoc.jar.asc Tue Jan 23 12:03:25 2024 @@ -0,0 +1,16 @@ +-BEGIN PGP SIGNATURE- + +iQIzBAABCgAdFiEERPR5elLDNvpmbNknHeRhUo8fGyoFAmWndNgACgkQHeRhUo8f +GyoFKA//SLGJ7bF7osPIlaZZkoP9XIvtwLGHpg2+Xnt8KFgc6JtGT2Z3wQVai/UV +7W0XJhxDq1LesL0m1iaiA5ATjBJu9h772HbLw1kDTxyG9SyU6KDemplgBrMzsQeB +Ar73KTqX3uRTVUa+dIPmZSDg3ZOa1PbKW8YT83iHw7UQWual8qJce7hIjYydX6pO +EVdESygEt/tIoIIoxzXl2tsZpChz83W9ovLcUsGpA6BXofuLCZHP/4pdGf7xUIyk +tIF3yIcBEQDWMJQUF2yTHLDJI1m+j/y47Mjx+g1v02Z4cQgLlc3TqFZSlbMHntGG +t+NPn750fT6FTwue6d0LO5NmugUUlusOX0wyHwAVGEwvbLTztv2a/JspVAKoC3K1 +0+ChS8zlyGrab8SULf/zkPJjwI7osiIX86uaAzpkQqEAqT/eTxv1QxVcOMHtCVl8 +CtXVmb2p9AUUYJHJbdb+2f0PL12EFnIVavmCkRVjR3bKf0YJ8hCyK0/7zXzNLepu +PPft2bETS+/KAKIsz/nE3my/1JLEkqeq8T22xhR/CZISoXCOZDmDge3UBMjBJdEn +uwYXPrtH3R9HD0QZGaOpi4IyyKGro5tLes0klTSex58Lk1sKvw/XygCt8Xe5siDO +CthMWXMvlendErcm3x/3p5FEhsP9PsbduMmALXlGxSytVpykXM4= +=yFEu +-END PGP SIGNATURE- Added: release/sling/org.apache.sling.resourceresolver-1.11.6-javadoc.jar.md5 == --- release/sling/org.apache.sling.resourceresolver-1.11.6-javadoc.jar.md5 (added) +++ release/sling/org.apache.sling.resourceresolver-1.11.6-javadoc.jar.md5 Tue Jan 23 12:03:25 2024 @@ -0,0 +1 @@ +92a94e78437ee0323eff717931f762b2 \ No newline at end of file Added: release/sling/org.apache.sling.resourceresolver-1.11.6-javadoc.jar.sha1 == --- release/sling/org.apache.sling.resourceresolver-1.11.6-javadoc.jar.sha1 (added) +++ release/sling/org.apache.sling.resourceresolver-1.11.6-javadoc.jar.sha1 Tue Jan 23 12:03:25 2024 @@ -0,0 +1 @@ +1ab634393fc72b8f8b38bb0a0f95be719d9826dc \ No newline at end of file Added: release/sling/org.apache.sling.resourceresolver-1.11.6-source-release.zip == Binary file - no diff available. Propchange: release/sling/org.apache.sling.resourceresolver-1.11.6-source-release.zip -- svn:mime-type = application/octet-stream Added: release/sling/org.apache.sling.resourceresolver-1.11.6-source-release.zip.asc == --- release/sling/org.apache.sling.resourceresolver-1.11.6-source
(sling-org-apache-sling-jcr-repoinit) branch feature/more-context-for-exceptions-in-repoinitializer updated (694506f -> e450938)
This is an automated email from the ASF dual-hosted git repository. kwin pushed a change to branch feature/more-context-for-exceptions-in-repoinitializer in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-jcr-repoinit.git omit 694506f SLING-12237 Extend error message from RepositoryInitializer(Factory) by source reference add e450938 SLING-12237 Extend error message from RepositoryInitializer(Factory) by source reference This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (694506f) \ N -- N -- N refs/heads/feature/more-context-for-exceptions-in-repoinitializer (e450938) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. No new revisions were added by this update. Summary of changes: .../org/apache/sling/jcr/repoinit/impl/RepositoryInitializer.java | 2 +- .../sling/jcr/repoinit/impl/RepositoryInitializerFactory.java | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-)
(sling-org-apache-sling-jcr-repoinit) branch feature/more-context-for-exceptions-in-repoinitializer updated (970e422 -> 694506f)
This is an automated email from the ASF dual-hosted git repository. kwin pushed a change to branch feature/more-context-for-exceptions-in-repoinitializer in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-jcr-repoinit.git omit 970e422 SLING-12237 Extend error message from RepositoryInitializer(Factory) by source reference add 694506f SLING-12237 Extend error message from RepositoryInitializer(Factory) by source reference This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (970e422) \ N -- N -- N refs/heads/feature/more-context-for-exceptions-in-repoinitializer (694506f) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. No new revisions were added by this update. Summary of changes: .../java/org/apache/sling/jcr/repoinit/impl/RepositoryInitializer.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
(sling-org-apache-sling-jcr-repoinit) 01/01: SLING-12237 Extend error message from RepositoryInitializer(Factory) by source reference
This is an automated email from the ASF dual-hosted git repository.
kwin pushed a commit to branch
feature/more-context-for-exceptions-in-repoinitializer
in repository
https://gitbox.apache.org/repos/asf/sling-org-apache-sling-jcr-repoinit.git
commit 970e4220dc334386c8f80db47e591d9fa80f3f5b
Author: Konrad Windszus
AuthorDate: Mon Jan 22 16:21:42 2024 +0100
SLING-12237 Extend error message from RepositoryInitializer(Factory) by
source reference
---
pom.xml| 5 +++
.../jcr/repoinit/impl/RepositoryInitializer.java | 26 ++--
.../impl/RepositoryInitializerFactory.java | 36 ++
.../jcr/repoinit/impl/RetryableOperation.java | 15 ++---
.../jcr/repoinit/RepositoryInitializerTest.java| 14 +++--
.../impl/RepositoryInitializerFactoryTest.java | 4 +--
.../jcr/repoinit/impl/RetryableOperationTest.java | 12
7 files changed, 76 insertions(+), 36 deletions(-)
diff --git a/pom.xml b/pom.xml
index 9af040c..75d1f93 100644
--- a/pom.xml
+++ b/pom.xml
@@ -168,6 +168,11 @@
org.osgi.annotation.versioning
provided
+
+org.osgi
+org.osgi.service.component
+provided
+
org.slf4j
slf4j-api
diff --git
a/src/main/java/org/apache/sling/jcr/repoinit/impl/RepositoryInitializer.java
b/src/main/java/org/apache/sling/jcr/repoinit/impl/RepositoryInitializer.java
index d221c28..9ea21c6 100644
---
a/src/main/java/org/apache/sling/jcr/repoinit/impl/RepositoryInitializer.java
+++
b/src/main/java/org/apache/sling/jcr/repoinit/impl/RepositoryInitializer.java
@@ -16,16 +16,19 @@
*/
package org.apache.sling.jcr.repoinit.impl;
+import java.io.IOException;
import java.io.StringReader;
import java.util.Arrays;
import java.util.List;
+import javax.jcr.RepositoryException;
import javax.jcr.Session;
import org.apache.sling.jcr.api.SlingRepository;
import org.apache.sling.jcr.api.SlingRepositoryInitializer;
import org.apache.sling.jcr.repoinit.JcrRepoInitOpsProcessor;
import org.apache.sling.repoinit.parser.RepoInitParser;
+import org.apache.sling.repoinit.parser.RepoInitParsingException;
import org.apache.sling.repoinit.parser.operations.Operation;
import org.osgi.framework.Constants;
import org.osgi.service.component.annotations.Activate;
@@ -86,7 +89,7 @@ public class RepositoryInitializer implements
SlingRepositoryInitializer {
}
@Override
-public void processRepository(SlingRepository repo) throws Exception {
+public void processRepository(SlingRepository repo) throws
RepositoryException {
if ( config.references() != null && config.references().length > 0 ) {
// loginAdministrative is ok here, definitely an admin operation
@SuppressWarnings("deprecation")
@@ -94,16 +97,21 @@ public class RepositoryInitializer implements
SlingRepositoryInitializer {
try {
final RepoinitTextProvider p = new RepoinitTextProvider();
for(String reference : config.references()) {
-final String repoinitText = p.getRepoinitText(reference);
-final List ops;
-try (StringReader sr = new StringReader(repoinitText)) {
-ops = parser.parse(sr);
+try {
+final String repoinitText =
p.getRepoinitText(reference);
+final List ops;
+try (StringReader sr = new StringReader(repoinitText))
{
+ops = parser.parse(sr);
+}
+log.info("Executing {} repoinit operations from {}",
ops.size(), reference);
+processor.apply(s, ops);
+s.save();
+} catch
(IOException|RuntimeException|RepositoryException|RepoInitParsingException e) {
+throw new RepoInitException("Error executing repoinit
script " + reference, e);
}
-log.info("Executing {} repoinit operations", ops.size());
-processor.apply(s, ops);
-s.save();
}
-} finally {
+}
+finally {
s.logout();
}
}
diff --git
a/src/main/java/org/apache/sling/jcr/repoinit/impl/RepositoryInitializerFactory.java
b/src/main/java/org/apache/sling/jcr/repoinit/impl/RepositoryInitializerFactory.java
index 447d7bb..a1656da 100644
---
a/src/main/java/org/apache/sling/jcr/repoinit/impl/RepositoryInitializerFactory.java
+++
b/src/main/java/org/apache/sling/jcr/repoinit/impl/RepositoryInitializerFactory.java
@@ -19,6 +19,7 @@ package org.apache.sling.jcr.repoinit.impl;
import java.io.StringReader;
import java.util.Ar
(sling-org-apache-sling-jcr-repoinit) branch feature/more-context-for-exceptions-in-repoinitializer created (now 970e422)
This is an automated email from the ASF dual-hosted git repository. kwin pushed a change to branch feature/more-context-for-exceptions-in-repoinitializer in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-jcr-repoinit.git at 970e422 SLING-12237 Extend error message from RepositoryInitializer(Factory) by source reference This branch includes the following new commits: new 970e422 SLING-12237 Extend error message from RepositoryInitializer(Factory) by source reference The 1 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.
(sling-parent) branch bugfix/adjust-url-inheritance deleted (was aae9812)
This is an automated email from the ASF dual-hosted git repository. kwin pushed a change to branch bugfix/adjust-url-inheritance in repository https://gitbox.apache.org/repos/asf/sling-parent.git was aae9812 SLING-12207 Adjust url inheritance The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
(sling-parent) branch master updated: SLING-12207 Adjust url inheritance (#42)
This is an automated email from the ASF dual-hosted git repository.
kwin pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-parent.git
The following commit(s) were added to refs/heads/master by this push:
new 7ecafb4 SLING-12207 Adjust url inheritance (#42)
7ecafb4 is described below
commit 7ecafb4c9c7069988479ad9e9b9404d0aa8d138c
Author: Konrad Windszus
AuthorDate: Fri Jan 12 13:01:16 2024 +0100
SLING-12207 Adjust url inheritance (#42)
---
sling-parent/pom.xml | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/sling-parent/pom.xml b/sling-parent/pom.xml
index dbc2e44..55469b5 100644
--- a/sling-parent/pom.xml
+++ b/sling-parent/pom.xml
@@ -15,7 +15,7 @@
See the License for the specific language governing permissions
and limitations under the License.
-->
-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";>
+http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
child.project.url.inherit.append.path="false"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";>
4.0.0
@@ -117,7 +117,8 @@
https://docs.oracle.com/javase/9/tools/javac.htm#GUID-AEEC9F07-CB49-4E96-8BC7-BCC2C7F725C9__GUID-D343F6B4-3FDD-43A8-AD24-43DD70214471
and http://openjdk.java.net/jeps/247, this affects m-compiler-p
and m-javadoc-p -->
${sling.java.version}
-3.3.9
+
+3.6.1
11
(sling-parent) branch bugfix/adjust-url-inheritance updated (278445b -> aae9812)
This is an automated email from the ASF dual-hosted git repository. kwin pushed a change to branch bugfix/adjust-url-inheritance in repository https://gitbox.apache.org/repos/asf/sling-parent.git omit 278445b SLING-12207 Adjust url inheritance add aae9812 SLING-12207 Adjust url inheritance This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (278445b) \ N -- N -- N refs/heads/bugfix/adjust-url-inheritance (aae9812) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. No new revisions were added by this update. Summary of changes: sling-parent/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
