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/06/08 11:22:03 UTC
[sling-org-apache-sling-event] branch master updated: SLING-11385 Update to Sling Bundle Parent 48
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-event.git
The following commit(s) were added to refs/heads/master by this push:
new 973d5bc SLING-11385 Update to Sling Bundle Parent 48
973d5bc is described below
commit 973d5bc865c3bd9526324bd2f28c2ab6eec1aeba
Author: Oliver Lietz <ol...@apache.org>
AuthorDate: Wed Jun 8 13:20:32 2022 +0200
SLING-11385 Update to Sling Bundle Parent 48
- update parent
- tidy up properties, configurations and dependencies
---
pom.xml | 82 +++++++++++++++++++++++++++--------------------------------------
1 file changed, 34 insertions(+), 48 deletions(-)
diff --git a/pom.xml b/pom.xml
index a399abf..3db14ec 100644
--- a/pom.xml
+++ b/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.sling</groupId>
<artifactId>sling-bundle-parent</artifactId>
- <version>44</version>
+ <version>48</version>
<relativePath />
</parent>
@@ -38,15 +38,12 @@
<connection>scm:git:https://gitbox.apache.org/repos/asf/sling-org-apache-sling-event.git</connection>
<developerConnection>scm:git:https://gitbox.apache.org/repos/asf/sling-org-apache-sling-event.git</developerConnection>
<url>https://gitbox.apache.org/repos/asf?p=sling-org-apache-sling-event.git</url>
- <tag>org.apache.sling.event-4.3.2</tag>
+ <tag>HEAD</tag>
</scm>
<properties>
<site.jira.version.id>12315369</site.jira.version.id>
- <exam.version>4.13.4</exam.version>
- <url.version>2.5.2</url.version>
- <bundle.build.dir>${basedir}/target</bundle.build.dir>
- <bundle.file.name>${bundle.build.dir}/${project.build.finalName}.jar</bundle.file.name>
+ <org.ops4j.pax.exam.version>4.13.3</org.ops4j.pax.exam.version>
<min.port>37000</min.port>
<max.port>37999</max.port>
<project.build.outputTimestamp>2022-05-19T07:49:58Z</project.build.outputTimestamp>
@@ -102,13 +99,6 @@
<groupId>org.apache.servicemix.tooling</groupId>
<artifactId>depends-maven-plugin</artifactId>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-javadoc-plugin</artifactId>
- <configuration>
- <excludePackageNames>org.apache.sling.event.impl:org.apache.sling.event.impl.discovery:org.apache.sling.event.impl.jobs:org.apache.sling.event.impl.jobs.config:org.apache.sling.event.impl.jobs.console:org.apache.sling.event.impl.jobs.jmx:org.apache.sling.event.impl.jobs.notifications:org.apache.sling.event.impl.jobs.queues:org.apache.sling.event.impl.jobs.scheduling:org.apache.sling.event.impl.jobs.stats:org.apache.sling.event.impl.jobs.tasks:org.apache.sling.event.im [...]
- </configuration>
- </plugin>
</plugins>
</build>
<profiles>
@@ -252,12 +242,6 @@
<version>2.1.10-1.16.0</version>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.ops4j.pax.exam</groupId>
- <artifactId>pax-exam-container-forked</artifactId>
- <version>${exam.version}</version>
- <scope>test</scope>
- </dependency>
<dependency>
<groupId>com.jayway.jsonpath</groupId>
<artifactId>json-path</artifactId>
@@ -271,34 +255,6 @@
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.ops4j.pax.exam</groupId>
- <artifactId>pax-exam-junit4</artifactId>
- <version>${exam.version}</version>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>org.ops4j.pax.exam</groupId>
- <artifactId>pax-exam-link-mvn</artifactId>
- <version>${exam.version}</version>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>org.ops4j.pax.exam</groupId>
- <artifactId>pax-exam-cm</artifactId>
- <version>${exam.version}</version>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>org.ops4j.pax.url</groupId>
- <artifactId>pax-url-aether</artifactId>
- <version>${url.version}</version>
- <scope>test</scope>
- </dependency>
-
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.framework</artifactId>
@@ -358,7 +314,37 @@
<dependency>
<groupId>org.ops4j.pax.exam</groupId>
<artifactId>pax-exam</artifactId>
- <version>4.13.4</version>
+ <version>${org.ops4j.pax.exam.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.ops4j.pax.exam</groupId>
+ <artifactId>pax-exam-cm</artifactId>
+ <version>${org.ops4j.pax.exam.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.ops4j.pax.exam</groupId>
+ <artifactId>pax-exam-container-forked</artifactId>
+ <version>${org.ops4j.pax.exam.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.ops4j.pax.exam</groupId>
+ <artifactId>pax-exam-junit4</artifactId>
+ <version>${org.ops4j.pax.exam.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.ops4j.pax.exam</groupId>
+ <artifactId>pax-exam-link-mvn</artifactId>
+ <version>${org.ops4j.pax.exam.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.ops4j.pax.url</groupId>
+ <artifactId>pax-url-wrap</artifactId>
+ <version>2.6.7</version>
<scope>test</scope>
</dependency>