You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@tamaya.apache.org by an...@apache.org on 2018/12/15 23:22:34 UTC

[incubator-tamaya-extensions] 02/05: Merge branch 'master' of https://github.com/apache/incubator-tamaya-extensions

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

anatole pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-tamaya-extensions.git

commit c878a30de70c83f9de4f369de6a1eb698511b62b
Merge: 74a7a9b 685016a
Author: Anatole Tresch <at...@gmail.com>
AuthorDate: Sat Dec 15 22:39:33 2018 +0100

    Merge branch 'master' of https://github.com/apache/incubator-tamaya-extensions

 examples/05-spring-example/pom.xml                       |  4 ++--
 modules/features/pom.xml                                 |  2 +-
 modules/spring/pom.xml                                   | 16 +++++++++++-----
 .../spring/SpringConfigInjectionPostProcessor.java       |  4 ----
 .../tamaya/integration/spring/SpringConfigTest.java      | 13 ++++++-------
 .../tamaya/integration/spring/SpringConfigTest2.java     | 15 +++++----------
 pom.xml                                                  | 14 ++++++++++++--
 7 files changed, 37 insertions(+), 31 deletions(-)