This is an automated email from the ASF dual-hosted git repository. matthieu pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/james-project.git
commit 89a3b2c52fa24c036adf27e23678be4b1f93a5b4 Merge: 4cb2104 22b747e Author: Matthieu Baechler <[email protected]> AuthorDate: Fri Aug 23 11:05:06 2019 +0200 Merge branch 'JAMES-2870-deprecate-zookeeper' .../META-INF/spring/mailbox-memory-osgi.xml | 39 --- .../META-INF/spring/mailbox-authenticator-osgi.xml | 33 -- .../META-INF/spring/mailbox-locker-osgi.xml | 33 -- mailbox/zoo-seq-provider/pom.xml | 2 +- .../james/mailbox/store/mail/ZooUidProvider.java | 5 + .../resources/META-INF/spring/loaders-osgi.xml | 61 ---- .../main/resources/META-INF/spring/data-osgi.xml | 45 --- .../main/resources/META-INF/spring/dns-osgi.xml | 37 --- server/karaf/README.md | 85 ------ server/karaf/build.sh | 5 - server/karaf/distribution/pom.xml | 149 --------- .../karaf/distribution/src/main/assembly/unix.xml | 81 ----- .../main/filtered-resources/etc/custom.properties | 34 --- .../etc/org.apache.karaf.features.cfg | 28 -- server/karaf/features/pom.xml | 92 ------ .../karaf/features/src/main/resources/features.xml | 334 --------------------- server/karaf/integration/pom.xml | 167 ----------- .../features/CommonsConfigurationLiveTest.java | 0 .../features/CommonsConfigurationTestLive.java | 14 - .../james/karaf/features/DnsServiceLiveTest.java | 0 .../james/karaf/features/DnsServiceTestLive.java | 16 - .../james/karaf/features/FetchMailLiveTest.java | 0 .../james/karaf/features/FetchMailTestLive.java | 15 - .../james/karaf/features/KarafLiveTestSupport.java | 152 ---------- .../karaf/features/MailetContainerLiveTest.java | 0 .../karaf/features/MailetContainerTestLive.java | 21 -- .../james/karaf/features/Mime4jLiveTest.java | 0 .../james/karaf/features/Mime4jTestLive.java | 14 - .../META-INF/spring/mailetcontainer-osgi.xml | 50 --- .../resources/META-INF/spring/fetchmail-osgi.xml | 36 --- .../resources/META-INF/spring/imapserver-osgi.xml | 36 --- .../resources/META-INF/spring/lmtpserver-osgi.xml | 35 --- .../resources/META-INF/spring/pop3server-osgi.xml | 36 --- .../resources/META-INF/spring/smtpserver-osgi.xml | 35 --- .../META-INF/spring/activemq-queue-osgi.xml | 48 --- .../resources/META-INF/spring/file-queue-osgi.xml | 35 --- 36 files changed, 6 insertions(+), 1767 deletions(-) --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
