diff --git a/uCC/ucc.karaf.feature/pom.xml b/uCC/ucc.karaf.feature/pom.xml index 909aca57d5bc5502435915d8ed2b30472b3fa0fc..ad6b6608fb5193a87a10977b214be9c2fc891ee4 100644 --- a/uCC/ucc.karaf.feature/pom.xml +++ b/uCC/ucc.karaf.feature/pom.xml @@ -15,6 +15,7 @@ <properties> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> + <uaal.parent.version>2.0.2-SNAPSHOT</uaal.parent.version> </properties> diff --git a/uCC/ucc.karaf.feature/src/main/features/uCC.xml b/uCC/ucc.karaf.feature/src/main/features/uCC.xml index 6fe0e0914887e476a782fdac2423499ecdf36bed..557cf8c6f9371d2954feed8f06298314134cda9e 100644 --- a/uCC/ucc.karaf.feature/src/main/features/uCC.xml +++ b/uCC/ucc.karaf.feature/src/main/features/uCC.xml @@ -1,12 +1,18 @@ <?xml version="1.0" encoding="UTF-8"?> -<features name="universAAL-uCC-karaf-2.0.1" xmlns="http://karaf.apache.org/xmlns/features/v1.0.0"> +<features name="universAAL-Control-Center" xmlns="http://karaf.apache.org/xmlns/features/v1.0.0"> - <feature name="uAAL-uCC" description="The uCC for universAAL middleware 2.0" - version="2.0.1-SNAPSHOT" resolver='(obr)'> + <repository>mvn:org.universAAL.middleware/mw.karaf.feature/${uaal.parent.version}/xml/features</repository> + <repository>mvn:org.universAAL.ontology/ont.karaf.feature/${uaal.parent.version}/xml/features</repository> + <feature name="uAAL-uCC" description="The uCC for universAAL middleware 2.0" + version="2.0.2-SNAPSHOT" resolver='(obr)'> + <feature>uAAL-MW</feature> + <feature>uAAL-Ont</feature> - <bundle start-level="90">mvn:org.universAAL.ontology/ont.profile/2.0.0</bundle> - <bundle start-level="91">mvn:org.universAAL.ontology/ont.profile.userid/2.0.0</bundle> +<!-- <bundle start-level="90">mvn:org.universAAL.ontology/ont.profile/2.0.0</bundle> --> +<!-- <bundle start-level="91">mvn:org.universAAL.ontology/ont.profile.userid/2.0.0</bundle> --> + <feature>uAAL-Ont.Profile.userId</feature> + <!-- <bundle start-level="91">mvn:org.universAAL.ontology/ont.profile.ui.mainmenu/2.0.0</bundle>--> <bundle start-level="91">wrap:mvn:org.universAAL.support/uAAL.utils/2.0.0</bundle> <bundle start-level="92">mvn:org.universAAL.tools.ucc/ucc.profile.agent/2.0.1-SNAPSHOT</bundle>