[1/7] cxf git commit: Update depends plugin to 1.4.0

Repository: cxf Updated Branches: refs/heads/3.1.x-fixes eaef73a95 -> daa35eef6 Update depends plugin to 1.4.0 # Conflicts: # osgi/itests/pom.xml # parent/pom.xml Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit:

[7/7] cxf git commit: Recording .gitmergeinfo Changes

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/daa35eef Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/daa35eef Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/daa35eef Branch:

[5/7] cxf git commit: Remove org.json stuff from build other than in systests/jaxrs (need to work on that yet)

Remove org.json stuff from build other than in systests/jaxrs (need to work on that yet) # Conflicts: # parent/pom.xml Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/072e094a Tree:

[6/7] cxf git commit: Remove usage of json.org stff in systests/jaxrs

Remove usage of json.org stff in systests/jaxrs # Conflicts: # systests/jaxrs/pom.xml # systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/description/AbstractSwaggerServiceDescriptionTest.java Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit:

[3/7] cxf git commit: Update Jackson version

Update Jackson version Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/dcc7e935 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/dcc7e935 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/dcc7e935 Branch:

[2/7] cxf git commit: fixed JavaDoc (XPathExpressionException no longer thrown)

fixed JavaDoc (XPathExpressionException no longer thrown) Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/abaa6b35 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/abaa6b35 Diff:

[4/7] cxf git commit: fixed typo in log message and invalid javadocs

fixed typo in log message and invalid javadocs # Conflicts: # core/src/main/java/org/apache/cxf/staxutils/StreamWriterContentHandler.java # maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/wsdl2java/WSDL2JavaMojo.java #

cxf git commit: Remove usage of json.org stff in systests/jaxrs

Repository: cxf Updated Branches: refs/heads/master 7f07dac41 -> 74cba28db Remove usage of json.org stff in systests/jaxrs Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/74cba28d Tree:

cxf git commit: Remove some final modifiers

Repository: cxf Updated Branches: refs/heads/master 9b2b7e812 -> 7f07dac41 Remove some final modifiers Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/7f07dac4 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/7f07dac4

[1/4] cxf git commit: Improve testing of STS intermediary caching

Repository: cxf Updated Branches: refs/heads/3.0.x-fixes 310e52e97 -> f285e3808 Improve testing of STS intermediary caching # Conflicts: # services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/intermediary_transformation/IntermediaryCachingPortTypeImpl.java #

[3/4] cxf git commit: Recording .gitmergeinfo Changes

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/83f0f004 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/83f0f004 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/83f0f004 Branch:

[2/4] cxf git commit: Minor fix to last commit

Minor fix to last commit Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/7a2ffb7f Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/7a2ffb7f Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/7a2ffb7f Branch:

[4/4] cxf git commit: JDK 1.6 fix

JDK 1.6 fix Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/f285e380 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/f285e380 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/f285e380 Branch: refs/heads/3.0.x-fixes

cxf git commit: Minor fix to last commit

Repository: cxf Updated Branches: refs/heads/3.1.x-fixes 20ba06e13 -> eaef73a95 Minor fix to last commit Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/eaef73a9 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/eaef73a9

cxf git commit: Minor fix to last commit

Repository: cxf Updated Branches: refs/heads/master 07093d2f5 -> 9b2b7e812 Minor fix to last commit Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/9b2b7e81 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/9b2b7e81 Diff:

[2/2] cxf git commit: Improve testing of STS intermediary caching

Improve testing of STS intermediary caching # Conflicts: # services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/intermediary_transformation/IntermediaryCachingPortTypeImpl.java #

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

Repository: cxf Updated Branches: refs/heads/3.1.x-fixes 6c70b024d -> 20ba06e13 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/20ba06e1 Tree:

cxf git commit: Improve testing of STS intermediary caching

Repository: cxf Updated Branches: refs/heads/master c255034b2 -> 07093d2f5 Improve testing of STS intermediary caching Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/07093d2f Tree:

cxf git commit: Remove org.json stuff from build other than in systests/jaxrs (need to work on that yet)

Repository: cxf Updated Branches: refs/heads/master ee62e3c37 -> c255034b2 Remove org.json stuff from build other than in systests/jaxrs (need to work on that yet) Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/c255034b

[3/3] cxf git commit: Recording .gitmergeinfo Changes

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/310e52e9 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/310e52e9 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/310e52e9 Branch:

[1/3] cxf git commit: CXF-7381 - DateFormat in MapEventLogger in the STS is not thread safe

Repository: cxf Updated Branches: refs/heads/3.0.x-fixes eeae9d07b -> 310e52e97 CXF-7381 - DateFormat in MapEventLogger in the STS is not thread safe # Conflicts: # services/sts/sts-core/src/main/java/org/apache/cxf/sts/event/map/MapEventLogger.java Project:

[2/3] cxf git commit: Fixing merge

Fixing merge Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/f3c19558 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/f3c19558 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/f3c19558 Branch: refs/heads/3.0.x-fixes

[2/3] cxf git commit: CXF-7381 - DateFormat in MapEventLogger in the STS is not thread safe

CXF-7381 - DateFormat in MapEventLogger in the STS is not thread safe # Conflicts: # services/sts/sts-core/src/main/java/org/apache/cxf/sts/event/map/MapEventLogger.java Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit:

[3/3] cxf git commit: Fixing merge

Fixing merge Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/6c70b024 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/6c70b024 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/6c70b024 Branch: refs/heads/3.1.x-fixes

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

Repository: cxf Updated Branches: refs/heads/3.1.x-fixes 42739ef5d -> 6c70b024d 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/742c38c4 Tree:

cxf git commit: CXF-7381 - DateFormat in MapEventLogger in the STS is not thread safe

Repository: cxf Updated Branches: refs/heads/master c2517eb55 -> ee62e3c37 CXF-7381 - DateFormat in MapEventLogger in the STS is not thread safe Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/ee62e3c3 Tree: