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

Update poms with CDMF upstream merge

Browse Source
merge-requests/1/head
charithag 9 years ago
parent 6ff453e213
commit 9ecf406252
2 changed files with 36 additions and 35 deletions
Show Stats Download Patch File Download Diff File

17
modules/distribution/src/assembly/bin.xml
Unescape View File

@ -801,16 +801,15 @@
<fileMode>644</fileMode> <fileMode>644</fileMode>
</file> </file>
<!-- TODO: Verify this feature is needed -->
<!--Webapp Authenticator Config file--> <!--Webapp Authenticator Config file-->
<!--<file>--> <file>
<!--<source>--> <source>
<!--../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/etc/webapp-authenticator-config.xml--> ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/etc/webapp-authenticator-config.xml
<!--</source>--> </source>
<!--<outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/etc</outputDirectory>--> <outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/etc</outputDirectory>
<!--<filtered>true</filtered>--> <filtered>true</filtered>
<!--<fileMode>644</fileMode>--> <fileMode>644</fileMode>
<!--</file>--> </file>
<!--notifications config file--> <!--notifications config file-->
<file> <file>

54
modules/p2-profile-gen/pom.xml
Unescape View File

@ -125,10 +125,18 @@
<featureArtifactDef> <featureArtifactDef>
org.wso2.carbon.devicemgt:org.wso2.carbon.device.mgt.group.server.feature:${carbon.device.mgt.version} org.wso2.carbon.devicemgt:org.wso2.carbon.device.mgt.group.server.feature:${carbon.device.mgt.version}
</featureArtifactDef> </featureArtifactDef>
<!-- TODO: Verify this feature is needed --> <featureArtifactDef>
<!--<featureArtifactDef>--> org.wso2.carbon.devicemgt:org.wso2.carbon.device.mgt.enterprise.store.feature:${carbon.device.mgt.version}
<!--org.wso2.carbon.devicemgt:org.wso2.carbon.webapp.authenticator.framework.server.feature:${carbon.device.mgt.version}--> </featureArtifactDef>
<!--</featureArtifactDef>--> <featureArtifactDef>
org.wso2.carbon.devicemgt:org.wso2.carbon.certificate.mgt.server.feature:${carbon.device.mgt.version}
</featureArtifactDef>
<featureArtifactDef>
org.wso2.carbon.devicemgt:org.wso2.carbon.dynamic.client.registration.server.feature:${carbon.device.mgt.version}
</featureArtifactDef>
<featureArtifactDef>
org.wso2.carbon.devicemgt:org.wso2.carbon.webapp.authenticator.framework.server.feature:${carbon.device.mgt.version}
</featureArtifactDef>
<!-- End of Device Management Features --> <!-- End of Device Management Features -->
<!-- Jaggery Features --> <!-- Jaggery Features -->
@ -388,15 +396,6 @@
</featureArtifactDef> </featureArtifactDef>
<!--========================================================================================================-->
<!-- Enterprise Store Features -->
<featureArtifactDef>
org.wso2.carbon.devicemgt:org.wso2.carbon.device.mgt.enterprise.store.feature:${carbon.device.mgt.version}
</featureArtifactDef>
<!-- Jaggery Features --> <!-- Jaggery Features -->
<!--+++++++++++++++++++++++++++++++++++++++++++++++--> <!--+++++++++++++++++++++++++++++++++++++++++++++++-->
<featureArtifactDef> <featureArtifactDef>
@ -647,11 +646,22 @@
<id>org.wso2.carbon.device.mgt.group.server.feature.group</id> <id>org.wso2.carbon.device.mgt.group.server.feature.group</id>
<version>${carbon.device.mgt.version}</version> <version>${carbon.device.mgt.version}</version>
</feature> </feature>
<!-- TODO: Verify this feature is needed --> <feature>
<!--<feature>--> <id>org.wso2.carbon.device.mgt.enterprise.store.feature.group</id>
<!--<id>org.wso2.carbon.webapp.authenticator.framework.server.feature.group</id>--> <version>${carbon.device.mgt.version}</version>
<!--<version>${carbon.device.mgt.version}</version>--> </feature>
<!--</feature>--> <feature>
<id>org.wso2.carbon.certificate.mgt.server.feature.group</id>
<version>${carbon.device.mgt.version}</version>
</feature>
<feature>
<id>org.wso2.carbon.dynamic.client.registration.server.feature.group</id>
<version>${carbon.device.mgt.version}</version>
</feature>
<feature>
<id>org.wso2.carbon.webapp.authenticator.framework.server.feature.group</id>
<version>${carbon.device.mgt.version}</version>
</feature>
<!-- End of Device Management Features --> <!-- End of Device Management Features -->
<!-- Jaggery Features --> <!-- Jaggery Features -->
@ -1001,14 +1011,6 @@
<version>${axis2-transports.wso2.version}</version> <version>${axis2-transports.wso2.version}</version>
</feature> </feature>
<!--========================================================================================================-->
<!-- Enterprise Store Features -->
<feature>
<id>org.wso2.carbon.device.mgt.enterprise.store.feature.group</id>
<version>${carbon.device.mgt.version}</version>
</feature>
<!-- Jaggery Features --> <!-- Jaggery Features -->
<!--+++++++++++++++++++++++++++++++++++++++++++++++--> <!--+++++++++++++++++++++++++++++++++++++++++++++++-->
<feature> <feature>

Write Preview
Loading…
Cancel
Save