Merge branch 'SM-2889' 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/3283fd3f
Tree: http://git-wip-us.apache.org/repos/asf/servicemix-bundles/tree/3283fd3f
Diff: http://git-wip-us.apache.org/repos/asf/servicemix-bundles/diff/3283fd3f
Branch: refs/heads/master
Commit: 3283fd3f4a7208a7fadf9c8dba201ef67a2203eb
Parents: ef308a2 7ba9479
Author: Freeman Fang <[email protected]>
Authored: Mon Feb 29 15:24:21 2016 +0800
Committer: Freeman Fang <[email protected]>
Committed: Mon Feb 29 15:24:21 2016 +0800
----------------------------------------------------------------------
pom.xml | 1 +
solr-solrj-5.5.0/pom.xml | 169 +++++++++++++++++++
.../src/main/resources/OSGI-INF/bundle.info | 21 +++
3 files changed, 191 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/servicemix-bundles/blob/3283fd3f/pom.xml
----------------------------------------------------------------------
diff --cc pom.xml
index cd7401a,9f87b7d..92b311f
--- a/pom.xml
+++ b/pom.xml
@@@ -47,11 -47,7 +47,12 @@@
<module>cglib-3.2.1</module>
<module>kafka_2.10-0.9.0.1</module>
<module>hystrix-1.4.23</module>
+ <module>lucene-5.5.0</module>
+ <module>lucene-analyzers-common-5.5.0</module>
+ <module>lucene-queries-5.5.0</module>
+ <module>lucene-queryparser-5.5.0</module>
+ <module>lucene-sandbox-5.5.0</module>
+ <module>solr-solrj-5.5.0</module>
</modules>
</project>
