You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by ss...@apache.org on 2019/11/14 14:44:57 UTC

[sling-org-apache-sling-testing-sling-mock] branch master updated (797f541 -> a75c6aa)

This is an automated email from the ASF dual-hosted git repository.

sseifert pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-testing-sling-mock.git.


    from 797f541  [maven-release-plugin] prepare for next development iteration
     new cbd946e  update to latest servlet-helpers
     new a75c6aa  update mockito testing dependency

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:
 core/pom.xml   | 12 ++++++------
 parent/pom.xml |  6 +++---
 2 files changed, 9 insertions(+), 9 deletions(-)


[sling-org-apache-sling-testing-sling-mock] 02/02: update mockito testing dependency

Posted by ss...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

sseifert pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-testing-sling-mock.git

commit a75c6aaa5513a452d7ace576b5b453365c950579
Author: sseifert <ss...@pro-vision.de>
AuthorDate: Thu Nov 14 15:44:01 2019 +0100

    update mockito testing dependency
---
 parent/pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/parent/pom.xml b/parent/pom.xml
index f799cb8..d7eb0c8 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -68,12 +68,12 @@
         <dependency>
             <groupId>org.mockito</groupId>
             <artifactId>mockito-core</artifactId>
-            <version>2.25.1</version>
+            <version>3.1.0</version>
         </dependency>
         <dependency>
             <groupId>org.mockito</groupId>
             <artifactId>mockito-junit-jupiter</artifactId>
-            <version>2.25.1</version>
+            <version>3.1.0</version>
         </dependency>
         <dependency>
             <groupId>org.apache.sling</groupId>


[sling-org-apache-sling-testing-sling-mock] 01/02: update to latest servlet-helpers

Posted by ss...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

sseifert pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-testing-sling-mock.git

commit cbd946e5baedb3e31c230c2bb46e5f16bba87ca4
Author: sseifert <ss...@pro-vision.de>
AuthorDate: Thu Nov 14 15:43:41 2019 +0100

    update to latest servlet-helpers
---
 core/pom.xml   | 12 ++++++------
 parent/pom.xml |  2 +-
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/core/pom.xml b/core/pom.xml
index 896ca29..8972ac3 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -188,6 +188,12 @@
         </dependency>
 
         <dependency>
+           <groupId>org.apache.commons</groupId>
+           <artifactId>commons-collections4</artifactId>
+           <version>4.1</version>
+           <scope>compile</scope>
+        </dependency>
+        <dependency>
             <groupId>commons-collections</groupId>
             <artifactId>commons-collections</artifactId>
             <version>3.2.2</version>
@@ -334,12 +340,6 @@
                     <version>1.8.2</version>
                     <scope>compile</scope>
                 </dependency>
-                <dependency>
-                   <groupId>org.apache.commons</groupId>
-                   <artifactId>commons-collections4</artifactId>
-                   <version>4.1</version>
-                   <scope>compile</scope>
-                </dependency>
             </dependencies>
         </profile>
         <profile>
diff --git a/parent/pom.xml b/parent/pom.xml
index f35af10..f799cb8 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -40,7 +40,7 @@
         <jcr-mock.version>1.4.4</jcr-mock.version>
         <resourceresolver-mock.version>1.1.24</resourceresolver-mock.version>
         <logging-mock.version>2.0.0</logging-mock.version>
-        <servlet-helpers.version>1.3.0</servlet-helpers.version>
+        <servlet-helpers.version>1.3.1-SNAPSHOT</servlet-helpers.version>
         <resourcebuilder.version>1.0.4</resourcebuilder.version>
 
     </properties>