Skip to content

Commit

Permalink
HSEARCH-1849 Making OSGi happy
Browse files Browse the repository at this point in the history
  • Loading branch information
@gunnarmorling @Sanne
gunnarmorling authored and Sanne committed Aug 6, 2015
1 parent 418d3f8 commit d9191fd
Show file tree
Hide file tree
Showing 3 changed files with 20 additions and 2 deletions.
19 changes: 18 additions & 1 deletion engine/pom.xml
View file
Expand Up @@ -194,7 +194,24 @@
<instructions>
<Import-Package>
org.hibernate.annotations.common.*;version="[5,6)",
org.apache.lucene.*;version="[4.10.0,4.11.0)",
org.apache.lucene;version="[5.2.1,5.2.2)",
org.apache.lucene.analysis;version="[5.2.1,5.2.2)",
org.apache.lucene.analysis.core;version="[5.2.1,5.2.2)",
org.apache.lucene.analysis.standard;version="[5.2.1,5.2.2)",
org.apache.lucene.analysis.tokenattributes;version="[5.2.1,5.2.2)",
org.apache.lucene.analysis.util;version="[5.2.1,5.2.2)",
org.apache.lucene.document;version="[5.2.1,5.2.2)",
org.apache.lucene.facet;version="[5.2.1,5.2.2)",
org.apache.lucene.facet.range;version="[5.2.1,5.2.2)",
org.apache.lucene.facet.sortedset;version="[5.2.1,5.2.2)",
org.apache.lucene.index;version="[5.2.1,5.2.2)",
org.apache.lucene.queries.mlt;version="[5.2.1,5.2.2)",
org.apache.lucene.search;version="[5.2.1,5.2.2)",
org.apache.lucene.search.similarities;version="[5.2.1,5.2.2)",
org.apache.lucene.store;version="[5.2.1,5.2.2)",
org.apache.lucene.uninverting;version="[5.2.1,5.2.2)",
org.apache.lucene.util;version="[5.2.1,5.2.2)",
org.apache.lucene.util.automaton;version="[5.2.1,5.2.2)",
org.jboss.logging.*;version="[3.1,4.0.0)",
org.apache.tika.*;version="[${tikaVersion}, 1.5)";resolution:=optional,
javax.transaction.*;version="0";resolution:=optional
Expand Down
1 change: 1 addition & 0 deletions integrationtest/osgi/karaf-features/src/main/features/features.xml
View file
Expand Up @@ -38,6 +38,7 @@
<bundle>wrap:mvn:org.apache.lucene/lucene-queries/${luceneVersion}$Bundle-SymbolicName=org.hibernate.org.apache.lucene.queries&amp;Export-Package=org.apache.lucene.queries;version="${luceneVersion}",org.apache.lucene.queries.function;version="${luceneVersion}",org.apache.lucene.queries.mlt;version="${luceneVersion}"</bundle>
<bundle>wrap:mvn:org.apache.lucene/lucene-analyzers-common/${luceneVersion}$Bundle-SymbolicName=org.hibernate.org.apache.lucene.analyzers.common&amp;Export-Package=org.apache.lucene.analysis.ar;version="${luceneVersion}",org.apache.lucene.analysis.bg;version="${luceneVersion}",org.apache.lucene.analysis.br;version="${luceneVersion}",org.apache.lucene.analysis.ca;version="${luceneVersion}",org.apache.lucene.analysis.charfilter;version="${luceneVersion}",org.apache.lucene.analysis.cjk;version="${luceneVersion}",org.apache.lucene.analysis.cn;version="${luceneVersion}",org.apache.lucene.analysis.commongrams;version="${luceneVersion}",org.apache.lucene.analysis.compound;version="${luceneVersion}",org.apache.lucene.analysis.core;version="${luceneVersion}",org.apache.lucene.analysis.cz;version="${luceneVersion}",org.apache.lucene.analysis.da;version="${luceneVersion}",org.apache.lucene.analysis.de;version="${luceneVersion}",org.apache.lucene.analysis.el;version="${luceneVersion}",org.apache.lucene.analysis.en;version="${luceneVersion}",org.apache.lucene.analysis.es;version="${luceneVersion}",org.apache.lucene.analysis.eu;version="${luceneVersion}",org.apache.lucene.analysis.fa;version="${luceneVersion}",org.apache.lucene.analysis.fi;version="${luceneVersion}",org.apache.lucene.analysis.fr;version="${luceneVersion}",org.apache.lucene.analysis.ga;version="${luceneVersion}",org.apache.lucene.analysis.gl;version="${luceneVersion}",org.apache.lucene.analysis.hi;version="${luceneVersion}",org.apache.lucene.analysis.hu;version="${luceneVersion}",org.apache.lucene.analysis.hunspell;version="${luceneVersion}",org.apache.lucene.analysis.hy;version="${luceneVersion}",org.apache.lucene.analysis.id;version="${luceneVersion}",org.apache.lucene.analysis.in;version="${luceneVersion}",org.apache.lucene.analysis.it;version="${luceneVersion}",org.apache.lucene.analysis.lv;version="${luceneVersion}",org.apache.lucene.analysis.miscellaneous;version="${luceneVersion}",org.apache.lucene.analysis.ngram;version="${luceneVersion}",org.apache.lucene.analysis.nl;version="${luceneVersion}",org.apache.lucene.analysis.no;version="${luceneVersion}",org.apache.lucene.analysis.path;version="${luceneVersion}",org.apache.lucene.analysis.pattern;version="${luceneVersion}",org.apache.lucene.analysis.payloads;version="${luceneVersion}",org.apache.lucene.analysis.position;version="${luceneVersion}",org.apache.lucene.analysis.pt;version="${luceneVersion}",org.apache.lucene.analysis.query;version="${luceneVersion}",org.apache.lucene.analysis.reverse;version="${luceneVersion}",org.apache.lucene.analysis.ro;version="${luceneVersion}",org.apache.lucene.analysis.ru;version="${luceneVersion}",org.apache.lucene.analysis.shingle;version="${luceneVersion}",org.apache.lucene.analysis.sinks;version="${luceneVersion}",org.apache.lucene.analysis.snowball;version="${luceneVersion}",org.apache.lucene.analysis.standard;version="${luceneVersion}",org.apache.lucene.analysis.sv;version="${luceneVersion}",org.apache.lucene.analysis.synonym;version="${luceneVersion}",org.apache.lucene.analysis.th;version="${luceneVersion}",org.apache.lucene.analysis.tr;version="${luceneVersion}",org.apache.lucene.analysis.util;version="${luceneVersion}",org.apache.lucene.analysis.wikipedia;version="${luceneVersion}",org.tartarus.snowball;version="${luceneVersion}",org.tartarus.snowball.ext;version="${luceneVersion}"</bundle>
<bundle>wrap:mvn:org.apache.lucene/lucene-facet/${luceneVersion}$Bundle-SymbolicName=org.hibernate.org.apache.lucene.facet&amp;Export-Package=org.apache.lucene.facet.*;version="${luceneVersion}"</bundle>
<bundle>wrap:mvn:org.apache.lucene/lucene-misc/${luceneVersion}$Bundle-SymbolicName=org.hibernate.org.apache.lucene.misc&amp;Export-Package=org.apache.lucene.uninverting*;version="${luceneVersion}"</bundle>

<!-- Hibernate Search -->
<bundle>mvn:org.hibernate/hibernate-search-engine/${project.version}</bundle>
Expand Down
2 changes: 1 addition & 1 deletion orm/pom.xml
View file
Expand Up @@ -171,7 +171,7 @@
<!-- the following search engine imports are explicitly listed, since they are not automatically generated by the plugin. BUG!?-->
org.hibernate.search.spatial.impl;version="[${project.version},${project.version}]",
org.hibernate.search.util.impl;version="[${project.version},${project.version}]",
org.apache.lucene.*;version="[4.10.0,4.11.0)",
org.apache.lucene.*;version="[5.2.1,5.2.2)",
org.hibernate.*;version="[5.0.0,5.1.0)",
javax.transaction;version="[1.1,2)",
javax.persistence.*;version="[2.0.0,3.0.0)";resolution:=optional
Expand Down

0 comments on commit d9191fd

Please sign in to comment.