community
/
product-iots
10
0
Fork 4
Code Issues Pull Requests Packages Projects Releases Wiki Activity

added filter properties to pick the parent plugins version

Browse Source
merge-requests/1/head
ayyoob 8 years ago
parent 834ad4f772
commit 475bd3ac84
2 changed files with 27 additions and 20 deletions
Show Stats Download Patch File Download Diff File

1
modules/distribution/pom.xml
Unescape View File

@ -777,6 +777,7 @@
<filters> <filters>
<filter>${basedir}/src/assembly/filter.properties</filter> <filter>${basedir}/src/assembly/filter.properties</filter>
</filters> </filters>
<escapeString>\</escapeString>
<descriptors> <descriptors>
<descriptor>${basedir}/src/assembly/bin.xml</descriptor> <descriptor>${basedir}/src/assembly/bin.xml</descriptor>
</descriptors> </descriptors>

46
modules/distribution/src/core/plugins/plugins-deployer.xml
Unescape View File

@ -46,22 +46,19 @@
<goal>p2-repo-gen</goal> <goal>p2-repo-gen</goal>
</goals> </goals>
<configuration> <configuration>
<metadataRepository>file:${basedir}/target/p2-repo</metadataRepository> <metadataRepository>file:\${basedir}/target/p2-repo</metadataRepository>
<artifactRepository>file:${basedir}/target/p2-repo</artifactRepository> <artifactRepository>file:\${basedir}/target/p2-repo</artifactRepository>
<publishArtifacts>true</publishArtifacts> <publishArtifacts>true</publishArtifacts>
<publishArtifactRepository>true</publishArtifactRepository> <publishArtifactRepository>true</publishArtifactRepository>
<featureArtifacts> <featureArtifacts>
<featureArtifactDef> <featureArtifactDef>
org.wso2.carbon.devicemgt-plugins:org.wso2.carbon.device.mgt.iot.androidsense.feature:${carbon.device.mgt.plugin.version} org.wso2.carbon.devicemgt-plugins:org.wso2.carbon.device.mgt.iot.arduino.feature:\${carbon.device.mgt.plugin.version}
</featureArtifactDef> </featureArtifactDef>
<featureArtifactDef> <featureArtifactDef>
org.wso2.carbon.devicemgt-plugins:org.wso2.carbon.device.mgt.iot.arduino.feature:${carbon.device.mgt.plugin.version} org.wso2.carbon.devicemgt-plugins:org.wso2.carbon.device.mgt.iot.raspberrypi.feature:\${carbon.device.mgt.plugin.version}
</featureArtifactDef> </featureArtifactDef>
<featureArtifactDef> <featureArtifactDef>
org.wso2.carbon.devicemgt-plugins:org.wso2.carbon.device.mgt.iot.raspberrypi.feature:${carbon.device.mgt.plugin.version} org.wso2.carbon.devicemgt-plugins:org.wso2.carbon.device.mgt.iot.virtualfirealarm.feature:\${carbon.device.mgt.plugin.version}
</featureArtifactDef>
<featureArtifactDef>
org.wso2.carbon.devicemgt-plugins:org.wso2.carbon.device.mgt.iot.virtualfirealarm.feature:${carbon.device.mgt.plugin.version}
</featureArtifactDef> </featureArtifactDef>
</featureArtifacts> </featureArtifacts>
</configuration> </configuration>
@ -74,26 +71,22 @@
</goals> </goals>
<configuration> <configuration>
<profile>default</profile> <profile>default</profile>
<metadataRepository>file:${basedir}/target/p2-repo</metadataRepository> <metadataRepository>file:\${basedir}/target/p2-repo</metadataRepository>
<artifactRepository>file:${basedir}/target/p2-repo</artifactRepository> <artifactRepository>file:\${basedir}/target/p2-repo</artifactRepository>
<destination>${basedir}/../wso2/components</destination> <destination>\${basedir}/../wso2/components</destination>
<deleteOldProfileFiles>false</deleteOldProfileFiles> <deleteOldProfileFiles>false</deleteOldProfileFiles>
<features> <features>
<feature>
<id>org.wso2.carbon.device.mgt.iot.androidsense.feature.group</id>
<version>${carbon.device.mgt.plugin.version}</version>
</feature>
<feature> <feature>
<id>org.wso2.carbon.device.mgt.iot.arduino.feature.group</id> <id>org.wso2.carbon.device.mgt.iot.arduino.feature.group</id>
<version>${carbon.device.mgt.plugin.version}</version> <version>\${carbon.device.mgt.plugin.version}</version>
</feature> </feature>
<feature> <feature>
<id>org.wso2.carbon.device.mgt.iot.raspberrypi.feature.group</id> <id>org.wso2.carbon.device.mgt.iot.raspberrypi.feature.group</id>
<version>${carbon.device.mgt.plugin.version}</version> <version>\${carbon.device.mgt.plugin.version}</version>
</feature> </feature>
<feature> <feature>
<id>org.wso2.carbon.device.mgt.iot.virtualfirealarm.feature.group</id> <id>org.wso2.carbon.device.mgt.iot.virtualfirealarm.feature.group</id>
<version>${carbon.device.mgt.plugin.version}</version> <version>\${carbon.device.mgt.plugin.version}</version>
</feature> </feature>
</features> </features>
</configuration> </configuration>
@ -110,8 +103,20 @@
<phase>package</phase> <phase>package</phase>
<configuration> <configuration>
<tasks> <tasks>
<!--This is to have analytics artifacts in the super tenant space, In multi tenant environemnt,-->
<!--deploy it through the UI-->
<copy todir="../wso2/analytics/repository/deployment/server/carbonapps">
<fileset dir="../repository/resources/devicetypes/arduino">
<include name="*.car"/>
</fileset>
</copy>
<copy todir="../wso2/analytics/repository/deployment/server/carbonapps">
<fileset dir="../repository/resources/devicetypes/raspberrypi">
<include name="*.car"/>
</fileset>
</copy>
<copy todir="../wso2/analytics/repository/deployment/server/carbonapps"> <copy todir="../wso2/analytics/repository/deployment/server/carbonapps">
<fileset dir="../repository/resources/devicetypes"> <fileset dir="../repository/resources/devicetypes/virtual_firealarm">
<include name="*.car"/> <include name="*.car"/>
</fileset> </fileset>
</copy> </copy>
@ -207,6 +212,7 @@
</repository> </repository>
</repositories> </repositories>
<properties> <properties>
<carbon.device.mgt.plugin.version>3.0.31</carbon.device.mgt.plugin.version> <!--This gets picked from the build properties, Do not change it-->
<carbon.device.mgt.plugin.version>${carbon.device.mgt.plugin.version}</carbon.device.mgt.plugin.version>
</properties> </properties>
</project> </project>

Write Preview
Loading…
Cancel
Save