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 2019/12/16 20:56:27 UTC
[sling-org-apache-sling-karaf-integration-tests] branch master
updated (199be10 -> 6e991f7)
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 199be10 SLING-3027 Improve Launchpad Karaf Features
new 78dac2c SLING-3017 Improve Karaf integration tests
new 6e991f7 do not fail on missing baseline
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 | 10 +++-------
.../karaf/tests/bootstrap/SlingCommonsMessagingMailIT.java | 13 -------------
2 files changed, 3 insertions(+), 20 deletions(-)
[sling-org-apache-sling-karaf-integration-tests] 01/02: 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 78dac2ce925fb7de832388375e62862ee7339239
Author: Oliver Lietz <ol...@apache.org>
AuthorDate: Mon Dec 16 21:41:19 2019 +0100
SLING-3017 Improve Karaf integration tests
adjust SlingCommonsMessagingMailIT
---
.../karaf/tests/bootstrap/SlingCommonsMessagingMailIT.java | 13 -------------
1 file changed, 13 deletions(-)
diff --git a/src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingCommonsMessagingMailIT.java b/src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingCommonsMessagingMailIT.java
index 5a5a3cf..adb68fb 100644
--- a/src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingCommonsMessagingMailIT.java
+++ b/src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingCommonsMessagingMailIT.java
@@ -18,9 +18,6 @@
*/
package org.apache.sling.karaf.tests.bootstrap;
-import javax.inject.Inject;
-
-import org.apache.sling.commons.messaging.MessageService;
import org.apache.sling.karaf.testing.KarafTestSupport;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -30,28 +27,18 @@ import org.ops4j.pax.exam.OptionUtils;
import org.ops4j.pax.exam.junit.PaxExam;
import org.ops4j.pax.exam.spi.reactors.ExamReactorStrategy;
import org.ops4j.pax.exam.spi.reactors.PerClass;
-import org.ops4j.pax.exam.util.Filter;
import org.osgi.framework.Bundle;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
-import static org.ops4j.pax.exam.karaf.options.KarafDistributionOption.editConfigurationFilePut;
@RunWith(PaxExam.class)
@ExamReactorStrategy(PerClass.class)
public class SlingCommonsMessagingMailIT extends KarafTestSupport {
- @Inject
- @Filter(timeout = 300000)
- public MessageService messageService;
-
@Configuration
public Option[] configuration() {
return OptionUtils.combine(baseConfiguration(),
- editConfigurationFilePut("etc/org.apache.sling.commons.messaging.mail.internal.SimpleMailBuilder.config", "subject", "Default Subject"),
- editConfigurationFilePut("etc/org.apache.sling.commons.messaging.mail.internal.SimpleMailBuilder.config", "from", "from@example.net"),
- editConfigurationFilePut("etc/org.apache.sling.commons.messaging.mail.internal.SimpleMailBuilder.config", "smtp.hostname", "localhost"),
- editConfigurationFilePut("etc/org.apache.sling.commons.messaging.mail.internal.SimpleMailBuilder.config", "smtp.port", "25"),
addSlingFeatures("sling-commons-messaging-mail")
);
}
[sling-org-apache-sling-karaf-integration-tests] 02/02: do not fail
on missing baseline
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 6e991f745c9dbc72981fd5c1603198cb77ecde80
Author: Oliver Lietz <ol...@apache.org>
AuthorDate: Mon Dec 16 21:52:07 2019 +0100
do not fail on missing baseline
---
pom.xml | 10 +++-------
1 file changed, 3 insertions(+), 7 deletions(-)
diff --git a/pom.xml b/pom.xml
index 210024e..21f67da 100644
--- a/pom.xml
+++ b/pom.xml
@@ -243,15 +243,11 @@
<plugins>
<plugin>
<groupId>biz.aQute.bnd</groupId>
- <artifactId>bnd-maven-plugin</artifactId>
- </plugin>
- <!-- enable baseline after initial release -->
- <!--
- <plugin>
- <groupId>biz.aQute.bnd</groupId>
<artifactId>bnd-baseline-maven-plugin</artifactId>
+ <configuration>
+ <failOnMissing>false</failOnMissing>
+ </configuration>
</plugin>
- -->
<plugin>
<groupId>org.apache.servicemix.tooling</groupId>
<artifactId>depends-maven-plugin</artifactId>