You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by ss...@apache.org on 2021/12/01 17:39:54 UTC
[sling-org-apache-sling-models-integration-tests] branch feature/SLING-10948-update-integration-tests updated (aacf60b -> 124710b)
This is an automated email from the ASF dual-hosted git repository.
sseifert pushed a change to branch feature/SLING-10948-update-integration-tests
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-models-integration-tests.git.
from aacf60b switch to commons lang 3
new 8454ce6 register models via bnd plugin
new 124710b comment beanutils dependency
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:
pom.xml | 43 ++++++++++++++++++-------------------------
1 file changed, 18 insertions(+), 25 deletions(-)
[sling-org-apache-sling-models-integration-tests] 02/02: comment beanutils dependency
Posted by ss...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
sseifert pushed a commit to branch feature/SLING-10948-update-integration-tests
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-models-integration-tests.git
commit 124710b0a5dea9683946aa275c7245d30044e819
Author: Stefan Seifert <st...@users.noreply.github.com>
AuthorDate: Wed Dec 1 18:36:18 2021 +0100
comment beanutils dependency
---
pom.xml | 13 +++++++------
1 file changed, 7 insertions(+), 6 deletions(-)
diff --git a/pom.xml b/pom.xml
index 07ccb35..d7f5cb6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -293,12 +293,6 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>commons-beanutils</groupId>
- <artifactId>commons-beanutils</artifactId>
- <version>1.9.2</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<version>1.7.25</version>
@@ -315,6 +309,13 @@
<artifactId>junit</artifactId>
<scope>test</scope>
</dependency>
+ <!-- This dependency is not actually used within Sling. It's used for ModelWithOptionalImport test case to test a model with a class that is not resolved. -->
+ <dependency>
+ <groupId>commons-beanutils</groupId>
+ <artifactId>commons-beanutils</artifactId>
+ <version>1.9.2</version>
+ <scope>provided</scope>
+ </dependency>
</dependencies>
<profiles>
[sling-org-apache-sling-models-integration-tests] 01/02: register models via bnd plugin
Posted by ss...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
sseifert pushed a commit to branch feature/SLING-10948-update-integration-tests
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-models-integration-tests.git
commit 8454ce65ecf8a1cc1102539e3b5e51329e1abf46
Author: Stefan Seifert <st...@users.noreply.github.com>
AuthorDate: Wed Dec 1 18:33:53 2021 +0100
register models via bnd plugin
---
pom.xml | 30 +++++++++++-------------------
1 file changed, 11 insertions(+), 19 deletions(-)
diff --git a/pom.xml b/pom.xml
index d7330b7..07ccb35 100644
--- a/pom.xml
+++ b/pom.xml
@@ -52,25 +52,6 @@
<extensions>true</extensions>
<configuration>
<instructions>
- <Sling-Model-Packages>
- org.apache.sling.models.it.nonexisting,
- org.apache.sling.models.it.noclasses,
- org.apache.sling.models.it.models,
- org.apache.sling.models.it.rtbound,
- org.apache.sling.models.it.rtboundpicker,
- org.apache.sling.models.it.delegate.request,
- org.apache.sling.models.it.delegate.resource
- </Sling-Model-Packages>
- <Sling-Model-Classes>
- org.apache.sling.models.it.exporter.BaseComponent,
- org.apache.sling.models.it.exporter.ComponentImpl,
- org.apache.sling.models.it.exporter.ExtendedComponent,
- org.apache.sling.models.it.exporter.BaseRequestComponent,
- org.apache.sling.models.it.exporter.RequestComponentImpl,
- org.apache.sling.models.it.exporter.ExtendedRequestComponent,
- org.apache.sling.models.it.exporter.DoubledFirstComponent,
- org.apache.sling.models.it.exporter.DoubledSecondComponent
- </Sling-Model-Classes>
<Sling-Test-Regexp>.*Test</Sling-Test-Regexp>
<Export-Package>
org.apache.sling.models.it.delegate.request,
@@ -87,8 +68,19 @@
org.apache.commons.beanutils;resolution:=optional,
*
</Import-Package>
+ <_plugin>
+ <!-- Generate bundle header for Sling Models classes -->
+ org.apache.sling.bnd.models.ModelsScannerPlugin
+ </_plugin>
</instructions>
</configuration>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.sling</groupId>
+ <artifactId>org.apache.sling.bnd.models</artifactId>
+ <version>1.0.0</version>
+ </dependency>
+ </dependencies>
</plugin>
<plugin>
<groupId>org.apache.felix</groupId>