You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by ro...@apache.org on 2023/06/02 11:38:18 UTC
[sling-org-apache-sling-servlets-get] branch master updated (f706512 -> 52bf987)
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-servlets-get.git
from f706512 cosmetic: eliminate duplicate definition of jackrabbit-jcr-commons dependency
new dacf09a SLING-11897 - Default Get Servlet tests fail on Java 17
new 52bf987 Update to parent pom 48
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 | 15 ++++++++-------
1 file changed, 8 insertions(+), 7 deletions(-)
[sling-org-apache-sling-servlets-get] 02/02: Update to parent pom 48
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-servlets-get.git
commit 52bf9875a749701713ff3f4247f8e3fe8c6a5ab7
Author: Robert Munteanu <ro...@apache.org>
AuthorDate: Fri Jun 2 13:27:42 2023 +0200
Update to parent pom 48
---
pom.xml | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index ff2e23e..536abd0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.sling</groupId>
<artifactId>sling-bundle-parent</artifactId>
- <version>41</version>
+ <version>48</version>
<relativePath />
</parent>
@@ -45,6 +45,7 @@
<properties>
<site.jira.version.id>12314473</site.jira.version.id>
+ <project.build.outputTimestamp>1</project.build.outputTimestamp>
</properties>
<build>
[sling-org-apache-sling-servlets-get] 01/02: SLING-11897 - Default Get Servlet tests fail on Java 17
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-servlets-get.git
commit dacf09a6f4f6311bc110b423c6a37ed342b0466a
Author: Robert Munteanu <ro...@apache.org>
AuthorDate: Fri Jun 2 11:36:54 2023 +0200
SLING-11897 - Default Get Servlet tests fail on Java 17
- update to a more recent version of sling-mock-oak
- ensure that it is on the classpath before sling-mock.junit4, so that the Oak
dependency is not overridden
---
pom.xml | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/pom.xml b/pom.xml
index ad813ee..ff2e23e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -151,6 +151,12 @@
<version>1.2.4</version>
<scope>provided</scope>
</dependency>
+ <dependency>
+ <groupId>org.apache.sling</groupId>
+ <artifactId>org.apache.sling.testing.sling-mock-oak</artifactId>
+ <scope>test</scope>
+ <version>3.1.10-1.44.0</version>
+ </dependency>
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.testing.sling-mock.junit4</artifactId>
@@ -181,12 +187,6 @@
<version>2.8.0</version>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.apache.sling</groupId>
- <artifactId>org.apache.sling.testing.sling-mock-oak</artifactId>
- <scope>test</scope>
- <version>2.1.10-1.16.0</version>
- </dependency>
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.servlet-helpers</artifactId>