[sling-org-apache-sling-jcr-filetransfer] branch master updated (b34e5da -> c4ea596)

[ol...@apache.org]

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


    from b34e5da  SLING-9113 Update Pax Exam to 4.13.2
     new 12e99a3  SLING-9273 Update to Sling Bundle Parent 38
     new c4ea596  SLING-9274 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-jcr-filetransfer] 01/02: SLING-9273 Update to Sling Bundle Parent 38

[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-jcr-filetransfer.git

commit 12e99a33eaa524c5e6236b3268f5d301ba0a412b
Author: Oliver Lietz <ol...@apache.org>
AuthorDate: Sat Mar 28 09:07:42 2020 +0100

    SLING-9273 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 cdb7f9e..2b6f93e 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>
 

[sling-org-apache-sling-jcr-filetransfer] 02/02: SLING-9274 Update Pax Exam to 4.13.3

[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-jcr-filetransfer.git

commit c4ea5968bd87557281ac0c2daaed97e18097c82b
Author: Oliver Lietz <ol...@apache.org>
AuthorDate: Sat Mar 28 09:11:12 2020 +0100

    SLING-9274 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 2b6f93e..d4ee6d1 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>
@@ -183,7 +183,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 -->