cxf git commit: CXF-7045: Updated cxf-rs-description-swagger2, added standalone cxf-jackson feature

2016-09-19 Thread reta 
Repository: cxf
Updated Branches:
  refs/heads/3.1.x-fixes dd4862fcb -> 9d7c9508b


CXF-7045: Updated cxf-rs-description-swagger2, added standalone cxf-jackson 
feature


Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/9d7c9508
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/9d7c9508
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/9d7c9508

Branch: refs/heads/3.1.x-fixes
Commit: 9d7c9508ba36161e795390985f384169c4f0d086
Parents: dd4862f
Author: reta 
Authored: Mon Sep 19 20:14:21 2016 -0400
Committer: reta 
Committed: Mon Sep 19 20:14:21 2016 -0400

--
 .../jax_rs/description_swagger2_osgi/README.txt  | 10 --
 osgi/karaf/features/src/main/resources/features.xml  | 15 +--
 2 files changed, 9 insertions(+), 16 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/9d7c9508/distribution/src/main/release/samples/jax_rs/description_swagger2_osgi/README.txt
--
diff --git 
a/distribution/src/main/release/samples/jax_rs/description_swagger2_osgi/README.txt
 
b/distribution/src/main/release/samples/jax_rs/description_swagger2_osgi/README.txt
index c803013..d0b0ba9 100644
--- 
a/distribution/src/main/release/samples/jax_rs/description_swagger2_osgi/README.txt
+++ 
b/distribution/src/main/release/samples/jax_rs/description_swagger2_osgi/README.txt
@@ -16,7 +16,6 @@ Using either UNIX or Windows:
 
   mvn install
 
-
 Starting Karaf (refer to 
http://karaf.apache.org/manual/latest-3.0.x/quick-start.html)
 
   bin/karaf
@@ -50,15 +49,6 @@ Install this demo bundle (using the appropriate bundle 
version number)
   
   install -s mvn:org.apache.cxf.samples/jax_rs_description_swagger2_osgi/3.n.m
 
-Optionally, installed the following bundles if they are missed:
-
-  install -s mvn:com.fasterxml.jackson.core/jackson-core/2.6.6  
-  install -s mvn:com.fasterxml.jackson.core/jackson-annotations/2.6.6
-  install -s mvn:com.fasterxml.jackson.core/jackson-databind/2.6.6 
-  install -s mvn:com.fasterxml.jackson.jaxrs/jackson-jaxrs-base/2.6.6  
-  install -s mvn:com.fasterxml.jackson.jaxrs/jackson-jaxrs-json-provider/2.6.6 
 
-  install -s mvn:javax.annotation/javax.annotation-api/1.2
-
 You can verify if the CXF JAX-RS Swagger2 Blueprint Demo is installed and 
started.
 
   karaf@root()> list

http://git-wip-us.apache.org/repos/asf/cxf/blob/9d7c9508/osgi/karaf/features/src/main/resources/features.xml
--
diff --git a/osgi/karaf/features/src/main/resources/features.xml 
b/osgi/karaf/features/src/main/resources/features.xml
index 196d823..89f9bbd 100644
--- a/osgi/karaf/features/src/main/resources/features.xml
+++ b/osgi/karaf/features/src/main/resources/features.xml
@@ -228,17 +228,20 @@
 cxf-rs-security-jose
 mvn:org.apache.cxf/cxf-rt-rs-security-oauth2/${project.version}
 
+
+mvn:com.fasterxml.jackson.core/jackson-core/${cxf.jackson.version}
+mvn:com.fasterxml.jackson.core/jackson-annotations/${cxf.jackson.version}
+mvn:com.fasterxml.jackson.core/jackson-databind/${cxf.jackson.version}
+mvn:com.fasterxml.jackson.dataformat/jackson-dataformat-yaml/${cxf.jackson.version}
+mvn:com.fasterxml.jackson.jaxrs/jackson-jaxrs-base/${cxf.jackson.version}
+mvn:com.fasterxml.jackson.jaxrs/jackson-jaxrs-json-provider/${cxf.jackson.version}
+
 
 cxf-jaxrs
+cxf-jackson
 mvn:org.apache.cxf/cxf-rt-rs-service-description-swagger/${project.version}
 mvn:javax.validation/validation-api/${cxf.validation.api.version}
 mvn:org.apache.commons/commons-lang3/${cxf.commons-lang3.version}
-mvn:com.fasterxml.jackson.core/jackson-core/${cxf.jackson.version}
-mvn:com.fasterxml.jackson.core/jackson-annotations/${cxf.jackson.version}
-mvn:com.fasterxml.jackson.core/jackson-databind/${cxf.jackson.version}
-mvn:com.fasterxml.jackson.dataformat/jackson-dataformat-yaml/${cxf.jackson.version}
-mvn:com.fasterxml.jackson.jaxrs/jackson-jaxrs-base/${cxf.jackson.version}
-mvn:com.fasterxml.jackson.jaxrs/jackson-jaxrs-json-provider/${cxf.jackson.version}
 mvn:org.javassist/javassist/${cxf.javassist.version}
 mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.reflections/${cxf.reflections.bundle.version}
 mvn:com.google.guava/guava/${cxf.guava.version}

cxf git commit: CXF-7045: Updated cxf-rs-description-swagger2, added standalone cxf-jackson feature

2016-09-19 Thread reta 
Repository: cxf
Updated Branches:
  refs/heads/master 57cb54473 -> 507ad4be6


CXF-7045: Updated cxf-rs-description-swagger2, added standalone cxf-jackson 
feature


Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/507ad4be
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/507ad4be
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/507ad4be

Branch: refs/heads/master
Commit: 507ad4be6ee6056bb75e8decef9ee8e1ef13c334
Parents: 57cb544
Author: reta 
Authored: Mon Sep 19 20:14:21 2016 -0400
Committer: reta 
Committed: Mon Sep 19 20:14:54 2016 -0400

--
 .../jax_rs/description_swagger2_osgi/README.txt  | 10 --
 osgi/karaf/features/src/main/resources/features.xml  | 15 +--
 2 files changed, 9 insertions(+), 16 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/507ad4be/distribution/src/main/release/samples/jax_rs/description_swagger2_osgi/README.txt
--
diff --git 
a/distribution/src/main/release/samples/jax_rs/description_swagger2_osgi/README.txt
 
b/distribution/src/main/release/samples/jax_rs/description_swagger2_osgi/README.txt
index c803013..d0b0ba9 100644
--- 
a/distribution/src/main/release/samples/jax_rs/description_swagger2_osgi/README.txt
+++ 
b/distribution/src/main/release/samples/jax_rs/description_swagger2_osgi/README.txt
@@ -16,7 +16,6 @@ Using either UNIX or Windows:
 
   mvn install
 
-
 Starting Karaf (refer to 
http://karaf.apache.org/manual/latest-3.0.x/quick-start.html)
 
   bin/karaf
@@ -50,15 +49,6 @@ Install this demo bundle (using the appropriate bundle 
version number)
   
   install -s mvn:org.apache.cxf.samples/jax_rs_description_swagger2_osgi/3.n.m
 
-Optionally, installed the following bundles if they are missed:
-
-  install -s mvn:com.fasterxml.jackson.core/jackson-core/2.6.6  
-  install -s mvn:com.fasterxml.jackson.core/jackson-annotations/2.6.6
-  install -s mvn:com.fasterxml.jackson.core/jackson-databind/2.6.6 
-  install -s mvn:com.fasterxml.jackson.jaxrs/jackson-jaxrs-base/2.6.6  
-  install -s mvn:com.fasterxml.jackson.jaxrs/jackson-jaxrs-json-provider/2.6.6 
 
-  install -s mvn:javax.annotation/javax.annotation-api/1.2
-
 You can verify if the CXF JAX-RS Swagger2 Blueprint Demo is installed and 
started.
 
   karaf@root()> list

http://git-wip-us.apache.org/repos/asf/cxf/blob/507ad4be/osgi/karaf/features/src/main/resources/features.xml
--
diff --git a/osgi/karaf/features/src/main/resources/features.xml 
b/osgi/karaf/features/src/main/resources/features.xml
index af7952c..9df83bf 100644
--- a/osgi/karaf/features/src/main/resources/features.xml
+++ b/osgi/karaf/features/src/main/resources/features.xml
@@ -233,17 +233,20 @@
 cxf-rs-security-jose
 mvn:org.apache.cxf/cxf-rt-rs-security-oauth2/${project.version}
 
+
+mvn:com.fasterxml.jackson.core/jackson-core/${cxf.jackson.version}
+mvn:com.fasterxml.jackson.core/jackson-annotations/${cxf.jackson.version}
+mvn:com.fasterxml.jackson.core/jackson-databind/${cxf.jackson.version}
+mvn:com.fasterxml.jackson.dataformat/jackson-dataformat-yaml/${cxf.jackson.version}
+mvn:com.fasterxml.jackson.jaxrs/jackson-jaxrs-base/${cxf.jackson.version}
+mvn:com.fasterxml.jackson.jaxrs/jackson-jaxrs-json-provider/${cxf.jackson.version}
+
 
 cxf-jaxrs
+cxf-jackson
 mvn:org.apache.cxf/cxf-rt-rs-service-description-swagger/${project.version}
 mvn:javax.validation/validation-api/${cxf.validation.api.version}
 mvn:org.apache.commons/commons-lang3/${cxf.commons-lang3.version}
-mvn:com.fasterxml.jackson.core/jackson-core/${cxf.jackson.version}
-mvn:com.fasterxml.jackson.core/jackson-annotations/${cxf.jackson.version}
-mvn:com.fasterxml.jackson.core/jackson-databind/${cxf.jackson.version}
-mvn:com.fasterxml.jackson.dataformat/jackson-dataformat-yaml/${cxf.jackson.version}
-mvn:com.fasterxml.jackson.jaxrs/jackson-jaxrs-base/${cxf.jackson.version}
-mvn:com.fasterxml.jackson.jaxrs/jackson-jaxrs-json-provider/${cxf.jackson.version}
 mvn:org.javassist/javassist/${cxf.javassist.version}
 mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.reflections/${cxf.reflections.bundle.version}
 mvn:com.google.guava/guava/${cxf.guava.version}

cxf git commit: [CXF-7060] Disable karaf 4 until snapshots are removed

2016-09-19 Thread gnodet 
Repository: cxf
Updated Branches:
  refs/heads/master 87775f638 -> 57cb54473


[CXF-7060] Disable karaf 4 until snapshots are removed

Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/57cb5447
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/57cb5447
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/57cb5447

Branch: refs/heads/master
Commit: 57cb5447341949836b7d8cc8f00ca3ced68622f1
Parents: 87775f6
Author: Guillaume Nodet 
Authored: Mon Sep 19 17:49:40 2016 +0200
Committer: Guillaume Nodet 
Committed: Mon Sep 19 17:49:57 2016 +0200

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


http://git-wip-us.apache.org/repos/asf/cxf/blob/57cb5447/osgi/pom.xml
--
diff --git a/osgi/pom.xml b/osgi/pom.xml
index 2614d46..83a0652d 100644
--- a/osgi/pom.xml
+++ b/osgi/pom.xml
@@ -34,7 +34,7 @@
 itests
 itests-felix
 karaf
-karaf4
+
 repository

[2/2] cxf git commit: [CXF-7058] Extra CDATA elements added on long CDATA payload Allow passing woodstox config to bypass the issue This closes #169

2016-09-19 Thread dkulp 
[CXF-7058] Extra CDATA elements added on long CDATA payload
Allow passing woodstox config to bypass the issue
This closes #169


Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/1cb33324
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/1cb33324
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/1cb33324

Branch: refs/heads/3.1.x-fixes
Commit: 1cb33324a5d2ab1a0308daa2fa4a38363b67be60
Parents: 4e78777
Author: Rodrigo Merino 
Authored: Wed Sep 14 13:22:27 2016 -0300
Committer: Daniel Kulp 
Committed: Mon Sep 19 11:03:36 2016 -0400

--
 .../org/apache/cxf/staxutils/StaxUtils.java | 20 +---
 1 file changed, 13 insertions(+), 7 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/1cb33324/core/src/main/java/org/apache/cxf/staxutils/StaxUtils.java
--
diff --git a/core/src/main/java/org/apache/cxf/staxutils/StaxUtils.java 
b/core/src/main/java/org/apache/cxf/staxutils/StaxUtils.java
index 4af5ddf..eb68092 100644
--- a/core/src/main/java/org/apache/cxf/staxutils/StaxUtils.java
+++ b/core/src/main/java/org/apache/cxf/staxutils/StaxUtils.java
@@ -107,6 +107,8 @@ public final class StaxUtils {
 "org.apache.cxf.stax.maxAttributeSize";
 public static final String MAX_TEXT_LENGTH = 
 "org.apache.cxf.stax.maxTextLength";
+public static final String MIN_TEXT_SEGMENT =
+"org.apache.cxf.stax.minTextSegment";
 public static final String MAX_ELEMENT_COUNT = 
 "org.apache.cxf.stax.maxElementCount";
 public static final String MAX_XML_CHARACTERS = 
@@ -139,6 +141,7 @@ public final class StaxUtils {
 private static int maxAttributeCount = 500; 
 private static int maxAttributeSize = 64 * 1024; //64K per attribute, 
likely just "list" will hit
 private static int maxTextLength = 128 * 1024 * 1024;  //128M - more than 
this should DEFINITLEY use MTOM 
+private static int minTextSegment = 64; // Same default as woodstox
 private static long maxElementCount = Long.MAX_VALUE;
 private static long maxXMLCharacters = Long.MAX_VALUE;
 
@@ -159,6 +162,7 @@ public final class StaxUtils {
 maxAttributeCount = getInteger(MAX_ATTRIBUTE_COUNT, 
maxAttributeCount); 
 maxAttributeSize = getInteger(MAX_ATTRIBUTE_SIZE, maxAttributeSize);
 maxTextLength = getInteger(MAX_TEXT_LENGTH, maxTextLength); 
+minTextSegment = getInteger(MIN_TEXT_SEGMENT, minTextSegment);
 maxElementCount = getLong(MAX_ELEMENT_COUNT, maxElementCount);
 maxXMLCharacters = getLong(MAX_XML_CHARACTERS, maxXMLCharacters);
 
@@ -361,13 +365,15 @@ public final class StaxUtils {
 private static boolean setRestrictionProperties(XMLInputFactory factory) {
 //For now, we can only support Woodstox 4.2.x and newer as none of the 
other
 //stax parsers support these settings
-return setProperty(factory, "com.ctc.wstx.maxAttributesPerElement", 
maxAttributeCount)
-&& setProperty(factory, "com.ctc.wstx.maxAttributeSize", 
maxAttributeSize)
-&& setProperty(factory, "com.ctc.wstx.maxChildrenPerElement", 
innerElementCountThreshold)
-&& setProperty(factory, "com.ctc.wstx.maxElementCount", 
maxElementCount)
-&& setProperty(factory, "com.ctc.wstx.maxElementDepth", 
innerElementLevelThreshold)
-&& setProperty(factory, "com.ctc.wstx.maxCharacters", 
maxXMLCharacters)
-&& setProperty(factory, "com.ctc.wstx.maxTextLength", 
maxTextLength);
+final boolean wstxMaxs = setProperty(factory, 
"com.ctc.wstx.maxAttributesPerElement", maxAttributeCount)
+&& setProperty(factory, "com.ctc.wstx.maxAttributeSize", 
maxAttributeSize)
+&& setProperty(factory, 
"com.ctc.wstx.maxChildrenPerElement", innerElementCountThreshold)
+&& setProperty(factory, "com.ctc.wstx.maxElementCount", 
maxElementCount)
+&& setProperty(factory, "com.ctc.wstx.maxElementDepth", 
innerElementLevelThreshold)
+&& setProperty(factory, "com.ctc.wstx.maxCharacters", 
maxXMLCharacters)
+&& setProperty(factory, "com.ctc.wstx.maxTextLength", 
maxTextLength);
+return wstxMaxs
+&& setProperty(factory, "com.ctc.wstx.minTextSegment", 
minTextSegment);
 }
 
 private static boolean setProperty(XMLInputFactory f, String p, Object o) {

[1/2] cxf git commit: Recording .gitmergeinfo Changes

2016-09-19 Thread dkulp 
Repository: cxf
Updated Branches:
  refs/heads/3.1.x-fixes 4e787778c -> dd4862fcb


Recording .gitmergeinfo Changes


Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/dd4862fc
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/dd4862fc
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/dd4862fc

Branch: refs/heads/3.1.x-fixes
Commit: dd4862fcb09cb9725c750e21331ecd46fb9c21ab
Parents: 1cb3332
Author: Daniel Kulp 
Authored: Mon Sep 19 11:03:36 2016 -0400
Committer: Daniel Kulp 
Committed: Mon Sep 19 11:03:36 2016 -0400

--
 .gitmergeinfo | 5 +
 1 file changed, 5 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/dd4862fc/.gitmergeinfo
--
diff --git a/.gitmergeinfo b/.gitmergeinfo
index 25f0698..d5a81e1 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -93,6 +93,7 @@ M 01d06cee06203b0ba616ca1924f1878aecc1a791
 M 0222768baf6b60742c4a8332308edf2be0f4a2e4
 M 055f1d738016ae5caf3eba42e656782de8490890
 M 0578e16146527b0782530c40ba2db17531756d96
+M 07707cd522e63cd0574db378e08f2f820882b5ec
 M 0865c3a85b9687f857b51d1ae56c8f8e97bdbf5b
 M 0e5fd5a54cb271ba494e7e30b45d4228b33364a9
 M 1184e08f0d1c40c754e39fd5d6340d1057fbdd17
@@ -109,6 +110,8 @@ M 366a556210a1a7b047c4b4dd8da4fc74af6bd301
 M 386805560479b35276d88605c5acf805e3004aa5
 M 39c772a0764b323f98ab58e00345f4fca924c425
 M 3a1fa0b23f1778594b6339dfcfbc90dcc43a87d4
+M 3e30d8892a723adcf04268efd7d407e164607065
+M 45d54d558625236b84752b0d7976f0cf85518c16
 M 47691ae5c2c6528d95795a51e98e02b54a033c88
 M 4799fef822a96f5d1b2827d5cc42ab886fd4e673
 M 4837a6cb5ea319f6bf87aaf3bf49c1e4e99e45a7
@@ -118,6 +121,7 @@ M 574b2a9997c94011794fa2e083181e23c9936f15
 M 585df048b7730ee36644a4bb7c1a20fcf977d79e
 M 6242c682dfce4a2ba4869978c28b14f1472484c1
 M 63a1088a9253da0452497440e900d35a5415c3c9
+M 6becb31c62ef0845a5078f4ec2124fe7bc264e58
 M 7304dfbd8f3044d8d46981abf2058c6cb732d219
 M 746914a5084f5db8d0c0f052802c7ef2217b9b6b
 M 7690a1fd087aff24ad8e8e1ab2e0722e24bf3d81
@@ -135,6 +139,7 @@ M 955fd4b7fee79642934a828b7758ce14f783364a
 M 9a9e0a8a37608195c4ef6fbf386728d13d025d2d
 M 9b2bda583c09861c693122ab631c4bffa2187ddd
 M 9b816a21d8b85cc051be59a8ab6e968c5d0d
+M 9d3c46e0cfe87700d7105ee131c3e3e33f228e06
 M 9ecea375930d1a217f35da65e0d6073f7a80bf7d
 M a034e5853484a7ef0a9f0ad1ae6582178f622f31
 M a1710bdd783afcd667d9e72ccb031480d3806850

cxf git commit: [CXF-7058] Extra CDATA elements added on long CDATA payload Allow passing woodstox config to bypass the issue This closes #169

2016-09-19 Thread dkulp 
Repository: cxf
Updated Branches:
  refs/heads/master 042d1dbe5 -> 87775f638


[CXF-7058] Extra CDATA elements added on long CDATA payload
Allow passing woodstox config to bypass the issue
This closes #169


Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/87775f63
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/87775f63
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/87775f63

Branch: refs/heads/master
Commit: 87775f63829494a4604752773253f27801a9132e
Parents: 042d1db
Author: Rodrigo Merino 
Authored: Wed Sep 14 13:22:27 2016 -0300
Committer: Daniel Kulp 
Committed: Mon Sep 19 10:01:13 2016 -0400

--
 .../org/apache/cxf/staxutils/StaxUtils.java | 20 +---
 1 file changed, 13 insertions(+), 7 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/87775f63/core/src/main/java/org/apache/cxf/staxutils/StaxUtils.java
--
diff --git a/core/src/main/java/org/apache/cxf/staxutils/StaxUtils.java 
b/core/src/main/java/org/apache/cxf/staxutils/StaxUtils.java
index 4af5ddf..eb68092 100644
--- a/core/src/main/java/org/apache/cxf/staxutils/StaxUtils.java
+++ b/core/src/main/java/org/apache/cxf/staxutils/StaxUtils.java
@@ -107,6 +107,8 @@ public final class StaxUtils {
 "org.apache.cxf.stax.maxAttributeSize";
 public static final String MAX_TEXT_LENGTH = 
 "org.apache.cxf.stax.maxTextLength";
+public static final String MIN_TEXT_SEGMENT =
+"org.apache.cxf.stax.minTextSegment";
 public static final String MAX_ELEMENT_COUNT = 
 "org.apache.cxf.stax.maxElementCount";
 public static final String MAX_XML_CHARACTERS = 
@@ -139,6 +141,7 @@ public final class StaxUtils {
 private static int maxAttributeCount = 500; 
 private static int maxAttributeSize = 64 * 1024; //64K per attribute, 
likely just "list" will hit
 private static int maxTextLength = 128 * 1024 * 1024;  //128M - more than 
this should DEFINITLEY use MTOM 
+private static int minTextSegment = 64; // Same default as woodstox
 private static long maxElementCount = Long.MAX_VALUE;
 private static long maxXMLCharacters = Long.MAX_VALUE;
 
@@ -159,6 +162,7 @@ public final class StaxUtils {
 maxAttributeCount = getInteger(MAX_ATTRIBUTE_COUNT, 
maxAttributeCount); 
 maxAttributeSize = getInteger(MAX_ATTRIBUTE_SIZE, maxAttributeSize);
 maxTextLength = getInteger(MAX_TEXT_LENGTH, maxTextLength); 
+minTextSegment = getInteger(MIN_TEXT_SEGMENT, minTextSegment);
 maxElementCount = getLong(MAX_ELEMENT_COUNT, maxElementCount);
 maxXMLCharacters = getLong(MAX_XML_CHARACTERS, maxXMLCharacters);
 
@@ -361,13 +365,15 @@ public final class StaxUtils {
 private static boolean setRestrictionProperties(XMLInputFactory factory) {
 //For now, we can only support Woodstox 4.2.x and newer as none of the 
other
 //stax parsers support these settings
-return setProperty(factory, "com.ctc.wstx.maxAttributesPerElement", 
maxAttributeCount)
-&& setProperty(factory, "com.ctc.wstx.maxAttributeSize", 
maxAttributeSize)
-&& setProperty(factory, "com.ctc.wstx.maxChildrenPerElement", 
innerElementCountThreshold)
-&& setProperty(factory, "com.ctc.wstx.maxElementCount", 
maxElementCount)
-&& setProperty(factory, "com.ctc.wstx.maxElementDepth", 
innerElementLevelThreshold)
-&& setProperty(factory, "com.ctc.wstx.maxCharacters", 
maxXMLCharacters)
-&& setProperty(factory, "com.ctc.wstx.maxTextLength", 
maxTextLength);
+final boolean wstxMaxs = setProperty(factory, 
"com.ctc.wstx.maxAttributesPerElement", maxAttributeCount)
+&& setProperty(factory, "com.ctc.wstx.maxAttributeSize", 
maxAttributeSize)
+&& setProperty(factory, 
"com.ctc.wstx.maxChildrenPerElement", innerElementCountThreshold)
+&& setProperty(factory, "com.ctc.wstx.maxElementCount", 
maxElementCount)
+&& setProperty(factory, "com.ctc.wstx.maxElementDepth", 
innerElementLevelThreshold)
+&& setProperty(factory, "com.ctc.wstx.maxCharacters", 
maxXMLCharacters)
+&& setProperty(factory, "com.ctc.wstx.maxTextLength", 
maxTextLength);
+return wstxMaxs
+&& setProperty(factory, "com.ctc.wstx.minTextSegment", 
minTextSegment);
 }
 
 private static boolean setProperty(XMLInputFactory f, String p, Object o) {

svn commit: r997746 - in /websites/production/cxf/content: cache/main.pageCache distributed-osgi.html dosgi-demos.html dosgi-presentations-and-articles.html dosgi-releases.html

2016-09-19 Thread buildbot 
Author: buildbot
Date: Mon Sep 19 14:47:33 2016
New Revision: 997746

Log:
Production update by buildbot for cxf

Modified:
websites/production/cxf/content/cache/main.pageCache
websites/production/cxf/content/distributed-osgi.html
websites/production/cxf/content/dosgi-demos.html
websites/production/cxf/content/dosgi-presentations-and-articles.html
websites/production/cxf/content/dosgi-releases.html

Modified: websites/production/cxf/content/cache/main.pageCache
==
Binary files - no diff available.

Modified: websites/production/cxf/content/distributed-osgi.html
==
--- websites/production/cxf/content/distributed-osgi.html (original)
+++ websites/production/cxf/content/distributed-osgi.html Mon Sep 19 14:47:33 
2016
@@ -99,7 +99,7 @@ Apache CXF -- Distributed OSGi
  


-The Apache CXF Distributed OSGi subproject 
provides the Reference Implementation of the Distribution Provider component of 
the OSGi Remote Services Specification (Chapter 13 in the http://www.osgi.org/Download/Release4V42; 
rel="nofollow">OSGi 4.2 Compendium Specification). It 
implements the Remote Services functionality using Web Services, leveraging 
SOAP over HTTP and exposing the Service over a WSDL contract. Starting from 
version 1.1, Java interfaces can also be exposed and consumed as RESTful JAX-RS 
services. The 1.2 version of this project is also the Reference Implementation 
of the OSGi Remote Service Admin specification, chapter 122 in the http://www.osgi.org/Download/Release4V42; rel="nofollow">OSGi 4.2 
Enterprise Specification).This page is about getting started and the 
demos, further links:Distributed OSGi 
Reference guideDOSGi ArchitectureDOSGi Presentations and 
ArticlesDOSGi 
ReleasesDOSGi Build 
pageDOSGi FAQ 
pageGetting StartedTo 
get started, get yourself a CXF-DOSGi distribution. The following distributions 
are available:DOSGi Apache Karaf Feature : Allows 
installation in Apache Karaf using the feature commands (Available as of 
CXF-DOSGi 1.4.0)DOSGi Multi Bundle 
Distribution: Zip file containing the Distributed OSGi bundles, as
  well as all their dependenciesWhich distribution to take? That 
depends on what you are doing. The single-bundle distribution is a really 
convenient way of getting started as it provides all of Distributed OSGi plus 
its dependencies in one.  The multi-bundle distribution is 
obviously a little more work to install, but the fine-grained bundles do have 
an extra benefit: they allow sharing. So if your application depends on one or 
more of the library bundles, it can use them from the multi-bundle 
distribution. Similarly, the multi-bundle distribution makes it possible to 
update the dependency bundles - if compatible - without having to replace the 
Distributed OSGi bundles.Setting up CXF/DOSGi 
DiscoverySee the DOSGi 
Discovery page and the DOSGi Discovery Demo page.The SamplesThe samples directory contains these sample 
projects:SampleDescriptiongreeter Greeter OSGi Service exposed 
remotely and a Consumer invoking on it.greeter_rest 
Greeter OSGi 
Service exposed remotely as a RESTful service and a Consumer invoking on it. 
Virtually identical to a greeter samplespring_dmShows how you can use Spring DM 
to export your beans as OSGi Services and similarly how to use Spring-DM to 
inject a (remote) OSGi Service.dsShows how Distributed OSGi can be used with OSGi 
Declarative Services (DS).discoveryShows how to use Distributed OSGi with a 
dynamic Discovery system such as the one based on Zookeeper that comes with 
CXF/DOSGi.http://felix.apache.org/site/apache-felix-ip
 ojo-dosgi.html">iPOJOShows how Distributed OSGi can be used with 
iPOJOThe samples can be installed 
directly from the maven release repository (as described in the demo 
documentation pages), but you can also build them yourself. To 
build the samples from source:simply browse the DOSGi master using 
the git web interface (https://git-wip-us.apache.org/repos/asf?p=cxf-dosgi.git;>https://git-wip-us.apache.org/repos/asf?p=cxf-dosgi.git)
 or clone it from (https://git-wip-us.apache.org/repos/asf/cxf-dosgi.git;>https://git-wip-us.apache.org/repos/asf/cxf-dosgi.git)go
 into the samples directoryand build them using mvn 
install
+The Apache CXF Distributed OSGi subproject 
provides CXF based distribution providers for http://aries.apache.org/modules/rsa.html;>Aries 
Remote Service Admin (RSA). This allows to:Offer and consume 
SOAP as well as REST based services. For declarative services CXF DOSGi is the 
easiest way to interact with such services.Transparently communicate 
between OSGi containersFamiliarize yourself with CXF DOSGi by 
trying the examples below. Leveraging Apache Karaf it only takes a few minutes 
to understand and try each example.ReleasesThe current release 
is 2.0.0. See the releases page 
for release

[2/2] cxf git commit: [CXF-7060] Provide Karaf 4 specific features and commands

2016-09-19 Thread gnodet 
[CXF-7060] Provide Karaf 4 specific features and commands

Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/042d1dbe
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/042d1dbe
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/042d1dbe

Branch: refs/heads/master
Commit: 042d1dbe5f236125c77db8348bf66d4a3d4d2385
Parents: 56dab42
Author: Guillaume Nodet 
Authored: Mon Sep 19 14:19:26 2016 +0200
Committer: Guillaume Nodet 
Committed: Mon Sep 19 14:22:59 2016 +0200

--
 osgi/karaf4/commands/pom.xml|  84 +++
 .../cxf/karaf/commands/ListBussesCommand.java   |  65 +++
 .../karaf/commands/ListEndpointsCommand.java| 160 ++
 .../karaf/commands/StartEndpointCommand.java|  68 +++
 .../cxf/karaf/commands/StopEndpointCommand.java |  68 +++
 .../karaf/commands/completers/BusCompleter.java |  53 ++
 .../completers/EndpointCompleterSupport.java|  68 +++
 .../completers/StartedEndpointCompleter.java|  33 ++
 .../completers/StoppedEndpointCompleter.java|  34 ++
 .../karaf/commands/internal/CXFController.java  |  94 
 osgi/karaf4/features/pom.xml| 127 +
 .../src/main/resources/config.properties| 334 
 .../features/src/main/resources/features.xml| 517 +++
 osgi/karaf4/pom.xml |  36 ++
 osgi/pom.xml|   1 +
 parent/pom.xml  |   1 +
 rt/management-web/pom.xml   |   4 +
 rt/transports/http-netty/netty-client/pom.xml   |   1 +
 rt/transports/http-netty/netty-server/pom.xml   |   2 +
 19 files changed, 1750 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/042d1dbe/osgi/karaf4/commands/pom.xml
--
diff --git a/osgi/karaf4/commands/pom.xml b/osgi/karaf4/commands/pom.xml
new file mode 100644
index 000..4a6e5fc
--- /dev/null
+++ b/osgi/karaf4/commands/pom.xml
@@ -0,0 +1,84 @@
+
+http://maven.apache.org/POM/4.0.0; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance; 
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 
http://maven.apache.org/maven-v4_0_0.xsd;>
+
+4.0.0
+
+org.apache.cxf.karaf4
+karaf4-parent
+3.2.0-SNAPSHOT
+
+cxf-karaf4-commands
+bundle
+Apache CXF Karaf4 Commands
+Apache CXF Karaf4 Commands
+
+
+
+org.apache.cxf
+cxf-core
+${project.version}
+
+
+
+org.apache.karaf.shell
+org.apache.karaf.shell.core
+${cxf.karaf4.version}
+
+
+org.apache.karaf
+org.apache.karaf.util
+${cxf.karaf4.version}
+
+
+org.osgi
+org.osgi.core
+
+
+org.osgi
+org.osgi.compendium
+
+
+
+
+
+org.apache.karaf.tooling
+karaf-services-maven-plugin
+${cxf.karaf4.version}
+
+
+org.apache.felix
+maven-bundle-plugin
+true
+
+
+*
+
+  !org.apache.cxf.karaf.commands,
+  org.apache.cxf*;version="[3,4)",
+  org.apache.karaf.shell*;version="[4,5)",
+  *
+
+<_nouses>true
+
<_versionpolicy>[$(version;==;$(@)),$(version;+;$(@)))
+
+
+
+
+
+

http://git-wip-us.apache.org/repos/asf/cxf/blob/042d1dbe/osgi/karaf4/commands/src/main/java/org/apache/cxf/karaf/commands/ListBussesCommand.java
--
diff --git 
a/osgi/karaf4/commands/src/main/java/org/apache/cxf/karaf/commands/ListBussesCommand.java
 
b/osgi/karaf4/commands/src/main/java/org/apache/cxf/karaf/commands/ListBussesCommand.java
new file mode 100644
index 000..820f065
--- /dev/null
+++ 
b/osgi/karaf4/commands/src/main/java/org/apache/cxf/karaf/commands/ListBussesCommand.java
@@ -0,0 +1,65 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *

[1/2] cxf git commit: [CXF-7060] Provide Karaf 4 specific features and commands

2016-09-19 Thread gnodet 
Repository: cxf
Updated Branches:
  refs/heads/master 56dab42ca -> 042d1dbe5


http://git-wip-us.apache.org/repos/asf/cxf/blob/042d1dbe/osgi/karaf4/features/src/main/resources/features.xml
--
diff --git a/osgi/karaf4/features/src/main/resources/features.xml 
b/osgi/karaf4/features/src/main/resources/features.xml
new file mode 100644
index 000..5814db2
--- /dev/null
+++ b/osgi/karaf4/features/src/main/resources/features.xml
@@ -0,0 +1,517 @@
+
+
+http://karaf.apache.org/xmlns/features/v1.4.0; 
name="cxf-${project.version}">
+
+   
mvn:org.ops4j.pax.web/pax-web-features/6.0.0-SNAPSHOT/xml/features
+   
mvn:org.ops4j.pax.cdi/pax-cdi-features/[1.0.0.RC1,2)/xml/features
+   
mvn:org.apache.activemq/activemq-karaf/[5.4,6)/xml/features
+
+
+mvn:org.apache.geronimo.specs/geronimo-osgi-registry/1.1
+mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.activation-api-1.1/${cxf.servicemix.specs.version}
+mvn:javax.annotation/javax.annotation-api/${cxf.javax.annotation-api.version}
+mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.stax-api-1.0/${cxf.servicemix.specs.version}
+mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.jaxb-api-2.2/${cxf.servicemix.specs.version}
+mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.jaxws-api-2.2/${cxf.servicemix.specs.version}
+mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.saaj-api-1.3/${cxf.servicemix.specs.version}
+mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.jsr339-api-2.0.1/${cxf.servicemix.specs.version.jaxrs}
+mvn:javax.mail/mail/${cxf.javax.mail.version}
+mvn:org.codehaus.woodstox/stax2-api/${cxf.woodstox.stax2-api.version}
+mvn:org.codehaus.woodstox/woodstox-core-asl/${cxf.woodstox.core.version}
+mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jaxb-impl/${cxf.jaxb.bundle.version}
+mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jaxb-xjc/${cxf.jaxb.bundle.version}
+
+
+cxf-specs
+cxf-wsdl
+mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jaxb-impl/${cxf.jaxb.bundle.version}
+mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jaxb-xjc/${cxf.jaxb.bundle.version}
+
+
+
+cxf-specs
+mvn:commons-codec/commons-codec/${cxf.commons-codec.version}
+mvn:org.apache.abdera/abdera-core/${cxf.abdera.version}
+mvn:org.apache.abdera/abdera-extensions-main/${cxf.abdera.version}
+mvn:org.apache.abdera/abdera-i18n/${cxf.abdera.version}
+mvn:org.apache.james/apache-mime4j-core/${cxf.james.mim4j.version}
+mvn:org.apache.abdera/abdera-parser/${cxf.abdera.version}
+mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jdom/${cxf.jdom.bundle.version}
+mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.dom4j/${cxf.dom4j.bundle.version}
+
+
+
+cxf-specs
+mvn:joda-time/joda-time/${cxf.joda.time.version}
+mvn:commons-codec/commons-codec/${cxf.commons-codec.version}
+mvn:org.apache.santuario/xmlsec/${cxf.xmlsec.bundle.version}
+mvn:com.google.guava/guava/${cxf.guava.version}
+mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.opensaml/${cxf.opensaml.osgi.version}
+mvn:org.jvnet.staxex/stax-ex/${cxf.stax-ex.version}
+mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.saaj-impl/${cxf.saaj-impl.bundle.version}
+mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xmlresolver/${cxf.xmlresolver.bundle.version}
+mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xerces/${cxf.xerces.bundle.version}
+mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.bcel/${cxf.bcel.bundle.version}
+mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xalan/${cxf.xalan.bundle.version}
+mvn:org.apache.neethi/neethi/${cxf.neethi.version}
+mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jasypt/${cxf.jasypt.bundle.version}
+mvn:org.apache.wss4j/wss4j-bindings/${cxf.wss4j.version}
+mvn:org.apache.wss4j/wss4j-ws-security-common/${cxf.wss4j.version}
+mvn:org.apache.wss4j/wss4j-ws-security-dom/${cxf.wss4j.version}
+mvn:org.apache.wss4j/wss4j-policy/${cxf.wss4j.version}
+mvn:org.apache.wss4j/wss4j-ws-security-stax/${cxf.wss4j.version}
+mvn:org.apache.wss4j/wss4j-ws-security-policy-stax/${cxf.wss4j.version}
+
+
+cxf-specs
+mvn:org.apache.ws.xmlschema/xmlschema-core/${cxf.xmlschema.version}
+mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xmlresolver/${cxf.xmlresolver.bundle.version}
+

cxf git commit: Addimg a snapshot repo to resolve Tika 2.0 deps

2016-09-19 Thread sergeyb 
Repository: cxf
Updated Branches:
  refs/heads/master c978ca027 -> 56dab42ca


Addimg a snapshot repo to resolve Tika 2.0 deps


Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/56dab42c
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/56dab42c
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/56dab42c

Branch: refs/heads/master
Commit: 56dab42caaf27e3bedf08cbb419d3644aeccb7af
Parents: c978ca0
Author: Sergey Beryozkin 
Authored: Mon Sep 19 10:23:42 2016 +0100
Committer: Sergey Beryozkin 
Committed: Mon Sep 19 10:23:42 2016 +0100

--
 distribution/src/main/release/samples/jax_rs/spark/pom.xml | 6 ++
 1 file changed, 6 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/56dab42c/distribution/src/main/release/samples/jax_rs/spark/pom.xml
--
diff --git a/distribution/src/main/release/samples/jax_rs/spark/pom.xml 
b/distribution/src/main/release/samples/jax_rs/spark/pom.xml
index ab4b30e..ca9ad56 100644
--- a/distribution/src/main/release/samples/jax_rs/spark/pom.xml
+++ b/distribution/src/main/release/samples/jax_rs/spark/pom.xml
@@ -95,4 +95,10 @@
 
 
 
+
+  
+ snapshots
+ 
https://repository.apache.org/content/repositories/snapshots/
+   
+

cxf git commit: Fixing SSE module checkstyle issues

2016-09-19 Thread sergeyb 
Repository: cxf
Updated Branches:
  refs/heads/master bd8aff665 -> c978ca027


Fixing SSE module checkstyle issues


Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/c978ca02
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/c978ca02
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/c978ca02

Branch: refs/heads/master
Commit: c978ca0274c06abd6ebf67adf2a839c4624b4906
Parents: bd8aff6
Author: Sergey Beryozkin 
Authored: Mon Sep 19 10:14:44 2016 +0100
Committer: Sergey Beryozkin 
Committed: Mon Sep 19 10:14:44 2016 +0100

--
 .../cxf/jaxrs/sse/OutboundSseEventImpl.java | 35 ++--
 .../SseAtmosphereEventOutputImpl.java   |  2 +-
 .../cdi/SseTransportCustomizationExtension.java |  2 +-
 3 files changed, 20 insertions(+), 19 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/c978ca02/rt/rs/sse/src/main/java/org/apache/cxf/jaxrs/sse/OutboundSseEventImpl.java
--
diff --git 
a/rt/rs/sse/src/main/java/org/apache/cxf/jaxrs/sse/OutboundSseEventImpl.java 
b/rt/rs/sse/src/main/java/org/apache/cxf/jaxrs/sse/OutboundSseEventImpl.java
index f852637..edff945 100644
--- a/rt/rs/sse/src/main/java/org/apache/cxf/jaxrs/sse/OutboundSseEventImpl.java
+++ b/rt/rs/sse/src/main/java/org/apache/cxf/jaxrs/sse/OutboundSseEventImpl.java
@@ -45,14 +45,14 @@ public class OutboundSseEventImpl implements 
OutboundSseEvent {
 private Object data;
 
 @Override
-public Builder id(String id) {
-this.id = id;
+public Builder id(String newId) {
+this.id = newId;
 return this;
 }
 
 @Override
-public Builder name(String name) {
-this.name = name;
+public Builder name(String newName) {
+this.name = newName;
 return this;
 }
 
@@ -63,36 +63,36 @@ public class OutboundSseEventImpl implements 
OutboundSseEvent {
 }
 
 @Override
-public Builder mediaType(MediaType mediaType) {
-this.mediaType = mediaType;
+public Builder mediaType(MediaType newMediaType) {
+this.mediaType = newMediaType;
 return this;
 }
 
 @Override
-public Builder comment(String comment) {
-this.comment = comment;
+public Builder comment(String newComment) {
+this.comment = newComment;
 return this;
 }
 
 @Override
 @SuppressWarnings("rawtypes")
-public Builder data(Class type, Object data) {
-this.type = type;
-this.data= data;
+public Builder data(Class newType, Object newData) {
+this.type = newType;
+this.data = newData;
 return this;
 }
 
 @Override
 @SuppressWarnings("rawtypes")
-public Builder data(GenericType type, Object data) {
-this.genericType = type.getType();
-this.data= data;
+public Builder data(GenericType newType, Object newData) {
+this.genericType = newType.getType();
+this.data = newData;
 return this;
 }
 
 @Override
-public Builder data(Object data) {
-this.data = data;
+public Builder data(Object newData) {
+this.data = newData;
 return this;
 }
 
@@ -111,7 +111,7 @@ public class OutboundSseEventImpl implements 
OutboundSseEvent {
 }
 
 }
-
+//CHECKSTYLE:OFF
 OutboundSseEventImpl(String id, String name, String comment, long 
reconnectDelay, 
 Class type, Type genericType, MediaType mediaType, Object data) 
{
 this.id = id;
@@ -123,6 +123,7 @@ public class OutboundSseEventImpl implements 
OutboundSseEvent {
 this.mediaType = mediaType;
 this.data = data;
 }
+//CHECKSTYLE:ON
 
 @Override
 public String getId() {

http://git-wip-us.apache.org/repos/asf/cxf/blob/c978ca02/rt/rs/sse/src/main/java/org/apache/cxf/jaxrs/sse/atmosphere/SseAtmosphereEventOutputImpl.java
--
diff --git 
a/rt/rs/sse/src/main/java/org/apache/cxf/jaxrs/sse/atmosphere/SseAtmosphereEventOutputImpl.java
 
b/rt/rs/sse/src/main/java/org/apache/cxf/jaxrs/sse/atmosphere/SseAtmosphereEventOutputImpl.java
index cbf1a26..3896ec6 100644
--- 
a/rt/rs/sse/src/main/java/org/apache/cxf/jaxrs/sse/atmosphere/SseAtmosphereEventOutputImpl.java
+++ 
b/rt/rs/sse/src/main/java/org/apache/cxf/jaxrs/sse/atmosphere/SseAtmosphereEventOutputImpl.java
@@ -41,7 +41,7 @@ public class SseAtmosphereEventOutputImpl implements 
SseEventOutput {
 
 private final

cxf-fediz git commit: Fix dependencies to beanutils and ognl. This closes #10.

2016-09-19 Thread coheigea 
Repository: cxf-fediz
Updated Branches:
  refs/heads/master 3610309d1 -> dd65d5a30


Fix dependencies to beanutils and ognl.   This closes #10.

Idp has a dependency to :
 * both commons-beanutils-core:1.8.3 and commons-beanutils:1.9.2.
 * opensymphony:ognl and ognl:ognl

Excluded dependency to the oldest version of libraries.


Project: http://git-wip-us.apache.org/repos/asf/cxf-fediz/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf-fediz/commit/dd65d5a3
Tree: http://git-wip-us.apache.org/repos/asf/cxf-fediz/tree/dd65d5a3
Diff: http://git-wip-us.apache.org/repos/asf/cxf-fediz/diff/dd65d5a3

Branch: refs/heads/master
Commit: dd65d5a302c87f75bd842cf5ee11cfce206e615f
Parents: 3610309
Author: Adrian Gonzalez 
Authored: Sun Sep 18 22:24:21 2016 +0200
Committer: Colm O hEigeartaigh 
Committed: Mon Sep 19 10:10:42 2016 +0100

--
 services/idp/pom.xml | 14 ++
 1 file changed, 14 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/dd65d5a3/services/idp/pom.xml
--
diff --git a/services/idp/pom.xml b/services/idp/pom.xml
index b7e918f..e3ce225 100644
--- a/services/idp/pom.xml
+++ b/services/idp/pom.xml
@@ -100,6 +100,12 @@
 org.springframework.webflow
 spring-webflow
 2.3.4.RELEASE
+
+
+opensymphony
+ognl
+
+
 
 
 org.springframework.security
@@ -256,6 +262,14 @@
 com.sun.xml.bind
 jaxb-impl
 
+
+
+commons-beanutils
+commons-beanutils-core
+