You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by ol...@apache.org on 2022/10/24 08:09:04 UTC
[sling-org-apache-sling-karaf-integration-tests] branch master updated (dd96193 -> 93d9b56)
This is an automated email from the ASF dual-hosted git repository.
olli pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-karaf-integration-tests.git
from dd96193 SLING-3027 Improve Launchpad Karaf Features
new 233e52b SLING-11215 Upgrade Karaf to 4.4
new 707c29b style
new ad683e5 SLING-3017 Improve Karaf integration tests
new 93d9b56 SLING-11650 Update to Sling (Bundle) Parent 49
The 4 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 | 9 ++++++---
.../java/org/apache/sling/karaf/testing/KarafTestSupport.java | 2 +-
.../org/apache/sling/karaf/tests/bootstrap/JackrabbitOakIT.java | 1 -
.../sling/karaf/tests/bootstrap/SlingQuickstartOakMongoIT.java | 4 ++--
4 files changed, 9 insertions(+), 7 deletions(-)
[sling-org-apache-sling-karaf-integration-tests] 04/04: SLING-11650 Update to Sling (Bundle) Parent 49
Posted by ol...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
olli pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-karaf-integration-tests.git
commit 93d9b5620ee1e79b5fc85dbea85f28cd11588756
Author: Oliver Lietz <ol...@apache.org>
AuthorDate: Mon Oct 24 09:56:29 2022 +0200
SLING-11650 Update to Sling (Bundle) Parent 49
---
pom.xml | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index c5d2cc0..217d07a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.sling</groupId>
<artifactId>sling-bundle-parent</artifactId>
- <version>47</version>
+ <version>49</version>
<relativePath/>
</parent>
@@ -165,11 +165,13 @@
<groupId>org.ops4j.pax.exam</groupId>
<artifactId>pax-exam</artifactId>
<version>${org.ops4j.pax.exam.version}</version>
+ <scope>compile</scope>
</dependency>
<dependency>
<groupId>org.ops4j.pax.exam</groupId>
<artifactId>pax-exam-container-karaf</artifactId>
<version>${org.ops4j.pax.exam.version}</version>
+ <scope>compile</scope>
</dependency>
<dependency>
<groupId>org.ops4j.pax.exam</groupId>
@@ -181,6 +183,7 @@
<groupId>org.ops4j.pax.tinybundles</groupId>
<artifactId>tinybundles</artifactId>
<version>3.0.0</version>
+ <scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.karaf</groupId>
[sling-org-apache-sling-karaf-integration-tests] 02/04: style
Posted by ol...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
olli pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-karaf-integration-tests.git
commit 707c29b554abfe920144608eb5c1cbc314e9b750
Author: Oliver Lietz <ol...@apache.org>
AuthorDate: Mon Oct 24 09:53:51 2022 +0200
style
---
src/main/java/org/apache/sling/karaf/testing/KarafTestSupport.java | 2 +-
.../java/org/apache/sling/karaf/tests/bootstrap/JackrabbitOakIT.java | 1 -
2 files changed, 1 insertion(+), 2 deletions(-)
diff --git a/src/main/java/org/apache/sling/karaf/testing/KarafTestSupport.java b/src/main/java/org/apache/sling/karaf/testing/KarafTestSupport.java
index c390525..f7e05f7 100644
--- a/src/main/java/org/apache/sling/karaf/testing/KarafTestSupport.java
+++ b/src/main/java/org/apache/sling/karaf/testing/KarafTestSupport.java
@@ -74,7 +74,7 @@ public abstract class KarafTestSupport {
public KarafTestSupport() {
}
- protected synchronized int findFreePort() {
+ protected static synchronized int findFreePort() {
try (final ServerSocket serverSocket = new ServerSocket(0)) {
return serverSocket.getLocalPort();
} catch (Exception e) {
diff --git a/src/test/java/org/apache/sling/karaf/tests/bootstrap/JackrabbitOakIT.java b/src/test/java/org/apache/sling/karaf/tests/bootstrap/JackrabbitOakIT.java
index e390a0f..34ff941 100644
--- a/src/test/java/org/apache/sling/karaf/tests/bootstrap/JackrabbitOakIT.java
+++ b/src/test/java/org/apache/sling/karaf/tests/bootstrap/JackrabbitOakIT.java
@@ -57,7 +57,6 @@ public class JackrabbitOakIT extends KarafTestSupport {
assertEquals(Bundle.ACTIVE, bundle.getState());
}
-
@Test
public void testOrgApacheJackrabbitOakBlobPlugins() {
final Bundle bundle = findBundle("org.apache.jackrabbit.oak-blob-plugins");
[sling-org-apache-sling-karaf-integration-tests] 03/04: SLING-3017 Improve Karaf integration tests
Posted by ol...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
olli pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-karaf-integration-tests.git
commit ad683e53837f01f026de919b6562e571a0d8a625
Author: Oliver Lietz <ol...@apache.org>
AuthorDate: Mon Oct 24 09:56:14 2022 +0200
SLING-3017 Improve Karaf integration tests
* use new wrap feature name
* remove testcontainers' manifest fix
---
.../apache/sling/karaf/tests/bootstrap/SlingQuickstartOakMongoIT.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingQuickstartOakMongoIT.java b/src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingQuickstartOakMongoIT.java
index 63e9e17..d3a4f2e 100644
--- a/src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingQuickstartOakMongoIT.java
+++ b/src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingQuickstartOakMongoIT.java
@@ -67,12 +67,12 @@ public class SlingQuickstartOakMongoIT extends AbstractSlingQuickstartOakTestSup
return combine(
baseConfiguration(),
allowEveryoneReadContent(),
- editConfigurationFilePut("etc/org.apache.karaf.features.cfg", "featuresBoot", "(wrap)"),
+ editConfigurationFilePut("etc/org.apache.karaf.features.cfg", "featuresBoot", "(pax-url-wrap)"),
editConfigurationFilePut("etc/org.apache.jackrabbit.oak.plugins.document.DocumentNodeStoreService.config", "mongouri", mongoUri),
addSlingFeatures("sling-quickstart-oak-mongo"),
addFelixHttpFeature(),
wrappedBundle(mavenBundle().groupId("org.rnorth.duct-tape").artifactId("duct-tape").versionAsInProject()),
- wrappedBundle(mavenBundle().groupId("org.testcontainers").artifactId("testcontainers").versionAsInProject()).imports("org.junit.rules").overwriteManifest(WrappedUrlProvisionOption.OverwriteMode.MERGE)
+ wrappedBundle(mavenBundle().groupId("org.testcontainers").artifactId("testcontainers").versionAsInProject())
);
}
[sling-org-apache-sling-karaf-integration-tests] 01/04: SLING-11215 Upgrade Karaf to 4.4
Posted by ol...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
olli pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-karaf-integration-tests.git
commit 233e52b8343e6a9b4d76d2c52788bcc3e5721f29
Author: Oliver Lietz <ol...@apache.org>
AuthorDate: Mon Oct 24 08:31:53 2022 +0200
SLING-11215 Upgrade Karaf to 4.4
use Karaf 4.4.2
---
pom.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pom.xml b/pom.xml
index b8e9e16..c5d2cc0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -104,7 +104,7 @@
<dependency>
<groupId>org.apache.karaf.features</groupId>
<artifactId>org.apache.karaf.features.core</artifactId>
- <version>4.4.1</version>
+ <version>4.4.2</version>
<scope>provided</scope>
</dependency>
<!-- Apache Sling -->
@@ -186,7 +186,7 @@
<groupId>org.apache.karaf</groupId>
<artifactId>apache-karaf</artifactId>
<type>tar.gz</type>
- <version>4.4.1</version>
+ <version>4.4.2</version>
<scope>test</scope>
<exclusions>
<exclusion>