You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by jb...@apache.org on 2018/08/16 17:32:20 UTC

[karaf] branch master updated (31dc5ca -> e90faab)

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

jbonofre pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/karaf.git.


    from 31dc5ca  Merge pull request #597 from jbonofre/KARAF-5867
     add a316eb4  [KARAF-5869] Upgrade to awaitility 3.1.2
     new e90faab  Merge pull request #593 from jbonofre/KARAF-5869

The 1 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 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


[karaf] 01/01: Merge pull request #593 from jbonofre/KARAF-5869

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

jbonofre pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/karaf.git

commit e90faabffb0a978605501e801d0d9a7d24dfba4b
Merge: 31dc5ca a316eb4
Author: Jean-Baptiste Onofré <jb...@apache.org>
AuthorDate: Thu Aug 16 19:32:18 2018 +0200

    Merge pull request #593 from jbonofre/KARAF-5869
    
    [KARAF-5869] Upgrade to awaitility 3.1.2

 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --cc pom.xml
index f6e2874,8253ba0..2ffd214
--- a/pom.xml
+++ b/pom.xml
@@@ -146,9 -146,9 +146,9 @@@
          <aspectj.bundle.version>1.7.4_1</aspectj.bundle.version>
          <ant.bundle.version>1.9.7_1</ant.bundle.version>
          <antlr.bundle.version>2.7.7_5</antlr.bundle.version>
 -        <asm.version>6.2</asm.version>
 +        <asm.version>6.2.1</asm.version>
          <javax.annotation.version>1.2</javax.annotation.version>
-         <awaitility.version>3.1.1</awaitility.version>
+         <awaitility.version>3.1.2</awaitility.version>
          <cglib.bundle.version>3.2.4_1</cglib.bundle.version>
          <cglib2.version>2.2.0</cglib2.version>