You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by ss...@apache.org on 2024/11/05 10:01:36 UTC

(sling-org-apache-sling-models-integration-tests) branch feature/SLING-12470-fix-its created (now 4131b6d)

This is an automated email from the ASF dual-hosted git repository.

sseifert pushed a change to branch feature/SLING-12470-fix-its
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-models-integration-tests.git


      at 4131b6d  update to latest versions

This branch includes the following new commits:

     new c0c62f7  running baseline
     new 6b47e61  last running version
     new cd9e5b8  ignore DummyClass for junit test inspection to avoid junit warnings in log
     new d7e0dfa  get ITs running with models impl 1.6.0
     new 4131b6d  update to latest versions

The 5 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-integration-tests) 05/05: update to latest versions

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-12470-fix-its
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-models-integration-tests.git

commit 4131b6dd50812421ea3058890ddd8906478ec530
Author: Stefan Seifert <st...@users.noreply.github.com>
AuthorDate: Tue Nov 5 10:54:31 2024 +0100

    update to latest versions
---
 pom.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pom.xml b/pom.xml
index d3481e3..95318dd 100644
--- a/pom.xml
+++ b/pom.xml
@@ -252,19 +252,19 @@
         <dependency>
             <groupId>org.apache.sling</groupId>
             <artifactId>org.apache.sling.models.api</artifactId>
-            <version>1.5.0</version>
+            <version>1.5.5-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.sling</groupId>
             <artifactId>org.apache.sling.models.impl</artifactId>
-            <version>1.6.0</version>
+            <version>1.7.3-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.sling</groupId>
             <artifactId>org.apache.sling.models.jacksonexporter</artifactId>
-            <version>1.1.3-SNAPSHOT</version>
+            <version>1.1.5-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
         


(sling-org-apache-sling-models-integration-tests) 04/05: get ITs running with models impl 1.6.0

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-12470-fix-its
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-models-integration-tests.git

commit d7e0dfae81e5521119c5933ce3db8685a4a74434
Author: Stefan Seifert <st...@users.noreply.github.com>
AuthorDate: Tue Nov 5 10:50:35 2024 +0100

    get ITs running with models impl 1.6.0
---
 pom.xml                         | 4 ++--
 src/test/provisioning/sling.txt | 7 +++++++
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index d9fb8a9..d3481e3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -252,13 +252,13 @@
         <dependency>
             <groupId>org.apache.sling</groupId>
             <artifactId>org.apache.sling.models.api</artifactId>
-            <version>1.4.2</version>
+            <version>1.5.0</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.sling</groupId>
             <artifactId>org.apache.sling.models.impl</artifactId>
-            <version>1.5.2</version>
+            <version>1.6.0</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
diff --git a/src/test/provisioning/sling.txt b/src/test/provisioning/sling.txt
index 432d466..d5d7e47 100644
--- a/src/test/provisioning/sling.txt
+++ b/src/test/provisioning/sling.txt
@@ -23,6 +23,13 @@
 [artifacts]
     org.apache.sling/org.apache.sling.starter/11/slingstart
 
+    # Update to newer bundles required by sling models impl
+    org.osgi/org.osgi.util.converter/1.0.9
+    org.apache.sling/org.apache.sling.api/2.21.0
+    org.apache.sling/org.apache.sling.resourceresolver/1.6.16
+    org.apache.sling/org.apache.sling.servlets.resolver/2.5.8
+    org.apache.sling/org.apache.sling.scripting.core/2.1.0
+
     # Use versions as defined in POM
     org.apache.sling/org.apache.sling.models.api
     org.apache.sling/org.apache.sling.models.impl


(sling-org-apache-sling-models-integration-tests) 03/05: ignore DummyClass for junit test inspection to avoid junit warnings in log

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-12470-fix-its
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-models-integration-tests.git

commit cd9e5b8656b818e3539ff2160b8d0c6fe07a3b7e
Author: Stefan Seifert <st...@users.noreply.github.com>
AuthorDate: Tue Nov 5 10:31:50 2024 +0100

    ignore DummyClass for junit test inspection to avoid junit warnings in log
---
 src/test/java/org/apache/sling/models/testing/ModelFactorySimpleIT.java | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/test/java/org/apache/sling/models/testing/ModelFactorySimpleIT.java b/src/test/java/org/apache/sling/models/testing/ModelFactorySimpleIT.java
index e5bc8cc..e807f02 100644
--- a/src/test/java/org/apache/sling/models/testing/ModelFactorySimpleIT.java
+++ b/src/test/java/org/apache/sling/models/testing/ModelFactorySimpleIT.java
@@ -37,6 +37,7 @@ import org.apache.sling.models.it.models.implextend.InvalidImplementsInterfacePr
 import org.apache.sling.models.it.models.implextend.SampleServiceInterface;
 import org.junit.After;
 import org.junit.Before;
+import org.junit.Ignore;
 import org.junit.Rule;
 import org.junit.Test;
 
@@ -89,6 +90,7 @@ public class ModelFactorySimpleIT {
         assertSame("Adaptable is not injected", resource, model.getResource());
     }
 
+    @Ignore
     private static final class DummyClass {
     }
 


(sling-org-apache-sling-models-integration-tests) 02/05: last running version

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-12470-fix-its
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-models-integration-tests.git

commit 6b47e61ce081f8953a3239b5fbb8d47aa71da3c1
Author: Stefan Seifert <st...@users.noreply.github.com>
AuthorDate: Tue Nov 5 10:23:39 2024 +0100

    last running version
---
 pom.xml                         | 4 ++--
 src/test/provisioning/sling.txt | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/pom.xml b/pom.xml
index a370874..d9fb8a9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -252,13 +252,13 @@
         <dependency>
             <groupId>org.apache.sling</groupId>
             <artifactId>org.apache.sling.models.api</artifactId>
-            <version>1.4.3-SNAPSHOT</version>
+            <version>1.4.2</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.sling</groupId>
             <artifactId>org.apache.sling.models.impl</artifactId>
-            <version>1.5.3-SNAPSHOT</version>
+            <version>1.5.2</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
diff --git a/src/test/provisioning/sling.txt b/src/test/provisioning/sling.txt
index d714ab9..432d466 100644
--- a/src/test/provisioning/sling.txt
+++ b/src/test/provisioning/sling.txt
@@ -24,12 +24,12 @@
     org.apache.sling/org.apache.sling.starter/11/slingstart
 
     # Use versions as defined in POM
-#    org.apache.sling/org.apache.sling.models.api
-#    org.apache.sling/org.apache.sling.models.impl
+    org.apache.sling/org.apache.sling.models.api
+    org.apache.sling/org.apache.sling.models.impl
 
     # Additional test bundles
     org.apache.sling/org.apache.sling.junit.core
-#    org.apache.sling/org.apache.sling.models.integration-tests
+    org.apache.sling/org.apache.sling.models.integration-tests
 
 [configurations]
     # configure service user mapping for junit core (being used in the IT itself)


(sling-org-apache-sling-models-integration-tests) 01/05: running baseline

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-12470-fix-its
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-models-integration-tests.git

commit c0c62f717949e6b3c3137281a8afcd0d608d3a03
Author: Stefan Seifert <st...@users.noreply.github.com>
AuthorDate: Tue Nov 5 10:18:33 2024 +0100

    running baseline
---
 src/test/provisioning/sling-models-jacksonexporter.txt | 2 +-
 src/test/provisioning/sling.txt                        | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/test/provisioning/sling-models-jacksonexporter.txt b/src/test/provisioning/sling-models-jacksonexporter.txt
index cf590fa..a2a903d 100644
--- a/src/test/provisioning/sling-models-jacksonexporter.txt
+++ b/src/test/provisioning/sling-models-jacksonexporter.txt
@@ -21,4 +21,4 @@
 [feature name=models-jacksonexporter]
 
 [artifacts]
-  org.apache.sling/org.apache.sling.models.jacksonexporter
+    org.apache.sling/org.apache.sling.models.jacksonexporter
diff --git a/src/test/provisioning/sling.txt b/src/test/provisioning/sling.txt
index 432d466..d714ab9 100644
--- a/src/test/provisioning/sling.txt
+++ b/src/test/provisioning/sling.txt
@@ -24,12 +24,12 @@
     org.apache.sling/org.apache.sling.starter/11/slingstart
 
     # Use versions as defined in POM
-    org.apache.sling/org.apache.sling.models.api
-    org.apache.sling/org.apache.sling.models.impl
+#    org.apache.sling/org.apache.sling.models.api
+#    org.apache.sling/org.apache.sling.models.impl
 
     # Additional test bundles
     org.apache.sling/org.apache.sling.junit.core
-    org.apache.sling/org.apache.sling.models.integration-tests
+#    org.apache.sling/org.apache.sling.models.integration-tests
 
 [configurations]
     # configure service user mapping for junit core (being used in the IT itself)