You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by cs...@apache.org on 2020/01/16 17:53:21 UTC
[sling-org-apache-sling-distribution-journal-it] branch master
updated: SLING-9010 - Fix jenkins build
This is an automated email from the ASF dual-hosted git repository.
cschneider pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-distribution-journal-it.git
The following commit(s) were added to refs/heads/master by this push:
new d14d72d SLING-9010 - Fix jenkins build
d14d72d is described below
commit d14d72df5aa01d49d98613bd405f3d9abc0bf1a5
Author: Christian Schneider <cs...@adobe.com>
AuthorDate: Thu Jan 16 18:53:11 2020 +0100
SLING-9010 - Fix jenkins build
---
pom.xml | 2 +-
.../distribution/journal/it/DistributionTestSupport.java | 13 ++++++++++++-
2 files changed, 13 insertions(+), 2 deletions(-)
diff --git a/pom.xml b/pom.xml
index 8cf530b..7a64c8b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -42,7 +42,7 @@
</description>
<properties>
- <org.ops4j.pax.exam.version>4.11.0</org.ops4j.pax.exam.version>
+ <org.ops4j.pax.exam.version>4.12.0</org.ops4j.pax.exam.version>
</properties>
<scm>
diff --git a/src/test/java/org/apache/sling/distribution/journal/it/DistributionTestSupport.java b/src/test/java/org/apache/sling/distribution/journal/it/DistributionTestSupport.java
index 3bf7e48..1223afd 100644
--- a/src/test/java/org/apache/sling/distribution/journal/it/DistributionTestSupport.java
+++ b/src/test/java/org/apache/sling/distribution/journal/it/DistributionTestSupport.java
@@ -25,6 +25,7 @@ import static java.util.Collections.singletonList;
import static java.util.Collections.singletonMap;
import static org.apache.kafka.clients.admin.AdminClient.create;
import static org.apache.kafka.clients.producer.ProducerConfig.BOOTSTRAP_SERVERS_CONFIG;
+import static org.apache.sling.testing.paxexam.SlingOptions.paxTinybundles;
import static org.apache.sling.testing.paxexam.SlingOptions.slingDistribution;
import static org.apache.sling.testing.paxexam.SlingOptions.slingQuickstartOak;
import static org.ops4j.pax.exam.Constants.START_LEVEL_SYSTEM_BUNDLES;
@@ -32,7 +33,9 @@ import static org.ops4j.pax.exam.CoreOptions.bootDelegationPackage;
import static org.ops4j.pax.exam.CoreOptions.bundle;
import static org.ops4j.pax.exam.CoreOptions.composite;
import static org.ops4j.pax.exam.CoreOptions.frameworkStartLevel;
+import static org.ops4j.pax.exam.CoreOptions.keepCaches;
import static org.ops4j.pax.exam.CoreOptions.mavenBundle;
+import static org.ops4j.pax.exam.CoreOptions.repository;
import static org.ops4j.pax.exam.CoreOptions.systemProperty;
import static org.ops4j.pax.exam.CoreOptions.url;
import static org.ops4j.pax.exam.CoreOptions.vmOption;
@@ -57,6 +60,7 @@ import org.apache.sling.testing.paxexam.SlingOptions;
import org.apache.sling.testing.paxexam.TestSupport;
import org.ops4j.pax.exam.ConfigurationManager;
import org.ops4j.pax.exam.Constants;
+import org.ops4j.pax.exam.CoreOptions;
import org.ops4j.pax.exam.Option;
import org.ops4j.pax.exam.options.CompositeOption;
import org.ops4j.pax.exam.options.DefaultCompositeOption;
@@ -104,7 +108,14 @@ public class DistributionTestSupport extends TestSupport {
SlingOptions.versionResolver.setVersion("org.slf4j", "log4j-over-slf4j", "1.7.6");
Option baseOptions = composite(
- super.baseConfiguration(),
+ failOnUnresolvedBundles(),
+ keepCaches(),
+ localMavenRepo(),
+ //repository("https://repository.apache.org/snapshots/").id("apache-snapshots").allowSnapshots(),
+ repository("https://repo1.maven.org/maven2").id("central"),
+ CoreOptions.workingDirectory(workingDirectory()),
+ mavenBundle().groupId("org.apache.sling").artifactId("org.apache.sling.testing.paxexam").versionAsInProject(),
+ paxTinybundles(),
SlingOptions.logback(),
mavenBundle().groupId("org.slf4j").artifactId("log4j-over-slf4j").version(SlingOptions.versionResolver),