diff --git a/pom.xml b/pom.xml index 4c865c89f3758f866b68f2926d5d5fd01c643ec4..42f6fa94eaf800ea6a2491ed6b21602b97a58733 100644 --- a/pom.xml +++ b/pom.xml @@ -5,9 +5,9 @@ <parent> <groupId>info.kwarc.sally4</groupId> - <artifactId>sally4</artifactId> + <artifactId>sally4-osgi</artifactId> <version>0.0.7-SNAPSHOT</version> - <relativePath>..</relativePath> + <relativePath>../sally4-osgi</relativePath> </parent> <artifactId>sally4-features</artifactId> diff --git a/src/main/resources/sally.features.xml b/src/main/resources/sally.features.xml index feced6916f48c18ae9e2d91436b894c993807255..d844678c483df6bc7ff1b6273ab8534c05cd1433 100644 --- a/src/main/resources/sally.features.xml +++ b/src/main/resources/sally.features.xml @@ -6,46 +6,41 @@ <bundle start-level="50" start="false">mvn:org.scala-lang/scala-compiler/2.10.3</bundle> </feature> - <feature name="sally-extdeps" version="0.0.7-SNAPSHOT"> + <feature name="sally-extdeps" version="${project.version}"> <feature>ipojo</feature> - <feature>camel-test</feature> <feature>camel-jaxb</feature> <feature>activemq-camel</feature> <feature>camel-freemarker</feature> <feature>camel-servlet</feature> - <feature>camel-sql</feature> <feature>camel-jackson</feature> <feature>activemq-broker</feature> <bundle>mvn:org.apache.felix/org.apache.felix.ipojo.handler.extender/1.4.0</bundle> - <!-- <bundle>mvn:org.apache.felix/org.apache.felix.ipojo/1.11.2</bundle> --> - <!-- <bundle>mvn:org.apache.felix/org.apache.felix.ipojo.webconsole/1.7.0</bundle> --> - </feature> - <feature name="sally-docmanager" version="0.0.7-SNAPSHOT"> + <feature name="sally-docmanager" version="${project.version}"> <feature>sally-extdeps</feature> - <bundle>mvn:info.kwarc.sally4.comm/comm-core/0.0.7-SNAPSHOT</bundle> - <bundle>mvn:info.kwarc.sally4/sally4-docmanager/0.0.7-SNAPSHOT</bundle> - <bundle>mvn:info.kwarc.sally4/sally4-utils/0.0.7-SNAPSHOT</bundle> + <bundle>mvn:info.kwarc.sally4.comm/comm-core/${project.version}</bundle> + <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="0.0.7-SNAPSHOT"> + <feature name="sally-deepamehta" version="${project.version}"> <feature>sally-office</feature> - <bundle>mvn:info.kwarc.sally4.comm/comm-deepa/0.0.7-SNAPSHOT</bundle> - <bundle>mvn:info.kwarc.sally4/deepamehta-base/0.0.7-SNAPSHOT</bundle> + <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="0.0.7-SNAPSHOT"> + <feature name="sally-office" version="${project.version}"> <feature>sally-docmanager</feature> - <bundle>mvn:info.kwarc.sally4.comm/comm-annotation/0.0.7-SNAPSHOT</bundle> - <bundle>mvn:info.kwarc.sally4.comm/comm-text/0.0.7-SNAPSHOT</bundle> - <bundle>mvn:info.kwarc.sally4/office-base/0.0.7-SNAPSHOT</bundle> + <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="0.0.7-SNAPSHOT"> + <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> @@ -54,7 +49,7 @@ <bundle>mvn:info.kwarc.mmt/mmt-tiscaf</bundle> </feature> - <feature name="sally-mmt-dev" version="0.0.7-SNAPSHOT"> + <feature name="sally-mmt-dev" version="${project.version}"> <feature>scala</feature> <bundle>mvn:info.kwarc.mmt/mmt-informal/1.0.1</bundle> <bundle>mvn:info.kwarc.mmt/planetary-mmt/1.0.1</bundle> @@ -64,19 +59,19 @@ </feature> - <feature name="sally-mhw" version="0.0.7-SNAPSHOT"> + <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/0.0.7-SNAPSHOT</bundle> - <bundle>mvn:info.kwarc.sally4.comm/comm-planetary/0.0.7-SNAPSHOT</bundle> - <bundle>mvn:info.kwarc.sally4.comm/comm-search/0.0.7-SNAPSHOT</bundle> - <bundle>mvn:info.kwarc.sally4/mhw-base/0.0.7-SNAPSHOT</bundle> - <bundle>mvn:info.kwarc.sally4/text-base/0.0.7-SNAPSHOT</bundle> - <bundle>mvn:info.kwarc.sally4/mhw-lmh/0.0.7-SNAPSHOT</bundle> - <bundle>mvn:info.kwarc.sally4/mhw-mmt/0.0.7-SNAPSHOT</bundle> - <bundle>mvn:info.kwarc.sally4/repository-base/0.0.7-SNAPSHOT</bundle> - <bundle>mvn:info.kwarc.sally4/mhw-stexservices/0.0.7-SNAPSHOT</bundle> + <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