Merge remote-tracking branch 'johnpoth/ARTEMIS-1630'
Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/54c80aab Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/54c80aab Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/54c80aab Branch: refs/heads/master Commit: 54c80aabcddd54d819226667278d853bcd825f8f Parents: 2bba8cc cef1cc8 Author: Guillaume Nodet <gno...@gmail.com> Authored: Mon Feb 5 11:03:47 2018 +0100 Committer: Guillaume Nodet <gno...@gmail.com> Committed: Mon Feb 5 11:03:47 2018 +0100 ---------------------------------------------------------------------- artemis-core-client-osgi/pom.xml | 113 +++++++++++ .../src/main/resources/features.xml | 37 +++- artemis-jms-client-osgi/pom.xml | 123 ++++++++++++ artemis-server/pom.xml | 7 +- pom.xml | 4 + tests/integration-tests/pom.xml | 2 - tests/karaf-client-integration-tests/pom.xml | 197 +++++++++++++++++++ .../client/ArtemisAMQPClientFeatureIT.java | 84 ++++++++ .../client/ArtemisCoreClientFeatureIT.java | 84 ++++++++ .../karaf/client/ArtemisJMSClientFeatureIT.java | 84 ++++++++ .../ArtemisTransactionalJMSClientFeatureIT.java | 108 ++++++++++ .../karaf/client/PaxExamOptions.java | 98 +++++++++ tests/pom.xml | 1 + 13 files changed, 932 insertions(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/54c80aab/pom.xml ----------------------------------------------------------------------
