(sling-org-apache-sling-testing-sling-mock) branch feature/SLING-12435-timeout-configurable deleted (was 41ff3d8)
This is an automated email from the ASF dual-hosted git repository. sseifert pushed a change to branch feature/SLING-12435-timeout-configurable in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-testing-sling-mock.git was 41ff3d8 SLING-12435 Make timeout to wait for ResourceResolverFactoryActivator configurable via system property 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-testing-sling-mock) branch master updated: SLING-12435 Make timeout to wait for ResourceResolverFactoryActivator configurable via system property (#41)
This is an automated email from the ASF dual-hosted git repository.
sseifert pushed a commit to branch master
in repository
https://gitbox.apache.org/repos/asf/sling-org-apache-sling-testing-sling-mock.git
The following commit(s) were added to refs/heads/master by this push:
new 73e3bec SLING-12435 Make timeout to wait for
ResourceResolverFactoryActivator configurable via system property (#41)
73e3bec is described below
commit 73e3bec4ade92b42202303ef99b516ab93e72ac2
Author: Stefan Seifert
AuthorDate: Tue Sep 17 11:53:39 2024 +0200
SLING-12435 Make timeout to wait for ResourceResolverFactoryActivator
configurable via system property (#41)
---
.../testing/mock/sling/ResourceResolverFactoryInitializer.java | 10 +-
1 file changed, 9 insertions(+), 1 deletion(-)
diff --git
a/core/src/main/java/org/apache/sling/testing/mock/sling/ResourceResolverFactoryInitializer.java
b/core/src/main/java/org/apache/sling/testing/mock/sling/ResourceResolverFactoryInitializer.java
index b7296b6..7dde426 100644
---
a/core/src/main/java/org/apache/sling/testing/mock/sling/ResourceResolverFactoryInitializer.java
+++
b/core/src/main/java/org/apache/sling/testing/mock/sling/ResourceResolverFactoryInitializer.java
@@ -26,6 +26,7 @@ import java.lang.reflect.Proxy;
import java.util.HashMap;
import java.util.Map;
+import org.apache.commons.lang3.math.NumberUtils;
import org.apache.sling.api.resource.ResourceResolverFactory;
import org.apache.sling.commons.classloader.DynamicClassLoaderManager;
import org.apache.sling.jcr.api.SlingRepository;
@@ -51,7 +52,14 @@ class ResourceResolverFactoryInitializer {
private static final Logger log =
LoggerFactory.getLogger(ResourceResolverFactoryInitializer.class);
-private static final long RESOURCERESOLVER_FACTORY_ACTIVATOR_TIMEOUT_MS =
250;
+private static final String
SYSTEM_PROPERTY_RESOURCERESOLVER_FACTORY_ACTIVATOR_TIMEOUT_MS =
+"sling.mock.resourceresolverfactoryactivator.timeout.ms";
+private static final long RESOURCERESOLVER_FACTORY_ACTIVATOR_TIMEOUT_MS;
+
+static {
+RESOURCERESOLVER_FACTORY_ACTIVATOR_TIMEOUT_MS = NumberUtils.toLong(
+
System.getProperty(SYSTEM_PROPERTY_RESOURCERESOLVER_FACTORY_ACTIVATOR_TIMEOUT_MS,
"250"));
+}
private ResourceResolverFactoryInitializer() {
// static methods only
(sling-org-apache-sling-testing-sling-mock) branch feature/SLING-12435-timeout-configurable created (now 41ff3d8)
This is an automated email from the ASF dual-hosted git repository. sseifert pushed a change to branch feature/SLING-12435-timeout-configurable in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-testing-sling-mock.git at 41ff3d8 SLING-12435 Make timeout to wait for ResourceResolverFactoryActivator configurable via system property This branch includes the following new commits: new 41ff3d8 SLING-12435 Make timeout to wait for ResourceResolverFactoryActivator configurable via system property 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-testing-sling-mock) 01/01: SLING-12435 Make timeout to wait for ResourceResolverFactoryActivator configurable via system property
This is an automated email from the ASF dual-hosted git repository.
sseifert pushed a commit to branch feature/SLING-12435-timeout-configurable
in repository
https://gitbox.apache.org/repos/asf/sling-org-apache-sling-testing-sling-mock.git
commit 41ff3d824ca81788d6fd144509e2b1a7881a949f
Author: Stefan Seifert
AuthorDate: Tue Sep 17 11:21:31 2024 +0200
SLING-12435 Make timeout to wait for ResourceResolverFactoryActivator
configurable via system property
---
.../testing/mock/sling/ResourceResolverFactoryInitializer.java | 10 +-
1 file changed, 9 insertions(+), 1 deletion(-)
diff --git
a/core/src/main/java/org/apache/sling/testing/mock/sling/ResourceResolverFactoryInitializer.java
b/core/src/main/java/org/apache/sling/testing/mock/sling/ResourceResolverFactoryInitializer.java
index b7296b6..7dde426 100644
---
a/core/src/main/java/org/apache/sling/testing/mock/sling/ResourceResolverFactoryInitializer.java
+++
b/core/src/main/java/org/apache/sling/testing/mock/sling/ResourceResolverFactoryInitializer.java
@@ -26,6 +26,7 @@ import java.lang.reflect.Proxy;
import java.util.HashMap;
import java.util.Map;
+import org.apache.commons.lang3.math.NumberUtils;
import org.apache.sling.api.resource.ResourceResolverFactory;
import org.apache.sling.commons.classloader.DynamicClassLoaderManager;
import org.apache.sling.jcr.api.SlingRepository;
@@ -51,7 +52,14 @@ class ResourceResolverFactoryInitializer {
private static final Logger log =
LoggerFactory.getLogger(ResourceResolverFactoryInitializer.class);
-private static final long RESOURCERESOLVER_FACTORY_ACTIVATOR_TIMEOUT_MS =
250;
+private static final String
SYSTEM_PROPERTY_RESOURCERESOLVER_FACTORY_ACTIVATOR_TIMEOUT_MS =
+"sling.mock.resourceresolverfactoryactivator.timeout.ms";
+private static final long RESOURCERESOLVER_FACTORY_ACTIVATOR_TIMEOUT_MS;
+
+static {
+RESOURCERESOLVER_FACTORY_ACTIVATOR_TIMEOUT_MS = NumberUtils.toLong(
+
System.getProperty(SYSTEM_PROPERTY_RESOURCERESOLVER_FACTORY_ACTIVATOR_TIMEOUT_MS,
"250"));
+}
private ResourceResolverFactoryInitializer() {
// static methods only
(sling-org-apache-sling-testing-sling-mock) branch master updated: update to latest dependency versions in testing profile "latest-dependency-versions"
This is an automated email from the ASF dual-hosted git repository. sseifert pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-testing-sling-mock.git The following commit(s) were added to refs/heads/master by this push: new a162244 update to latest dependency versions in testing profile "latest-dependency-versions" a162244 is described below commit a16224473e57fc7be0f7fff648920bdd4df8b715 Author: Stefan Seifert AuthorDate: Tue Sep 17 11:24:58 2024 +0200 update to latest dependency versions in testing profile "latest-dependency-versions" --- parent/pom.xml | 16 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/parent/pom.xml b/parent/pom.xml index 64ef21e..ba0052f 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -355,22 +355,22 @@ org.apache.sling org.apache.sling.models.api -1.5.0 +1.5.4 org.apache.sling org.apache.sling.models.impl -1.6.4 +1.7.0 org.apache.sling org.apache.sling.api -2.27.2 +2.27.6 org.apache.sling org.apache.sling.resourceresolver -1.11.4 +1.12.0 org.apache.sling @@ -385,7 +385,7 @@ org.apache.sling org.apache.sling.jcr.resource -3.2.4 +3.3.2 org.apache.sling @@ -395,7 +395,7 @@ org.apache.sling org.apache.sling.scripting.core -2.4.8 +2.4.10 org.apache.sling @@ -415,7 +415,7 @@ org.apache.sling org.apache.sling.i18n -2.6.2 +2.6.4 org.apache.sling @@ -425,7 +425,7 @@ org.apache.sling org.apache.sling.xss -2.4.0 +2.4.2 org.apache.sling
(sling-org-apache-sling-testing-sling-mock) branch master updated: update to latest osgi-mock
This is an automated email from the ASF dual-hosted git repository. sseifert pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-testing-sling-mock.git The following commit(s) were added to refs/heads/master by this push: new 1d686cd update to latest osgi-mock 1d686cd is described below commit 1d686cdfcc67b335c65fb3466910c54f38cc5ba8 Author: Stefan Seifert AuthorDate: Mon Sep 2 14:55:05 2024 +0200 update to latest osgi-mock --- parent/pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/parent/pom.xml b/parent/pom.xml index e7939a4..64ef21e 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -51,12 +51,12 @@ org.apache.sling org.apache.sling.testing.osgi-mock.core -3.5.0 +3.5.1-SNAPSHOT org.apache.sling org.apache.sling.testing.osgi-mock.junit4 -3.5.0 +3.5.1-SNAPSHOT org.apache.sling
(sling-org-apache-sling-testing-osgi-mock) branch master updated: SLING-12413: update/improve code
This is an automated email from the ASF dual-hosted git repository.
sseifert pushed a commit to branch master
in repository
https://gitbox.apache.org/repos/asf/sling-org-apache-sling-testing-osgi-mock.git
The following commit(s) were added to refs/heads/master by this push:
new a9d4ee8 SLING-12413: update/improve code
a9d4ee8 is described below
commit a9d4ee81e84cedc2d770fdcea180aa8b8aba36e7
Author: Bart Thierens
AuthorDate: Mon Sep 2 10:19:09 2024 +0200
SLING-12413: update/improve code
---
.../sling/testing/mock/osgi/MockBundleContext.java | 20 +
.../sling/testing/mock/osgi/OsgiServiceUtil.java | 26 +-
.../mock/osgi/MockServiceReferencesSortTest.java | 14 ++--
3 files changed, 18 insertions(+), 42 deletions(-)
diff --git
a/core/src/main/java/org/apache/sling/testing/mock/osgi/MockBundleContext.java
b/core/src/main/java/org/apache/sling/testing/mock/osgi/MockBundleContext.java
index e4a373c..4b10057 100644
---
a/core/src/main/java/org/apache/sling/testing/mock/osgi/MockBundleContext.java
+++
b/core/src/main/java/org/apache/sling/testing/mock/osgi/MockBundleContext.java
@@ -116,7 +116,6 @@ class MockBundleContext implements BundleContext {
}
}
-@SuppressWarnings("unchecked")
@Override
public ServiceRegistration registerService(final String clazz, final
Object service, final Dictionary properties) {
String[] clazzes;
@@ -165,9 +164,7 @@ class MockBundleContext implements BundleContext {
* Check for already registered services that may be affected by the
service registration - either
* adding by additional optional references, or creating a conflict in the
dependencies.
* @param registration Service registration
- * @param bundleContext Bundle context
*/
-@SuppressWarnings("unchecked")
private void handleRefsUpdateOnRegister(MockServiceRegistration
registration) {
// handle DYNAMIC references to this registration
@@ -194,11 +191,11 @@ class MockBundleContext implements BundleContext {
OsgiServiceUtil.invokeBindMethod(
reference,
referenceInfo.getServiceRegistration().getService(),
-new ServiceInfo(registration),
+new ServiceInfo<>(registration),
this);
break;
default:
-throw new RuntimeException("Unepxected cardinality: "
+ reference.getCardinality());
+throw new RuntimeException("Unexpected cardinality: "
+ reference.getCardinality());
}
}
}
@@ -220,7 +217,7 @@ class MockBundleContext implements BundleContext {
servicesToRestart.add(referenceInfo.getServiceRegistration());
break;
default:
-throw new RuntimeException("Unepxected cardinality: "
+ reference.getCardinality());
+throw new RuntimeException("Unexpected cardinality: "
+ reference.getCardinality());
}
}
}
@@ -269,9 +266,7 @@ class MockBundleContext implements BundleContext {
* Check for already registered services that may be affected by the
service unregistration - either
* adding by removing optional references, or creating a conflict in the
dependencies.
* @param registration Service registration
- * @param bundleContext Bundle context
*/
-@SuppressWarnings("unchecked")
private void handleRefsUpdateOnUnregister(MockServiceRegistration
registration) {
// handle DYNAMIC references to this registration
@@ -290,11 +285,11 @@ class MockBundleContext implements BundleContext {
OsgiServiceUtil.invokeUnbindMethod(
reference,
referenceInfo.getServiceRegistration().getService(),
-new ServiceInfo(registration),
+new ServiceInfo<>(registration),
this);
break;
default:
-throw new RuntimeException("Unepxected cardinality: "
+ reference.getCardinality());
+throw new RuntimeException("Unexpected cardinality: "
+ reference.getCardinality());
}
}
}
@@ -314,14 +309,13 @@ class MockBundleContext implements BundleContext {
servicesToRestart.add(referenceInfo.getServiceRegistration());
break;
default:
-throw new RuntimeException("Unepxected cardinality: &q
(sling-org-apache-sling-testing-sling-mock) branch master updated: switch back to released versions
This is an automated email from the ASF dual-hosted git repository. sseifert pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-testing-sling-mock.git The following commit(s) were added to refs/heads/master by this push: new 97538ca switch back to released versions 97538ca is described below commit 97538cac7679e4e2eafdcd5c212c6ed1bc8ec88f Author: Stefan Seifert AuthorDate: Mon Aug 26 10:20:10 2024 +0200 switch back to released versions --- parent/pom.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/parent/pom.xml b/parent/pom.xml index d544e58..e7939a4 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -51,12 +51,12 @@ org.apache.sling org.apache.sling.testing.osgi-mock.core -3.5.1-SNAPSHOT +3.5.0 org.apache.sling org.apache.sling.testing.osgi-mock.junit4 -3.5.1-SNAPSHOT +3.5.0 org.apache.sling @@ -66,7 +66,7 @@ org.apache.sling org.apache.sling.testing.resourceresolver-mock -1.5.1-SNAPSHOT +1.5.0 org.apache.sling
(sling-site) branch master updated: Apache Sling Testing ResourceResolver Mock 1.5.0, OSGi Mock 3.5.0, Sling Mock 3.5.2
This is an automated email from the ASF dual-hosted git repository. sseifert pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/sling-site.git The following commit(s) were added to refs/heads/master by this push: new 4ca0f4c01 Apache Sling Testing ResourceResolver Mock 1.5.0, OSGi Mock 3.5.0, Sling Mock 3.5.2 4ca0f4c01 is described below commit 4ca0f4c0154618e0bdff7e20954146bbef25dd84 Author: Stefan Seifert AuthorDate: Mon Aug 26 10:17:28 2024 +0200 Apache Sling Testing ResourceResolver Mock 1.5.0, OSGi Mock 3.5.0, Sling Mock 3.5.2 --- src/main/jbake/content/releases.md | 1 + src/main/jbake/templates/downloads.tpl | 14 +++--- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/src/main/jbake/content/releases.md b/src/main/jbake/content/releases.md index f672b5132..e4d981bf3 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 ## August 2024 +* Testing ResourceResolver Mock 1.5.0, OSGi Mock 3.5.0, Sling Mock 3.5.2 (26th) * Installer Configuration Factory 1.4.6 (21st) * XSS 2.4.2, Commons Prometheus Metrics Exporter 0.1.2 (19th) * Feature Analyser 2.0.10, Scripting HTL Testing 1.0.36-1.4.0, Scripting HTL JS Use Provider 1.2.10, Scripting HTL Testing Content 1.0.34-1.4.0 (14th) diff --git a/src/main/jbake/templates/downloads.tpl b/src/main/jbake/templates/downloads.tpl index 0b5687620..2219b9f7c 100644 --- a/src/main/jbake/templates/downloads.tpl +++ b/src/main/jbake/templates/downloads.tpl @@ -280,14 +280,14 @@ def helpers=[ "Testing Hamcrest|org.apache.sling.testing.hamcrest|1.0.2|Y|jar", "Testing JCR Mock|org.apache.sling.testing.jcr-mock|1.6.14|Y|jar", "Testing Logging Mock|org.apache.sling.testing.logging-mock|2.0.0|Y|jar", - "Testing OSGi Mock Core|org.apache.sling.testing.osgi-mock.core|3.4.2|org.apache.sling.testing.osgi-mock|jar", - "Testing OSGi Mock JUnit 4|org.apache.sling.testing.osgi-mock.junit4|3.4.2|org.apache.sling.testing.osgi-mock|jar", - "Testing OSGi Mock JUnit 5|org.apache.sling.testing.osgi-mock.junit5|3.4.2|org.apache.sling.testing.osgi-mock|jar", + "Testing OSGi Mock Core|org.apache.sling.testing.osgi-mock.core|3.5.0|org.apache.sling.testing.osgi-mock|jar", + "Testing OSGi Mock JUnit 4|org.apache.sling.testing.osgi-mock.junit4|3.5.0|org.apache.sling.testing.osgi-mock|jar", + "Testing OSGi Mock JUnit 5|org.apache.sling.testing.osgi-mock.junit5|3.5.0|org.apache.sling.testing.osgi-mock|jar", "Testing PaxExam|org.apache.sling.testing.paxexam|4.0.0|Y|jar", - "Testing Resource Resolver Mock|org.apache.sling.testing.resourceresolver-mock|1.4.6|Y|jar", - "Testing Sling Mock Core|org.apache.sling.testing.sling-mock.core|3.5.0|org.apache.sling.testing.sling-mock|jar", - "Testing Sling Mock JUnit 4|org.apache.sling.testing.sling-mock.junit4|3.5.0|org.apache.sling.testing.sling-mock|jar", - "Testing Sling Mock JUnit 5|org.apache.sling.testing.sling-mock.junit5|3.5.0|org.apache.sling.testing.sling-mock|jar", + "Testing Resource Resolver Mock|org.apache.sling.testing.resourceresolver-mock|1.5.0|Y|jar", + "Testing Sling Mock Core|org.apache.sling.testing.sling-mock.core|3.5.2|org.apache.sling.testing.sling-mock|jar", + "Testing Sling Mock JUnit 4|org.apache.sling.testing.sling-mock.junit4|3.5.2|org.apache.sling.testing.sling-mock|jar", + "Testing Sling Mock JUnit 5|org.apache.sling.testing.sling-mock.junit5|3.5.2|org.apache.sling.testing.sling-mock|jar", "Testing Sling Mock Oak|org.apache.sling.testing.sling-mock-oak|4.0.0-1.62.0|Y|jar", ]
svn commit: r71097 [1/3] - /release/sling/
Author: sseifert Date: Mon Aug 26 08:16:30 2024 New Revision: 71097 Log: Apache Sling Testing ResourceResolver Mock 1.5.0, OSGi Mock 3.5.0, Sling Mock 3.5.2 Added: release/sling/org.apache.sling.testing.osgi-mock-3.5.0-source-release.zip (with props) release/sling/org.apache.sling.testing.osgi-mock-3.5.0-source-release.zip.asc release/sling/org.apache.sling.testing.osgi-mock-3.5.0-source-release.zip.md5 release/sling/org.apache.sling.testing.osgi-mock-3.5.0-source-release.zip.sha1 release/sling/org.apache.sling.testing.osgi-mock-3.5.0-source-release.zip.sha512 release/sling/org.apache.sling.testing.osgi-mock-3.5.0.pom release/sling/org.apache.sling.testing.osgi-mock-3.5.0.pom.asc release/sling/org.apache.sling.testing.osgi-mock-3.5.0.pom.md5 release/sling/org.apache.sling.testing.osgi-mock-3.5.0.pom.sha1 release/sling/org.apache.sling.testing.osgi-mock.core-3.5.0-javadoc.jar (with props) release/sling/org.apache.sling.testing.osgi-mock.core-3.5.0-javadoc.jar.asc release/sling/org.apache.sling.testing.osgi-mock.core-3.5.0-javadoc.jar.md5 release/sling/org.apache.sling.testing.osgi-mock.core-3.5.0-javadoc.jar.sha1 release/sling/org.apache.sling.testing.osgi-mock.core-3.5.0-source-release.zip (with props) release/sling/org.apache.sling.testing.osgi-mock.core-3.5.0-source-release.zip.asc release/sling/org.apache.sling.testing.osgi-mock.core-3.5.0-source-release.zip.md5 release/sling/org.apache.sling.testing.osgi-mock.core-3.5.0-source-release.zip.sha1 release/sling/org.apache.sling.testing.osgi-mock.core-3.5.0-source-release.zip.sha512 release/sling/org.apache.sling.testing.osgi-mock.core-3.5.0-sources.jar (with props) release/sling/org.apache.sling.testing.osgi-mock.core-3.5.0-sources.jar.asc release/sling/org.apache.sling.testing.osgi-mock.core-3.5.0-sources.jar.md5 release/sling/org.apache.sling.testing.osgi-mock.core-3.5.0-sources.jar.sha1 release/sling/org.apache.sling.testing.osgi-mock.core-3.5.0-tests.jar (with props) release/sling/org.apache.sling.testing.osgi-mock.core-3.5.0-tests.jar.asc release/sling/org.apache.sling.testing.osgi-mock.core-3.5.0-tests.jar.md5 release/sling/org.apache.sling.testing.osgi-mock.core-3.5.0-tests.jar.sha1 release/sling/org.apache.sling.testing.osgi-mock.core-3.5.0.jar (with props) release/sling/org.apache.sling.testing.osgi-mock.core-3.5.0.jar.asc release/sling/org.apache.sling.testing.osgi-mock.core-3.5.0.jar.md5 release/sling/org.apache.sling.testing.osgi-mock.core-3.5.0.jar.sha1 release/sling/org.apache.sling.testing.osgi-mock.core-3.5.0.pom release/sling/org.apache.sling.testing.osgi-mock.core-3.5.0.pom.asc release/sling/org.apache.sling.testing.osgi-mock.core-3.5.0.pom.md5 release/sling/org.apache.sling.testing.osgi-mock.core-3.5.0.pom.sha1 release/sling/org.apache.sling.testing.osgi-mock.junit4-3.5.0-javadoc.jar (with props) release/sling/org.apache.sling.testing.osgi-mock.junit4-3.5.0-javadoc.jar.asc release/sling/org.apache.sling.testing.osgi-mock.junit4-3.5.0-javadoc.jar.md5 release/sling/org.apache.sling.testing.osgi-mock.junit4-3.5.0-javadoc.jar.sha1 release/sling/org.apache.sling.testing.osgi-mock.junit4-3.5.0-source-release.zip (with props) release/sling/org.apache.sling.testing.osgi-mock.junit4-3.5.0-source-release.zip.asc release/sling/org.apache.sling.testing.osgi-mock.junit4-3.5.0-source-release.zip.md5 release/sling/org.apache.sling.testing.osgi-mock.junit4-3.5.0-source-release.zip.sha1 release/sling/org.apache.sling.testing.osgi-mock.junit4-3.5.0-source-release.zip.sha512 release/sling/org.apache.sling.testing.osgi-mock.junit4-3.5.0-sources.jar (with props) release/sling/org.apache.sling.testing.osgi-mock.junit4-3.5.0-sources.jar.asc release/sling/org.apache.sling.testing.osgi-mock.junit4-3.5.0-sources.jar.md5 release/sling/org.apache.sling.testing.osgi-mock.junit4-3.5.0-sources.jar.sha1 release/sling/org.apache.sling.testing.osgi-mock.junit4-3.5.0.jar (with props) release/sling/org.apache.sling.testing.osgi-mock.junit4-3.5.0.jar.asc release/sling/org.apache.sling.testing.osgi-mock.junit4-3.5.0.jar.md5 release/sling/org.apache.sling.testing.osgi-mock.junit4-3.5.0.jar.sha1 release/sling/org.apache.sling.testing.osgi-mock.junit4-3.5.0.pom release/sling/org.apache.sling.testing.osgi-mock.junit4-3.5.0.pom.asc release/sling/org.apache.sling.testing.osgi-mock.junit4-3.5.0.pom.md5 release/sling/org.apache.sling.testing.osgi-mock.junit4-3.5.0.pom.sha1 release/sling/org.apache.sling.testing.osgi-mock.junit5-3.5.0-javadoc.jar (with props) release/sling/org.apache.sling.testing.osgi-mock.junit5-3.5.0-javadoc.jar.asc release/sling/org.apache.sling.testing.osgi-mock.junit5-3.5.0-javadoc.jar.md5 release/sling/org.apache.sling.testing.osgi-mock.junit5-3.5.0-javadoc.jar.sha1
svn commit: r71097 [2/3] - /release/sling/
Added: release/sling/org.apache.sling.testing.osgi-mock.junit5-3.5.0.pom == --- release/sling/org.apache.sling.testing.osgi-mock.junit5-3.5.0.pom (added) +++ release/sling/org.apache.sling.testing.osgi-mock.junit5-3.5.0.pom Mon Aug 26 08:16:30 2024 @@ -0,0 +1,115 @@ + + +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/xsd/maven-4.0.0.xsd";> + +4.0.0 + +org.apache.sling +org.apache.sling.testing.osgi-mock.parent +3.5.0 +../parent/pom.xml + + +org.apache.sling.testing.osgi-mock.junit5 +jar + +Apache Sling Testing OSGi Mock JUnit 5 + + + + + +org.junit +junit-bom +5.10.1 +pom +import + + + + + + + + +org.apache.sling +org.apache.sling.testing.osgi-mock.core +3.5.0 +compile + + +org.apache.sling +org.apache.sling.testing.osgi-mock.core +3.5.0 +tests +test + + + +org.mockito +mockito-core +test + + +org.mockito +mockito-junit-jupiter +test + + +org.apache.sling +org.apache.sling.testing.logging-mock +test + + + + +org.junit.jupiter +junit-jupiter-api +provided + + +org.junit.jupiter +junit-jupiter-params +test + + +org.junit.jupiter +junit-jupiter-engine +test + + + + + + + + +biz.aQute.bnd +bnd-maven-plugin + + +biz.aQute.bnd +bnd-baseline-maven-plugin + + + + + + Added: release/sling/org.apache.sling.testing.osgi-mock.junit5-3.5.0.pom.asc == --- release/sling/org.apache.sling.testing.osgi-mock.junit5-3.5.0.pom.asc (added) +++ release/sling/org.apache.sling.testing.osgi-mock.junit5-3.5.0.pom.asc Mon Aug 26 08:16:30 2024 @@ -0,0 +1,11 @@ +-BEGIN PGP SIGNATURE- + +iQEzBAABCgAdFiEEpN7YllwuHIGCF8uRzit/9nXXjpIFAmbFmrcACgkQzit/9nXX +jpIs0wf9Hg++IKhtO+904v1tGOkw7+jWPRvnwB7UGI74KYKO9438s4eXHYmqkqR0 +rgCtzppVhvKyYxRWwuwQI+6/camCozTHvE7DhlKzJvRivEjLqnBS8IUdhdUe9xle +X1y4HkHog91pLq4clrAYK0Y3e8j7LQJMpvTa6nyAHX8rGCy8GRem9YGjdVTmYThb +hFJndATqAkObSQruQQqAcj4fn7i4VH5syxApvzfvl/s5WS0Pf6BW+a9RTdZzduUS +7vU4/pEhWikc1udReVPpDv0gwNaxJle7ENGdbtA6cJ86Gv/6NawsdGHTtATpGFUa +fN6jnWZ67BLw4NJr4EKW61BEg7ZXUQ== +=0fDC +-END PGP SIGNATURE- Added: release/sling/org.apache.sling.testing.osgi-mock.junit5-3.5.0.pom.md5 == --- release/sling/org.apache.sling.testing.osgi-mock.junit5-3.5.0.pom.md5 (added) +++ release/sling/org.apache.sling.testing.osgi-mock.junit5-3.5.0.pom.md5 Mon Aug 26 08:16:30 2024 @@ -0,0 +1 @@ +5bb1f859712131f94864adb2dcea8344 \ No newline at end of file Added: release/sling/org.apache.sling.testing.osgi-mock.junit5-3.5.0.pom.sha1 == --- release/sling/org.apache.sling.testing.osgi-mock.junit5-3.5.0.pom.sha1 (added) +++ release/sling/org.apache.sling.testing.osgi-mock.junit5-3.5.0.pom.sha1 Mon Aug 26 08:16:30 2024 @@ -0,0 +1 @@ +906a481be39630db76bf32aa9801f60fe42c3ac5 \ No newline at end of file Added: release/sling/org.apache.sling.testing.osgi-mock.parent-3.5.0-source-release.zip == Binary file - no diff available. Propchange: release/sling/org.apache.sling.testing.osgi-mock.parent-3.5.0-source-release.zip -- svn:mime-type = application/octet-stream Propchange: release/sling/org.apache.sling.testing.osgi-mock.parent-3.5.0-source-release.zip -- svn:needs-lock = * Added: release/sling/org.apache.sling.testing.osgi-mock.parent-3.5.0-source-release.zip.asc == --- release/sling/org.apache.sling.testing.osgi-mock.parent-3.5.0-source-release.zip.asc (added) +++ release/sling/org.apache.sling.testing.osgi-mock.parent-3.5.0-source-release.zip.asc Mon Aug 26 08:16:30 2024 @@ -0,0 +1,11 @@ +-BEGIN PGP SIGNATURE- + +iQEzBAABCgAdFiEEpN7YllwuHIGCF8uRzit/9nXXjpIFAmbFmpwACgkQzit/9nXX +jpLdiAgAr
svn commit: r71097 [3/3] - /release/sling/
Added: release/sling/org.apache.sling.testing.sling-mock.junit4-3.5.2-source-release.zip.sha1 == --- release/sling/org.apache.sling.testing.sling-mock.junit4-3.5.2-source-release.zip.sha1 (added) +++ release/sling/org.apache.sling.testing.sling-mock.junit4-3.5.2-source-release.zip.sha1 Mon Aug 26 08:16:30 2024 @@ -0,0 +1 @@ +9ffdca07a6043a5a1d8bee48ec466c5ee825ccdb \ No newline at end of file Added: release/sling/org.apache.sling.testing.sling-mock.junit4-3.5.2-source-release.zip.sha512 == --- release/sling/org.apache.sling.testing.sling-mock.junit4-3.5.2-source-release.zip.sha512 (added) +++ release/sling/org.apache.sling.testing.sling-mock.junit4-3.5.2-source-release.zip.sha512 Mon Aug 26 08:16:30 2024 @@ -0,0 +1 @@ +b5034a190dad7046a676d70dfc0be0cb3a742c1d3b7e0a4539ddb8b15801b99a2c211c3f0c3e1288823db08f0e9517d044fc3ce282548108fef7c60e317e4667 \ No newline at end of file Added: release/sling/org.apache.sling.testing.sling-mock.junit4-3.5.2-sources.jar == Binary file - no diff available. Propchange: release/sling/org.apache.sling.testing.sling-mock.junit4-3.5.2-sources.jar -- svn:mime-type = application/octet-stream Added: release/sling/org.apache.sling.testing.sling-mock.junit4-3.5.2-sources.jar.asc == --- release/sling/org.apache.sling.testing.sling-mock.junit4-3.5.2-sources.jar.asc (added) +++ release/sling/org.apache.sling.testing.sling-mock.junit4-3.5.2-sources.jar.asc Mon Aug 26 08:16:30 2024 @@ -0,0 +1,11 @@ +-BEGIN PGP SIGNATURE- + +iQEzBAABCgAdFiEEpN7YllwuHIGCF8uRzit/9nXXjpIFAmbFm3gACgkQzit/9nXX +jpJYSgf/bn1RlOFSIfQzCTs+1+D9dAEzgIjH/XSfBjyBPiOkRchpq1a3i92q40PU +vYzCznwop/zbG7pmQ7kEUp00OhGcmYCreTX2VKMl8eSsqrN720WO18NNOneN8sMg +PuU8r4ALTRra1w8ShJwuWpM0rGntI/dqTHQCJKj5Dojoo7X8O4uG3ZK6RNYPsyjc +YcRbC8vjh4EADSvGmqISOFS/WmlbnJ/ZCPCEEk7sOBu+vXLzWL6N4e04BBDYd8hn +gDJW2hKxTPXhQul14Pz820No0/dEJDUM6I6AAxedn19hOEm5VR2snZyLQP7cIK/l +NSQeGOm8k8pq/mJUaAR2WkJwUqidoA== +=ymVD +-END PGP SIGNATURE- Added: release/sling/org.apache.sling.testing.sling-mock.junit4-3.5.2-sources.jar.md5 == --- release/sling/org.apache.sling.testing.sling-mock.junit4-3.5.2-sources.jar.md5 (added) +++ release/sling/org.apache.sling.testing.sling-mock.junit4-3.5.2-sources.jar.md5 Mon Aug 26 08:16:30 2024 @@ -0,0 +1 @@ +cd9b87b6d751c0ab3822295ac594e444 \ No newline at end of file Added: release/sling/org.apache.sling.testing.sling-mock.junit4-3.5.2-sources.jar.sha1 == --- release/sling/org.apache.sling.testing.sling-mock.junit4-3.5.2-sources.jar.sha1 (added) +++ release/sling/org.apache.sling.testing.sling-mock.junit4-3.5.2-sources.jar.sha1 Mon Aug 26 08:16:30 2024 @@ -0,0 +1 @@ +0c9acf1d812bad816326c7fdd2d424ff7818b30f \ No newline at end of file Added: release/sling/org.apache.sling.testing.sling-mock.junit4-3.5.2.jar == Binary file - no diff available. Propchange: release/sling/org.apache.sling.testing.sling-mock.junit4-3.5.2.jar -- svn:mime-type = application/octet-stream Added: release/sling/org.apache.sling.testing.sling-mock.junit4-3.5.2.jar.asc == --- release/sling/org.apache.sling.testing.sling-mock.junit4-3.5.2.jar.asc (added) +++ release/sling/org.apache.sling.testing.sling-mock.junit4-3.5.2.jar.asc Mon Aug 26 08:16:30 2024 @@ -0,0 +1,11 @@ +-BEGIN PGP SIGNATURE- + +iQEzBAABCgAdFiEEpN7YllwuHIGCF8uRzit/9nXXjpIFAmbFm3cACgkQzit/9nXX +jpIkhwf7BsCXOUgAwFXdES3kiuXrm9Dy/Nh+rDU1H+vRSUoyCSNbTCKkJ6Swy5iB +HOIQeW00AnJkvhMtQDTokK1LvP6pCTrhpvRlUZYZVl0sJPmf3tnDkg7XJ/buQCSo +Apx8QXtJQs7oVCdcnA5R4F5ChcJcsJfeu4cjPzYPDoVifiY/BfYVCTBrWo4IxIte +EFMojQKguH3WG5bt4HO5tZ65yf0D/V6rVnAU3HsDvDpcRaB+birWgr3zLGXWgwfQ +DeHkBOBAIuQ9CMIC5/NFJfiLC3StRBjLGzYg/3bMamzYr5qYTUKHploewwtgyPbb +jnJB7WS8TIKw9aXHDva+0eNdNic04w== +=6Aof +-END PGP SIGNATURE- Added: release/sling/org.apache.sling.testing.sling-mock.junit4-3.5.2.jar.md5 == --- release/sling/org.apache.sling.testing.sling-mock.junit4-3.5.2.jar.md5 (added) +++ release/sling/org.apache.sling.testing.sling-mock.junit4-3.5.2.jar.md5 Mon Aug 26 08:16:30 2024 @@ -0,0 +1 @@ +e26daf9aecf80af91c328ba58be45dfa \ No newline at end of file Added: release/sling/org.apache.sling.testing.sling-mock.junit4-3.5.2.jar.sha1 ===
(sling-org-apache-sling-testing-sling-mock) branch master updated: update dependencies to next SNAPSHOT version until release version is available on maven central
This is an automated email from the ASF dual-hosted git repository. sseifert pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-testing-sling-mock.git The following commit(s) were added to refs/heads/master by this push: new 6a64fd9 update dependencies to next SNAPSHOT version until release version is available on maven central 6a64fd9 is described below commit 6a64fd9ad1b2a44c39b1e9f017ee39c8e2924f38 Author: Stefan Seifert AuthorDate: Wed Aug 21 09:48:25 2024 +0200 update dependencies to next SNAPSHOT version until release version is available on maven central --- parent/pom.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/parent/pom.xml b/parent/pom.xml index e7939a4..d544e58 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -51,12 +51,12 @@ org.apache.sling org.apache.sling.testing.osgi-mock.core -3.5.0 +3.5.1-SNAPSHOT org.apache.sling org.apache.sling.testing.osgi-mock.junit4 -3.5.0 +3.5.1-SNAPSHOT org.apache.sling @@ -66,7 +66,7 @@ org.apache.sling org.apache.sling.testing.resourceresolver-mock -1.5.0 +1.5.1-SNAPSHOT org.apache.sling
(sling-org-apache-sling-testing-sling-mock) annotated tag org.apache.sling.testing.sling-mock.reactor-3.5.2 created (now 8f8975c)
This is an automated email from the ASF dual-hosted git repository. sseifert pushed a change to annotated tag org.apache.sling.testing.sling-mock.reactor-3.5.2 in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-testing-sling-mock.git at 8f8975c (tag) tagging 1888e33bfdf28075479ff20025d25906cd8214b7 (commit) replaces org.apache.sling.testing.sling-mock.reactor-3.5.0 by Stefan Seifert on Wed Aug 21 09:46:21 2024 +0200 - Log - [maven-release-plugin] copy for tag org.apache.sling.testing.sling-mock.reactor-3.5.2 --- No new revisions were added by this update.
(sling-org-apache-sling-testing-sling-mock) 01/02: update osgi-mock 3.5.0, resourceresolver-mock 1.5.0
This is an automated email from the ASF dual-hosted git repository. sseifert pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-testing-sling-mock.git commit 6f7d0fafb00f246dcf1df2e6a0f0f36e92ededa7 Author: Stefan Seifert AuthorDate: Wed Aug 21 09:45:31 2024 +0200 update osgi-mock 3.5.0, resourceresolver-mock 1.5.0 --- parent/pom.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/parent/pom.xml b/parent/pom.xml index be52684..1976118 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -51,12 +51,12 @@ org.apache.sling org.apache.sling.testing.osgi-mock.core -3.4.2 +3.5.0 org.apache.sling org.apache.sling.testing.osgi-mock.junit4 -3.4.2 +3.5.0 org.apache.sling @@ -66,7 +66,7 @@ org.apache.sling org.apache.sling.testing.resourceresolver-mock -1.4.6 +1.5.0 org.apache.sling
(sling-org-apache-sling-testing-sling-mock) branch master updated: [maven-release-plugin] prepare for next development iteration
This is an automated email from the ASF dual-hosted git repository. sseifert pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-testing-sling-mock.git The following commit(s) were added to refs/heads/master by this push: new 459c99a [maven-release-plugin] prepare for next development iteration 459c99a is described below commit 459c99ab6dcf9ceab40d36e927d7c5c18a4e832c Author: Stefan Seifert AuthorDate: Wed Aug 21 09:46:25 2024 +0200 [maven-release-plugin] prepare for next development iteration --- core/pom.xml | 2 +- junit4/pom.xml | 6 +++--- junit5/pom.xml | 6 +++--- parent/pom.xml | 6 +++--- pom.xml | 4 ++-- relocate/pom.xml | 2 +- 6 files changed, 13 insertions(+), 13 deletions(-) diff --git a/core/pom.xml b/core/pom.xml index 819b329..7095436 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -23,7 +23,7 @@ org.apache.sling org.apache.sling.testing.sling-mock.parent -3.5.2 +3.5.3-SNAPSHOT ../parent/pom.xml diff --git a/junit4/pom.xml b/junit4/pom.xml index 155ede5..aa247b4 100644 --- a/junit4/pom.xml +++ b/junit4/pom.xml @@ -23,7 +23,7 @@ org.apache.sling org.apache.sling.testing.sling-mock.parent -3.5.2 +3.5.3-SNAPSHOT ../parent/pom.xml @@ -37,13 +37,13 @@ org.apache.sling org.apache.sling.testing.sling-mock.core -3.5.2 +3.5.3-SNAPSHOT compile org.apache.sling org.apache.sling.testing.sling-mock.core -3.5.2 +3.5.3-SNAPSHOT tests test diff --git a/junit5/pom.xml b/junit5/pom.xml index f433c9b..9b5d895 100644 --- a/junit5/pom.xml +++ b/junit5/pom.xml @@ -23,7 +23,7 @@ org.apache.sling org.apache.sling.testing.sling-mock.parent -3.5.2 +3.5.3-SNAPSHOT ../parent/pom.xml @@ -51,13 +51,13 @@ org.apache.sling org.apache.sling.testing.sling-mock.core -3.5.2 +3.5.3-SNAPSHOT compile org.apache.sling org.apache.sling.testing.sling-mock.core -3.5.2 +3.5.3-SNAPSHOT tests test diff --git a/parent/pom.xml b/parent/pom.xml index f03bef9..e7939a4 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -28,7 +28,7 @@ org.apache.sling.testing.sling-mock.parent -3.5.2 +3.5.3-SNAPSHOT pom Apache Sling Testing Sling Mock Parent @@ -37,12 +37,12 @@ scm:git:https://gitbox.apache.org/repos/asf/sling-org-apache-sling-testing-sling-mock.git scm:git:https://gitbox.apache.org/repos/asf/sling-org-apache-sling-testing-sling-mock.git -org.apache.sling.testing.sling-mock.reactor-3.5.2 +org.apache.sling.testing.sling-mock.reactor-3.3.2 https://gitbox.apache.org/repos/asf?p=sling-org-apache-sling-testing-sling-mock.git - 2024-08-21T07:45:53Z + 2024-08-21T07:46:25Z diff --git a/pom.xml b/pom.xml index d5e13da..e7cf60d 100644 --- a/pom.xml +++ b/pom.xml @@ -23,7 +23,7 @@ org.apache.sling org.apache.sling.testing.sling-mock.parent -3.5.2 +3.5.3-SNAPSHOT parent/pom.xml @@ -43,7 +43,7 @@ scm:git:https://gitbox.apache.org/repos/asf/sling-org-apache-sling-testing-sling-mock.git scm:git:https://gitbox.apache.org/repos/asf/sling-org-apache-sling-testing-sling-mock.git -org.apache.sling.testing.sling-mock.reactor-3.5.2 +org.apache.sling.testing.sling-mock.reactor-3.3.2 https://github.com/apache/sling-org-apache-sling-testing-sling-mock.git diff --git a/relocate/pom.xml b/relocate/pom.xml index b12bf15..3049bd2 100644 --- a/relocate/pom.xml +++ b/relocate/pom.xml @@ -23,7 +23,7 @@ org.apache.sling org.apache.sling.testing.sling-mock.parent -3.5.2 +3.5.3-SNAPSHOT ../parent/pom.xml
(sling-org-apache-sling-testing-sling-mock) 02/02: [maven-release-plugin] prepare release org.apache.sling.testing.sling-mock.reactor-3.5.2
This is an automated email from the ASF dual-hosted git repository. sseifert pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-testing-sling-mock.git commit 1888e33bfdf28075479ff20025d25906cd8214b7 Author: Stefan Seifert AuthorDate: Wed Aug 21 09:46:16 2024 +0200 [maven-release-plugin] prepare release org.apache.sling.testing.sling-mock.reactor-3.5.2 --- core/pom.xml | 2 +- junit4/pom.xml | 6 +++--- junit5/pom.xml | 6 +++--- parent/pom.xml | 6 +++--- pom.xml | 4 ++-- relocate/pom.xml | 2 +- 6 files changed, 13 insertions(+), 13 deletions(-) diff --git a/core/pom.xml b/core/pom.xml index 100d81d..819b329 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -23,7 +23,7 @@ org.apache.sling org.apache.sling.testing.sling-mock.parent -3.5.1-SNAPSHOT +3.5.2 ../parent/pom.xml diff --git a/junit4/pom.xml b/junit4/pom.xml index 16a5653..155ede5 100644 --- a/junit4/pom.xml +++ b/junit4/pom.xml @@ -23,7 +23,7 @@ org.apache.sling org.apache.sling.testing.sling-mock.parent -3.5.1-SNAPSHOT +3.5.2 ../parent/pom.xml @@ -37,13 +37,13 @@ org.apache.sling org.apache.sling.testing.sling-mock.core -3.5.1-SNAPSHOT +3.5.2 compile org.apache.sling org.apache.sling.testing.sling-mock.core -3.5.1-SNAPSHOT +3.5.2 tests test diff --git a/junit5/pom.xml b/junit5/pom.xml index d0a9b12..f433c9b 100644 --- a/junit5/pom.xml +++ b/junit5/pom.xml @@ -23,7 +23,7 @@ org.apache.sling org.apache.sling.testing.sling-mock.parent -3.5.1-SNAPSHOT +3.5.2 ../parent/pom.xml @@ -51,13 +51,13 @@ org.apache.sling org.apache.sling.testing.sling-mock.core -3.5.1-SNAPSHOT +3.5.2 compile org.apache.sling org.apache.sling.testing.sling-mock.core -3.5.1-SNAPSHOT +3.5.2 tests test diff --git a/parent/pom.xml b/parent/pom.xml index 1976118..f03bef9 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -28,7 +28,7 @@ org.apache.sling.testing.sling-mock.parent -3.5.1-SNAPSHOT +3.5.2 pom Apache Sling Testing Sling Mock Parent @@ -37,12 +37,12 @@ scm:git:https://gitbox.apache.org/repos/asf/sling-org-apache-sling-testing-sling-mock.git scm:git:https://gitbox.apache.org/repos/asf/sling-org-apache-sling-testing-sling-mock.git -org.apache.sling.testing.sling-mock.reactor-3.3.2 +org.apache.sling.testing.sling-mock.reactor-3.5.2 https://gitbox.apache.org/repos/asf?p=sling-org-apache-sling-testing-sling-mock.git - 2024-04-17T18:12:14Z + 2024-08-21T07:45:53Z diff --git a/pom.xml b/pom.xml index 8e9f647..d5e13da 100644 --- a/pom.xml +++ b/pom.xml @@ -23,7 +23,7 @@ org.apache.sling org.apache.sling.testing.sling-mock.parent -3.5.1-SNAPSHOT +3.5.2 parent/pom.xml @@ -43,7 +43,7 @@ scm:git:https://gitbox.apache.org/repos/asf/sling-org-apache-sling-testing-sling-mock.git scm:git:https://gitbox.apache.org/repos/asf/sling-org-apache-sling-testing-sling-mock.git -org.apache.sling.testing.sling-mock.reactor-3.3.2 +org.apache.sling.testing.sling-mock.reactor-3.5.2 https://github.com/apache/sling-org-apache-sling-testing-sling-mock.git diff --git a/relocate/pom.xml b/relocate/pom.xml index 1318f8a..b12bf15 100644 --- a/relocate/pom.xml +++ b/relocate/pom.xml @@ -23,7 +23,7 @@ org.apache.sling org.apache.sling.testing.sling-mock.parent -3.5.1-SNAPSHOT +3.5.2 ../parent/pom.xml
(sling-org-apache-sling-testing-sling-mock) branch master updated (2c6ea53 -> 1888e33)
This is an automated email from the ASF dual-hosted git repository. sseifert pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-testing-sling-mock.git from 2c6ea53 Merge pull request #40 from apache/SLING-12352 new 6f7d0fa update osgi-mock 3.5.0, resourceresolver-mock 1.5.0 new 1888e33 [maven-release-plugin] prepare release org.apache.sling.testing.sling-mock.reactor-3.5.2 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: core/pom.xml | 2 +- junit4/pom.xml | 6 +++--- junit5/pom.xml | 6 +++--- parent/pom.xml | 12 ++-- pom.xml | 4 ++-- relocate/pom.xml | 2 +- 6 files changed, 16 insertions(+), 16 deletions(-)
(sling-org-apache-sling-testing-osgi-mock) branch master updated: [maven-release-plugin] prepare for next development iteration
This is an automated email from the ASF dual-hosted git repository. sseifert pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-testing-osgi-mock.git The following commit(s) were added to refs/heads/master by this push: new 2caaa14 [maven-release-plugin] prepare for next development iteration 2caaa14 is described below commit 2caaa14f5c38a54a0239f0f5550cd8a432307304 Author: Stefan Seifert AuthorDate: Wed Aug 21 09:43:08 2024 +0200 [maven-release-plugin] prepare for next development iteration --- core/pom.xml | 4 ++-- junit4/pom.xml| 6 +++--- junit5/pom.xml| 6 +++--- parent/pom.xml| 6 +++--- pom.xml | 4 ++-- relocate/pom.xml | 2 +- test-services/pom.xml | 2 +- 7 files changed, 15 insertions(+), 15 deletions(-) diff --git a/core/pom.xml b/core/pom.xml index 490d86d..7d341d0 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -23,7 +23,7 @@ org.apache.sling org.apache.sling.testing.osgi-mock.parent -3.5.0 +3.5.1-SNAPSHOT ../parent/pom.xml @@ -167,7 +167,7 @@ org.apache.sling org.apache.sling.testing.osgi-mock.test-services -3.5.0 +3.5.1-SNAPSHOT test diff --git a/junit4/pom.xml b/junit4/pom.xml index 6c35dbe..c8ad7e3 100644 --- a/junit4/pom.xml +++ b/junit4/pom.xml @@ -23,7 +23,7 @@ org.apache.sling org.apache.sling.testing.osgi-mock.parent -3.5.0 +3.5.1-SNAPSHOT ../parent/pom.xml @@ -37,13 +37,13 @@ org.apache.sling org.apache.sling.testing.osgi-mock.core -3.5.0 +3.5.1-SNAPSHOT compile org.apache.sling org.apache.sling.testing.osgi-mock.core -3.5.0 +3.5.1-SNAPSHOT tests test diff --git a/junit5/pom.xml b/junit5/pom.xml index b458798..0232a8e 100644 --- a/junit5/pom.xml +++ b/junit5/pom.xml @@ -23,7 +23,7 @@ org.apache.sling org.apache.sling.testing.osgi-mock.parent -3.5.0 +3.5.1-SNAPSHOT ../parent/pom.xml @@ -51,13 +51,13 @@ org.apache.sling org.apache.sling.testing.osgi-mock.core -3.5.0 +3.5.1-SNAPSHOT compile org.apache.sling org.apache.sling.testing.osgi-mock.core -3.5.0 +3.5.1-SNAPSHOT tests test diff --git a/parent/pom.xml b/parent/pom.xml index 1851b05..3d0da94 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -28,7 +28,7 @@ org.apache.sling.testing.osgi-mock.parent -3.5.0 +3.5.1-SNAPSHOT pom Apache Sling Testing OSGi Mock Parent @@ -37,12 +37,12 @@ scm:git:https://gitbox.apache.org/repos/asf/sling-org-apache-sling-testing-osgi-mock.git scm:git:https://gitbox.apache.org/repos/asf/sling-org-apache-sling-testing-osgi-mock.git -org.apache.sling.testing.osgi-mock.reactor-3.5.0 +HEAD https://gitbox.apache.org/repos/asf?p=sling-org-apache-sling-testing-osgi-mock.git - 2024-08-21T07:42:39Z + 2024-08-21T07:43:07Z diff --git a/pom.xml b/pom.xml index 9533e4b..976a264 100644 --- a/pom.xml +++ b/pom.xml @@ -23,7 +23,7 @@ org.apache.sling org.apache.sling.testing.osgi-mock.parent -3.5.0 +3.5.1-SNAPSHOT parent/pom.xml @@ -44,7 +44,7 @@ scm:git:https://gitbox.apache.org/repos/asf/sling-org-apache-sling-testing-osgi-mock.git scm:git:https://gitbox.apache.org/repos/asf/sling-org-apache-sling-testing-osgi-mock.git -org.apache.sling.testing.osgi-mock.reactor-3.5.0 +HEAD https://github.com/apache/sling-org-apache-sling-testing-osgi-mock.git diff --git a/relocate/pom.xml b/relocate/pom.xml index cf29224..ca1318c 100644 --- a/relocate/pom.xml +++ b/relocate/pom.xml @@ -23,7 +23,7 @@ org.apache.sling org.apache.sling.testing.osgi-mock.parent -3.5.0 +3.5.1-SNAPSHOT ../parent/pom.xml diff --git a/test-services/pom.xml b/test-services/pom.xml index 421d082..3f5ce7e 100644 --- a/test-services/pom.xml +++ b/test-services/pom.xml @@ -23,7 +23,7 @@ org.apache.sling org.apache.sling.testing.osgi-mock.parent -3.5.0 +3.5.1-SNAPSHOT ../parent/pom.xml
(sling-org-apache-sling-testing-osgi-mock) annotated tag org.apache.sling.testing.osgi-mock.reactor-3.5.0 created (now b9357f1)
This is an automated email from the ASF dual-hosted git repository. sseifert pushed a change to annotated tag org.apache.sling.testing.osgi-mock.reactor-3.5.0 in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-testing-osgi-mock.git at b9357f1 (tag) tagging ce402977d675535f32a3756a851d5931ba1c53b6 (commit) replaces org.apache.sling.testing.osgi-mock.reactor-3.4.2 by Stefan Seifert on Wed Aug 21 09:43:03 2024 +0200 - Log - [maven-release-plugin] copy for tag org.apache.sling.testing.osgi-mock.reactor-3.5.0 --- No new revisions were added by this update.
(sling-org-apache-sling-testing-osgi-mock) branch master updated: [maven-release-plugin] prepare release org.apache.sling.testing.osgi-mock.reactor-3.5.0
This is an automated email from the ASF dual-hosted git repository. sseifert pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-testing-osgi-mock.git The following commit(s) were added to refs/heads/master by this push: new ce40297 [maven-release-plugin] prepare release org.apache.sling.testing.osgi-mock.reactor-3.5.0 ce40297 is described below commit ce402977d675535f32a3756a851d5931ba1c53b6 Author: Stefan Seifert AuthorDate: Wed Aug 21 09:42:58 2024 +0200 [maven-release-plugin] prepare release org.apache.sling.testing.osgi-mock.reactor-3.5.0 --- core/pom.xml | 4 ++-- junit4/pom.xml| 6 +++--- junit5/pom.xml| 6 +++--- parent/pom.xml| 6 +++--- pom.xml | 4 ++-- relocate/pom.xml | 2 +- test-services/pom.xml | 2 +- 7 files changed, 15 insertions(+), 15 deletions(-) diff --git a/core/pom.xml b/core/pom.xml index fdd5312..490d86d 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -23,7 +23,7 @@ org.apache.sling org.apache.sling.testing.osgi-mock.parent -3.5.0-SNAPSHOT +3.5.0 ../parent/pom.xml @@ -167,7 +167,7 @@ org.apache.sling org.apache.sling.testing.osgi-mock.test-services -3.5.0-SNAPSHOT +3.5.0 test diff --git a/junit4/pom.xml b/junit4/pom.xml index 2fa6c93..6c35dbe 100644 --- a/junit4/pom.xml +++ b/junit4/pom.xml @@ -23,7 +23,7 @@ org.apache.sling org.apache.sling.testing.osgi-mock.parent -3.5.0-SNAPSHOT +3.5.0 ../parent/pom.xml @@ -37,13 +37,13 @@ org.apache.sling org.apache.sling.testing.osgi-mock.core -3.5.0-SNAPSHOT +3.5.0 compile org.apache.sling org.apache.sling.testing.osgi-mock.core -3.5.0-SNAPSHOT +3.5.0 tests test diff --git a/junit5/pom.xml b/junit5/pom.xml index e056406..b458798 100644 --- a/junit5/pom.xml +++ b/junit5/pom.xml @@ -23,7 +23,7 @@ org.apache.sling org.apache.sling.testing.osgi-mock.parent -3.5.0-SNAPSHOT +3.5.0 ../parent/pom.xml @@ -51,13 +51,13 @@ org.apache.sling org.apache.sling.testing.osgi-mock.core -3.5.0-SNAPSHOT +3.5.0 compile org.apache.sling org.apache.sling.testing.osgi-mock.core -3.5.0-SNAPSHOT +3.5.0 tests test diff --git a/parent/pom.xml b/parent/pom.xml index 7e2941a..1851b05 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -28,7 +28,7 @@ org.apache.sling.testing.osgi-mock.parent -3.5.0-SNAPSHOT +3.5.0 pom Apache Sling Testing OSGi Mock Parent @@ -37,12 +37,12 @@ scm:git:https://gitbox.apache.org/repos/asf/sling-org-apache-sling-testing-osgi-mock.git scm:git:https://gitbox.apache.org/repos/asf/sling-org-apache-sling-testing-osgi-mock.git -HEAD +org.apache.sling.testing.osgi-mock.reactor-3.5.0 https://gitbox.apache.org/repos/asf?p=sling-org-apache-sling-testing-osgi-mock.git - 2024-04-09T15:35:54Z + 2024-08-21T07:42:39Z diff --git a/pom.xml b/pom.xml index 8742750..9533e4b 100644 --- a/pom.xml +++ b/pom.xml @@ -23,7 +23,7 @@ org.apache.sling org.apache.sling.testing.osgi-mock.parent -3.5.0-SNAPSHOT +3.5.0 parent/pom.xml @@ -44,7 +44,7 @@ scm:git:https://gitbox.apache.org/repos/asf/sling-org-apache-sling-testing-osgi-mock.git scm:git:https://gitbox.apache.org/repos/asf/sling-org-apache-sling-testing-osgi-mock.git -HEAD +org.apache.sling.testing.osgi-mock.reactor-3.5.0 https://github.com/apache/sling-org-apache-sling-testing-osgi-mock.git diff --git a/relocate/pom.xml b/relocate/pom.xml index e26b469..cf29224 100644 --- a/relocate/pom.xml +++ b/relocate/pom.xml @@ -23,7 +23,7 @@ org.apache.sling org.apache.sling.testing.osgi-mock.parent -3.5.0-SNAPSHOT +3.5.0 ../parent/pom.xml diff --git a/test-services/pom.xml b/test-services/pom.xml index d4172d4..421d082 100644 --- a/test-services/pom.xml +++ b/test-services/pom.xml @@ -23,7 +23,7 @@ org.apache.sling org.apache.sling.testing.osgi-mock.parent -3.5.0-SNAPSHOT +3.5.0 ../parent/pom.xml
(sling-org-apache-sling-testing-resourceresolver-mock) branch master updated: [maven-release-plugin] prepare for next development iteration
This is an automated email from the ASF dual-hosted git repository. sseifert pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-testing-resourceresolver-mock.git The following commit(s) were added to refs/heads/master by this push: new d461f34 [maven-release-plugin] prepare for next development iteration d461f34 is described below commit d461f3430c9c9ae81ed8b783e106593481f88b20 Author: Stefan Seifert AuthorDate: Wed Aug 21 09:40:06 2024 +0200 [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 85f1564..b3d93b1 100644 --- a/pom.xml +++ b/pom.xml @@ -28,7 +28,7 @@ org.apache.sling.testing.resourceresolver-mock -1.5.0 +1.5.1-SNAPSHOT Apache Sling Testing Resource Resolver Mock Mock for the resource resolver / factory for easier testing. @@ -36,12 +36,12 @@ scm:git:https://gitbox.apache.org/repos/asf/sling-org-apache-sling-testing-resourceresolver-mock.git scm:git:https://gitbox.apache.org/repos/asf/sling-org-apache-sling-testing-resourceresolver-mock.git -org.apache.sling.testing.resourceresolver-mock-1.5.0 +HEAD https://github.com/apache/sling-org-apache-sling-testing-resourceresolver-mock.git - 2024-08-21T07:39:47Z + 2024-08-21T07:40:06Z
(sling-org-apache-sling-testing-resourceresolver-mock) branch master updated: [maven-release-plugin] prepare release org.apache.sling.testing.resourceresolver-mock-1.5.0
This is an automated email from the ASF dual-hosted git repository. sseifert pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-testing-resourceresolver-mock.git The following commit(s) were added to refs/heads/master by this push: new 771c256 [maven-release-plugin] prepare release org.apache.sling.testing.resourceresolver-mock-1.5.0 771c256 is described below commit 771c2562c0824db44e3a861a05ef3f7955a8e0be Author: Stefan Seifert AuthorDate: Wed Aug 21 09:39:58 2024 +0200 [maven-release-plugin] prepare release org.apache.sling.testing.resourceresolver-mock-1.5.0 --- pom.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index d1a18de..85f1564 100644 --- a/pom.xml +++ b/pom.xml @@ -28,7 +28,7 @@ org.apache.sling.testing.resourceresolver-mock -1.5.0-SNAPSHOT +1.5.0 Apache Sling Testing Resource Resolver Mock Mock for the resource resolver / factory for easier testing. @@ -36,12 +36,12 @@ scm:git:https://gitbox.apache.org/repos/asf/sling-org-apache-sling-testing-resourceresolver-mock.git scm:git:https://gitbox.apache.org/repos/asf/sling-org-apache-sling-testing-resourceresolver-mock.git -HEAD +org.apache.sling.testing.resourceresolver-mock-1.5.0 https://github.com/apache/sling-org-apache-sling-testing-resourceresolver-mock.git - 2024-01-22T13:57:46Z + 2024-08-21T07:39:47Z
(sling-org-apache-sling-testing-resourceresolver-mock) annotated tag org.apache.sling.testing.resourceresolver-mock-1.5.0 created (now 0c1af3b)
This is an automated email from the ASF dual-hosted git repository. sseifert pushed a change to annotated tag org.apache.sling.testing.resourceresolver-mock-1.5.0 in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-testing-resourceresolver-mock.git at 0c1af3b (tag) tagging 771c2562c0824db44e3a861a05ef3f7955a8e0be (commit) replaces org.apache.sling.testing.resourceresolver-mock-1.4.6 by Stefan Seifert on Wed Aug 21 09:40:02 2024 +0200 - Log - [maven-release-plugin] copy for tag org.apache.sling.testing.resourceresolver-mock-1.5.0 --- No new revisions were added by this update.
(sling-org-apache-sling-testing-resourceresolver-mock) branch master updated: SLING-12410 ResourceResolver: Add impl for copy and move methods (#16)
This is an automated email from the ASF dual-hosted git repository.
sseifert pushed a commit to branch master
in repository
https://gitbox.apache.org/repos/asf/sling-org-apache-sling-testing-resourceresolver-mock.git
The following commit(s) were added to refs/heads/master by this push:
new dd68324 SLING-12410 ResourceResolver: Add impl for copy and move
methods (#16)
dd68324 is described below
commit dd68324dd96f1772e81249f38089d40627748748
Author: Bart
AuthorDate: Tue Aug 20 12:41:12 2024 +0200
SLING-12410 ResourceResolver: Add impl for copy and move methods (#16)
Co-authored-by: Bart Thierens
Co-authored-by: Stefan Seifert
---
.../resourceresolver/MockResourceResolver.java | 55 -
.../CopyMoveResourceResolverTest.java | 240 +
...pyMoveResourceResolverResourceProviderTest.java | 39
3 files changed, 324 insertions(+), 10 deletions(-)
diff --git
a/src/main/java/org/apache/sling/testing/resourceresolver/MockResourceResolver.java
b/src/main/java/org/apache/sling/testing/resourceresolver/MockResourceResolver.java
index 09e7857..f0f15fe 100644
---
a/src/main/java/org/apache/sling/testing/resourceresolver/MockResourceResolver.java
+++
b/src/main/java/org/apache/sling/testing/resourceresolver/MockResourceResolver.java
@@ -518,6 +518,51 @@ public class MockResourceResolver extends SlingAdaptable
implements ResourceReso
.orElse(Collections.emptyIterator());
}
+@Override
+public Resource copy(String srcAbsPath, String destAbsPath) throws
PersistenceException {
+Resource source = getResource(srcAbsPath);
+if (source == null) {
+throw new PersistenceException("Copy source does not exist");
+}
+Resource destinationParent = getResource(destAbsPath);
+if (destinationParent == null) {
+throw new PersistenceException("Copy destination does not exist");
+}
+if (destinationParent.getChild(source.getName()) != null) {
+throw new PersistenceException("A resource with the same name
already exists at " + destAbsPath);
+}
+recursivelyCreate(source, destinationParent);
+Resource destination = getResource(destAbsPath + "/" +
source.getName());
+if (destination == null) {
+throw new PersistenceException("Something went wrong");
+}
+return destination;
+}
+
+private void recursivelyCreate(Resource source, Resource destParent)
throws PersistenceException {
+ValueMap sourceProperties = source.getValueMap();
+Resource target = create(destParent, source.getName(),
sourceProperties);
+Iterator childrenIter = source.listChildren();
+while (childrenIter.hasNext()) {
+recursivelyCreate(childrenIter.next(), target);
+}
+}
+
+@Override
+public Resource move(String srcAbsPath, String destAbsPath) throws
PersistenceException {
+Resource source = getResource(srcAbsPath);
+if (source == null) {
+throw new PersistenceException("Move source does not exist");
+}
+Resource destinationParent = getResource(destAbsPath);
+if (destinationParent == null) {
+throw new PersistenceException("Move destination does not exist");
+}
+Resource destination = copy(srcAbsPath, destAbsPath);
+delete(source);
+return destination;
+}
+
/**
* Adds a handler that can provide a mocked query resources result. You
can add multiple handlers which are called
* in the order they were added when calling {@link
#queryResources(String, String)}.
@@ -556,16 +601,6 @@ public class MockResourceResolver extends SlingAdaptable
implements ResourceReso
throw new UnsupportedOperationException();
}
-@Override
-public Resource copy(String srcAbsPath, String destAbsPath) throws
PersistenceException {
-throw new UnsupportedOperationException();
-}
-
-@Override
-public Resource move(String srcAbsPath, String destAbsPath) throws
PersistenceException {
-throw new UnsupportedOperationException();
-}
-
// Sling API 2.24.0
public boolean orderBefore(@NotNull Resource parent, @NotNull String name,
@Nullable String followingSiblingName)
throws UnsupportedOperationException, PersistenceException,
IllegalArgumentException {
diff --git
a/src/test/java/org/apache/sling/testing/resourceresolver/CopyMoveResourceResolverTest.java
b/src/test/java/org/apache/sling/testing/resourceresolver/CopyMoveResourceResolverTest.java
new file mode 100644
index 000..ace876a
--- /dev/null
+++
b/src/test/java/org/apache/sling/testing/resourceresolver/CopyMoveResourceResolverTest.java
@@ -0,0 +1,240 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor licen
(sling-org-apache-sling-models-impl) branch master updated: update models API dependency to get rid of annotation processor source code warning
This is an automated email from the ASF dual-hosted git repository. sseifert pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-models-impl.git The following commit(s) were added to refs/heads/master by this push: new 018b951 update models API dependency to get rid of annotation processor source code warning 018b951 is described below commit 018b9514eb71292b08b3891035e4a74612e1a866 Author: Stefan Seifert AuthorDate: Fri Jul 5 18:21:09 2024 +0200 update models API dependency to get rid of annotation processor source code warning --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 96dac75..7fb1d5d 100644 --- a/pom.xml +++ b/pom.xml @@ -44,7 +44,7 @@ org.apache.sling org.apache.sling.models.api -1.5.0 +1.5.4 provided
(sling-site) branch master updated: Apache Sling Models API 1.5.4
This is an automated email from the ASF dual-hosted git repository. sseifert pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/sling-site.git The following commit(s) were added to refs/heads/master by this push: new 05f6a851b Apache Sling Models API 1.5.4 05f6a851b is described below commit 05f6a851bf7ef38bfe371fce654bc52ad6c3fd77 Author: Stefan Seifert AuthorDate: Fri Jul 5 18:17:41 2024 +0200 Apache Sling Models API 1.5.4 --- src/main/jbake/content/releases.md | 4 src/main/jbake/templates/downloads.tpl | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/main/jbake/content/releases.md b/src/main/jbake/content/releases.md index 1958b9afa..96411a9c5 100644 --- a/src/main/jbake/content/releases.md +++ b/src/main/jbake/content/releases.md @@ -6,6 +6,10 @@ tableOfContents=false ~~ This is a list of all our releases, available from our [downloads](/downloads.cgi) page. +## July 2024 + +* Models API 1.5.4 (5th) + ## June 2024 * Models API 1.5.2, Models Implementation 1.7.0 (28th) diff --git a/src/main/jbake/templates/downloads.tpl b/src/main/jbake/templates/downloads.tpl index ec716939f..6d65f6952 100644 --- a/src/main/jbake/templates/downloads.tpl +++ b/src/main/jbake/templates/downloads.tpl @@ -185,7 +185,7 @@ def bundles=[ "Launchpad Testing Services|org.apache.sling.launchpad.test-services|12|Y|jar", "Launchpad Testing Services WAR|org.apache.sling.launchpad.test-services-war|2.0.16|Y|war", "Log Tracer|org.apache.sling.tracer|1.0.8|Y|jar", - "Models API|org.apache.sling.models.api|1.5.2|Y|jar", + "Models API|org.apache.sling.models.api|1.5.4|Y|jar", "Models Implementation|org.apache.sling.models.impl|1.7.0|Y|jar", "Models Jackson Exporter|org.apache.sling.models.jacksonexporter|1.1.4|Y|jar", "Models Validation Implementation|org.apache.sling.models.validation-impl|1.1.0|Y|jar",
svn commit: r70147 - /release/sling/
Author: sseifert Date: Fri Jul 5 16:02:29 2024 New Revision: 70147 Log: Apache Sling Models API 1.5.4 Added: release/sling/org.apache.sling.models.api-1.5.4-javadoc.jar (with props) release/sling/org.apache.sling.models.api-1.5.4-javadoc.jar.asc release/sling/org.apache.sling.models.api-1.5.4-javadoc.jar.md5 release/sling/org.apache.sling.models.api-1.5.4-javadoc.jar.sha1 release/sling/org.apache.sling.models.api-1.5.4-source-release.zip (with props) release/sling/org.apache.sling.models.api-1.5.4-source-release.zip.asc release/sling/org.apache.sling.models.api-1.5.4-source-release.zip.md5 release/sling/org.apache.sling.models.api-1.5.4-source-release.zip.sha1 release/sling/org.apache.sling.models.api-1.5.4-source-release.zip.sha512 release/sling/org.apache.sling.models.api-1.5.4-sources.jar (with props) release/sling/org.apache.sling.models.api-1.5.4-sources.jar.asc release/sling/org.apache.sling.models.api-1.5.4-sources.jar.md5 release/sling/org.apache.sling.models.api-1.5.4-sources.jar.sha1 release/sling/org.apache.sling.models.api-1.5.4.jar (with props) release/sling/org.apache.sling.models.api-1.5.4.jar.asc release/sling/org.apache.sling.models.api-1.5.4.jar.md5 release/sling/org.apache.sling.models.api-1.5.4.jar.sha1 release/sling/org.apache.sling.models.api-1.5.4.pom release/sling/org.apache.sling.models.api-1.5.4.pom.asc release/sling/org.apache.sling.models.api-1.5.4.pom.md5 release/sling/org.apache.sling.models.api-1.5.4.pom.sha1 Removed: release/sling/org.apache.sling.models.api-1.5.2-javadoc.jar release/sling/org.apache.sling.models.api-1.5.2-javadoc.jar.asc release/sling/org.apache.sling.models.api-1.5.2-javadoc.jar.md5 release/sling/org.apache.sling.models.api-1.5.2-javadoc.jar.sha1 release/sling/org.apache.sling.models.api-1.5.2-source-release.zip release/sling/org.apache.sling.models.api-1.5.2-source-release.zip.asc release/sling/org.apache.sling.models.api-1.5.2-source-release.zip.md5 release/sling/org.apache.sling.models.api-1.5.2-source-release.zip.sha1 release/sling/org.apache.sling.models.api-1.5.2-source-release.zip.sha512 release/sling/org.apache.sling.models.api-1.5.2-sources.jar release/sling/org.apache.sling.models.api-1.5.2-sources.jar.asc release/sling/org.apache.sling.models.api-1.5.2-sources.jar.md5 release/sling/org.apache.sling.models.api-1.5.2-sources.jar.sha1 release/sling/org.apache.sling.models.api-1.5.2.jar release/sling/org.apache.sling.models.api-1.5.2.jar.asc release/sling/org.apache.sling.models.api-1.5.2.jar.md5 release/sling/org.apache.sling.models.api-1.5.2.jar.sha1 release/sling/org.apache.sling.models.api-1.5.2.pom release/sling/org.apache.sling.models.api-1.5.2.pom.asc release/sling/org.apache.sling.models.api-1.5.2.pom.md5 release/sling/org.apache.sling.models.api-1.5.2.pom.sha1 Added: release/sling/org.apache.sling.models.api-1.5.4-javadoc.jar == Binary file - no diff available. Propchange: release/sling/org.apache.sling.models.api-1.5.4-javadoc.jar -- svn:mime-type = application/octet-stream Added: release/sling/org.apache.sling.models.api-1.5.4-javadoc.jar.asc == --- release/sling/org.apache.sling.models.api-1.5.4-javadoc.jar.asc (added) +++ release/sling/org.apache.sling.models.api-1.5.4-javadoc.jar.asc Fri Jul 5 16:02:29 2024 @@ -0,0 +1,11 @@ +-BEGIN PGP SIGNATURE- + +iQEzBAABCgAdFiEEpN7YllwuHIGCF8uRzit/9nXXjpIFAmaCoHIACgkQzit/9nXX +jpIIkwf/dG0b6KpgEmq3LRDL6spM26Lg+tBj11070VRnQ+t7z5qRaawfLHC+qhty +3znJcP5KDoAIkKTGe/DSvPkFAyvhFf2lmazMBPuohcVnuYEwJQD6TBux1LABR9Dl +HPjZZdb54pFpawjxU3+3dHNXy9CMzN39hL+kkNQR1EY2wm6n7Y9RNR/FlGILKYTo +pXtTv5qdUlMx5RwWAjQKs06o+1MP775tEXnEzBHoGqYDwSOV0anNYwfHTJrdWala +j0L9SWzIXDNSdP7lctNL/+QT8IiI+bw86tyeyoEF5633t/0xfE5ZYplAtHPfzPMS +Qk5lxsNlhVTUEQJLN28FA3R87szYcQ== +=TIJ6 +-END PGP SIGNATURE- Added: release/sling/org.apache.sling.models.api-1.5.4-javadoc.jar.md5 == --- release/sling/org.apache.sling.models.api-1.5.4-javadoc.jar.md5 (added) +++ release/sling/org.apache.sling.models.api-1.5.4-javadoc.jar.md5 Fri Jul 5 16:02:29 2024 @@ -0,0 +1 @@ +c51d49c5c92443fcd23511172a61c5b5 \ No newline at end of file Added: release/sling/org.apache.sling.models.api-1.5.4-javadoc.jar.sha1 == --- release/sling/org.apache.sling.models.api-1.5.4-javadoc.jar.sha1 (added) +++ release/sling/org.apache.sling.models.api-1.5.4-javadoc.jar.sha1 Fri Jul 5 16:02:29 2024 @@ -0,0 +1 @@ +82c96b1d1738717c8836ffdc5b95012d21a5abae \ No newline at end of file Added: release/sling
(sling-org-apache-sling-models-api) branch master updated: [maven-release-plugin] prepare for next development iteration
This is an automated email from the ASF dual-hosted git repository. sseifert pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-models-api.git The following commit(s) were added to refs/heads/master by this push: new a2aa69d [maven-release-plugin] prepare for next development iteration a2aa69d is described below commit a2aa69dcedbdd5018160f59e22f6bdef806c2bca Author: Stefan Seifert AuthorDate: Mon Jul 1 14:25:41 2024 +0200 [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 e512978..b0ffb98 100644 --- a/pom.xml +++ b/pom.xml @@ -27,19 +27,19 @@ org.apache.sling.models.api -1.5.4 +1.5.5-SNAPSHOT Apache Sling Models API Apache Sling Models API scm:git:https://gitbox.apache.org/repos/asf/sling-org-apache-sling-models-api.git scm:git:https://gitbox.apache.org/repos/asf/sling-org-apache-sling-models-api.git -org.apache.sling.models.api-1.5.4 +HEAD https://github.com/apache/sling-org-apache-sling-models-api.git 8 - 2024-07-01T12:25:20Z + 2024-07-01T12:25:41Z
(sling-org-apache-sling-models-api) annotated tag org.apache.sling.models.api-1.5.4 created (now b6995aa)
This is an automated email from the ASF dual-hosted git repository. sseifert pushed a change to annotated tag org.apache.sling.models.api-1.5.4 in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-models-api.git at b6995aa (tag) tagging 5035c3d239331671b85c2aad1240e9a0a3df94ea (commit) replaces org.apache.sling.models.api-1.5.2 by Stefan Seifert on Mon Jul 1 14:25:37 2024 +0200 - Log - [maven-release-plugin] copy for tag org.apache.sling.models.api-1.5.4 --- No new revisions were added by this update.
(sling-org-apache-sling-models-api) branch master updated: [maven-release-plugin] prepare release org.apache.sling.models.api-1.5.4
This is an automated email from the ASF dual-hosted git repository. sseifert pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-models-api.git The following commit(s) were added to refs/heads/master by this push: new 5035c3d [maven-release-plugin] prepare release org.apache.sling.models.api-1.5.4 5035c3d is described below commit 5035c3d239331671b85c2aad1240e9a0a3df94ea Author: Stefan Seifert AuthorDate: Mon Jul 1 14:25:33 2024 +0200 [maven-release-plugin] prepare release org.apache.sling.models.api-1.5.4 --- pom.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index b1721d2..e512978 100644 --- a/pom.xml +++ b/pom.xml @@ -27,19 +27,19 @@ org.apache.sling.models.api -1.5.3-SNAPSHOT +1.5.4 Apache Sling Models API Apache Sling Models API scm:git:https://gitbox.apache.org/repos/asf/sling-org-apache-sling-models-api.git scm:git:https://gitbox.apache.org/repos/asf/sling-org-apache-sling-models-api.git -HEAD +org.apache.sling.models.api-1.5.4 https://github.com/apache/sling-org-apache-sling-models-api.git 8 - 2024-06-25T14:55:27Z + 2024-07-01T12:25:20Z
(sling-org-apache-sling-models-api) branch feature/SLING-12364-annotation-supported-source deleted (was 6181eab)
This is an automated email from the ASF dual-hosted git repository. sseifert pushed a change to branch feature/SLING-12364-annotation-supported-source in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-models-api.git was 6181eab SLING-12364 Define that any java source version is supported 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 master updated: SLING-12364 Define that any java source version is supported
This is an automated email from the ASF dual-hosted git repository.
sseifert pushed a commit to branch master
in repository
https://gitbox.apache.org/repos/asf/sling-org-apache-sling-models-api.git
The following commit(s) were added to refs/heads/master by this push:
new 4ac935c SLING-12364 Define that any java source version is supported
4ac935c is described below
commit 4ac935cfc0565d1acfadbd9e1c34849bfb2ddeae
Author: Stefan Seifert
AuthorDate: Fri Jun 28 18:24:39 2024 +0200
SLING-12364 Define that any java source version is supported
---
.../sling/models/annotations/apt/ValidatingAnnotationProcessor.java | 6 ++
1 file changed, 6 insertions(+)
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 3d25ab6..87284c8 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,6 +21,7 @@ package org.apache.sling.models.annotations.apt;
import javax.annotation.processing.AbstractProcessor;
import javax.annotation.processing.RoundEnvironment;
import javax.annotation.processing.SupportedAnnotationTypes;
+import javax.lang.model.SourceVersion;
import javax.lang.model.element.Element;
import javax.lang.model.element.ElementKind;
import javax.lang.model.element.Modifier;
@@ -72,6 +73,11 @@ public class ValidatingAnnotationProcessor extends
AbstractProcessor {
return true;
}
+@Override
+public SourceVersion getSupportedSourceVersion() {
+return SourceVersion.latest();
+}
+
private String getSymbolName(Element annotatedElement) {
String name =
annotatedElement.getEnclosingElement().getSimpleName().toString() + "#"
+ annotatedElement.getSimpleName().toString();
(sling-org-apache-sling-models-api) 01/01: SLING-12364 Define that any java source version is supported
This is an automated email from the ASF dual-hosted git repository.
sseifert pushed a commit to branch
feature/SLING-12364-annotation-supported-source
in repository
https://gitbox.apache.org/repos/asf/sling-org-apache-sling-models-api.git
commit 6181eabd070f1bdcf6e1da1253c3b832a6b5099b
Author: Stefan Seifert
AuthorDate: Fri Jun 28 18:24:39 2024 +0200
SLING-12364 Define that any java source version is supported
---
.../sling/models/annotations/apt/ValidatingAnnotationProcessor.java | 6 ++
1 file changed, 6 insertions(+)
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 3d25ab6..87284c8 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,6 +21,7 @@ package org.apache.sling.models.annotations.apt;
import javax.annotation.processing.AbstractProcessor;
import javax.annotation.processing.RoundEnvironment;
import javax.annotation.processing.SupportedAnnotationTypes;
+import javax.lang.model.SourceVersion;
import javax.lang.model.element.Element;
import javax.lang.model.element.ElementKind;
import javax.lang.model.element.Modifier;
@@ -72,6 +73,11 @@ public class ValidatingAnnotationProcessor extends
AbstractProcessor {
return true;
}
+@Override
+public SourceVersion getSupportedSourceVersion() {
+return SourceVersion.latest();
+}
+
private String getSymbolName(Element annotatedElement) {
String name =
annotatedElement.getEnclosingElement().getSimpleName().toString() + "#"
+ annotatedElement.getSimpleName().toString();
(sling-org-apache-sling-models-api) branch feature/SLING-12364-annotation-supported-source created (now 6181eab)
This is an automated email from the ASF dual-hosted git repository. sseifert pushed a change to branch feature/SLING-12364-annotation-supported-source in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-models-api.git at 6181eab SLING-12364 Define that any java source version is supported This branch includes the following new commits: new 6181eab SLING-12364 Define that any java source version is supported 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 master updated: Apache Sling Models API 1.5.2, Models Implementation 1.7.0
This is an automated email from the ASF dual-hosted git repository. sseifert pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/sling-site.git The following commit(s) were added to refs/heads/master by this push: new ffe12b31f Apache Sling Models API 1.5.2, Models Implementation 1.7.0 ffe12b31f is described below commit ffe12b31f9fe1f9876a8f2d0da847f1f8624279b Author: Stefan Seifert AuthorDate: Fri Jun 28 18:03:48 2024 +0200 Apache Sling Models API 1.5.2, Models Implementation 1.7.0 --- src/main/jbake/content/releases.md | 1 + src/main/jbake/templates/downloads.tpl | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/main/jbake/content/releases.md b/src/main/jbake/content/releases.md index d2e84eb36..1958b9afa 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 ## June 2024 +* Models API 1.5.2, Models Implementation 1.7.0 (28th) * Repoinit JCR 1.1.50 (26th) * OSGi Feature Maven Plugin 1.8.4 (26th) * Feature Model Analyser 2.0.8 (26th) diff --git a/src/main/jbake/templates/downloads.tpl b/src/main/jbake/templates/downloads.tpl index 556dd9b02..ec716939f 100644 --- a/src/main/jbake/templates/downloads.tpl +++ b/src/main/jbake/templates/downloads.tpl @@ -185,8 +185,8 @@ def bundles=[ "Launchpad Testing Services|org.apache.sling.launchpad.test-services|12|Y|jar", "Launchpad Testing Services WAR|org.apache.sling.launchpad.test-services-war|2.0.16|Y|war", "Log Tracer|org.apache.sling.tracer|1.0.8|Y|jar", - "Models API|org.apache.sling.models.api|1.5.0|Y|jar", - "Models Implementation|org.apache.sling.models.impl|1.6.4|Y|jar", + "Models API|org.apache.sling.models.api|1.5.2|Y|jar", + "Models Implementation|org.apache.sling.models.impl|1.7.0|Y|jar", "Models Jackson Exporter|org.apache.sling.models.jacksonexporter|1.1.4|Y|jar", "Models Validation Implementation|org.apache.sling.models.validation-impl|1.1.0|Y|jar", "Models Context-Aware Configuration|org.apache.sling.models.caconfig|1.0.2|Y|jar",
svn commit: r70042 - /release/sling/
Author: sseifert Date: Fri Jun 28 16:01:37 2024 New Revision: 70042 Log: Apache Sling Models API 1.5.2, Models Implementation 1.7.0 Added: release/sling/org.apache.sling.models.api-1.5.2-javadoc.jar (with props) release/sling/org.apache.sling.models.api-1.5.2-javadoc.jar.asc release/sling/org.apache.sling.models.api-1.5.2-javadoc.jar.md5 release/sling/org.apache.sling.models.api-1.5.2-javadoc.jar.sha1 release/sling/org.apache.sling.models.api-1.5.2-source-release.zip (with props) release/sling/org.apache.sling.models.api-1.5.2-source-release.zip.asc release/sling/org.apache.sling.models.api-1.5.2-source-release.zip.md5 release/sling/org.apache.sling.models.api-1.5.2-source-release.zip.sha1 release/sling/org.apache.sling.models.api-1.5.2-source-release.zip.sha512 release/sling/org.apache.sling.models.api-1.5.2-sources.jar (with props) release/sling/org.apache.sling.models.api-1.5.2-sources.jar.asc release/sling/org.apache.sling.models.api-1.5.2-sources.jar.md5 release/sling/org.apache.sling.models.api-1.5.2-sources.jar.sha1 release/sling/org.apache.sling.models.api-1.5.2.jar (with props) release/sling/org.apache.sling.models.api-1.5.2.jar.asc release/sling/org.apache.sling.models.api-1.5.2.jar.md5 release/sling/org.apache.sling.models.api-1.5.2.jar.sha1 release/sling/org.apache.sling.models.api-1.5.2.pom release/sling/org.apache.sling.models.api-1.5.2.pom.asc release/sling/org.apache.sling.models.api-1.5.2.pom.md5 release/sling/org.apache.sling.models.api-1.5.2.pom.sha1 release/sling/org.apache.sling.models.impl-1.7.0-javadoc.jar (with props) release/sling/org.apache.sling.models.impl-1.7.0-javadoc.jar.asc release/sling/org.apache.sling.models.impl-1.7.0-javadoc.jar.md5 release/sling/org.apache.sling.models.impl-1.7.0-javadoc.jar.sha1 release/sling/org.apache.sling.models.impl-1.7.0-source-release.zip (with props) release/sling/org.apache.sling.models.impl-1.7.0-source-release.zip.asc release/sling/org.apache.sling.models.impl-1.7.0-source-release.zip.md5 release/sling/org.apache.sling.models.impl-1.7.0-source-release.zip.sha1 release/sling/org.apache.sling.models.impl-1.7.0-source-release.zip.sha512 release/sling/org.apache.sling.models.impl-1.7.0-sources.jar (with props) release/sling/org.apache.sling.models.impl-1.7.0-sources.jar.asc release/sling/org.apache.sling.models.impl-1.7.0-sources.jar.md5 release/sling/org.apache.sling.models.impl-1.7.0-sources.jar.sha1 release/sling/org.apache.sling.models.impl-1.7.0.jar (with props) release/sling/org.apache.sling.models.impl-1.7.0.jar.asc release/sling/org.apache.sling.models.impl-1.7.0.jar.md5 release/sling/org.apache.sling.models.impl-1.7.0.jar.sha1 release/sling/org.apache.sling.models.impl-1.7.0.pom release/sling/org.apache.sling.models.impl-1.7.0.pom.asc release/sling/org.apache.sling.models.impl-1.7.0.pom.md5 release/sling/org.apache.sling.models.impl-1.7.0.pom.sha1 Removed: release/sling/org.apache.sling.models.api-1.5.0-javadoc.jar release/sling/org.apache.sling.models.api-1.5.0-javadoc.jar.asc release/sling/org.apache.sling.models.api-1.5.0-javadoc.jar.md5 release/sling/org.apache.sling.models.api-1.5.0-javadoc.jar.sha1 release/sling/org.apache.sling.models.api-1.5.0-source-release.zip release/sling/org.apache.sling.models.api-1.5.0-source-release.zip.asc release/sling/org.apache.sling.models.api-1.5.0-source-release.zip.md5 release/sling/org.apache.sling.models.api-1.5.0-source-release.zip.sha1 release/sling/org.apache.sling.models.api-1.5.0-source-release.zip.sha512 release/sling/org.apache.sling.models.api-1.5.0-source-release.zip.sha512.md5 release/sling/org.apache.sling.models.api-1.5.0-source-release.zip.sha512.sha1 release/sling/org.apache.sling.models.api-1.5.0-sources.jar release/sling/org.apache.sling.models.api-1.5.0-sources.jar.asc release/sling/org.apache.sling.models.api-1.5.0-sources.jar.md5 release/sling/org.apache.sling.models.api-1.5.0-sources.jar.sha1 release/sling/org.apache.sling.models.api-1.5.0.jar release/sling/org.apache.sling.models.api-1.5.0.jar.asc release/sling/org.apache.sling.models.api-1.5.0.jar.md5 release/sling/org.apache.sling.models.api-1.5.0.jar.sha1 release/sling/org.apache.sling.models.api-1.5.0.pom release/sling/org.apache.sling.models.api-1.5.0.pom.asc release/sling/org.apache.sling.models.api-1.5.0.pom.md5 release/sling/org.apache.sling.models.api-1.5.0.pom.sha1 release/sling/org.apache.sling.models.impl-1.6.4-javadoc.jar release/sling/org.apache.sling.models.impl-1.6.4-javadoc.jar.asc release/sling/org.apache.sling.models.impl-1.6.4-javadoc.jar.md5 release/sling/org.apache.sling.models.impl-1.6.4-javadoc.jar.sha1 release/sling/org.apache.sling.models.impl-1.6.4-source-release.zip release/sling
(sling-org-apache-sling-models-impl) branch master updated: [maven-release-plugin] prepare for next development iteration
This is an automated email from the ASF dual-hosted git repository. sseifert pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-models-impl.git The following commit(s) were added to refs/heads/master by this push: new 74804b5 [maven-release-plugin] prepare for next development iteration 74804b5 is described below commit 74804b57cf032c19ae925a5752d1a64a18708f75 Author: Stefan Seifert AuthorDate: Tue Jun 25 16:58:38 2024 +0200 [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 09e0e69..96dac75 100644 --- a/pom.xml +++ b/pom.xml @@ -26,18 +26,18 @@ org.apache.sling.models.impl -1.7.0 +1.7.1-SNAPSHOT Apache Sling Models Implementation Apache Sling Models Implementation scm:git:https://gitbox.apache.org/repos/asf/sling-org-apache-sling-models-impl.git scm:git:https://gitbox.apache.org/repos/asf/sling-org-apache-sling-models-impl.git -org.apache.sling.models.impl-1.7.0 +HEAD https://github.com/apache/sling-org-apache-sling-models-impl.git - 2024-06-25T14:57:33Z + 2024-06-25T14:58:38Z
(sling-org-apache-sling-models-impl) annotated tag org.apache.sling.models.impl-1.7.0 created (now e3de3e9)
This is an automated email from the ASF dual-hosted git repository. sseifert pushed a change to annotated tag org.apache.sling.models.impl-1.7.0 in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-models-impl.git at e3de3e9 (tag) tagging bae451fed939cebad35fe3f02bcaf9ee262ebc70 (commit) replaces org.apache.sling.models.impl-1.6.4 by Stefan Seifert on Tue Jun 25 16:58:34 2024 +0200 - Log - [maven-release-plugin] copy for tag org.apache.sling.models.impl-1.7.0 --- No new revisions were added by this update.
(sling-org-apache-sling-models-impl) branch master updated: [maven-release-plugin] prepare release org.apache.sling.models.impl-1.7.0
This is an automated email from the ASF dual-hosted git repository. sseifert pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-models-impl.git The following commit(s) were added to refs/heads/master by this push: new bae451f [maven-release-plugin] prepare release org.apache.sling.models.impl-1.7.0 bae451f is described below commit bae451fed939cebad35fe3f02bcaf9ee262ebc70 Author: Stefan Seifert AuthorDate: Tue Jun 25 16:58:29 2024 +0200 [maven-release-plugin] prepare release org.apache.sling.models.impl-1.7.0 --- pom.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index 2dd843c..09e0e69 100644 --- a/pom.xml +++ b/pom.xml @@ -26,18 +26,18 @@ org.apache.sling.models.impl -1.6.5-SNAPSHOT +1.7.0 Apache Sling Models Implementation Apache Sling Models Implementation scm:git:https://gitbox.apache.org/repos/asf/sling-org-apache-sling-models-impl.git scm:git:https://gitbox.apache.org/repos/asf/sling-org-apache-sling-models-impl.git -HEAD +org.apache.sling.models.impl-1.7.0 https://github.com/apache/sling-org-apache-sling-models-impl.git - 2023-05-30T08:54:10Z + 2024-06-25T14:57:33Z
(sling-org-apache-sling-models-api) branch feature/SLING-2186-spotless-poc deleted (was 28db54c)
This is an automated email from the ASF dual-hosted git repository. sseifert pushed a change to branch feature/SLING-2186-spotless-poc in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-models-api.git was 28db54c Enable spotless-maven-plugin with palantir and pom plugin 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 master updated: [maven-release-plugin] prepare for next development iteration
This is an automated email from the ASF dual-hosted git repository. sseifert pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-models-api.git The following commit(s) were added to refs/heads/master by this push: new 671d1c3 [maven-release-plugin] prepare for next development iteration 671d1c3 is described below commit 671d1c356e7a80b4546bb3f7a40f52f34b2f87bc Author: Stefan Seifert AuthorDate: Tue Jun 25 16:55:27 2024 +0200 [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 58919a7..b1721d2 100644 --- a/pom.xml +++ b/pom.xml @@ -27,19 +27,19 @@ org.apache.sling.models.api -1.5.2 +1.5.3-SNAPSHOT Apache Sling Models API Apache Sling Models API scm:git:https://gitbox.apache.org/repos/asf/sling-org-apache-sling-models-api.git scm:git:https://gitbox.apache.org/repos/asf/sling-org-apache-sling-models-api.git -org.apache.sling.models.api-1.5.2 +HEAD https://github.com/apache/sling-org-apache-sling-models-api.git 8 - 2024-06-25T14:55:06Z + 2024-06-25T14:55:27Z
(sling-org-apache-sling-models-api) annotated tag org.apache.sling.models.api-1.5.2 created (now fcb87e9)
This is an automated email from the ASF dual-hosted git repository. sseifert pushed a change to annotated tag org.apache.sling.models.api-1.5.2 in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-models-api.git at fcb87e9 (tag) tagging 15325e729aacefc06bbae1166a5882ba6299d4ba (commit) replaces org.apache.sling.models.api-1.5.0 by Stefan Seifert on Tue Jun 25 16:55:23 2024 +0200 - Log - [maven-release-plugin] copy for tag org.apache.sling.models.api-1.5.2 --- No new revisions were added by this update.
(sling-org-apache-sling-models-api) branch master updated: [maven-release-plugin] prepare release org.apache.sling.models.api-1.5.2
This is an automated email from the ASF dual-hosted git repository. sseifert pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-models-api.git The following commit(s) were added to refs/heads/master by this push: new 15325e7 [maven-release-plugin] prepare release org.apache.sling.models.api-1.5.2 15325e7 is described below commit 15325e729aacefc06bbae1166a5882ba6299d4ba Author: Stefan Seifert AuthorDate: Tue Jun 25 16:55:19 2024 +0200 [maven-release-plugin] prepare release org.apache.sling.models.api-1.5.2 --- pom.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index 01761a5..58919a7 100644 --- a/pom.xml +++ b/pom.xml @@ -27,19 +27,19 @@ org.apache.sling.models.api -1.5.1-SNAPSHOT +1.5.2 Apache Sling Models API Apache Sling Models API scm:git:https://gitbox.apache.org/repos/asf/sling-org-apache-sling-models-api.git scm:git:https://gitbox.apache.org/repos/asf/sling-org-apache-sling-models-api.git -HEAD +org.apache.sling.models.api-1.5.2 https://github.com/apache/sling-org-apache-sling-models-api.git 8 - 2023-03-28T11:29:18Z + 2024-06-25T14:55:06Z
(sling-org-apache-sling-models-impl) 01/01: SLING-12359 Experimental test case with Java 17 using a Record-based model
This is an automated email from the ASF dual-hosted git repository.
sseifert pushed a commit to branch experimental/SLING-12359-record-unit-test
in repository
https://gitbox.apache.org/repos/asf/sling-org-apache-sling-models-impl.git
commit 1f85748212a70ad7d260fce40e74072e6e8ee332
Author: Stefan Seifert
AuthorDate: Mon Jun 24 12:01:38 2024 +0200
SLING-12359 Experimental test case with Java 17 using a Record-based model
---
pom.xml| 1 +
.../apache/sling/models/impl/ConstructorTest.java | 22 ++-
.../models/testmodels/classes/RecordModel.java | 28 +++
.../classes/RecordNamedAttributesModel.java| 31 ++
4 files changed, 81 insertions(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 2dd843c..81b7550 100644
--- a/pom.xml
+++ b/pom.xml
@@ -37,6 +37,7 @@
https://github.com/apache/sling-org-apache-sling-models-impl.git
+17
2023-05-30T08:54:10Z
diff --git a/src/test/java/org/apache/sling/models/impl/ConstructorTest.java
b/src/test/java/org/apache/sling/models/impl/ConstructorTest.java
index 7bfc250..510c686 100644
--- a/src/test/java/org/apache/sling/models/impl/ConstructorTest.java
+++ b/src/test/java/org/apache/sling/models/impl/ConstructorTest.java
@@ -34,6 +34,8 @@ import
org.apache.sling.models.impl.injectors.RequestAttributeInjector;
import org.apache.sling.models.impl.injectors.SelfInjector;
import org.apache.sling.models.impl.via.BeanPropertyViaProvider;
import org.apache.sling.models.testmodels.classes.InvalidConstructorModel;
+import org.apache.sling.models.testmodels.classes.RecordModel;
+import org.apache.sling.models.testmodels.classes.RecordNamedAttributesModel;
import org.apache.sling.models.testmodels.classes.SuperclassConstructorModel;
import org.apache.sling.models.testmodels.classes.WithOneConstructorModel;
import org.apache.sling.models.testmodels.classes.WithThreeConstructorsModel;
@@ -86,7 +88,9 @@ public class ConstructorTest {
InvalidConstructorModel.class,
WithThreeConstructorsOneInjectModel.class,
NoNameModel.class,
-ViaRequestSuffixModel.class);
+ViaRequestSuffixModel.class,
+RecordModel.class,
+RecordNamedAttributesModel.class);
}
@Test
@@ -211,4 +215,20 @@ public class ConstructorTest {
assertThat(model, Matchers.notNullValue());
assertThat(model.getSuffix(), Matchers.is("/the/suffix"));
}
+
+@Test
+public void testRecordImplicitConstructor() {
+RecordModel model = factory.getAdapter(request, RecordModel.class);
+assertNotNull(model);
+assertEquals(INT_VALUE, model.attribute());
+assertEquals(STRING_VALUE, model.attribute2());
+}
+
+@Test
+public void testRecordNamedAttributesImplicitConstructor() {
+RecordNamedAttributesModel model = factory.getAdapter(request,
RecordNamedAttributesModel.class);
+assertNotNull(model);
+assertEquals(INT_VALUE, model.attribute());
+assertEquals(STRING_VALUE, model.attribute2());
+}
}
diff --git
a/src/test/java/org/apache/sling/models/testmodels/classes/RecordModel.java
b/src/test/java/org/apache/sling/models/testmodels/classes/RecordModel.java
new file mode 100644
index 000..579f1d7
--- /dev/null
+++ b/src/test/java/org/apache/sling/models/testmodels/classes/RecordModel.java
@@ -0,0 +1,28 @@
+/*
+ * 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.models.testmodels.classes;
+
+import javax.inject.Inject;
+
+import org.apache.sling.api.SlingHttpServletRequest;
+import org.apache.sling.models.annotations.Default;
+import org.apache.sling.models.annotations.Model;
+
+@Model(adaptables = SlingHttpServletRequest.class)
+public record RecordModel(@Inject int attribute, @Inject @Default(values =
"unknown") String attribute2) {}
diff --git
a/src/test/java/org/apache/sling/models/testmodels/classes/RecordNamedAttributesModel.java
b/src/test/java/org/apache/sling/models/testmodels/classes/RecordNamedAttributesModel
(sling-org-apache-sling-models-impl) branch experimental/SLING-12359-record-unit-test updated (c3db4ad -> 1f85748)
This is an automated email from the ASF dual-hosted git repository. sseifert pushed a change to branch experimental/SLING-12359-record-unit-test in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-models-impl.git discard c3db4ad SLING-12359 Experimental test case with Java 17 using a Record-based model add e8ca837 SLING-11917 Evaluate constructor parameter names via reflection (#45) new 1f85748 SLING-12359 Experimental test case with Java 17 using a Record-based model 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 (c3db4ad) \ N -- N -- N refs/heads/experimental/SLING-12359-record-unit-test (1f85748) 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. 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: .../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(-)
(sling-org-apache-sling-bnd-models) branch master updated: SLING-12360 ignore spotless code reformatting commit in git blame
This is an automated email from the ASF dual-hosted git repository. sseifert pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-bnd-models.git The following commit(s) were added to refs/heads/master by this push: new 211d811 SLING-12360 ignore spotless code reformatting commit in git blame 211d811 is described below commit 211d811d62dc1096f057209448792b6eb031bc2c Author: Stefan Seifert AuthorDate: Tue Jun 25 14:21:54 2024 +0200 SLING-12360 ignore spotless code reformatting commit 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..9741657 --- /dev/null +++ b/.git-blame-ignore-revs @@ -0,0 +1 @@ +0e11beb1435229fc18310abf5e4a8719952e4d2d \ No newline at end of file
(sling-org-apache-sling-bnd-models) branch feature/SLING-12360-parent-60 deleted (was 1c8c163)
This is an automated email from the ASF dual-hosted git repository. sseifert pushed a change to branch feature/SLING-12360-parent-60 in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-bnd-models.git was 1c8c163 SLING-12360 apply spotless code formatting 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-bnd-models) 01/02: SLING-12360 Update to Parent 60, Java 11 Minimum Version
This is an automated email from the ASF dual-hosted git repository.
sseifert pushed a commit to branch master
in repository
https://gitbox.apache.org/repos/asf/sling-org-apache-sling-bnd-models.git
commit 4b7ee02af75cd1e4684064c28affd6981d227d39
Author: Stefan Seifert
AuthorDate: Mon Jun 24 14:58:38 2024 +0200
SLING-12360 Update to Parent 60, Java 11 Minimum Version
---
.sling-module.json | 5 +
pom.xml| 2 +-
2 files changed, 6 insertions(+), 1 deletion(-)
diff --git a/.sling-module.json b/.sling-module.json
new file mode 100644
index 000..cfad4d2
--- /dev/null
+++ b/.sling-module.json
@@ -0,0 +1,5 @@
+{
+ "jenkins": {
+"jdks": [17, 21]
+ }
+}
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index 570c832..314b7d7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,7 +23,7 @@
org.apache.sling
sling
-52
+60
(sling-org-apache-sling-bnd-models) branch master updated (6e15014 -> 0e11beb)
This is an automated email from the ASF dual-hosted git repository. sseifert pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-bnd-models.git from 6e15014 Update README.md new 4b7ee02 SLING-12360 Update to Parent 60, Java 11 Minimum Version new 0e11beb SLING-12360 apply spotless code formatting The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .sling-module.json | 5 ++ pom.xml| 4 +- .../sling/bnd/models/ModelsScannerPlugin.java | 57 ++ src/test/java/dummy/example/pkg1/Model1.java | 6 +-- src/test/java/dummy/example/pkg1/Model2.java | 6 +-- src/test/java/dummy/example/pkg1/sub1/Model3.java | 6 +-- src/test/java/dummy/example/pkg2/Model4.java | 6 +-- src/test/java/dummy/example/pkg2/Model5.java | 6 +-- .../models/AbstractModelsScannerPluginTest.java| 37 +++--- .../bnd/models/GenerateClassesHeaderTest.java | 18 +++ .../bnd/models/GeneratePackagesHeaderTest.java | 19 +++- 11 files changed, 76 insertions(+), 94 deletions(-) create mode 100644 .sling-module.json
(sling-org-apache-sling-bnd-models) 02/02: SLING-12360 apply spotless code formatting
This is an automated email from the ASF dual-hosted git repository.
sseifert pushed a commit to branch master
in repository
https://gitbox.apache.org/repos/asf/sling-org-apache-sling-bnd-models.git
commit 0e11beb1435229fc18310abf5e4a8719952e4d2d
Author: Stefan Seifert
AuthorDate: Mon Jun 24 14:59:31 2024 +0200
SLING-12360 apply spotless code formatting
---
pom.xml| 2 +-
.../sling/bnd/models/ModelsScannerPlugin.java | 57 ++
src/test/java/dummy/example/pkg1/Model1.java | 6 +--
src/test/java/dummy/example/pkg1/Model2.java | 6 +--
src/test/java/dummy/example/pkg1/sub1/Model3.java | 6 +--
src/test/java/dummy/example/pkg2/Model4.java | 6 +--
src/test/java/dummy/example/pkg2/Model5.java | 6 +--
.../models/AbstractModelsScannerPluginTest.java| 37 +++---
.../bnd/models/GenerateClassesHeaderTest.java | 18 +++
.../bnd/models/GeneratePackagesHeaderTest.java | 19 +++-
10 files changed, 70 insertions(+), 93 deletions(-)
diff --git a/pom.xml b/pom.xml
index 314b7d7..9e8f1bc 100644
--- a/pom.xml
+++ b/pom.xml
@@ -28,8 +28,8 @@
org.apache.sling.bnd.models
-jar
1.0.1-SNAPSHOT
+jar
Apache Sling Models bnd Plugin
This bnd plugin detected all Sling Models classes and adds a
bundle header 'Sling-Model-Classes' containing their names.
diff --git a/src/main/java/org/apache/sling/bnd/models/ModelsScannerPlugin.java
b/src/main/java/org/apache/sling/bnd/models/ModelsScannerPlugin.java
index e53047c..c6f8f8e 100644
--- a/src/main/java/org/apache/sling/bnd/models/ModelsScannerPlugin.java
+++ b/src/main/java/org/apache/sling/bnd/models/ModelsScannerPlugin.java
@@ -25,9 +25,6 @@ import java.util.Set;
import java.util.SortedSet;
import java.util.TreeSet;
-import org.apache.commons.lang3.BooleanUtils;
-import org.apache.commons.lang3.StringUtils;
-
import aQute.bnd.osgi.Analyzer;
import aQute.bnd.osgi.Clazz;
import aQute.bnd.osgi.Clazz.QUERY;
@@ -35,26 +32,29 @@ import aQute.bnd.osgi.Instruction;
import aQute.bnd.service.AnalyzerPlugin;
import aQute.bnd.service.Plugin;
import aQute.service.reporter.Reporter;
+import org.apache.commons.lang3.BooleanUtils;
+import org.apache.commons.lang3.StringUtils;
/**
* Scans the classpath of the bundle for Sling Models classes.
* All class names found are stored in a bundle header for processing them at
runtime and reading their metadata.
*/
public class ModelsScannerPlugin implements AnalyzerPlugin, Plugin {
-
+
static final String MODELS_ANNOTATION_CLASS =
"org.apache.sling.models.annotations.Model";
-
+
static final String MODELS_PACKAGES_HEADER = "Sling-Model-Packages";
static final String MODELS_CLASSES_HEADER = "Sling-Model-Classes";
-
-// max length of manifest header value 65535 bytes (see
http://docs.oracle.com/javase/8/docs/technotes/guides/jar/jar.html)
+
+// max length of manifest header value 65535 bytes (see
+// http://docs.oracle.com/javase/8/docs/technotes/guides/jar/jar.html)
// fall back to packages header when class names string gets too long
static final int MODELS_CLASSES_HEADER_MAXLENGTH = 6;
-
+
static final String PROPERTY_GENERATE_PACKAGES_HEADER =
"generatePackagesHeader";
-
+
private Reporter reporter;
-private Map properties;
+private Map properties;
@Override
public void setProperties(Map map) throws Exception {
@@ -68,7 +68,7 @@ public class ModelsScannerPlugin implements AnalyzerPlugin,
Plugin {
@Override
public boolean analyzeJar(Analyzer analyzer) throws Exception {
-
+
// process only if no models packages or class header was set
if (analyzer.get(MODELS_PACKAGES_HEADER) == null &&
analyzer.get(MODELS_CLASSES_HEADER) == null) {
@@ -79,30 +79,27 @@ public class ModelsScannerPlugin implements AnalyzerPlugin,
Plugin {
if (!classNames.isEmpty()) {
if (getBooleanProperty(PROPERTY_GENERATE_PACKAGES_HEADER)) {
generatePackagesHeader(analyzer, classNames);
-}
-else {
+} else {
generateClassesHeader(analyzer, classNames);
}
}
-
}
-
+
// we did not change any classes - no need to re-analyze
return false;
}
-
+
private void generateClassesHeader(Analyzer analyzer, Collection
classNames) {
String classNameHeader = StringUtils.join(classNames, ",");
if (classNameHeader.length() <= MODELS_CLASSES_HEADER_MAXLENGTH) {
analyzer.set(MODELS_CLASSES_HEADER, classNameHeader);
-}
-else {
+} else {
generatePackagesHeader(analyzer, classNames);
}
}
-
+
private void generatePackagesHeader(Analy
(sling-org-apache-sling-models-caconfig) branch master updated: SLING-12360 ignore spotless code reformatting commit in git blame
This is an automated email from the ASF dual-hosted git repository. sseifert pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-models-caconfig.git The following commit(s) were added to refs/heads/master by this push: new a63749c SLING-12360 ignore spotless code reformatting commit in git blame a63749c is described below commit a63749c6608c9f2e737dfe5f6f00b217cb7afa42 Author: Stefan Seifert AuthorDate: Tue Jun 25 14:20:05 2024 +0200 SLING-12360 ignore spotless code reformatting commit 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..6bda52d --- /dev/null +++ b/.git-blame-ignore-revs @@ -0,0 +1 @@ +f043041308758eca9138fb42e04643fd612a1bd0 \ No newline at end of file
(sling-org-apache-sling-models-caconfig) 02/02: SLING-12360 apply spotless code formatting
This is an automated email from the ASF dual-hosted git repository. sseifert pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-models-caconfig.git commit f043041308758eca9138fb42e04643fd612a1bd0 Author: Stefan Seifert AuthorDate: Mon Jun 24 14:51:52 2024 +0200 SLING-12360 apply spotless code formatting --- pom.xml| 30 +++--- .../annotations/ContextAwareConfiguration.java | 39 .../models/caconfig/annotations/package-info.java | 2 +- .../ContextAwareConfigurationInjector.java | 78 --- .../ContextAwareConfigurationProcessor.java| 1 - .../caconfig/example/caconfig/ListConfig.java | 1 - .../caconfig/example/caconfig/SingleConfig.java| 1 - .../caconfig/model/ConfigurationValuesModel.java | 8 +- .../invalidmodel/InvalidAnnotationListModel.java | 3 +- .../invalidmodel/InvalidAnnotationModel.java | 3 +- .../example/invalidmodel/InvalidInjectModel.java | 3 +- .../example/invalidmodel/InvalidSetModel.java | 3 +- .../example/model/ListConfigAdaptModel.java| 3 +- .../caconfig/example/model/ListConfigModel.java| 3 +- .../example/model/ListConfigValueMapModel.java | 3 +- .../example/model/SingleConfigAdaptModel.java | 3 +- .../caconfig/example/model/SingleConfigModel.java | 3 +- .../example/model/SingleConfigValueMapModel.java | 3 +- .../example/testhelper/ListConfigGetter.java | 1 - .../example/testhelper/SingleConfigGetter.java | 1 - .../ContextAwareConfigurationInjectorTest.java | 108 - 21 files changed, 157 insertions(+), 143 deletions(-) diff --git a/pom.xml b/pom.xml index 2c10f2a..c4245e0 100644 --- a/pom.xml +++ b/pom.xml @@ -36,14 +36,26 @@ scm:git:https://gitbox.apache.org/repos/asf/sling-org-apache-sling-models-caconfig.git scm:git:https://gitbox.apache.org/repos/asf/sling-org-apache-sling-models-caconfig.git +HEAD https://github.com/apache/sling-org-apache-sling-models-caconfig.git - HEAD - + 2022-08-08T14:03:16Z + + + +org.junit +junit-bom +5.8.2 +pom +import + + + + @@ -153,21 +165,9 @@ - - - -org.junit -junit-bom -5.8.2 -pom -import - - - - - + biz.aQute.bnd bnd-baseline-maven-plugin diff --git a/src/main/java/org/apache/sling/models/caconfig/annotations/ContextAwareConfiguration.java b/src/main/java/org/apache/sling/models/caconfig/annotations/ContextAwareConfiguration.java index 0c527b5..59df346 100644 --- a/src/main/java/org/apache/sling/models/caconfig/annotations/ContextAwareConfiguration.java +++ b/src/main/java/org/apache/sling/models/caconfig/annotations/ContextAwareConfiguration.java @@ -1,26 +1,23 @@ /* - * 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 + * 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 + * 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. + * 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.models.caconfig.annotations; -import static java.lang.annotation.ElementType.FIELD; -import static java.lan
(sling-org-apache-sling-models-caconfig) branch feature/SLING-12360-parent-60 deleted (was e0d1a9b)
This is an automated email from the ASF dual-hosted git repository. sseifert pushed a change to branch feature/SLING-12360-parent-60 in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-models-caconfig.git was e0d1a9b SLING-12360 apply spotless code formatting 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-caconfig) branch master updated (a7ec94c -> f043041)
This is an automated email from the ASF dual-hosted git repository. sseifert pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-models-caconfig.git from a7ec94c SLING-12094 - Use GitHub for the Maven scm.url value new 098970b SLING-12360 Update to Parent 60, Java 11 Minimum Version new f043041 SLING-12360 apply spotless code formatting The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .sling-module.json | 5 + pom.xml| 32 +++--- .../annotations/ContextAwareConfiguration.java | 39 .../models/caconfig/annotations/package-info.java | 2 +- .../ContextAwareConfigurationInjector.java | 78 --- .../ContextAwareConfigurationProcessor.java| 1 - .../caconfig/example/caconfig/ListConfig.java | 1 - .../caconfig/example/caconfig/SingleConfig.java| 1 - .../caconfig/model/ConfigurationValuesModel.java | 8 +- .../invalidmodel/InvalidAnnotationListModel.java | 3 +- .../invalidmodel/InvalidAnnotationModel.java | 3 +- .../example/invalidmodel/InvalidInjectModel.java | 3 +- .../example/invalidmodel/InvalidSetModel.java | 3 +- .../example/model/ListConfigAdaptModel.java| 3 +- .../caconfig/example/model/ListConfigModel.java| 3 +- .../example/model/ListConfigValueMapModel.java | 3 +- .../example/model/SingleConfigAdaptModel.java | 3 +- .../caconfig/example/model/SingleConfigModel.java | 3 +- .../example/model/SingleConfigValueMapModel.java | 3 +- .../example/testhelper/ListConfigGetter.java | 1 - .../example/testhelper/SingleConfigGetter.java | 1 - .../ContextAwareConfigurationInjectorTest.java | 108 - 22 files changed, 163 insertions(+), 144 deletions(-) create mode 100644 .sling-module.json
(sling-org-apache-sling-models-caconfig) 01/02: SLING-12360 Update to Parent 60, Java 11 Minimum Version
This is an automated email from the ASF dual-hosted git repository.
sseifert pushed a commit to branch master
in repository
https://gitbox.apache.org/repos/asf/sling-org-apache-sling-models-caconfig.git
commit 098970bb8e0ad0da65348756a93be02071986d38
Author: Stefan Seifert
AuthorDate: Mon Jun 24 14:51:23 2024 +0200
SLING-12360 Update to Parent 60, Java 11 Minimum Version
---
.sling-module.json | 5 +
pom.xml| 2 +-
2 files changed, 6 insertions(+), 1 deletion(-)
diff --git a/.sling-module.json b/.sling-module.json
new file mode 100644
index 000..cfad4d2
--- /dev/null
+++ b/.sling-module.json
@@ -0,0 +1,5 @@
+{
+ "jenkins": {
+"jdks": [17, 21]
+ }
+}
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index ba8c812..2c10f2a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,7 +23,7 @@
org.apache.sling
sling-bundle-parent
-49
+60
(sling-org-apache-sling-models-jacksonexporter) branch master updated: SLING-12360 ignore spotless code reformatting commit in git blame
This is an automated email from the ASF dual-hosted git repository. sseifert pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-models-jacksonexporter.git The following commit(s) were added to refs/heads/master by this push: new 777eaff SLING-12360 ignore spotless code reformatting commit in git blame 777eaff is described below commit 777eaffa7851722bc5a2eceef7ffcc3701df266d Author: Stefan Seifert AuthorDate: Tue Jun 25 14:17:57 2024 +0200 SLING-12360 ignore spotless code reformatting commit 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..b7755b5 --- /dev/null +++ b/.git-blame-ignore-revs @@ -0,0 +1 @@ +66a0c832c57e40b85a33b8a0463fc05383057d87 \ No newline at end of file
(sling-org-apache-sling-models-jacksonexporter) branch master updated (00e49cf -> 66a0c83)
This is an automated email from the ASF dual-hosted git repository. sseifert pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-models-jacksonexporter.git from 00e49cf SLING-11969 a few minor improvements to make the limits more explicit (#10) new 4fe850b SLING-12360 Update to Parent 60, Java 11 Minimum Version new 66a0c83 SLING-12360 apply spotless code formatting The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .sling-module.json | 5 ++ pom.xml| 43 ++- .../models/jacksonexporter/ModuleProvider.java | 30 .../ConfigurableSerializationModuleProvider.java | 71 +- .../impl/EnumerationSerializer.java| 33 - .../impl/HttpServletRequestMixin.java | 39 +- .../impl/IgnoringResourceResolverMixin.java| 8 +-- .../jacksonexporter/impl/JacksonExporter.java | 44 ++-- .../impl/ModelSkippingSerializers.java | 29 .../jacksonexporter/impl/PropertiesUtil.java | 3 +- .../impl/RequestModuleProvider.java| 36 +- .../impl/ResourceModuleProvider.java | 45 ++-- .../jacksonexporter/impl/ResourceSerializer.java | 84 -- .../jacksonexporter/impl/ServletRequestMixin.java | 37 +- .../impl/SlingHttpServletRequestMixin.java | 37 +- .../impl/WarningResourceResolverMixin.java | 31 +++- .../JacksonExporterLimitSerializationTest.java | 80 ++--- .../impl/JacksonExporterMappingOptionsTest.java| 30 .../impl/ModelSkippingSerializersTest.java | 35 - .../jacksonexporter/impl/PropertiesUtilTest.java | 17 ++--- .../jacksonexporter/impl/example/ExamplePojo.java | 1 - .../impl/example/PojoWithResourceResolver.java | 10 +-- .../jacksonexporter/impl/util/LogCapture.java | 16 ++--- 23 files changed, 381 insertions(+), 383 deletions(-) create mode 100644 .sling-module.json
(sling-org-apache-sling-models-jacksonexporter) branch feature/SLING-12360-parent-60 deleted (was a76be12)
This is an automated email from the ASF dual-hosted git repository. sseifert pushed a change to branch feature/SLING-12360-parent-60 in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-models-jacksonexporter.git was a76be12 SLING-12360 apply spotless code formatting 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-jacksonexporter) 02/02: SLING-12360 apply spotless code formatting
This is an automated email from the ASF dual-hosted git repository. sseifert pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-models-jacksonexporter.git commit 66a0c832c57e40b85a33b8a0463fc05383057d87 Author: Stefan Seifert AuthorDate: Mon Jun 24 14:49:00 2024 +0200 SLING-12360 apply spotless code formatting --- pom.xml| 40 +-- .../models/jacksonexporter/ModuleProvider.java | 30 .../ConfigurableSerializationModuleProvider.java | 71 +- .../impl/EnumerationSerializer.java| 33 - .../impl/HttpServletRequestMixin.java | 39 +- .../impl/IgnoringResourceResolverMixin.java| 8 +-- .../jacksonexporter/impl/JacksonExporter.java | 44 ++-- .../impl/ModelSkippingSerializers.java | 29 .../jacksonexporter/impl/PropertiesUtil.java | 3 +- .../impl/RequestModuleProvider.java| 36 +- .../impl/ResourceModuleProvider.java | 45 ++-- .../jacksonexporter/impl/ResourceSerializer.java | 84 -- .../jacksonexporter/impl/ServletRequestMixin.java | 37 +- .../impl/SlingHttpServletRequestMixin.java | 37 +- .../impl/WarningResourceResolverMixin.java | 31 +++- .../JacksonExporterLimitSerializationTest.java | 80 ++--- .../impl/JacksonExporterMappingOptionsTest.java| 30 .../impl/ModelSkippingSerializersTest.java | 35 - .../jacksonexporter/impl/PropertiesUtilTest.java | 17 ++--- .../jacksonexporter/impl/example/ExamplePojo.java | 1 - .../impl/example/PojoWithResourceResolver.java | 10 +-- .../jacksonexporter/impl/util/LogCapture.java | 16 ++--- 22 files changed, 375 insertions(+), 381 deletions(-) diff --git a/pom.xml b/pom.xml index 576c1cd..b907238 100644 --- a/pom.xml +++ b/pom.xml @@ -1,4 +1,4 @@ - +
(sling-org-apache-sling-models-jacksonexporter) 01/02: SLING-12360 Update to Parent 60, Java 11 Minimum Version
This is an automated email from the ASF dual-hosted git repository.
sseifert pushed a commit to branch master
in repository
https://gitbox.apache.org/repos/asf/sling-org-apache-sling-models-jacksonexporter.git
commit 4fe850b4f3b6bf4d3d4908d32e10965575309942
Author: Stefan Seifert
AuthorDate: Mon Jun 24 14:48:19 2024 +0200
SLING-12360 Update to Parent 60, Java 11 Minimum Version
---
.sling-module.json | 5 +
pom.xml| 3 +--
2 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/.sling-module.json b/.sling-module.json
new file mode 100644
index 000..cfad4d2
--- /dev/null
+++ b/.sling-module.json
@@ -0,0 +1,5 @@
+{
+ "jenkins": {
+"jdks": [17, 21]
+ }
+}
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index 11950b6..576c1cd 100644
--- a/pom.xml
+++ b/pom.xml
@@ -22,7 +22,7 @@
org.apache.sling
sling-bundle-parent
-49
+60
@@ -39,7 +39,6 @@
-8
2023-07-13T09:44:49Z
(sling-org-apache-sling-models-impl) branch feature/use-java-lang-reflect-parameter updated (eba7e54 -> 1689b52)
This is an automated email from the ASF dual-hosted git repository. sseifert 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 from eba7e54 SLING-11917 Evaluate constructor parameter names via reflection add b701d76 SLING-12094 - Use GitHub for the Maven scm.url value add cf08871 SLING-12158 improve logging in InjectableElements (#47) add 5b17227 Bump org.springframework:spring-context add 9d1c725 SLING-12359 - Extend records support (#51) add cc4ac50 SLING-12360 Update to Parent 60, Java 11 Minimum Version add fcb45ad SLING-12360 apply spotless code formatting add 164b9f3 SLING-12361 ignore spotless code reformatting commit in git blame add 1689b52 Merge branch 'master' into feature/use-java-lang-reflect-parameter No new revisions were added by this update. Summary of changes: .git-blame-ignore-revs | 1 + .sling-module.json | 5 + pom.xml| 119 +++--- .../sling/models/impl/AdapterImplementations.java | 162 .../apache/sling/models/impl/ExportServlet.java| 71 ++-- .../models/impl/FirstImplementationPicker.java | 8 +- .../models/impl/MapBackedInvocationHandler.java| 3 +- .../sling/models/impl/ModelAdapterFactory.java | 449 + .../impl/ModelAdapterFactoryConfiguration.java | 33 +- .../models/impl/ModelConfigurationPrinter.java | 77 ++-- .../models/impl/ModelPackageBundleListener.java| 107 +++-- .../apache/sling/models/impl/ReflectionUtil.java | 39 +- .../impl/ResourceOverridingRequestWrapper.java | 54 +-- .../impl/ResourceTypeBasedResourcePicker.java | 32 +- .../java/org/apache/sling/models/impl/Result.java | 16 +- .../impl/SlingModelsScriptEngineFactory.java | 51 +-- .../sling/models/impl/ThreadInvocationCounter.java | 2 +- .../models/impl/injectors/AbstractInjector.java| 6 +- .../models/impl/injectors/BindingsInjector.java| 41 +- .../impl/injectors/ChildResourceInjector.java | 72 ++-- .../models/impl/injectors/OSGiServiceInjector.java | 97 +++-- .../impl/injectors/RequestAttributeInjector.java | 44 +- .../impl/injectors/ResourcePathInjector.java | 35 +- .../sling/models/impl/injectors/SelfInjector.java | 47 ++- .../models/impl/injectors/SlingObjectInjector.java | 47 ++- .../models/impl/injectors/ValueMapInjector.java| 50 ++- .../impl/model/AbstractInjectableElement.java | 90 +++-- .../models/impl/model/ConstructorParameter.java| 40 +- .../sling/models/impl/model/InjectableElement.java | 1 - .../sling/models/impl/model/InjectableField.java | 18 +- .../sling/models/impl/model/InjectableMethod.java | 15 +- .../apache/sling/models/impl/model/ModelClass.java | 39 +- .../models/impl/model/ModelClassConstructor.java | 37 +- .../impl/model/OptionalTypedInjectableElement.java | 29 +- .../impl/model/ParameterCountInjectComparator.java | 18 +- .../impl/via/AbstractResourceTypeViaProvider.java | 39 +- .../models/impl/via/BeanPropertyViaProvider.java | 28 +- .../models/impl/via/ChildResourceViaProvider.java | 32 +- .../impl/via/ForcedResourceTypeViaProvider.java| 28 +- .../impl/via/OriginalResourceTypeViaProvider.java | 26 +- .../impl/via/ResourceSuperTypeViaProvider.java | 28 +- .../via/ResourceTypeForcingRequestWrapper.java | 26 +- .../via/ResourceTypeForcingResourceWrapper.java| 26 +- .../sling/models/impl/AdapterFactoryTest.java | 61 +-- .../models/impl/AdapterImplementationsTest.java| 65 +-- .../sling/models/impl/AnnotationConflictsTest.java | 34 +- .../org/apache/sling/models/impl/CachingTest.java | 108 ++--- .../apache/sling/models/impl/ConstructorTest.java | 49 +-- .../models/impl/ConstructorVisibilityTest.java | 37 +- .../sling/models/impl/CustomInjectorTest.java | 41 +- .../models/impl/DefaultInterfaceMethodTest.java| 34 +- .../org/apache/sling/models/impl/DefaultTest.java | 95 +++-- .../sling/models/impl/ExtraDefaultTests.java | 53 +-- .../sling/models/impl/ImplementsExtendsTest.java | 89 ++-- .../impl/InjectorSpecificAnnotationTest.java | 128 +++--- .../models/impl/InterfaceInheritanceTest.java | 39 +- .../sling/models/impl/InvalidAdaptationsTest.java | 49 ++- .../impl/ModelPackageBundleListenerTest.java | 61 +-- .../sling/models/impl/MultipleInjectorTest.java| 44 +- .../sling/models/impl/OSGiInjectionTest.java | 114 +++--- .../sling/models/impl/OptionalObjectsTest.java | 72 ++-- .../sling/models/impl/OptionalPrimitivesTest.java | 64 +-- .../ParameterizedTypeFromRequestAttributeTest.java | 12 +- .../sling/models/impl/PostConstructTest.java | 57 ++- .../sling/models/impl/ReflectionUtilTest.java
(sling-org-apache-sling-models-impl) 01/01: SLING-12359 Experimental test case with Java 17 using a Record-based model
This is an automated email from the ASF dual-hosted git repository.
sseifert pushed a commit to branch experimental/SLING-12359-record-unit-test
in repository
https://gitbox.apache.org/repos/asf/sling-org-apache-sling-models-impl.git
commit c3db4ad3172c852cf401a6f94ac619f3b1a88131
Author: Stefan Seifert
AuthorDate: Mon Jun 24 12:01:38 2024 +0200
SLING-12359 Experimental test case with Java 17 using a Record-based model
---
pom.xml| 1 +
.../apache/sling/models/impl/ConstructorTest.java | 22 ++-
.../models/testmodels/classes/RecordModel.java | 28 +++
.../classes/RecordNamedAttributesModel.java| 31 ++
4 files changed, 81 insertions(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 2dd843c..81b7550 100644
--- a/pom.xml
+++ b/pom.xml
@@ -37,6 +37,7 @@
https://github.com/apache/sling-org-apache-sling-models-impl.git
+17
2023-05-30T08:54:10Z
diff --git a/src/test/java/org/apache/sling/models/impl/ConstructorTest.java
b/src/test/java/org/apache/sling/models/impl/ConstructorTest.java
index 7bfc250..510c686 100644
--- a/src/test/java/org/apache/sling/models/impl/ConstructorTest.java
+++ b/src/test/java/org/apache/sling/models/impl/ConstructorTest.java
@@ -34,6 +34,8 @@ import
org.apache.sling.models.impl.injectors.RequestAttributeInjector;
import org.apache.sling.models.impl.injectors.SelfInjector;
import org.apache.sling.models.impl.via.BeanPropertyViaProvider;
import org.apache.sling.models.testmodels.classes.InvalidConstructorModel;
+import org.apache.sling.models.testmodels.classes.RecordModel;
+import org.apache.sling.models.testmodels.classes.RecordNamedAttributesModel;
import org.apache.sling.models.testmodels.classes.SuperclassConstructorModel;
import org.apache.sling.models.testmodels.classes.WithOneConstructorModel;
import org.apache.sling.models.testmodels.classes.WithThreeConstructorsModel;
@@ -86,7 +88,9 @@ public class ConstructorTest {
InvalidConstructorModel.class,
WithThreeConstructorsOneInjectModel.class,
NoNameModel.class,
-ViaRequestSuffixModel.class);
+ViaRequestSuffixModel.class,
+RecordModel.class,
+RecordNamedAttributesModel.class);
}
@Test
@@ -211,4 +215,20 @@ public class ConstructorTest {
assertThat(model, Matchers.notNullValue());
assertThat(model.getSuffix(), Matchers.is("/the/suffix"));
}
+
+@Test
+public void testRecordImplicitConstructor() {
+RecordModel model = factory.getAdapter(request, RecordModel.class);
+assertNotNull(model);
+assertEquals(INT_VALUE, model.attribute());
+assertEquals(STRING_VALUE, model.attribute2());
+}
+
+@Test
+public void testRecordNamedAttributesImplicitConstructor() {
+RecordNamedAttributesModel model = factory.getAdapter(request,
RecordNamedAttributesModel.class);
+assertNotNull(model);
+assertEquals(INT_VALUE, model.attribute());
+assertEquals(STRING_VALUE, model.attribute2());
+}
}
diff --git
a/src/test/java/org/apache/sling/models/testmodels/classes/RecordModel.java
b/src/test/java/org/apache/sling/models/testmodels/classes/RecordModel.java
new file mode 100644
index 000..579f1d7
--- /dev/null
+++ b/src/test/java/org/apache/sling/models/testmodels/classes/RecordModel.java
@@ -0,0 +1,28 @@
+/*
+ * 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.models.testmodels.classes;
+
+import javax.inject.Inject;
+
+import org.apache.sling.api.SlingHttpServletRequest;
+import org.apache.sling.models.annotations.Default;
+import org.apache.sling.models.annotations.Model;
+
+@Model(adaptables = SlingHttpServletRequest.class)
+public record RecordModel(@Inject int attribute, @Inject @Default(values =
"unknown") String attribute2) {}
diff --git
a/src/test/java/org/apache/sling/models/testmodels/classes/RecordNamedAttributesModel.java
b/src/test/java/org/apache/sling/models/testmodels/classes/RecordNamedAttributesModel
(sling-org-apache-sling-models-impl) branch experimental/SLING-12359-record-unit-test updated (87ef08d -> c3db4ad)
This is an automated email from the ASF dual-hosted git repository. sseifert pushed a change to branch experimental/SLING-12359-record-unit-test in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-models-impl.git discard 87ef08d SLING-12359 Experimental test case with Java 17 using a Record-based model add 9d1c725 SLING-12359 - Extend records support (#51) add cc4ac50 SLING-12360 Update to Parent 60, Java 11 Minimum Version add fcb45ad SLING-12360 apply spotless code formatting add 164b9f3 SLING-12361 ignore spotless code reformatting commit in git blame new c3db4ad SLING-12359 Experimental test case with Java 17 using a Record-based model 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 (87ef08d) \ N -- N -- N refs/heads/experimental/SLING-12359-record-unit-test (c3db4ad) 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. 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| 116 +++--- .../sling/models/impl/AdapterImplementations.java | 162 .../apache/sling/models/impl/ExportServlet.java| 71 ++-- .../models/impl/FirstImplementationPicker.java | 8 +- .../models/impl/MapBackedInvocationHandler.java| 3 +- .../sling/models/impl/ModelAdapterFactory.java | 429 + .../impl/ModelAdapterFactoryConfiguration.java | 33 +- .../models/impl/ModelConfigurationPrinter.java | 77 ++-- .../models/impl/ModelPackageBundleListener.java| 107 +++-- .../apache/sling/models/impl/ReflectionUtil.java | 39 +- .../impl/ResourceOverridingRequestWrapper.java | 54 +-- .../impl/ResourceTypeBasedResourcePicker.java | 32 +- .../java/org/apache/sling/models/impl/Result.java | 16 +- .../impl/SlingModelsScriptEngineFactory.java | 51 +-- .../sling/models/impl/ThreadInvocationCounter.java | 2 +- .../models/impl/injectors/AbstractInjector.java| 6 +- .../models/impl/injectors/BindingsInjector.java| 41 +- .../impl/injectors/ChildResourceInjector.java | 72 ++-- .../models/impl/injectors/OSGiServiceInjector.java | 97 +++-- .../impl/injectors/RequestAttributeInjector.java | 44 ++- .../impl/injectors/ResourcePathInjector.java | 35 +- .../sling/models/impl/injectors/SelfInjector.java | 47 ++- .../models/impl/injectors/SlingObjectInjector.java | 47 ++- .../models/impl/injectors/ValueMapInjector.java| 50 ++- .../impl/model/AbstractInjectableElement.java | 80 ++-- .../models/impl/model/ConstructorParameter.java| 23 +- .../sling/models/impl/model/InjectableElement.java | 1 - .../sling/models/impl/model/InjectableField.java | 16 +- .../sling/models/impl/model/InjectableMethod.java | 15 +- .../apache/sling/models/impl/model/ModelClass.java | 39 +- .../models/impl/model/ModelClassConstructor.java | 38 +- .../impl/model/OptionalTypedInjectableElement.java | 29 +- .../impl/model/ParameterCountInjectComparator.java | 18 +- .../impl/via/AbstractResourceTypeViaProvider.java | 39 +- .../models/impl/via/BeanPropertyViaProvider.java | 28 +- .../models/impl/via/ChildResourceViaProvider.java | 32 +- .../impl/via/ForcedResourceTypeViaProvider.java| 28 +- .../impl/via/OriginalResourceTypeViaProvider.java | 26 +- .../impl/via/ResourceSuperTypeViaProvider.java | 28 +- .../via/ResourceTypeForcingRequestWrapper.java | 26 +- .../via/ResourceTypeForcingResourceWrapper.java| 26 +- .../sling/models/impl/AdapterFactoryTest.java | 61 +-- .../models/impl/AdapterImplementationsTest.java| 65 ++-- .../sling/models/impl/AnnotationConflictsTest.java | 34 +- .../org/apache/sling/models/impl/CachingTest.java | 108 +++--- .../apache/sling/models/impl/ConstructorTest.java | 50 +-- .../models/impl/ConstructorVisibilityTest.java | 37 +- .../sling/models/impl/CustomInjectorTest.java | 41 +- .../models/impl/DefaultInterfaceMethodTest.java| 34 +- .../org/apache/sling/models/impl/DefaultTest.java | 95 +++-- .../sling/models/impl/ExtraDefaultTest
(sling-org-apache-sling-models-impl) branch feature/SLING-12186-poc-for-spotless deleted (was df9c055)
This is an automated email from the ASF dual-hosted git repository. sseifert pushed a change to branch feature/SLING-12186-poc-for-spotless in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-models-impl.git was df9c055 SLING-12186 PoC for spotless-maven-plugin 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-12361 ignore spotless code reformatting commit in git blame
This is an automated email from the ASF dual-hosted git repository. sseifert pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-models-impl.git The following commit(s) were added to refs/heads/master by this push: new 164b9f3 SLING-12361 ignore spotless code reformatting commit in git blame 164b9f3 is described below commit 164b9f32401c088609a8abffc0d3eba7ec959ef5 Author: Stefan Seifert AuthorDate: Tue Jun 25 13:52:16 2024 +0200 SLING-12361 ignore spotless code reformatting commit 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..4dffeee --- /dev/null +++ b/.git-blame-ignore-revs @@ -0,0 +1 @@ +fcb45ad9be1930e0ee5956e45a2dddf2387a4453 \ No newline at end of file
(sling-org-apache-sling-models-impl) branch master updated (9d1c725 -> fcb45ad)
This is an automated email from the ASF dual-hosted git repository. sseifert pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-models-impl.git from 9d1c725 SLING-12359 - Extend records support (#51) new cc4ac50 SLING-12360 Update to Parent 60, Java 11 Minimum Version new fcb45ad SLING-12360 apply spotless code formatting The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .sling-module.json | 5 + pom.xml| 117 +++--- .../sling/models/impl/AdapterImplementations.java | 162 .../apache/sling/models/impl/ExportServlet.java| 71 ++-- .../models/impl/FirstImplementationPicker.java | 8 +- .../models/impl/MapBackedInvocationHandler.java| 3 +- .../sling/models/impl/ModelAdapterFactory.java | 426 + .../impl/ModelAdapterFactoryConfiguration.java | 33 +- .../models/impl/ModelConfigurationPrinter.java | 77 ++-- .../models/impl/ModelPackageBundleListener.java| 107 -- .../apache/sling/models/impl/ReflectionUtil.java | 14 +- .../impl/ResourceOverridingRequestWrapper.java | 54 +-- .../impl/ResourceTypeBasedResourcePicker.java | 32 +- .../java/org/apache/sling/models/impl/Result.java | 16 +- .../impl/SlingModelsScriptEngineFactory.java | 51 +-- .../sling/models/impl/ThreadInvocationCounter.java | 2 +- .../models/impl/injectors/AbstractInjector.java| 6 +- .../models/impl/injectors/BindingsInjector.java| 41 +- .../impl/injectors/ChildResourceInjector.java | 72 ++-- .../models/impl/injectors/OSGiServiceInjector.java | 97 +++-- .../impl/injectors/RequestAttributeInjector.java | 44 ++- .../impl/injectors/ResourcePathInjector.java | 35 +- .../sling/models/impl/injectors/SelfInjector.java | 47 ++- .../models/impl/injectors/SlingObjectInjector.java | 47 ++- .../models/impl/injectors/ValueMapInjector.java| 50 ++- .../impl/model/AbstractInjectableElement.java | 80 ++-- .../models/impl/model/ConstructorParameter.java| 23 +- .../sling/models/impl/model/InjectableElement.java | 1 - .../sling/models/impl/model/InjectableField.java | 16 +- .../sling/models/impl/model/InjectableMethod.java | 15 +- .../apache/sling/models/impl/model/ModelClass.java | 37 +- .../models/impl/model/ModelClassConstructor.java | 32 +- .../impl/model/OptionalTypedInjectableElement.java | 29 +- .../impl/model/ParameterCountInjectComparator.java | 18 +- .../impl/via/AbstractResourceTypeViaProvider.java | 39 +- .../models/impl/via/BeanPropertyViaProvider.java | 28 +- .../models/impl/via/ChildResourceViaProvider.java | 32 +- .../impl/via/ForcedResourceTypeViaProvider.java| 28 +- .../impl/via/OriginalResourceTypeViaProvider.java | 26 +- .../impl/via/ResourceSuperTypeViaProvider.java | 28 +- .../via/ResourceTypeForcingRequestWrapper.java | 26 +- .../via/ResourceTypeForcingResourceWrapper.java| 26 +- .../sling/models/impl/AdapterFactoryTest.java | 61 +-- .../models/impl/AdapterImplementationsTest.java| 65 ++-- .../sling/models/impl/AnnotationConflictsTest.java | 34 +- .../org/apache/sling/models/impl/CachingTest.java | 108 +++--- .../apache/sling/models/impl/ConstructorTest.java | 49 +-- .../models/impl/ConstructorVisibilityTest.java | 37 +- .../sling/models/impl/CustomInjectorTest.java | 41 +- .../models/impl/DefaultInterfaceMethodTest.java| 34 +- .../org/apache/sling/models/impl/DefaultTest.java | 95 +++-- .../sling/models/impl/ExtraDefaultTests.java | 53 +-- .../sling/models/impl/ImplementsExtendsTest.java | 89 +++-- .../impl/InjectorSpecificAnnotationTest.java | 128 --- .../models/impl/InterfaceInheritanceTest.java | 39 +- .../sling/models/impl/InvalidAdaptationsTest.java | 49 ++- .../impl/ModelPackageBundleListenerTest.java | 61 +-- .../sling/models/impl/MultipleInjectorTest.java| 44 +-- .../sling/models/impl/OSGiInjectionTest.java | 114 +++--- .../sling/models/impl/OptionalObjectsTest.java | 72 ++-- .../sling/models/impl/OptionalPrimitivesTest.java | 64 ++-- .../ParameterizedTypeFromRequestAttributeTest.java | 12 +- .../sling/models/impl/PostConstructTest.java | 57 +-- .../sling/models/impl/ReflectionUtilTest.java | 41 +- .../sling/models/impl/RequestDisposalTest.java | 81 ++-- .../sling/models/impl/RequestInjectionTest.java| 47 +-- .../sling/models/impl/RequestWrapperTest.java | 59 +-- .../models/impl/ResourceModelClassesTest.java | 104 ++--- .../models/impl/ResourceModelConstructorTest.java | 48
(sling-org-apache-sling-models-impl) branch feature/SLING-12360-parent-60 deleted (was c920ee4)
This is an automated email from the ASF dual-hosted git repository. sseifert pushed a change to branch feature/SLING-12360-parent-60 in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-models-impl.git was c920ee4 SLING-12360 apply spotless code formatting 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) 01/02: SLING-12360 Update to Parent 60, Java 11 Minimum Version
This is an automated email from the ASF dual-hosted git repository.
sseifert pushed a commit to branch master
in repository
https://gitbox.apache.org/repos/asf/sling-org-apache-sling-models-impl.git
commit cc4ac50b5be64ba7cb91dee511978a0fc592e370
Author: Stefan Seifert
AuthorDate: Mon Jun 24 14:34:46 2024 +0200
SLING-12360 Update to Parent 60, Java 11 Minimum Version
---
.sling-module.json | 5 +
pom.xml| 3 +--
2 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/.sling-module.json b/.sling-module.json
new file mode 100644
index 000..cfad4d2
--- /dev/null
+++ b/.sling-module.json
@@ -0,0 +1,5 @@
+{
+ "jenkins": {
+"jdks": [17, 21]
+ }
+}
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index 4a58754..7f113ff 100644
--- a/pom.xml
+++ b/pom.xml
@@ -22,7 +22,7 @@
org.apache.sling
sling-bundle-parent
-49
+60
org.apache.sling.models.impl
@@ -37,7 +37,6 @@
HEAD
-8
2023-05-30T08:54:10Z
(sling-org-apache-sling-caconfig-bnd-plugin) branch master updated: SLING-12361 ignore spotless code reformatting commit in git blame
This is an automated email from the ASF dual-hosted git repository. sseifert pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-caconfig-bnd-plugin.git The following commit(s) were added to refs/heads/master by this push: new 2d90393 SLING-12361 ignore spotless code reformatting commit in git blame 2d90393 is described below commit 2d9039395e1676cb39317c2b0fb198bc7e9a0ba1 Author: Stefan Seifert AuthorDate: Tue Jun 25 13:49:30 2024 +0200 SLING-12361 ignore spotless code reformatting commit 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..fa85a67 --- /dev/null +++ b/.git-blame-ignore-revs @@ -0,0 +1 @@ +de19fab14fbf05e06d6897047688439fb721b46e \ No newline at end of file
(sling-org-apache-sling-caconfig-bnd-plugin) branch feature/SLING-12361-parent-60 deleted (was c60f4f6)
This is an automated email from the ASF dual-hosted git repository. sseifert pushed a change to branch feature/SLING-12361-parent-60 in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-caconfig-bnd-plugin.git was c60f4f6 SLING-12361 apply spotless code formatting 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-caconfig-bnd-plugin) 02/02: SLING-12361 apply spotless code formatting
This is an automated email from the ASF dual-hosted git repository.
sseifert pushed a commit to branch master
in repository
https://gitbox.apache.org/repos/asf/sling-org-apache-sling-caconfig-bnd-plugin.git
commit de19fab14fbf05e06d6897047688439fb721b46e
Author: Stefan Seifert
AuthorDate: Mon Jun 24 14:26:30 2024 +0200
SLING-12361 apply spotless code formatting
---
pom.xml| 10 +-
.../bndplugin/ConfigurationClassScannerPlugin.java | 7 ++-
src/test/java/dummy/example/pkg1/Config1.java | 4 +---
src/test/java/dummy/example/pkg1/Config2.java | 4 +---
src/test/java/dummy/example/pkg1/sub1/Config3.java | 4 +---
.../AbstractConfigurationClassScannerPlugin.java | 23 +++---
.../caconfig/bndplugin/GenerateHeaderTest.java | 10 +-
7 files changed, 26 insertions(+), 36 deletions(-)
diff --git a/pom.xml b/pom.xml
index 98319b9..fdab314 100644
--- a/pom.xml
+++ b/pom.xml
@@ -28,21 +28,21 @@
org.apache.sling.caconfig.bnd-plugin
-jar
1.0.3-SNAPSHOT
+jar
Apache Sling Context-Aware Configuration bnd Plugin
This bnd plugin detected all configuration annotation classes
and adds a bundle header 'Sling-ContextAware-Configuration-Classes' containing
their names.
-
-
2021-12-15T00:00:00Z
-
-
scm:git:https://gitbox.apache.org/repos/asf/sling-org-apache-sling-caconfig-bnd-plugin.git
scm:git:https://gitbox.apache.org/repos/asf/sling-org-apache-sling-caconfig-bnd-plugin.git
https://github.com/apache/sling-org-apache-sling-caconfig-bnd-plugin.git
+
+
2021-12-15T00:00:00Z
+
+
biz.aQute.bnd
diff --git
a/src/main/java/org/apache/sling/caconfig/bndplugin/ConfigurationClassScannerPlugin.java
b/src/main/java/org/apache/sling/caconfig/bndplugin/ConfigurationClassScannerPlugin.java
index c71949f..7f1c461 100644
---
a/src/main/java/org/apache/sling/caconfig/bndplugin/ConfigurationClassScannerPlugin.java
+++
b/src/main/java/org/apache/sling/caconfig/bndplugin/ConfigurationClassScannerPlugin.java
@@ -23,8 +23,6 @@ import java.util.Map;
import java.util.SortedSet;
import java.util.TreeSet;
-import org.apache.commons.lang3.StringUtils;
-
import aQute.bnd.osgi.Analyzer;
import aQute.bnd.osgi.Clazz;
import aQute.bnd.osgi.Clazz.QUERY;
@@ -32,6 +30,7 @@ import aQute.bnd.osgi.Instruction;
import aQute.bnd.service.AnalyzerPlugin;
import aQute.bnd.service.Plugin;
import aQute.service.reporter.Reporter;
+import org.apache.commons.lang3.StringUtils;
/**
* Scans the classpath of the bundle for annotation classes with the
"Configuration" annotation
@@ -87,11 +86,9 @@ public class ConfigurationClassScannerPlugin implements
AnalyzerPlugin, Plugin {
classNames.add(clazz.getClassName().getFQN());
}
}
-}
-catch (Exception ex) {
+} catch (Exception ex) {
reporter.exception(ex, "Error querying for classes with
annotation: " + annotationClassName);
}
return classNames;
}
-
}
diff --git a/src/test/java/dummy/example/pkg1/Config1.java
b/src/test/java/dummy/example/pkg1/Config1.java
index 9dd90b7..4c20d6d 100644
--- a/src/test/java/dummy/example/pkg1/Config1.java
+++ b/src/test/java/dummy/example/pkg1/Config1.java
@@ -21,6 +21,4 @@ package dummy.example.pkg1;
import org.apache.sling.caconfig.annotation.Configuration;
@Configuration
-public @interface Config1 {
-
-}
+public @interface Config1 {}
diff --git a/src/test/java/dummy/example/pkg1/Config2.java
b/src/test/java/dummy/example/pkg1/Config2.java
index 322a1df..796a145 100644
--- a/src/test/java/dummy/example/pkg1/Config2.java
+++ b/src/test/java/dummy/example/pkg1/Config2.java
@@ -21,6 +21,4 @@ package dummy.example.pkg1;
import org.apache.sling.caconfig.annotation.Configuration;
@Configuration
-public @interface Config2 {
-
-}
+public @interface Config2 {}
diff --git a/src/test/java/dummy/example/pkg1/sub1/Config3.java
b/src/test/java/dummy/example/pkg1/sub1/Config3.java
index 456413c..f521f12 100644
--- a/src/test/java/dummy/example/pkg1/sub1/Config3.java
+++ b/src/test/java/dummy/example/pkg1/sub1/Config3.java
@@ -21,6 +21,4 @@ package dummy.example.pkg1.sub1;
import org.apache.sling.caconfig.annotation.Configuration;
@Configuration
-public @interface Config3 {
-
-}
+public @interface Config3 {}
diff --git
a/src/test/java/org/apache/sling/caconfig/bndplugin/AbstractConfigurationClassScannerPlugin.java
b/src/test/java/org/apache/sling/caconfig/bndplugin/AbstractConfigurationClassScannerPlugin.java
index 4e3e158..b1c4123 100644
---
a/src/test/java/org/apache/sling/caconfig/bndplugin/AbstractConfigurationClassScannerPlugin.java
+++
b/src/test/java/org/apache/sling/caconfig/bndplugin/AbstractConfigurationClassScannerPlugin.java
@@ -18,10 +18,6 @@
*/
package org.apache.sling
(sling-org-apache-sling-caconfig-bnd-plugin) 01/02: SLING-12361 Update to Parent 60, Java 11 Minimum Version, bnd 6.0.0
This is an automated email from the ASF dual-hosted git repository.
sseifert pushed a commit to branch master
in repository
https://gitbox.apache.org/repos/asf/sling-org-apache-sling-caconfig-bnd-plugin.git
commit 80577e102c746ae8e8f66e1b709c1dfe2d3789d8
Author: Stefan Seifert
AuthorDate: Mon Jun 24 14:25:09 2024 +0200
SLING-12361 Update to Parent 60, Java 11 Minimum Version, bnd 6.0.0
---
.sling-module.json | 5 +
pom.xml| 4 ++--
2 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/.sling-module.json b/.sling-module.json
new file mode 100644
index 000..cfad4d2
--- /dev/null
+++ b/.sling-module.json
@@ -0,0 +1,5 @@
+{
+ "jenkins": {
+"jdks": [17, 21]
+ }
+}
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index 73ddbb7..98319b9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,7 +23,7 @@
org.apache.sling
sling
-46
+60
@@ -47,7 +47,7 @@
biz.aQute.bnd
biz.aQute.bndlib
-3.2.0
+6.0.0
provided
(sling-org-apache-sling-caconfig-bnd-plugin) branch master updated (3e9c619 -> de19fab)
This is an automated email from the ASF dual-hosted git repository. sseifert pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-caconfig-bnd-plugin.git from 3e9c619 SLING-12094 - Use GitHub for the Maven scm.url value new 80577e1 SLING-12361 Update to Parent 60, Java 11 Minimum Version, bnd 6.0.0 new de19fab SLING-12361 apply spotless code formatting The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .sling-module.json | 5 + pom.xml| 14 ++--- .../bndplugin/ConfigurationClassScannerPlugin.java | 7 ++- src/test/java/dummy/example/pkg1/Config1.java | 4 +--- src/test/java/dummy/example/pkg1/Config2.java | 4 +--- src/test/java/dummy/example/pkg1/sub1/Config3.java | 4 +--- .../AbstractConfigurationClassScannerPlugin.java | 23 +++--- .../caconfig/bndplugin/GenerateHeaderTest.java | 10 +- 8 files changed, 33 insertions(+), 38 deletions(-) create mode 100644 .sling-module.json
(sling-org-apache-sling-caconfig-impl) branch master updated: SLING-12361 ignore spotless code reformatting commit in git blame
This is an automated email from the ASF dual-hosted git repository. sseifert pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-caconfig-impl.git The following commit(s) were added to refs/heads/master by this push: new 9f5f501 SLING-12361 ignore spotless code reformatting commit in git blame 9f5f501 is described below commit 9f5f501b0f8dc36e26889e693c1b82aed0c83088 Author: Stefan Seifert AuthorDate: Tue Jun 25 13:47:36 2024 +0200 SLING-12361 ignore spotless code reformatting commit 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..b97525c --- /dev/null +++ b/.git-blame-ignore-revs @@ -0,0 +1 @@ +91dd7cb4fa07252beeac7ac2a8c6c2e80713a8fc \ No newline at end of file
(sling-org-apache-sling-caconfig-impl) branch feature/SLING-12361-parent-60 deleted (was 022a99a)
This is an automated email from the ASF dual-hosted git repository. sseifert pushed a change to branch feature/SLING-12361-parent-60 in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-caconfig-impl.git was 022a99a SLING-12361 apply spotless code formatting 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-caconfig-impl) branch master updated (6d87c0a -> 91dd7cb)
This is an automated email from the ASF dual-hosted git repository. sseifert pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-caconfig-impl.git from 6d87c0a SLING-12147 Replace Sling XSS with OWASP Encoder new 9c31071 SLING-12361 Update to Parent 60, Java 11 Minimum Version new 91dd7cb SLING-12361 apply spotless code formatting The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .sling-module.json | 5 + pom.xml| 89 +-- .../impl/ConfigurationBindingsValueProvider.java | 37 +- .../impl/ConfigurationBuilderAdapterFactory.java | 11 +- .../caconfig/impl/ConfigurationBuilderImpl.java| 187 --- ...gurationInheritanceStrategyMultiplexerImpl.java | 35 +- ...ctResourceDetectionStrategyMultiplexerImpl.java | 32 +- .../caconfig/impl/ConfigurationNameConstants.java | 1 - .../sling/caconfig/impl/ConfigurationProxy.java| 32 +- .../caconfig/impl/ConfigurationResolverImpl.java | 44 +- .../impl/ConfigurationResourceWrapper.java | 13 +- .../impl/def/ConfigurationDefNameConstants.java| 1 - .../DefaultConfigurationInheritanceStrategy.java | 42 +- ...nfigurationInjectResourceDetectionStrategy.java | 4 +- .../DefaultConfigurationPersistenceStrategy.java | 46 +- ...notationClassConfigurationMetadataProvider.java | 17 +- .../impl/metadata/AnnotationClassParser.java | 58 +- .../impl/metadata/BundleConfigurationMapping.java | 33 +- .../ConfigClassBundleTackerCustomizer.java | 7 +- .../impl/metadata/ConfigurationMapping.java| 1 - ...nfigurationMetadataProviderMultiplexerImpl.java | 26 +- .../ConfigurationOverrideMultiplexerImpl.java | 48 +- .../OsgiConfigurationOverrideProvider.java | 25 +- .../sling/caconfig/impl/override/OverrideItem.java | 9 +- .../impl/override/OverrideStringParser.java| 81 +-- ...ystemPropertyConfigurationOverrideProvider.java | 14 +- .../management/ConfigurationCollectionData.java| 13 +- .../caconfig/management/ConfigurationData.java | 22 +- .../ConfigurationManagementSettings.java | 1 - .../caconfig/management/ConfigurationManager.java | 27 +- .../ConfigurationResourceResolverConfig.java | 4 +- .../sling/caconfig/management/ValueInfo.java | 16 +- .../impl/ConfigurationCollectionDataImpl.java | 18 +- .../management/impl/ConfigurationDataImpl.java | 110 ++-- .../impl/ConfigurationManagementSettingsImpl.java | 51 +- .../management/impl/ConfigurationManagerImpl.java | 309 +++ .../ConfigurationPersistenceStrategyBridge.java| 53 +- ...gurationPersistenceStrategyMultiplexerImpl.java | 34 +- .../impl/ContextPathStrategyMultiplexerImpl.java | 30 +- .../management/impl/PropertiesFilterUtil.java | 3 +- .../caconfig/management/impl/ValueInfoImpl.java| 43 +- .../impl/console/CAConfigInventoryPrinter.java | 63 ++- .../impl/console/ConfigurationMetadataPrinter.java | 11 +- .../impl/console/ConfigurationOverridePrinter.java | 6 +- .../ConfigurationPersistenceStrategyPrinter.java | 11 +- .../console/ConfigurationWebConsolePlugin.java | 82 +-- .../impl/console/ServiceConfigurationPrinter.java | 1 - ...InjectResourceDetectionStrategyMultiplexer.java | 3 +- .../ConfigurationOverrideMultiplexer.java | 15 +- ...onfigurationPersistenceStrategyMultiplexer.java | 10 +- .../impl/ConfigurationResourceResolverImpl.java| 16 +- ...onResourceResolvingStrategyMultiplexerImpl.java | 48 +- .../def/ConfigurationResourceNameConstants.java| 1 - ...aultConfigurationResourceResolvingStrategy.java | 239 .../impl/def/DefaultContextPathStrategy.java | 45 +- .../resource/impl/util/ConfigNameUtil.java | 1 - .../sling/caconfig/resource/impl/util/MapUtil.java | 12 +- .../impl/util/PathEliminateDuplicatesIterator.java | 2 - .../impl/util/PathParentExpandIterator.java| 1 - .../caconfig/resource/impl/util/PropertyUtil.java | 10 +- .../util/ResourceEliminateDuplicatesIterator.java | 5 +- .../impl/util/ResourcePathCollatingIterator.java | 6 +- .../sling/caconfig/example/AllTypesConfig.java | 15 +- .../sling/caconfig/example/AllTypesDefaults.java | 1 - .../sling/caconfig/example/IllegalTypesConfig.java | 1 - .../apache/sling/caconfig/example/ListConfig.java | 1 - .../caconfig/example/ListDoubleNestedConfig.java | 1 - .../sling/caconfig/example/ListNestedConfig.java | 1 - .../caconfig/example/MetadataSimpleConfig.java | 13 +- .../sling/caconfig/example/NestedConfig.java | 1 - .../sling/caconfig/example/SimpleCon
(sling-org-apache-sling-caconfig-impl) 01/02: SLING-12361 Update to Parent 60, Java 11 Minimum Version
This is an automated email from the ASF dual-hosted git repository.
sseifert pushed a commit to branch master
in repository
https://gitbox.apache.org/repos/asf/sling-org-apache-sling-caconfig-impl.git
commit 9c31071e482e3af758f166f3a332a561157d8611
Author: Stefan Seifert
AuthorDate: Mon Jun 24 14:17:41 2024 +0200
SLING-12361 Update to Parent 60, Java 11 Minimum Version
---
.sling-module.json | 5 +
pom.xml| 2 +-
2 files changed, 6 insertions(+), 1 deletion(-)
diff --git a/.sling-module.json b/.sling-module.json
new file mode 100644
index 000..cfad4d2
--- /dev/null
+++ b/.sling-module.json
@@ -0,0 +1,5 @@
+{
+ "jenkins": {
+"jdks": [17, 21]
+ }
+}
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index a3ec04a..5b5051a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,7 +23,7 @@
org.apache.sling
sling-bundle-parent
-52
+60
(sling-org-apache-sling-caconfig-spi) branch master updated: SLING-12361 ignore spotless code reformatting commit in git blame
This is an automated email from the ASF dual-hosted git repository. sseifert pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-caconfig-spi.git The following commit(s) were added to refs/heads/master by this push: new 3a93994 SLING-12361 ignore spotless code reformatting commit in git blame 3a93994 is described below commit 3a9399466b0af35d7c7f2e9110d1c2178574906e Author: Stefan Seifert AuthorDate: Tue Jun 25 13:44:23 2024 +0200 SLING-12361 ignore spotless code reformatting commit 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..908d4fa --- /dev/null +++ b/.git-blame-ignore-revs @@ -0,0 +1 @@ +da624284af085acec003dfa96db5ff753b348d8d \ No newline at end of file
(sling-org-apache-sling-caconfig-spi) branch feature/SLING-12361-parent-60 deleted (was d1e33f5)
This is an automated email from the ASF dual-hosted git repository. sseifert pushed a change to branch feature/SLING-12361-parent-60 in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-caconfig-spi.git was d1e33f5 SLING-12361 apply spotless code formatting 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-caconfig-spi) 02/02: SLING-12361 apply spotless code formatting
This is an automated email from the ASF dual-hosted git repository.
sseifert pushed a commit to branch master
in repository
https://gitbox.apache.org/repos/asf/sling-org-apache-sling-caconfig-spi.git
commit da624284af085acec003dfa96db5ff753b348d8d
Author: Stefan Seifert
AuthorDate: Mon Jun 24 14:15:29 2024 +0200
SLING-12361 apply spotless code formatting
---
pom.xml| 36 +--
.../resource/spi/CollectionInheritanceDecider.java | 4 +--
.../ConfigurationResourceResolvingStrategy.java| 24 +
.../caconfig/resource/spi/ContextPathStrategy.java | 4 +--
.../caconfig/resource/spi/ContextResource.java | 3 +-
.../caconfig/resource/spi/InheritanceDecision.java | 3 +-
.../spi/ConfigurationCollectionPersistData.java| 9 ++---
.../spi/ConfigurationInheritanceStrategy.java | 4 +--
...nfigurationInjectResourceDetectionStrategy.java | 1 -
.../spi/ConfigurationMetadataProvider.java | 7 ++--
.../spi/ConfigurationOverrideProvider.java | 4 +--
.../caconfig/spi/ConfigurationPersistData.java | 3 +-
...figurationPersistenceAccessDeniedException.java | 1 -
.../spi/ConfigurationPersistenceException.java | 1 -
.../spi/ConfigurationPersistenceStrategy.java | 19 ++
.../spi/ConfigurationPersistenceStrategy2.java | 40 ++
.../caconfig/spi/metadata/AbstractMetadata.java| 13 ---
.../spi/metadata/ConfigurationMetadata.java| 14
.../caconfig/spi/metadata/PropertyMetadata.java| 20 ---
.../caconfig/resource/spi/ContextResourceTest.java | 18 +-
.../ConfigurationCollectionPersistDataTest.java| 19 +-
.../caconfig/spi/ConfigurationPersistDataTest.java | 12 +++
.../spi/metadata/ConfigurationMetadataTest.java| 40 --
.../spi/metadata/PropertyMetadataTest.java | 32 -
24 files changed, 172 insertions(+), 159 deletions(-)
diff --git a/pom.xml b/pom.xml
index d4647f3..69b30df 100644
--- a/pom.xml
+++ b/pom.xml
@@ -28,34 +28,21 @@
org.apache.sling.caconfig.spi
-jar
1.4.1-SNAPSHOT
+jar
Apache Sling Context-Aware Configuration SPI
Apache Sling Context-Aware Configuration SPI
-
-
2022-01-03T11:35:43Z
-
-
scm:git:https://gitbox.apache.org/repos/asf/sling-org-apache-sling-caconfig-spi.git
scm:git:https://gitbox.apache.org/repos/asf/sling-org-apache-sling-caconfig-spi.git
-
https://github.com/apache/sling-org-apache-sling-caconfig-spi.git
HEAD
+
https://github.com/apache/sling-org-apache-sling-caconfig-spi.git
-
-
-
-biz.aQute.bnd
-bnd-maven-plugin
-
-
-biz.aQute.bnd
-bnd-baseline-maven-plugin
-
-
-
+
+
2022-01-03T11:35:43Z
+
@@ -121,4 +108,17 @@
+
+
+
+biz.aQute.bnd
+bnd-maven-plugin
+
+
+biz.aQute.bnd
+bnd-baseline-maven-plugin
+
+
+
+
diff --git
a/src/main/java/org/apache/sling/caconfig/resource/spi/CollectionInheritanceDecider.java
b/src/main/java/org/apache/sling/caconfig/resource/spi/CollectionInheritanceDecider.java
index 896920a..378e77b 100644
---
a/src/main/java/org/apache/sling/caconfig/resource/spi/CollectionInheritanceDecider.java
+++
b/src/main/java/org/apache/sling/caconfig/resource/spi/CollectionInheritanceDecider.java
@@ -42,6 +42,6 @@ public interface CollectionInheritanceDecider {
* @param resource The resource
* @return The decision or {@code null}
*/
-@Nullable InheritanceDecision decide(@NotNull Resource resource, @NotNull
String bucketName);
-
+@Nullable
+InheritanceDecision decide(@NotNull Resource resource, @NotNull String
bucketName);
}
diff --git
a/src/main/java/org/apache/sling/caconfig/resource/spi/ConfigurationResourceResolvingStrategy.java
b/src/main/java/org/apache/sling/caconfig/resource/spi/ConfigurationResourceResolvingStrategy.java
index 04b04ef..96904be 100644
---
a/src/main/java/org/apache/sling/caconfig/resource/spi/ConfigurationResourceResolvingStrategy.java
+++
b/src/main/java/org/apache/sling/caconfig/resource/spi/ConfigurationResourceResolvingStrategy.java
@@ -47,7 +47,9 @@ public interface ConfigurationResourceResolvingStrategy {
* @param configName Configuration name or relative path.
* @return Configuration resource or {@code null} if this strategy did not
found matching resources.
*/
-@Nullable Resource getResource(@NotNull Resource resource, @NotNull
Collection bucketNames, @NotNull String configName);
+@Nullable
+Resource getResource(
+@NotNull Resource resource, @NotNull Collection
bucketNames
(sling-org-apache-sling-caconfig-spi) 01/02: SLING-12361 Update to Parent 60, Java 11 Minimum Version
This is an automated email from the ASF dual-hosted git repository.
sseifert pushed a commit to branch master
in repository
https://gitbox.apache.org/repos/asf/sling-org-apache-sling-caconfig-spi.git
commit 794bf3387100902ec47c4a785803f2bc3473da15
Author: Stefan Seifert
AuthorDate: Mon Jun 24 14:14:01 2024 +0200
SLING-12361 Update to Parent 60, Java 11 Minimum Version
---
.sling-module.json | 5 +
pom.xml| 2 +-
2 files changed, 6 insertions(+), 1 deletion(-)
diff --git a/.sling-module.json b/.sling-module.json
new file mode 100644
index 000..cfad4d2
--- /dev/null
+++ b/.sling-module.json
@@ -0,0 +1,5 @@
+{
+ "jenkins": {
+"jdks": [17, 21]
+ }
+}
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index 57e285d..d4647f3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,7 +23,7 @@
org.apache.sling
sling-bundle-parent
-46
+60
(sling-org-apache-sling-caconfig-spi) branch master updated (7f17fa7 -> da62428)
This is an automated email from the ASF dual-hosted git repository. sseifert pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-caconfig-spi.git from 7f17fa7 SLING-12094 - Use GitHub for the Maven scm.url value new 794bf33 SLING-12361 Update to Parent 60, Java 11 Minimum Version new da62428 SLING-12361 apply spotless code formatting The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .sling-module.json | 5 +++ pom.xml| 38 ++-- .../resource/spi/CollectionInheritanceDecider.java | 4 +-- .../ConfigurationResourceResolvingStrategy.java| 24 + .../caconfig/resource/spi/ContextPathStrategy.java | 4 +-- .../caconfig/resource/spi/ContextResource.java | 3 +- .../caconfig/resource/spi/InheritanceDecision.java | 3 +- .../spi/ConfigurationCollectionPersistData.java| 9 ++--- .../spi/ConfigurationInheritanceStrategy.java | 4 +-- ...nfigurationInjectResourceDetectionStrategy.java | 1 - .../spi/ConfigurationMetadataProvider.java | 7 ++-- .../spi/ConfigurationOverrideProvider.java | 4 +-- .../caconfig/spi/ConfigurationPersistData.java | 3 +- ...figurationPersistenceAccessDeniedException.java | 1 - .../spi/ConfigurationPersistenceException.java | 1 - .../spi/ConfigurationPersistenceStrategy.java | 19 ++ .../spi/ConfigurationPersistenceStrategy2.java | 40 ++ .../caconfig/spi/metadata/AbstractMetadata.java| 13 --- .../spi/metadata/ConfigurationMetadata.java| 14 .../caconfig/spi/metadata/PropertyMetadata.java| 20 --- .../caconfig/resource/spi/ContextResourceTest.java | 18 +- .../ConfigurationCollectionPersistDataTest.java| 19 +- .../caconfig/spi/ConfigurationPersistDataTest.java | 12 +++ .../spi/metadata/ConfigurationMetadataTest.java| 40 -- .../spi/metadata/PropertyMetadataTest.java | 32 - 25 files changed, 178 insertions(+), 160 deletions(-) create mode 100644 .sling-module.json
(sling-org-apache-sling-caconfig-api) branch master updated: SLING-12361 ignore spotless code reformatting commit in git blame
This is an automated email from the ASF dual-hosted git repository. sseifert pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-caconfig-api.git The following commit(s) were added to refs/heads/master by this push: new f78856e SLING-12361 ignore spotless code reformatting commit in git blame f78856e is described below commit f78856e56fb024f3191436d72706e7914f733b99 Author: Stefan Seifert AuthorDate: Tue Jun 25 13:40:44 2024 +0200 SLING-12361 ignore spotless code reformatting commit 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..a190a21 --- /dev/null +++ b/.git-blame-ignore-revs @@ -0,0 +1 @@ +3278436d6b9a86702067c0b3812010f5fba3a3aa \ No newline at end of file
(sling-org-apache-sling-caconfig-api) branch feature/SLING-12361-parent-60 deleted (was 51f5613)
This is an automated email from the ASF dual-hosted git repository. sseifert pushed a change to branch feature/SLING-12361-parent-60 in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-caconfig-api.git was 51f5613 SLING-12361 apply spotless code formatting 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-caconfig-api) 02/02: SLING-12361 apply spotless code formatting
This is an automated email from the ASF dual-hosted git repository.
sseifert pushed a commit to branch master
in repository
https://gitbox.apache.org/repos/asf/sling-org-apache-sling-caconfig-api.git
commit 3278436d6b9a86702067c0b3812010f5fba3a3aa
Author: Stefan Seifert
AuthorDate: Mon Jun 24 14:09:55 2024 +0200
SLING-12361 apply spotless code formatting
---
pom.xml| 38 +++---
.../sling/caconfig/ConfigurationBuilder.java | 19 +++
.../caconfig/ConfigurationResolveException.java| 1 -
.../sling/caconfig/ConfigurationResolver.java | 4 +--
.../sling/caconfig/annotation/Configuration.java | 1 -
.../apache/sling/caconfig/annotation/Property.java | 1 -
.../resource/ConfigurationResourceResolver.java| 11 ---
7 files changed, 40 insertions(+), 35 deletions(-)
diff --git a/pom.xml b/pom.xml
index 39e4cdb..f39caa7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -26,36 +26,23 @@
60
-
+
org.apache.sling.caconfig.api
-jar
1.3.1-SNAPSHOT
+jar
Apache Sling Context-Aware Configuration API
Apache Sling Context-Aware Configuration API
-
-
2022-01-03T11:32:43Z
-
-
scm:git:https://gitbox.apache.org/repos/asf/sling-org-apache-sling-caconfig-api.git
scm:git:https://gitbox.apache.org/repos/asf/sling-org-apache-sling-caconfig-api.git
-
https://github.com/apache/sling-org-apache-sling-caconfig-api.git
HEAD
+
https://github.com/apache/sling-org-apache-sling-caconfig-api.git
-
-
-
-biz.aQute.bnd
-bnd-maven-plugin
-
-
-biz.aQute.bnd
-bnd-baseline-maven-plugin
-
-
-
+
+
2022-01-03T11:32:43Z
+
@@ -81,4 +68,17 @@
+
+
+
+biz.aQute.bnd
+bnd-maven-plugin
+
+
+biz.aQute.bnd
+bnd-baseline-maven-plugin
+
+
+
+
diff --git a/src/main/java/org/apache/sling/caconfig/ConfigurationBuilder.java
b/src/main/java/org/apache/sling/caconfig/ConfigurationBuilder.java
index afb9481..736d379 100644
--- a/src/main/java/org/apache/sling/caconfig/ConfigurationBuilder.java
+++ b/src/main/java/org/apache/sling/caconfig/ConfigurationBuilder.java
@@ -36,7 +36,8 @@ public interface ConfigurationBuilder {
* @param configName Relative path
* @return Configuration builder
*/
-@NotNull ConfigurationBuilder name(@NotNull String configName);
+@NotNull
+ConfigurationBuilder name(@NotNull String configName);
/**
* Get configuration as singleton resource and its properties mapped to
the given annotation class.
@@ -46,7 +47,8 @@ public interface ConfigurationBuilder {
* @param Annotation class type
* @return Configuration object. Contains only the default values if
content resource or configuration cannot be found.
*/
-@NotNull T as(@NotNull Class clazz);
+@NotNull
+ T as(@NotNull Class clazz);
/**
* Get collection of configuration resources with their properties mapped
to the given annotation class.
@@ -56,19 +58,22 @@ public interface ConfigurationBuilder {
* @param Annotation class type
* @return Collection of configuration objects. Is empty if content
resource or configuration cannot be found.
*/
-@NotNull Collection asCollection(@NotNull Class clazz);
+@NotNull
+ Collection asCollection(@NotNull Class clazz);
/**
* Get configuration as singleton resource and return its properties as
value map.
* @return Value map. If content resource or configuration cannot be found
the map is empty unless default or configuration override values are present
for this configuration.
*/
-@NotNull ValueMap asValueMap();
+@NotNull
+ValueMap asValueMap();
/**
* Get collection of configuration resources with their properties mapped
to the given annotation class.
* @return Collection of value maps. Is empty if content resource or
configuration cannot be found.
*/
-@NotNull Collection asValueMapCollection();
+@NotNull
+Collection asValueMapCollection();
/**
* Get configuration as singleton configuration resource and adapt it to
the given class.
@@ -84,7 +89,8 @@ public interface ConfigurationBuilder {
* @param Annotation class type
* @return Collection of object instances. Is empty if content resource or
configuration cannot be found or if the adaption was not possible.
*/
-@NotNull Collection asAdaptableCollection(@NotNull Class clazz);
+@NotNull
+ Collection asAdaptableCollection(@NotNull Class clazz);
/**
* This method checks for the configuration existence based on {@code
(sling-org-apache-sling-caconfig-api) 01/02: SLING-12361 Update to Parent 60, Java 11 Minimum Version
This is an automated email from the ASF dual-hosted git repository.
sseifert pushed a commit to branch master
in repository
https://gitbox.apache.org/repos/asf/sling-org-apache-sling-caconfig-api.git
commit e20383050d57bfd549c7afcd616873583c0cfaff
Author: Stefan Seifert
AuthorDate: Mon Jun 24 14:08:52 2024 +0200
SLING-12361 Update to Parent 60, Java 11 Minimum Version
---
.sling-module.json | 5 +
pom.xml| 2 +-
2 files changed, 6 insertions(+), 1 deletion(-)
diff --git a/.sling-module.json b/.sling-module.json
new file mode 100644
index 000..cfad4d2
--- /dev/null
+++ b/.sling-module.json
@@ -0,0 +1,5 @@
+{
+ "jenkins": {
+"jdks": [17, 21]
+ }
+}
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index c9e6983..39e4cdb 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,7 +23,7 @@
org.apache.sling
sling-bundle-parent
-46
+60
(sling-org-apache-sling-caconfig-api) branch master updated (1baf8f2 -> 3278436)
This is an automated email from the ASF dual-hosted git repository. sseifert pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-caconfig-api.git from 1baf8f2 SLING-12094 - Use GitHub for the Maven scm.url value new e203830 SLING-12361 Update to Parent 60, Java 11 Minimum Version new 3278436 SLING-12361 apply spotless code formatting The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .sling-module.json | 5 +++ pom.xml| 40 +++--- .../sling/caconfig/ConfigurationBuilder.java | 19 ++ .../caconfig/ConfigurationResolveException.java| 1 - .../sling/caconfig/ConfigurationResolver.java | 4 +-- .../sling/caconfig/annotation/Configuration.java | 1 - .../apache/sling/caconfig/annotation/Property.java | 1 - .../resource/ConfigurationResourceResolver.java| 11 +++--- 8 files changed, 46 insertions(+), 36 deletions(-) create mode 100644 .sling-module.json
(sling-org-apache-sling-models-impl) branch feature/SLING-12360-parent-60 updated (16f1278 -> c920ee4)
This is an automated email from the ASF dual-hosted git repository. sseifert pushed a change to branch feature/SLING-12360-parent-60 in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-models-impl.git omit 16f1278 SLING-12360 apply spotless code formatting omit e8b1342 SLING-12360 Update to Parent 60, Java 11 Minimum Version add 9d1c725 SLING-12359 - Extend records support (#51) add cb54677 SLING-12360 Update to Parent 60, Java 11 Minimum Version add c920ee4 SLING-12360 apply spotless code formatting 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 (16f1278) \ N -- N -- N refs/heads/feature/SLING-12360-parent-60 (c920ee4) 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/models/impl/ModelAdapterFactory.java | 3 + .../apache/sling/models/impl/ReflectionUtil.java | 35 - .../apache/sling/models/impl/model/ModelClass.java | 2 +- .../models/impl/model/ModelClassConstructor.java | 7 + .../sling/models/impl/ReflectionUtilTest.java | 153 + 5 files changed, 195 insertions(+), 5 deletions(-) create mode 100644 src/test/java/org/apache/sling/models/impl/ReflectionUtilTest.java
(sling-org-apache-sling-models-impl) branch master updated: SLING-12359 - Extend records support (#51)
This is an automated email from the ASF dual-hosted git repository.
sseifert pushed a commit to branch master
in repository
https://gitbox.apache.org/repos/asf/sling-org-apache-sling-models-impl.git
The following commit(s) were added to refs/heads/master by this push:
new 9d1c725 SLING-12359 - Extend records support (#51)
9d1c725 is described below
commit 9d1c72501226d3dfdfb0644c5632f5e29be5370e
Author: Herman Ciechanowiec
AuthorDate: Tue Jun 25 13:22:16 2024 +0200
SLING-12359 - Extend records support (#51)
---
.../sling/models/impl/ModelAdapterFactory.java | 3 +
.../apache/sling/models/impl/ReflectionUtil.java | 33 -
.../apache/sling/models/impl/model/ModelClass.java | 2 +-
.../models/impl/model/ModelClassConstructor.java | 6 +
.../sling/models/impl/ReflectionUtilTest.java | 148 +
5 files changed, 187 insertions(+), 5 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 9724013..94e6be6 100644
--- a/src/main/java/org/apache/sling/models/impl/ModelAdapterFactory.java
+++ b/src/main/java/org/apache/sling/models/impl/ModelAdapterFactory.java
@@ -812,6 +812,9 @@ public class ModelAdapterFactory implements AdapterFactory,
Runnable, ModelFacto
if (constructor.hasInjectAnnotation()) {
return constructor;
}
+if (constructor.isCanonicalRecordConstructor()) {
+return constructor;
+}
// compatibility mode for sling models implementation <= 1.0.6:
// support constructor without @Inject if it has exactly one
parameter matching the adaptable class
final Class[] paramTypes =
constructor.getConstructor().getParameterTypes();
diff --git a/src/main/java/org/apache/sling/models/impl/ReflectionUtil.java
b/src/main/java/org/apache/sling/models/impl/ReflectionUtil.java
index 456b1c7..f8253a1 100644
--- a/src/main/java/org/apache/sling/models/impl/ReflectionUtil.java
+++ b/src/main/java/org/apache/sling/models/impl/ReflectionUtil.java
@@ -19,11 +19,9 @@
package org.apache.sling.models.impl;
import java.lang.annotation.Annotation;
-import java.lang.reflect.AnnotatedElement;
-import java.lang.reflect.Field;
-import java.lang.reflect.Method;
-import java.lang.reflect.Type;
+import java.lang.reflect.*;
import java.util.ArrayList;
+import java.util.Arrays;
import java.util.List;
import javax.inject.Inject;
@@ -125,4 +123,31 @@ public final class ReflectionUtil {
}
}
+public static boolean isRecord(Class checkedType) {
+try {
+Class recordType = Class.forName("java.lang.Record");
+return recordType.isAssignableFrom(checkedType);
+} catch (@SuppressWarnings("squid:S1166") ClassNotFoundException
exception) {
+return false;
+}
+}
+
+/**
+ * Checks if the number of parameters in the specified constructor matches
the number of fields in the class
+ * that declares the constructor. Can be useful for detection of canonical
constructors in records.
+ * Synthetic fields are ignored.
+ *
+ * @param constructor the constructor to check
+ * @return {@code true} if the number of constructor parameters equals the
number of fields in the declaring class,
+ * {@code false} otherwise
+ */
+public static boolean areBalancedCtorParamsAndFields(Constructor
constructor) {
+int numOfCtorParams = constructor.getParameterCount();
+Class declaringClass = constructor.getDeclaringClass();
+Field[] fields = declaringClass.getDeclaredFields();
+long numOfFields = Arrays.stream(fields)
+ .filter(field -> !field.isSynthetic())
+ .count();
+return numOfCtorParams == numOfFields;
+}
}
diff --git a/src/main/java/org/apache/sling/models/impl/model/ModelClass.java
b/src/main/java/org/apache/sling/models/impl/model/ModelClass.java
index 4f81a62..f3d776c 100644
--- a/src/main/java/org/apache/sling/models/impl/model/ModelClass.java
+++ b/src/main/java/org/apache/sling/models/impl/model/ModelClass.java
@@ -77,7 +77,7 @@ public class ModelClass {
}
private static InjectableField[] getInjectableFields(Class type,
StaticInjectAnnotationProcessorFactory[] processorFactories,
DefaultInjectionStrategy defaultInjectionStrategy) {
-if (type.isInterface()) {
+if (type.isInterface() || ReflectionUtil.isRecord(type)) {
return new InjectableField[0];
}
List injectableFields =
ReflectionUtil.collectInjectableFields(type);
diff --git
a/src/main/java/org/apache/sling/models/impl/model/ModelClassConstructor.java
b/src/main/java/org/apache/sling/models/impl/model/ModelClassConstructor.java
index 23460be..ffb6a30 100644
---
a/src/main/java/or
(sling-org-apache-sling-bnd-models) 01/02: SLING-12360 Update to Parent 60, Java 11 Minimum Version
This is an automated email from the ASF dual-hosted git repository.
sseifert pushed a commit to branch feature/SLING-12360-parent-60
in repository
https://gitbox.apache.org/repos/asf/sling-org-apache-sling-bnd-models.git
commit deef52292b26f88d6966e27d262a02424a1cadd1
Author: Stefan Seifert
AuthorDate: Mon Jun 24 14:58:38 2024 +0200
SLING-12360 Update to Parent 60, Java 11 Minimum Version
---
.sling-module.json | 5 +
pom.xml| 2 +-
2 files changed, 6 insertions(+), 1 deletion(-)
diff --git a/.sling-module.json b/.sling-module.json
new file mode 100644
index 000..cfad4d2
--- /dev/null
+++ b/.sling-module.json
@@ -0,0 +1,5 @@
+{
+ "jenkins": {
+"jdks": [17, 21]
+ }
+}
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index 570c832..314b7d7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,7 +23,7 @@
org.apache.sling
sling
-52
+60
(sling-org-apache-sling-bnd-models) branch feature/SLING-12360-parent-60 created (now 1c8c163)
This is an automated email from the ASF dual-hosted git repository. sseifert pushed a change to branch feature/SLING-12360-parent-60 in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-bnd-models.git at 1c8c163 SLING-12360 apply spotless code formatting This branch includes the following new commits: new deef522 SLING-12360 Update to Parent 60, Java 11 Minimum Version new 1c8c163 SLING-12360 apply spotless code formatting The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference.
(sling-org-apache-sling-bnd-models) 02/02: SLING-12360 apply spotless code formatting
This is an automated email from the ASF dual-hosted git repository.
sseifert pushed a commit to branch feature/SLING-12360-parent-60
in repository
https://gitbox.apache.org/repos/asf/sling-org-apache-sling-bnd-models.git
commit 1c8c163145577dab899e0217b8e7a3af212bbb5f
Author: Stefan Seifert
AuthorDate: Mon Jun 24 14:59:31 2024 +0200
SLING-12360 apply spotless code formatting
---
pom.xml| 2 +-
.../sling/bnd/models/ModelsScannerPlugin.java | 57 ++
src/test/java/dummy/example/pkg1/Model1.java | 6 +--
src/test/java/dummy/example/pkg1/Model2.java | 6 +--
src/test/java/dummy/example/pkg1/sub1/Model3.java | 6 +--
src/test/java/dummy/example/pkg2/Model4.java | 6 +--
src/test/java/dummy/example/pkg2/Model5.java | 6 +--
.../models/AbstractModelsScannerPluginTest.java| 37 +++---
.../bnd/models/GenerateClassesHeaderTest.java | 18 +++
.../bnd/models/GeneratePackagesHeaderTest.java | 19 +++-
10 files changed, 70 insertions(+), 93 deletions(-)
diff --git a/pom.xml b/pom.xml
index 314b7d7..9e8f1bc 100644
--- a/pom.xml
+++ b/pom.xml
@@ -28,8 +28,8 @@
org.apache.sling.bnd.models
-jar
1.0.1-SNAPSHOT
+jar
Apache Sling Models bnd Plugin
This bnd plugin detected all Sling Models classes and adds a
bundle header 'Sling-Model-Classes' containing their names.
diff --git a/src/main/java/org/apache/sling/bnd/models/ModelsScannerPlugin.java
b/src/main/java/org/apache/sling/bnd/models/ModelsScannerPlugin.java
index e53047c..c6f8f8e 100644
--- a/src/main/java/org/apache/sling/bnd/models/ModelsScannerPlugin.java
+++ b/src/main/java/org/apache/sling/bnd/models/ModelsScannerPlugin.java
@@ -25,9 +25,6 @@ import java.util.Set;
import java.util.SortedSet;
import java.util.TreeSet;
-import org.apache.commons.lang3.BooleanUtils;
-import org.apache.commons.lang3.StringUtils;
-
import aQute.bnd.osgi.Analyzer;
import aQute.bnd.osgi.Clazz;
import aQute.bnd.osgi.Clazz.QUERY;
@@ -35,26 +32,29 @@ import aQute.bnd.osgi.Instruction;
import aQute.bnd.service.AnalyzerPlugin;
import aQute.bnd.service.Plugin;
import aQute.service.reporter.Reporter;
+import org.apache.commons.lang3.BooleanUtils;
+import org.apache.commons.lang3.StringUtils;
/**
* Scans the classpath of the bundle for Sling Models classes.
* All class names found are stored in a bundle header for processing them at
runtime and reading their metadata.
*/
public class ModelsScannerPlugin implements AnalyzerPlugin, Plugin {
-
+
static final String MODELS_ANNOTATION_CLASS =
"org.apache.sling.models.annotations.Model";
-
+
static final String MODELS_PACKAGES_HEADER = "Sling-Model-Packages";
static final String MODELS_CLASSES_HEADER = "Sling-Model-Classes";
-
-// max length of manifest header value 65535 bytes (see
http://docs.oracle.com/javase/8/docs/technotes/guides/jar/jar.html)
+
+// max length of manifest header value 65535 bytes (see
+// http://docs.oracle.com/javase/8/docs/technotes/guides/jar/jar.html)
// fall back to packages header when class names string gets too long
static final int MODELS_CLASSES_HEADER_MAXLENGTH = 6;
-
+
static final String PROPERTY_GENERATE_PACKAGES_HEADER =
"generatePackagesHeader";
-
+
private Reporter reporter;
-private Map properties;
+private Map properties;
@Override
public void setProperties(Map map) throws Exception {
@@ -68,7 +68,7 @@ public class ModelsScannerPlugin implements AnalyzerPlugin,
Plugin {
@Override
public boolean analyzeJar(Analyzer analyzer) throws Exception {
-
+
// process only if no models packages or class header was set
if (analyzer.get(MODELS_PACKAGES_HEADER) == null &&
analyzer.get(MODELS_CLASSES_HEADER) == null) {
@@ -79,30 +79,27 @@ public class ModelsScannerPlugin implements AnalyzerPlugin,
Plugin {
if (!classNames.isEmpty()) {
if (getBooleanProperty(PROPERTY_GENERATE_PACKAGES_HEADER)) {
generatePackagesHeader(analyzer, classNames);
-}
-else {
+} else {
generateClassesHeader(analyzer, classNames);
}
}
-
}
-
+
// we did not change any classes - no need to re-analyze
return false;
}
-
+
private void generateClassesHeader(Analyzer analyzer, Collection
classNames) {
String classNameHeader = StringUtils.join(classNames, ",");
if (classNameHeader.length() <= MODELS_CLASSES_HEADER_MAXLENGTH) {
analyzer.set(MODELS_CLASSES_HEADER, classNameHeader);
-}
-else {
+} else {
generatePackagesHeader(analyzer, classNames);
}
}
-
+
privat
(sling-org-apache-sling-models-caconfig) 02/02: SLING-12360 apply spotless code formatting
This is an automated email from the ASF dual-hosted git repository. sseifert pushed a commit to branch feature/SLING-12360-parent-60 in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-models-caconfig.git commit e0d1a9b628f89ebc5a4376924f6248100cddebf3 Author: Stefan Seifert AuthorDate: Mon Jun 24 14:51:52 2024 +0200 SLING-12360 apply spotless code formatting --- pom.xml| 30 +++--- .../annotations/ContextAwareConfiguration.java | 39 .../models/caconfig/annotations/package-info.java | 2 +- .../ContextAwareConfigurationInjector.java | 78 --- .../ContextAwareConfigurationProcessor.java| 1 - .../caconfig/example/caconfig/ListConfig.java | 1 - .../caconfig/example/caconfig/SingleConfig.java| 1 - .../caconfig/model/ConfigurationValuesModel.java | 8 +- .../invalidmodel/InvalidAnnotationListModel.java | 3 +- .../invalidmodel/InvalidAnnotationModel.java | 3 +- .../example/invalidmodel/InvalidInjectModel.java | 3 +- .../example/invalidmodel/InvalidSetModel.java | 3 +- .../example/model/ListConfigAdaptModel.java| 3 +- .../caconfig/example/model/ListConfigModel.java| 3 +- .../example/model/ListConfigValueMapModel.java | 3 +- .../example/model/SingleConfigAdaptModel.java | 3 +- .../caconfig/example/model/SingleConfigModel.java | 3 +- .../example/model/SingleConfigValueMapModel.java | 3 +- .../example/testhelper/ListConfigGetter.java | 1 - .../example/testhelper/SingleConfigGetter.java | 1 - .../ContextAwareConfigurationInjectorTest.java | 108 - 21 files changed, 157 insertions(+), 143 deletions(-) diff --git a/pom.xml b/pom.xml index 2c10f2a..c4245e0 100644 --- a/pom.xml +++ b/pom.xml @@ -36,14 +36,26 @@ scm:git:https://gitbox.apache.org/repos/asf/sling-org-apache-sling-models-caconfig.git scm:git:https://gitbox.apache.org/repos/asf/sling-org-apache-sling-models-caconfig.git +HEAD https://github.com/apache/sling-org-apache-sling-models-caconfig.git - HEAD - + 2022-08-08T14:03:16Z + + + +org.junit +junit-bom +5.8.2 +pom +import + + + + @@ -153,21 +165,9 @@ - - - -org.junit -junit-bom -5.8.2 -pom -import - - - - - + biz.aQute.bnd bnd-baseline-maven-plugin diff --git a/src/main/java/org/apache/sling/models/caconfig/annotations/ContextAwareConfiguration.java b/src/main/java/org/apache/sling/models/caconfig/annotations/ContextAwareConfiguration.java index 0c527b5..59df346 100644 --- a/src/main/java/org/apache/sling/models/caconfig/annotations/ContextAwareConfiguration.java +++ b/src/main/java/org/apache/sling/models/caconfig/annotations/ContextAwareConfiguration.java @@ -1,26 +1,23 @@ /* - * 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 + * 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 + * 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. + * 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.models.caconfig.annotations; -import static java.lang.anno
(sling-org-apache-sling-models-caconfig) 01/02: SLING-12360 Update to Parent 60, Java 11 Minimum Version
This is an automated email from the ASF dual-hosted git repository.
sseifert pushed a commit to branch feature/SLING-12360-parent-60
in repository
https://gitbox.apache.org/repos/asf/sling-org-apache-sling-models-caconfig.git
commit acfc0a5a1fdd3e381fc06cad71818abdf2990e2d
Author: Stefan Seifert
AuthorDate: Mon Jun 24 14:51:23 2024 +0200
SLING-12360 Update to Parent 60, Java 11 Minimum Version
---
.sling-module.json | 5 +
pom.xml| 2 +-
2 files changed, 6 insertions(+), 1 deletion(-)
diff --git a/.sling-module.json b/.sling-module.json
new file mode 100644
index 000..cfad4d2
--- /dev/null
+++ b/.sling-module.json
@@ -0,0 +1,5 @@
+{
+ "jenkins": {
+"jdks": [17, 21]
+ }
+}
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index ba8c812..2c10f2a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,7 +23,7 @@
org.apache.sling
sling-bundle-parent
-49
+60
(sling-org-apache-sling-models-caconfig) branch feature/SLING-12360-parent-60 created (now e0d1a9b)
This is an automated email from the ASF dual-hosted git repository. sseifert pushed a change to branch feature/SLING-12360-parent-60 in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-models-caconfig.git at e0d1a9b SLING-12360 apply spotless code formatting This branch includes the following new commits: new acfc0a5 SLING-12360 Update to Parent 60, Java 11 Minimum Version new e0d1a9b SLING-12360 apply spotless code formatting The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference.
(sling-org-apache-sling-models-jacksonexporter) 02/02: SLING-12360 apply spotless code formatting
This is an automated email from the ASF dual-hosted git repository. sseifert pushed a commit to branch feature/SLING-12360-parent-60 in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-models-jacksonexporter.git commit a76be12333257243254f9996e4a570aff0605716 Author: Stefan Seifert AuthorDate: Mon Jun 24 14:49:00 2024 +0200 SLING-12360 apply spotless code formatting --- pom.xml| 40 +-- .../models/jacksonexporter/ModuleProvider.java | 30 .../ConfigurableSerializationModuleProvider.java | 71 +- .../impl/EnumerationSerializer.java| 33 - .../impl/HttpServletRequestMixin.java | 39 +- .../impl/IgnoringResourceResolverMixin.java| 8 +-- .../jacksonexporter/impl/JacksonExporter.java | 44 ++-- .../impl/ModelSkippingSerializers.java | 29 .../jacksonexporter/impl/PropertiesUtil.java | 3 +- .../impl/RequestModuleProvider.java| 36 +- .../impl/ResourceModuleProvider.java | 45 ++-- .../jacksonexporter/impl/ResourceSerializer.java | 84 -- .../jacksonexporter/impl/ServletRequestMixin.java | 37 +- .../impl/SlingHttpServletRequestMixin.java | 37 +- .../impl/WarningResourceResolverMixin.java | 31 +++- .../JacksonExporterLimitSerializationTest.java | 80 ++--- .../impl/JacksonExporterMappingOptionsTest.java| 30 .../impl/ModelSkippingSerializersTest.java | 35 - .../jacksonexporter/impl/PropertiesUtilTest.java | 17 ++--- .../jacksonexporter/impl/example/ExamplePojo.java | 1 - .../impl/example/PojoWithResourceResolver.java | 10 +-- .../jacksonexporter/impl/util/LogCapture.java | 16 ++--- 22 files changed, 375 insertions(+), 381 deletions(-) diff --git a/pom.xml b/pom.xml index 576c1cd..b907238 100644 --- a/pom.xml +++ b/pom.xml @@ -1,4 +1,4 @@ - +
(sling-org-apache-sling-models-jacksonexporter) 01/02: SLING-12360 Update to Parent 60, Java 11 Minimum Version
This is an automated email from the ASF dual-hosted git repository.
sseifert pushed a commit to branch feature/SLING-12360-parent-60
in repository
https://gitbox.apache.org/repos/asf/sling-org-apache-sling-models-jacksonexporter.git
commit 6bde19ef00b8b052a347e90cd01c72c326bdc451
Author: Stefan Seifert
AuthorDate: Mon Jun 24 14:48:19 2024 +0200
SLING-12360 Update to Parent 60, Java 11 Minimum Version
---
.sling-module.json | 5 +
pom.xml| 3 +--
2 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/.sling-module.json b/.sling-module.json
new file mode 100644
index 000..cfad4d2
--- /dev/null
+++ b/.sling-module.json
@@ -0,0 +1,5 @@
+{
+ "jenkins": {
+"jdks": [17, 21]
+ }
+}
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index 11950b6..576c1cd 100644
--- a/pom.xml
+++ b/pom.xml
@@ -22,7 +22,7 @@
org.apache.sling
sling-bundle-parent
-49
+60
@@ -39,7 +39,6 @@
-8
2023-07-13T09:44:49Z
(sling-org-apache-sling-models-jacksonexporter) branch feature/SLING-12360-parent-60 created (now a76be12)
This is an automated email from the ASF dual-hosted git repository. sseifert pushed a change to branch feature/SLING-12360-parent-60 in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-models-jacksonexporter.git at a76be12 SLING-12360 apply spotless code formatting This branch includes the following new commits: new 6bde19e SLING-12360 Update to Parent 60, Java 11 Minimum Version new a76be12 SLING-12360 apply spotless code formatting The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference.
(sling-org-apache-sling-models-impl) branch feature/SLING-12360-parent-60 updated (e3197cf -> 16f1278)
This is an automated email from the ASF dual-hosted git repository. sseifert pushed a change to branch feature/SLING-12360-parent-60 in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-models-impl.git omit e3197cf SLING-12361 apply spotless code formatting omit 9a49a9c SLING-12361 Update to Parent 60, Java 11 Minimum Version add e8b1342 SLING-12360 Update to Parent 60, Java 11 Minimum Version add 16f1278 SLING-12360 apply spotless code formatting 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 (e3197cf) \ N -- N -- N refs/heads/feature/SLING-12360-parent-60 (16f1278) 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:
