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/25 19:36:09 UTC

[sling-org-apache-sling-commons-jcr-file] branch master updated (66a687d -> 30cd458)

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-jcr-file.git.


    from 66a687d  style
     new de4841a  SLING-9256 Update to Sling Bundle Parent 38
     new 30cd458  SLING-9257 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 | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)


[sling-org-apache-sling-commons-jcr-file] 02/02: SLING-9257 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-jcr-file.git

commit 30cd45803277a04a9b21aa0842c4e82184f5ef35
Author: Oliver Lietz <ol...@apache.org>
AuthorDate: Wed Mar 25 20:33:44 2020 +0100

    SLING-9257 Update Pax Exam to 4.13.3
    
    * Update Pax Exam
    * Update Testing PaxExam
    * Use proper OSGi dependencies
---
 pom.xml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pom.xml b/pom.xml
index d1c662e..5ccceb1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -38,7 +38,7 @@
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
     <sling.java.version>8</sling.java.version>
-    <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>
@@ -117,12 +117,12 @@
     </dependency>
     <dependency>
       <groupId>org.osgi</groupId>
-      <artifactId>osgi.cmpn</artifactId>
+      <artifactId>osgi.core</artifactId>
       <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.osgi</groupId>
-      <artifactId>osgi.core</artifactId>
+      <artifactId>org.osgi.service.cm</artifactId>
       <scope>provided</scope>
     </dependency>
     <dependency>
@@ -152,7 +152,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>
     <!-- nullability -->


[sling-org-apache-sling-commons-jcr-file] 01/02: SLING-9256 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-jcr-file.git

commit de4841a3d311b6dd43ced3515bbf8826577867e1
Author: Oliver Lietz <ol...@apache.org>
AuthorDate: Wed Mar 25 20:32:24 2020 +0100

    SLING-9256 Update to Sling Bundle Parent 38
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index f9e584a..d1c662e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <groupId>org.apache.sling</groupId>
     <artifactId>sling-bundle-parent</artifactId>
-    <version>35</version>
+    <version>38</version>
     <relativePath/>
   </parent>