diff --git a/pom.xml b/pom.xml index 3239a995a6be20624b110f272e0c976154f9d487..47bf0b30be0bbdd74511cace16bfcaf535fdc487 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ <parent> <groupId>info.kwarc.sally4</groupId> <artifactId>sally4</artifactId> - <version>0.0.8-SNAPSHOT</version> + <version>1.0.1-SNAPSHOT</version> <relativePath>..</relativePath> </parent> diff --git a/src/main/resources/sally.features.xml b/src/main/resources/sally.features.xml index 882f7847c3c52b672578c3d097655c25e14632c0..1a1e5277104a6151344dfeeb8b69a005c4c39487 100644 --- a/src/main/resources/sally.features.xml +++ b/src/main/resources/sally.features.xml @@ -1,20 +1,16 @@ <features xmlns="http://karaf.apache.org/xmlns/features/v1.0.0" name="sally"> - <feature name="scala" version="2.10.3"> - <bundle start-level="50" start="false">mvn:org.scala-lang/scala-reflect/2.10.3</bundle> - <bundle start-level="50" start="false">mvn:org.scala-lang/scala-library/2.10.3</bundle> - <bundle start-level="50" start="false">mvn:org.scala-lang/scala-compiler/2.10.3</bundle> - </feature> - <feature name="sally-extdeps" version="${project.version}"> <feature>ipojo</feature> <feature>camel-jaxb</feature> <feature>activemq-camel</feature> <feature>camel-freemarker</feature> <feature>camel-servlet</feature> - <feature>camel-jackson</feature> <bundle>mvn:org.apache.felix/org.apache.felix.ipojo.handler.extender/1.4.0</bundle> + <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.cglib/2.2.2_1</bundle> + <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-beanutils/1.7.0_6</bundle> + <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-digester/1.8_4</bundle> <bundle>mvn:com.google.guava/guava/18.0</bundle> </feature> @@ -25,53 +21,4 @@ <bundle>mvn:info.kwarc.sally4/sally4-docmanager/${project.version}</bundle> <bundle>mvn:info.kwarc.sally4/sally4-utils/${project.version}</bundle> </feature> - - <feature name="sally-deepamehta" version="${project.version}"> - <feature>sally-office</feature> - <bundle>mvn:info.kwarc.sally4.comm/comm-deepa/${project.version}</bundle> - <bundle>mvn:info.kwarc.sally4/deepamehta-base/${project.version}</bundle> - </feature> - - <feature name="sally-office" version="${project.version}"> - <feature>sally-docmanager</feature> - - <bundle>mvn:info.kwarc.sally4.comm/comm-annotation/${project.version}</bundle> - <bundle>mvn:info.kwarc.sally4.comm/comm-text/${project.version}</bundle> - <bundle>mvn:info.kwarc.sally4/office-base/${project.version}</bundle> - </feature> - - <feature name="sally-mmt" version="${project.version}"> - <feature>scala</feature> - <bundle>mvn:info.kwarc.mmt/mmt-informal</bundle> - <bundle>mvn:info.kwarc.mmt/planetary-mmt</bundle> - <bundle>mvn:info.kwarc.mmt/mmt-stex</bundle> - <bundle>mvn:info.kwarc.mmt/mmt-webedit</bundle> - <bundle>mvn:info.kwarc.mmt/mmt-tiscaf</bundle> - </feature> - - <feature name="sally-mmt-dev" version="${project.version}"> - <feature>scala</feature> - <bundle>mvn:info.kwarc.mmt/mmt-informal/1.0.1-SNAPSHOT</bundle> - <bundle>mvn:info.kwarc.mmt/planetary-mmt/1.0.1-SNAPSHOT</bundle> - <bundle>mvn:info.kwarc.mmt/mmt-stex/1.0.1-SNAPSHOT</bundle> - <bundle>mvn:info.kwarc.mmt/mmt-webedit/1.0.1-SNAPSHOT</bundle> - <bundle>mvn:info.kwarc.mmt/mmt-tiscaf/1.0.1-SNAPSHOT</bundle> - </feature> - - - <feature name="sally-mhw" version="${project.version}"> - <feature>sally-docmanager</feature> - <feature>sally-mmt</feature> - <feature>camel-solr</feature> - <bundle>mvn:info.kwarc.sally4.comm/comm-text/${project.version}</bundle> - <bundle>mvn:info.kwarc.sally4.comm/comm-planetary/${project.version}</bundle> - <bundle>mvn:info.kwarc.sally4.comm/comm-search/${project.version}</bundle> - <bundle>mvn:info.kwarc.sally4/mhw-base/${project.version}</bundle> - <bundle>mvn:info.kwarc.sally4/text-base/${project.version}</bundle> - <bundle>mvn:info.kwarc.sally4/mhw-lmh/${project.version}</bundle> - <bundle>mvn:info.kwarc.sally4/mhw-mmt/${project.version}</bundle> - <bundle>mvn:info.kwarc.sally4/repository-base/${project.version}</bundle> - <bundle>mvn:info.kwarc.sally4/mhw-stexservices/${project.version}</bundle> - </feature> - -</features> \ No newline at end of file +</features>