You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicemix.apache.org by ff...@apache.org on 2015/12/18 03:43:28 UTC
[2/2] servicemix-bundles git commit: Merge branch 'SM-2775' of
https://github.com/oscerd/servicemix-bundles
Merge branch 'SM-2775' of https://github.com/oscerd/servicemix-bundles
Conflicts:
pom.xml
Project: http://git-wip-us.apache.org/repos/asf/servicemix-bundles/repo
Commit: http://git-wip-us.apache.org/repos/asf/servicemix-bundles/commit/96f4fab7
Tree: http://git-wip-us.apache.org/repos/asf/servicemix-bundles/tree/96f4fab7
Diff: http://git-wip-us.apache.org/repos/asf/servicemix-bundles/diff/96f4fab7
Branch: refs/heads/master
Commit: 96f4fab77625b63adc9270e613fa570b4da59b93
Parents: a655667 249bc6a
Author: Freeman Fang <fr...@gmail.com>
Authored: Fri Dec 18 10:43:07 2015 +0800
Committer: Freeman Fang <fr...@gmail.com>
Committed: Fri Dec 18 10:43:07 2015 +0800
----------------------------------------------------------------------
pom.xml | 1 +
solr-solrj-5.4.0/pom.xml | 168 +++++++++++++++++++
.../src/main/resources/OSGI-INF/bundle.info | 21 +++
3 files changed, 190 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/servicemix-bundles/blob/96f4fab7/pom.xml
----------------------------------------------------------------------
diff --cc pom.xml
index 3919d56,618e332..16bcbaa
--- a/pom.xml
+++ b/pom.xml
@@@ -53,12 -53,7 +53,13 @@@
<module>aws-java-sdk-1.10.41</module>
<module>elasticsearch-2.0.1</module>
<module>gae-1.9.30</module>
+ <module>quickfix-1-6-1</module>
+ <module>lucene-5.4.0</module>
+ <module>lucene-analyzers-common-5.4.0</module>
+ <module>lucene-queries-5.4.0</module>
+ <module>lucene-queryparser-5.4.0</module>
+ <module>lucene-sandbox-5.4.0</module>
+ <module>solr-solrj-5.4.0</module>
</modules>
</project>