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 2020/03/24 06:17:31 UTC
[sling-org-apache-sling-commons-contentdetection] branch master
updated (3141fed -> 9e34105)
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-commons-contentdetection.git.
from 3141fed [maven-release-plugin] prepare for next development iteration
new ed357ba SLING-9243 Update to Sling Bundle Parent 38
new 9e34105 SLING-9244 Update Pax Exam to 4.13.3
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 | 19 ++++++++++---------
1 file changed, 10 insertions(+), 9 deletions(-)
[sling-org-apache-sling-commons-contentdetection] 02/02: SLING-9244
Update Pax Exam to 4.13.3
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-commons-contentdetection.git
commit 9e341057f4bea405abe145e8971bdb22580243a0
Author: Oliver Lietz <ol...@apache.org>
AuthorDate: Tue Mar 24 07:16:43 2020 +0100
SLING-9244 Update Pax Exam to 4.13.3
* Update Pax Exam
* Update Testing PaxExam
* Use proper OSGi dependencies
---
pom.xml | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/pom.xml b/pom.xml
index 75e223e..3526e61 100644
--- a/pom.xml
+++ b/pom.xml
@@ -37,7 +37,7 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
- <org.ops4j.pax.exam.version>4.13.2</org.ops4j.pax.exam.version>
+ <org.ops4j.pax.exam.version>4.13.3</org.ops4j.pax.exam.version>
</properties>
<scm>
@@ -62,18 +62,18 @@
</dependency>
<dependency>
<groupId>org.osgi</groupId>
- <artifactId>org.osgi.service.component.annotations</artifactId>
- <scope>provided</scope>
+ <artifactId>org.osgi.service.cm</artifactId>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
- <artifactId>osgi.core</artifactId>
+ <artifactId>org.osgi.service.component.annotations</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
- <artifactId>osgi.cmpn</artifactId>
- <scope>test</scope>
+ <artifactId>osgi.core</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>biz.aQute.bnd</groupId>
@@ -98,7 +98,7 @@
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.testing.paxexam</artifactId>
- <version>3.0.0</version>
+ <version>3.1.0</version>
<scope>test</scope>
</dependency>
<!-- Apache Tika-->
[sling-org-apache-sling-commons-contentdetection] 01/02: SLING-9243
Update to Sling Bundle Parent 38
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-commons-contentdetection.git
commit ed357ba9138637d2429bbd6f66d599a90cbced6e
Author: Oliver Lietz <ol...@apache.org>
AuthorDate: Tue Mar 24 07:14:22 2020 +0100
SLING-9243 Update to Sling Bundle Parent 38
* Update Sling Bundle Parent
* Align module name
---
pom.xml | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/pom.xml b/pom.xml
index 8f82742..75e223e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -24,14 +24,14 @@
<parent>
<groupId>org.apache.sling</groupId>
<artifactId>sling-bundle-parent</artifactId>
- <version>35</version>
+ <version>38</version>
<relativePath />
</parent>
<artifactId>org.apache.sling.commons.contentdetection</artifactId>
<version>1.0.5-SNAPSHOT</version>
- <name>Apache Sling Content Detection Support</name>
+ <name>Apache Sling Commons Content Detection</name>
<description>Content-based MIME type detection</description>
<properties>
@@ -190,4 +190,5 @@
</plugin>
</plugins>
</build>
+
</project>