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/04/29 05:27:49 UTC

[karaf] branch master updated (9fb7006 -> b117670)

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 9fb7006  [KARAF-5694]don't strip out protocol header
     add 6d06d72  Fix formatting in pom.xml
     add 8a02b1c  Update pom.xml
     new b117670  Merge pull request #488 from ryandgoulding/fix-formatting

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 | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

-- 
To stop receiving notification emails like this one, please contact
jbonofre@apache.org.

[karaf] 01/01: Merge pull request #488 from ryandgoulding/fix-formatting

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 b1176700aaa382090e5b07e2ada20411abe5b9a2
Merge: 9fb7006 8a02b1c
Author: Jean-Baptiste Onofré <jb...@apache.org>
AuthorDate: Sun Apr 29 07:27:46 2018 +0200

    Merge pull request #488 from ryandgoulding/fix-formatting
    
    Fix formatting in pom.xml

 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --cc pom.xml
index 41448b9,86bccbd..447c5fa
--- a/pom.xml
+++ b/pom.xml
@@@ -160,19 -154,17 +160,19 @@@
          <commons-fileupload.version>1.3.1</commons-fileupload.version>
          <commons-jexl.version>2.1.1</commons-jexl.version>
          <commons-lang.version>2.6</commons-lang.version>
 +        <commons-lang3.version>3.7</commons-lang3.version>
 +        <commons-logging.version>1.2</commons-logging.version>
          <commons-pool.version>1.6</commons-pool.version>
 -        <commons-io.version>2.4</commons-io.version>
 +        <commons-io.version>2.6</commons-io.version>
  
          <dom4j.bundle.version>1.6.1_5</dom4j.bundle.version>
 -        <eclipselink.version>2.6.1</eclipselink.version>
 +        <eclipselink.version>2.7.1</eclipselink.version>
          <jasypt.bundle.version>1.9.2_1</jasypt.bundle.version>
 -        <jolokia.version>1.3.3</jolokia.version>
 +        <jolokia.version>1.3.5</jolokia.version>
          <serp.bundle.version>1.14.1_1</serp.bundle.version>
          <servlet.spec.groupId>javax.servlet</servlet.spec.groupId>
- 	    <servlet.spec.artifactId>javax.servlet-api</servlet.spec.artifactId>
- 	    <servlet.spec.version>3.1.0</servlet.spec.version>
+ 	<servlet.spec.artifactId>javax.servlet-api</servlet.spec.artifactId>
+ 	<servlet.spec.version>3.1.0</servlet.spec.version>
  
          <geronimo.jms-spec.version>1.1.1</geronimo.jms-spec.version>
          <geronimo.jpa-spec.version>1.1</geronimo.jpa-spec.version>

-- 
To stop receiving notification emails like this one, please contact
jbonofre@apache.org.