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/09/02 12:53:29 UTC
[sling-org-apache-sling-testing-paxexam] branch master updated (d751b91 -> 46eeb1d)
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-testing-paxexam.git
from d751b91 SLING-11561 Update to Sling Bundle Parent 49
new ad67fbb SLING-11561 Update to Sling Bundle Parent 49
new 62b1393 SLING-11490 Provide JUnit Option
new c4f6d11 remove unused imports
new 46eeb1d make common configuration option accessible
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 | 6 +++---
.../apache/sling/testing/paxexam/SlingVersionResolver.java | 2 +-
.../java/org/apache/sling/testing/paxexam/TestSupport.java | 11 ++++++-----
src/main/resources/templates/SlingVersionResolver.hbs | 2 +-
4 files changed, 11 insertions(+), 10 deletions(-)
[sling-org-apache-sling-testing-paxexam] 01/04: SLING-11561 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-testing-paxexam.git
commit ad67fbbd673eba71ebea8baa2412ed0c5b0c9326
Author: Oliver Lietz <ol...@apache.org>
AuthorDate: Fri Sep 2 14:38:34 2022 +0200
SLING-11561 Update to Sling Bundle Parent 49
fix wrong scopes
---
pom.xml | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/pom.xml b/pom.xml
index b6b4c73..d409c59 100644
--- a/pom.xml
+++ b/pom.xml
@@ -105,7 +105,7 @@
<dependency>
<groupId>org.ops4j.pax.tinybundles</groupId>
<artifactId>tinybundles</artifactId>
- <scope>provided</scope>
+ <scope>compile</scope>
<version>3.0.0</version>
</dependency>
<!-- logging -->
@@ -123,13 +123,13 @@
<dependency>
<groupId>org.ops4j.pax.exam</groupId>
<artifactId>pax-exam</artifactId>
- <scope>provided</scope>
+ <scope>compile</scope>
<version>${org.ops4j.pax.exam.version}</version>
</dependency>
<dependency>
<groupId>org.ops4j.pax.exam</groupId>
<artifactId>pax-exam-cm</artifactId>
- <scope>provided</scope>
+ <scope>compile</scope>
<version>${org.ops4j.pax.exam.version}</version>
</dependency>
<dependency>
[sling-org-apache-sling-testing-paxexam] 02/04: SLING-11490 Provide JUnit Option
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-testing-paxexam.git
commit 62b13937d1b0c0961eec87244ae678ac55ff66ad
Author: Oliver Lietz <ol...@apache.org>
AuthorDate: Fri Sep 2 14:41:39 2022 +0200
SLING-11490 Provide JUnit Option
downgrade JUnit to 4.12
---
.../java/org/apache/sling/testing/paxexam/SlingVersionResolver.java | 2 +-
src/main/resources/templates/SlingVersionResolver.hbs | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/main/java/org/apache/sling/testing/paxexam/SlingVersionResolver.java b/src/main/java/org/apache/sling/testing/paxexam/SlingVersionResolver.java
index e8da9de..7db25d7 100644
--- a/src/main/java/org/apache/sling/testing/paxexam/SlingVersionResolver.java
+++ b/src/main/java/org/apache/sling/testing/paxexam/SlingVersionResolver.java
@@ -66,7 +66,7 @@ public class SlingVersionResolver implements VersionResolver {
versions.put("org.apache.groovy:groovy-json", "4.0.3");
versions.put("org.apache.groovy:groovy-xml", "4.0.3");
versions.put("org.apache.servicemix.bundles:org.apache.servicemix.bundles.jaxb-impl", "2.2.11_1");
- versions.put("org.apache.servicemix.bundles:org.apache.servicemix.bundles.junit", "4.13.2_1");
+ versions.put("org.apache.servicemix.bundles:org.apache.servicemix.bundles.junit", "4.12_1");
versions.put("org.apache.servicemix.bundles:org.apache.servicemix.bundles.tagsoup", "1.2.1_1");
versions.put("org.apache.servicemix.specs:org.apache.servicemix.specs.annotation-api-1.3", "1.3_3");
versions.put("org.apache.servicemix.specs:org.apache.servicemix.specs.activation-api-1.1", "2.9.0");
diff --git a/src/main/resources/templates/SlingVersionResolver.hbs b/src/main/resources/templates/SlingVersionResolver.hbs
index 6cfb8c8..5375b33 100644
--- a/src/main/resources/templates/SlingVersionResolver.hbs
+++ b/src/main/resources/templates/SlingVersionResolver.hbs
@@ -66,7 +66,7 @@ public class SlingVersionResolver implements VersionResolver {
versions.put("org.apache.groovy:groovy-json", "4.0.3");
versions.put("org.apache.groovy:groovy-xml", "4.0.3");
versions.put("org.apache.servicemix.bundles:org.apache.servicemix.bundles.jaxb-impl", "2.2.11_1");
- versions.put("org.apache.servicemix.bundles:org.apache.servicemix.bundles.junit", "4.13.2_1");
+ versions.put("org.apache.servicemix.bundles:org.apache.servicemix.bundles.junit", "4.12_1");
versions.put("org.apache.servicemix.bundles:org.apache.servicemix.bundles.tagsoup", "1.2.1_1");
versions.put("org.apache.servicemix.specs:org.apache.servicemix.specs.annotation-api-1.3", "1.3_3");
versions.put("org.apache.servicemix.specs:org.apache.servicemix.specs.activation-api-1.1", "2.9.0");
[sling-org-apache-sling-testing-paxexam] 04/04: make common configuration option accessible
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-testing-paxexam.git
commit 46eeb1d97b817dac3ac306c391841bd8fa12e78d
Author: Oliver Lietz <ol...@apache.org>
AuthorDate: Fri Sep 2 14:52:59 2022 +0200
make common configuration option accessible
---
src/main/java/org/apache/sling/testing/paxexam/TestSupport.java | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/src/main/java/org/apache/sling/testing/paxexam/TestSupport.java b/src/main/java/org/apache/sling/testing/paxexam/TestSupport.java
index 4a36902..7d5356c 100644
--- a/src/main/java/org/apache/sling/testing/paxexam/TestSupport.java
+++ b/src/main/java/org/apache/sling/testing/paxexam/TestSupport.java
@@ -74,7 +74,8 @@ public abstract class TestSupport {
return when(Objects.nonNull(option)).useOptions(option);
}
- private ModifiableCompositeOption configuration() {
+ // commons options for both default and server mode
+ protected ModifiableCompositeOption commonConfiguration() {
return composite(
failOnUnresolvedBundles(),
keepCaches(),
@@ -89,15 +90,17 @@ public abstract class TestSupport {
);
}
+ // default mode
protected ModifiableCompositeOption baseConfiguration() {
return composite(
- configuration(),
+ commonConfiguration(),
mavenBundle().groupId("org.apache.sling").artifactId("org.apache.sling.testing.paxexam").versionAsInProject()
);
}
+ // server mode
protected ModifiableCompositeOption serverBaseConfiguration() {
- return configuration();
+ return commonConfiguration();
}
public static int findFreePort() {
[sling-org-apache-sling-testing-paxexam] 03/04: remove unused imports
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-testing-paxexam.git
commit c4f6d11a9da3f4b1e84f2be89ae7ec1fd9fb5d7b
Author: Oliver Lietz <ol...@apache.org>
AuthorDate: Fri Sep 2 14:43:11 2022 +0200
remove unused imports
---
src/main/java/org/apache/sling/testing/paxexam/TestSupport.java | 2 --
1 file changed, 2 deletions(-)
diff --git a/src/main/java/org/apache/sling/testing/paxexam/TestSupport.java b/src/main/java/org/apache/sling/testing/paxexam/TestSupport.java
index 9ac9796..4a36902 100644
--- a/src/main/java/org/apache/sling/testing/paxexam/TestSupport.java
+++ b/src/main/java/org/apache/sling/testing/paxexam/TestSupport.java
@@ -37,8 +37,6 @@ import org.ops4j.pax.tinybundles.core.TinyBundle;
import org.osgi.service.cm.ConfigurationAdmin;
import static org.apache.sling.testing.paxexam.SlingOptions.backing;
-import static org.apache.sling.testing.paxexam.SlingOptions.hamcrest;
-import static org.apache.sling.testing.paxexam.SlingOptions.junit;
import static org.apache.sling.testing.paxexam.SlingOptions.paxTinybundles;
import static org.apache.sling.testing.paxexam.SlingOptions.spifly;
import static org.ops4j.pax.exam.CoreOptions.bundle;