Merge branch 'Drop_slf4j_dependency' into develop

Project: http://git-wip-us.apache.org/repos/asf/zest-qi4j/repo
Commit: http://git-wip-us.apache.org/repos/asf/zest-qi4j/commit/126550ff
Tree: http://git-wip-us.apache.org/repos/asf/zest-qi4j/tree/126550ff
Diff: http://git-wip-us.apache.org/repos/asf/zest-qi4j/diff/126550ff

Branch: refs/heads/develop
Commit: 126550ff8f429d22c292a8ce8a9087db83dd58ef
Parents: c08eed1 72524b3
Author: Niclas Hedhman <[email protected]>
Authored: Fri Apr 24 11:45:44 2015 +0800
Committer: Niclas Hedhman <[email protected]>
Committed: Fri Apr 24 11:45:44 2015 +0800

----------------------------------------------------------------------
 core/api/build.gradle                           |  1 -
 .../ApplicationPassivationThread.java           |  5 +-
 core/bootstrap/build.gradle                     |  1 -
 core/functional/build.gradle                    |  4 --
 .../java/org/qi4j/functional/Iterables.java     | 12 +---
 .../src/main/java/org/qi4j/io/Transforms.java   |  2 +-
 .../test/java/org/qi4j/io/InputOutputTest.java  |  8 +--
 core/runtime/build.gradle                       |  2 -
 .../ImportedServiceReferenceInstance.java       |  3 -
 .../helpers/JSONMapEntityStoreMixin.java        | 59 ++++++++++----------
 .../helpers/MapEntityStoreMixin.java            | 59 ++++++++++----------
 .../spi/value/ValueDeserializerAdapter.java     | 59 +-------------------
 .../qi4j/spi/value/ValueSerializerAdapter.java  | 12 ----
 .../org/qi4j/test/AbstractQi4jBaseTest.java     | 14 -----
 .../org/qi4j/test/AbstractQi4jScenarioTest.java | 14 -----
 ...AbstractValueCompositeSerializationTest.java |  7 ---
 extensions/entitystore-jclouds/build.gradle     | 20 +++----
 extensions/entitystore-preferences/build.gradle | 15 +++--
 extensions/entitystore-riak/build.gradle        | 18 +++---
 extensions/indexing-elasticsearch/build.gradle  |  1 +
 extensions/indexing-rdf/build.gradle            |  1 +
 extensions/indexing-solr/build.gradle           |  1 +
 extensions/migration/build.gradle               |  1 +
 extensions/reindexer/build.gradle               |  1 +
 libraries/circuitbreaker/build.gradle           |  1 +
 libraries/eventsourcing/build.gradle            |  1 +
 libraries/fileconfig/build.gradle               |  1 +
 libraries/jmx/build.gradle                      |  1 +
 libraries/rest-client/build.gradle              |  1 +
 libraries/rest-server/build.gradle              |  1 +
 libraries/scheduler/build.gradle                |  1 +
 libraries/servlet/build.gradle                  |  3 +-
 libraries/shiro-core/build.gradle               |  1 +
 libraries/shiro-web/build.gradle                |  1 +
 libraries/sql-liquibase/build.gradle            |  1 +
 libraries/sql/build.gradle                      |  1 +
 libraries/struts2-plugin/build.gradle           |  1 +
 samples/dci-cargo/dcisample_a/build.gradle      |  1 +
 samples/dci-cargo/dcisample_b/build.gradle      |  1 +
 tests/performance/build.gradle                  |  3 +-
 40 files changed, 115 insertions(+), 225 deletions(-)
----------------------------------------------------------------------


Reply via email to