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/08/27 11:21:19 UTC
[sling-org-apache-sling-testing-paxexam] branch master updated (a8e3561 -> d751b91)
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 a8e3561 SLING-9687 Update options and versions to latest features
new 0a486f2 SLING-11520 Provision junit and hamcrest options by default
new d751b91 SLING-11561 Update to Sling Bundle Parent 49
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 | 23 +++++++++-------------
.../apache/sling/testing/paxexam/TestSupport.java | 4 +---
2 files changed, 10 insertions(+), 17 deletions(-)
[sling-org-apache-sling-testing-paxexam] 02/02: 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 d751b915acb0818a0558aca69912d47d16ddea02
Author: Oliver Lietz <ol...@apache.org>
AuthorDate: Sat Aug 27 13:21:03 2022 +0200
SLING-11561 Update to Sling Bundle Parent 49
* add required dependency scopes
* remove redundant build plugins
---
pom.xml | 23 +++++++++--------------
1 file changed, 9 insertions(+), 14 deletions(-)
diff --git a/pom.xml b/pom.xml
index 5e89ed2..b6b4c73 100644
--- a/pom.xml
+++ b/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.sling</groupId>
<artifactId>sling-bundle-parent</artifactId>
- <version>48</version>
+ <version>49</version>
<relativePath />
</parent>
@@ -50,14 +50,6 @@
<build>
<plugins>
- <plugin>
- <groupId>biz.aQute.bnd</groupId>
- <artifactId>bnd-maven-plugin</artifactId>
- </plugin>
- <plugin>
- <groupId>biz.aQute.bnd</groupId>
- <artifactId>bnd-baseline-maven-plugin</artifactId>
- </plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-failsafe-plugin</artifactId>
@@ -106,13 +98,14 @@
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.framework</artifactId>
- <version>7.0.5</version>
<scope>test</scope>
+ <version>7.0.5</version>
</dependency>
<!-- OPS4J Pax -->
<dependency>
<groupId>org.ops4j.pax.tinybundles</groupId>
<artifactId>tinybundles</artifactId>
+ <scope>provided</scope>
<version>3.0.0</version>
</dependency>
<!-- logging -->
@@ -130,36 +123,38 @@
<dependency>
<groupId>org.ops4j.pax.exam</groupId>
<artifactId>pax-exam</artifactId>
+ <scope>provided</scope>
<version>${org.ops4j.pax.exam.version}</version>
</dependency>
<dependency>
<groupId>org.ops4j.pax.exam</groupId>
<artifactId>pax-exam-cm</artifactId>
+ <scope>provided</scope>
<version>${org.ops4j.pax.exam.version}</version>
</dependency>
<dependency>
<groupId>org.ops4j.pax.exam</groupId>
<artifactId>pax-exam-container-forked</artifactId>
- <version>${org.ops4j.pax.exam.version}</version>
<scope>test</scope>
+ <version>${org.ops4j.pax.exam.version}</version>
</dependency>
<dependency>
<groupId>org.ops4j.pax.exam</groupId>
<artifactId>pax-exam-junit4</artifactId>
- <version>${org.ops4j.pax.exam.version}</version>
<scope>test</scope>
+ <version>${org.ops4j.pax.exam.version}</version>
</dependency>
<dependency>
<groupId>org.ops4j.pax.exam</groupId>
<artifactId>pax-exam-link-mvn</artifactId>
- <version>${org.ops4j.pax.exam.version}</version>
<scope>test</scope>
+ <version>${org.ops4j.pax.exam.version}</version>
</dependency>
<dependency>
<groupId>org.ops4j.pax.url</groupId>
<artifactId>pax-url-wrap</artifactId>
- <version>2.6.11</version>
<scope>test</scope>
+ <version>2.6.11</version>
</dependency>
</dependencies>
[sling-org-apache-sling-testing-paxexam] 01/02: SLING-11520 Provision junit and hamcrest options by default
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 0a486f2904979bc3b3a574b56de7568a045528b7
Author: Oliver Lietz <ol...@apache.org>
AuthorDate: Sat Aug 27 13:06:28 2022 +0200
SLING-11520 Provision junit and hamcrest options by default
revert as Pax Exam 4.13 fails with newer JUnit and Hamcrest versions
---
src/main/java/org/apache/sling/testing/paxexam/TestSupport.java | 4 +---
1 file changed, 1 insertion(+), 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 610a4af..9ac9796 100644
--- a/src/main/java/org/apache/sling/testing/paxexam/TestSupport.java
+++ b/src/main/java/org/apache/sling/testing/paxexam/TestSupport.java
@@ -87,9 +87,7 @@ public abstract class TestSupport {
paxTinybundles(),
backing(),
spifly(),
- jacoco(),
- junit(),
- hamcrest()
+ jacoco()
);
}