prathabanKavin
/
device-mgt-plugins
forked from community/device-mgt-plugins
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixed version variables

Browse Source
5026bump
Amalka Subasinghe 2 years ago
parent 747226d941
commit b51328aced
13 changed files with 62 additions and 62 deletions
Show Stats Download Patch File Download Diff File

2
components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/pom.xml
Unescape View File

@ -55,7 +55,7 @@
<artifactId>maven-assembly-plugin</artifactId>
<version>2.5.5</version>
<configuration>
<finalName>${project.artifactId}-${carbon.devicemgt.plugins.version}</finalName>
<finalName>${project.artifactId}-${io.entgra.device.mgt.plugins.version}</finalName>
<appendAssemblyId>false</appendAssemblyId>
<descriptors>
<descriptor>src/assembly/src.xml</descriptor>

2
components/extensions/pull-notification-listeners/io.entgra.device.mgt.plugins.mqtt.notification.listener/pom.xml
Unescape View File

@ -79,7 +79,7 @@
<instructions>
<Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
<Bundle-Name>${project.artifactId}</Bundle-Name>
<Bundle-Version>${carbon.devicemgt.plugins.version}</Bundle-Version>
<Bundle-Version>${io.entgra.device.mgt.plugins.version}</Bundle-Version>
<Bundle-Description>MQTT Pull Notification Provider Bundle</Bundle-Description>
<Export-Package>
!io.entgra.device.mgt.plugins.mqtt.notification.listener.internal,

2
components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.ui/pom.xml
Unescape View File

@ -107,7 +107,7 @@
<artifactId>maven-assembly-plugin</artifactId>
<version>2.5.5</version>
<configuration>
<finalName>${project.artifactId}-${carbon.devicemgt.plugins.version}</finalName>
<finalName>${project.artifactId}-${io.entgra.device.mgt.plugins.version}</finalName>
<appendAssemblyId>false</appendAssemblyId>
<descriptors>
<descriptor>src/assembly/src.xml</descriptor>

2
components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android/pom.xml
Unescape View File

@ -52,7 +52,7 @@
<instructions>
<Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
<Bundle-Name>${project.artifactId}</Bundle-Name>
<Bundle-Version>${carbon.devicemgt.plugins.version}</Bundle-Version>
<Bundle-Version>${io.entgra.device.mgt.plugins.version}</Bundle-Version>
<Bundle-Description>Device Management Mobile Android Impl Bundle</Bundle-Description>
<Private-Package>io.entgra.device.mgt.plugins.mobile.android.internal</Private-Package>
<Import-Package>

2
features/device-types-feature/virtual-fire-alarm-plugin-feature/io.entgra.device.mgt.plugins.virtualfirealarm.backend.feature/pom.xml
Unescape View File

@ -43,7 +43,7 @@
<dependency>
<groupId>io.entgra.device.mgt.plugins</groupId>
<artifactId>io.entgra.device.mgt.plugins.virtualfirealarm.api</artifactId>
<version>${carbon.devicemgt.plugins.version}</version>
<version>${io.entgra.device.mgt.plugins.version}</version>
<type>war</type>
</dependency>
<dependency>

18
features/extensions-feature/io.entgra.device.mgt.plugins.adapter.feature/pom.xml
Unescape View File

@ -103,7 +103,7 @@
<artifactItem>
<groupId>io.entgra.device.mgt.plugins</groupId>
<artifactId>io.entgra.device.mgt.plugins.output.adapter.websocket.endpoint</artifactId>
<version>${carbon.devicemgt.plugins.version}</version>
<version>${io.entgra.device.mgt.plugins.version}</version>
<type>war</type>
<overWrite>true</overWrite>
<outputDirectory>
@ -162,31 +162,31 @@
</adviceFile>
<bundles>
<bundleDef>
io.entgra.device.mgt.plugins:io.entgra.device.mgt.plugins.output.adapter.http:${carbon.devicemgt.plugins.version}
io.entgra.device.mgt.plugins:io.entgra.device.mgt.plugins.output.adapter.http:${io.entgra.device.mgt.plugins.version}
</bundleDef>
<bundleDef>
io.entgra.device.mgt.plugins:io.entgra.device.mgt.plugins.output.adapter.mqtt:${carbon.devicemgt.plugins.version}
io.entgra.device.mgt.plugins:io.entgra.device.mgt.plugins.output.adapter.mqtt:${io.entgra.device.mgt.plugins.version}
</bundleDef>
<bundleDef>
io.entgra.device.mgt.plugins:io.entgra.device.mgt.plugins.output.adapter.xmpp:${carbon.devicemgt.plugins.version}
io.entgra.device.mgt.plugins:io.entgra.device.mgt.plugins.output.adapter.xmpp:${io.entgra.device.mgt.plugins.version}
</bundleDef>
<bundleDef>
io.entgra.device.mgt.plugins:io.entgra.device.mgt.plugins.input.adapter.extension:${carbon.devicemgt.plugins.version}
io.entgra.device.mgt.plugins:io.entgra.device.mgt.plugins.input.adapter.extension:${io.entgra.device.mgt.plugins.version}
</bundleDef>
<bundleDef>
io.entgra.device.mgt.plugins:io.entgra.device.mgt.plugins.input.adapter.mqtt:${carbon.devicemgt.plugins.version}
io.entgra.device.mgt.plugins:io.entgra.device.mgt.plugins.input.adapter.mqtt:${io.entgra.device.mgt.plugins.version}
</bundleDef>
<bundleDef>
io.entgra.device.mgt.plugins:io.entgra.device.mgt.plugins.input.adapter.thrift:${carbon.devicemgt.plugins.version}
io.entgra.device.mgt.plugins:io.entgra.device.mgt.plugins.input.adapter.thrift:${io.entgra.device.mgt.plugins.version}
</bundleDef>
<bundleDef>
org.wso2.carbon.analytics-common:org.wso2.carbon.event.input.adapter.wso2event:${carbon.analytics.common.version}
</bundleDef>
<bundleDef>
io.entgra.device.mgt.plugins:io.entgra.device.mgt.plugins.input.adapter.xmpp:${carbon.devicemgt.plugins.version}
io.entgra.device.mgt.plugins:io.entgra.device.mgt.plugins.input.adapter.xmpp:${io.entgra.device.mgt.plugins.version}
</bundleDef>
<bundleDef>
io.entgra.device.mgt.plugins:io.entgra.device.mgt.plugins.output.adapter.websocket:${carbon.devicemgt.plugins.version}
io.entgra.device.mgt.plugins:io.entgra.device.mgt.plugins.output.adapter.websocket:${io.entgra.device.mgt.plugins.version}
</bundleDef>
<bundleDef>

2
features/extensions-feature/io.entgra.device.mgt.plugins.extension.siddhi.device.feature/pom.xml
Unescape View File

@ -61,7 +61,7 @@
</adviceFile>
<bundles>
<bundleDef>
io.entgra.device.mgt.plugins:io.entgra.device.mgt.plugins.extension.siddhi.device:${carbon.devicemgt.plugins.version}
io.entgra.device.mgt.plugins:io.entgra.device.mgt.plugins.extension.siddhi.device:${io.entgra.device.mgt.plugins.version}
</bundleDef>
</bundles>
</configuration>

2
features/extensions-feature/io.entgra.device.mgt.plugins.extension.siddhi.execution.json.feature/pom.xml
Unescape View File

@ -61,7 +61,7 @@
</adviceFile>
<bundles>
<bundleDef>
io.entgra.device.mgt.plugins:io.entgra.device.mgt.plugins.extension.siddhi.execution.json:${carbon.devicemgt.plugins.version}
io.entgra.device.mgt.plugins:io.entgra.device.mgt.plugins.extension.siddhi.execution.json:${io.entgra.device.mgt.plugins.version}
</bundleDef>
</bundles>
</configuration>

2
features/extensions-feature/io.entgra.device.mgt.plugins.notification.listener.feature/pom.xml
Unescape View File

@ -45,7 +45,7 @@
</adviceFile>
<bundles>
<bundleDef>
io.entgra.device.mgt.plugins:io.entgra.device.mgt.plugins.mqtt.notification.listener:${carbon.devicemgt.plugins.version}
io.entgra.device.mgt.plugins:io.entgra.device.mgt.plugins.mqtt.notification.listener:${io.entgra.device.mgt.plugins.version}
</bundleDef>
</bundles>
</configuration>

2
features/extensions-feature/org.wso2.carbon.andes.extensions.device.mgt.api.feature/pom.xml
Unescape View File

@ -111,7 +111,7 @@
<!--<importFeatures>-->
<!--<importFeatureDef>org.wso2.carbon.core.server:${carbon.kernel.version}-->
<!--</importFeatureDef>-->
<!--<importFeatureDef>org.wso2.carbon.device.mgt.server:${carbon.devicemgt.version}-->
<!--<importFeatureDef>org.wso2.carbon.device.mgt.server:${io.entgra.device.mgt.core.version}-->
<!--</importFeatureDef>-->
<!--</importFeatures>-->
</configuration>

2
features/extensions-feature/org.wso2.carbon.andes.extensions.device.mgt.mqtt.authorization.feature/pom.xml
Unescape View File

@ -72,7 +72,7 @@
</adviceFile>
<bundles>
<bundleDef>
io.entgra.device.mgt.plugins:org.wso2.carbon.andes.extensions.device.mgt.mqtt.authorization:${carbon.devicemgt.plugins.version}
io.entgra.device.mgt.plugins:org.wso2.carbon.andes.extensions.device.mgt.mqtt.authorization:${io.entgra.device.mgt.plugins.version}
</bundleDef>
<bundleDef>
io.github.openfeign:feign-core:${io.github.openfeign.version}

4
features/mobile-plugins-feature/android-plugin-feature/io.entgra.device.mgt.plugins.mobile.android.feature/pom.xml
Unescape View File

@ -242,7 +242,7 @@
</adviceFile>
<bundles>
<bundleDef>
io.entgra.device.mgt.plugins:io.entgra.device.mgt.plugins.mobile.android:${carbon.devicemgt.plugins.version}
io.entgra.device.mgt.plugins:io.entgra.device.mgt.plugins.mobile.android:${io.entgra.device.mgt.plugins.version}
</bundleDef>
</bundles>
<importFeatures>
@ -250,7 +250,7 @@
org.wso2.carbon.core.server:${carbon.kernel.version}
</importFeatureDef>
<importFeatureDef>
org.wso2.carbon.device.mgt.server:${carbon.devicemgt.version}
org.wso2.carbon.device.mgt.server:${io.entgra.device.mgt.core.version}
</importFeatureDef>
</importFeatures>
</configuration>

82
pom.xml
Unescape View File

@ -253,27 +253,27 @@
<dependency>
<groupId>io.entgra.device.mgt.core</groupId>
<artifactId>io.entgra.device.mgt.core.device.mgt.core</artifactId>
<version>${carbon.devicemgt.version}</version>
<version>${io.entgra.device.mgt.core.version}</version>
</dependency>
<dependency>
<groupId>io.entgra.device.mgt.core</groupId>
<artifactId>io.entgra.device.mgt.core.device.mgt.common</artifactId>
<version>${carbon.devicemgt.version}</version>
<version>${io.entgra.device.mgt.core.version}</version>
</dependency>
<dependency>
<groupId>io.entgra.device.mgt.core</groupId>
<artifactId>io.entgra.device.mgt.core.device.mgt.extensions</artifactId>
<version>${carbon.devicemgt.version}</version>
<version>${io.entgra.device.mgt.core.version}</version>
</dependency>
<dependency>
<groupId>io.entgra.device.mgt.core</groupId>
<artifactId>io.entgra.device.mgt.core.policy.mgt.common</artifactId>
<version>${carbon.devicemgt.version}</version>
<version>${io.entgra.device.mgt.core.version}</version>
</dependency>
<dependency>
<groupId>io.entgra.device.mgt.core</groupId>
<artifactId>io.entgra.device.mgt.core.policy.mgt.core</artifactId>
<version>${carbon.devicemgt.version}</version>
<version>${io.entgra.device.mgt.core.version}</version>
<exclusions>
<exclusion>
<groupId>org.mockito</groupId>
@ -285,38 +285,38 @@
<groupId>io.entgra.device.mgt.core</groupId>
<artifactId>io.entgra.device.mgt.core.device.mgt.server.feature</artifactId>
<type>zip</type>
<version>${carbon.devicemgt.version}</version>
<version>${io.entgra.device.mgt.core.version}</version>
</dependency>
<dependency>
<groupId>io.entgra.device.mgt.core</groupId>
<artifactId>io.entgra.device.mgt.core.device.mgt.extensions.feature</artifactId>
<type>zip</type>
<version>${carbon.devicemgt.version}</version>
<version>${io.entgra.device.mgt.core.version}</version>
</dependency>
<dependency>
<groupId>io.entgra.device.mgt.core</groupId>
<artifactId>io.entgra.device.mgt.core.certificate.mgt.core</artifactId>
<version>${carbon.devicemgt.version}</version>
<version>${io.entgra.device.mgt.core.version}</version>
</dependency>
<dependency>
<groupId>io.entgra.device.mgt.core</groupId>
<artifactId>io.entgra.device.mgt.core.identity.jwt.client.extension</artifactId>
<version>${carbon.devicemgt.version}</version>
<version>${io.entgra.device.mgt.core.version}</version>
</dependency>
<dependency>
<groupId>io.entgra.device.mgt.core</groupId>
<artifactId>io.entgra.device.mgt.core.apimgt.keymgt.extension</artifactId>
<version>${carbon.devicemgt.version}</version>
<version>${io.entgra.device.mgt.core.version}</version>
</dependency>
<dependency>
<groupId>io.entgra.device.mgt.core</groupId>
<artifactId>io.entgra.device.mgt.core.apimgt.application.extension</artifactId>
<version>${carbon.devicemgt.version}</version>
<version>${io.entgra.device.mgt.core.version}</version>
</dependency>
<dependency>
<groupId>io.entgra.device.mgt.core</groupId>
<artifactId>io.entgra.device.mgt.core.apimgt.annotations</artifactId>
<version>${carbon.devicemgt.version}</version>
<version>${io.entgra.device.mgt.core.version}</version>
</dependency>
<dependency>
@ -380,117 +380,117 @@
<dependency>
<groupId>io.entgra.device.mgt.plugins</groupId>
<artifactId>health-check-api</artifactId>
<version>${carbon.devicemgt.plugins.version}</version>
<version>${io.entgra.device.mgt.plugins.version}</version>
</dependency>
<dependency>
<groupId>io.entgra.device.mgt.plugins</groupId>
<artifactId>io.entgra.device.mgt.plugins.extension.siddhi.device</artifactId>
<version>${carbon.devicemgt.plugins.version}</version>
<version>${io.entgra.device.mgt.plugins.version}</version>
</dependency>
<dependency>
<groupId>io.entgra.device.mgt.plugins</groupId>
<artifactId>io.entgra.device.mgt.plugins.extension.siddhi.execution.json</artifactId>
<version>${carbon.devicemgt.plugins.version}</version>
<version>${io.entgra.device.mgt.plugins.version}</version>
</dependency>
<dependency>
<groupId>io.entgra.device.mgt.plugins</groupId>
<artifactId>io.entgra.device.mgt.plugins.output.adapter.http</artifactId>
<version>${carbon.devicemgt.plugins.version}</version>
<version>${io.entgra.device.mgt.plugins.version}</version>
</dependency>
<dependency>
<groupId>io.entgra.device.mgt.plugins</groupId>
<artifactId>io.entgra.device.mgt.plugins.output.adapter.mqtt</artifactId>
<version>${carbon.devicemgt.plugins.version}</version>
<version>${io.entgra.device.mgt.plugins.version}</version>
</dependency>
<dependency>
<groupId>io.entgra.device.mgt.plugins</groupId>
<artifactId>io.entgra.device.mgt.plugins.input.adapter.thrift</artifactId>
<version>${carbon.devicemgt.plugins.version}</version>
<version>${io.entgra.device.mgt.plugins.version}</version>
</dependency>
<dependency>
<groupId>io.entgra.device.mgt.plugins</groupId>
<artifactId>io.entgra.device.mgt.plugins.output.adapter.xmpp</artifactId>
<version>${carbon.devicemgt.plugins.version}</version>
<version>${io.entgra.device.mgt.plugins.version}</version>
</dependency>
<dependency>
<groupId>io.entgra.device.mgt.plugins</groupId>
<artifactId>io.entgra.device.mgt.plugins.input.adapter.extension</artifactId>
<version>${carbon.devicemgt.plugins.version}</version>
<version>${io.entgra.device.mgt.plugins.version}</version>
</dependency>
<dependency>
<groupId>io.entgra.device.mgt.plugins</groupId>
<artifactId>io.entgra.device.mgt.plugins.input.adapter.http</artifactId>
<version>${carbon.devicemgt.plugins.version}</version>
<version>${io.entgra.device.mgt.plugins.version}</version>
</dependency>
<dependency>
<groupId>io.entgra.device.mgt.plugins</groupId>
<artifactId>io.entgra.device.mgt.plugins.input.adapter.mqtt</artifactId>
<version>${carbon.devicemgt.plugins.version}</version>
<version>${io.entgra.device.mgt.plugins.version}</version>
</dependency>
<dependency>
<groupId>io.entgra.device.mgt.plugins</groupId>
<artifactId>io.entgra.device.mgt.plugins.input.adapter.xmpp</artifactId>
<version>${carbon.devicemgt.plugins.version}</version>
<version>${io.entgra.device.mgt.plugins.version}</version>
</dependency>
<dependency>
<groupId>io.entgra.device.mgt.plugins</groupId>
<artifactId>org.wso2.carbon.device.mgt.iot.api</artifactId>
<version>${carbon.devicemgt.plugins.version}</version>
<version>${io.entgra.device.mgt.plugins.version}</version>
<type>war</type>
</dependency>
<dependency>
<groupId>io.entgra.device.mgt.plugins</groupId>
<artifactId>io.entgra.device.mgt.plugins.output.adapter.websocket</artifactId>
<version>${carbon.devicemgt.plugins.version}</version>
<version>${io.entgra.device.mgt.plugins.version}</version>
</dependency>
<dependency>
<groupId>io.entgra.device.mgt.plugins</groupId>
<artifactId>io.entgra.device.mgt.plugins.mqtt.notification.listener</artifactId>
<version>${carbon.devicemgt.plugins.version}</version>
<version>${io.entgra.device.mgt.plugins.version}</version>
</dependency>
<dependency>
<groupId>io.entgra.device.mgt.plugins</groupId>
<artifactId>io.entgra.device.mgt.core.device.mgt.extensions.remote.session</artifactId>
<version>${carbon.devicemgt.plugins.version}</version>
<version>${io.entgra.device.mgt.plugins.version}</version>
</dependency>
<!--MDM dependencies-->
<dependency>
<groupId>io.entgra.device.mgt.plugins</groupId>
<artifactId>org.wso2.carbon.device.mgt.mobile</artifactId>
<version>${carbon.devicemgt.plugins.version}</version>
<version>${io.entgra.device.mgt.plugins.version}</version>
</dependency>
<dependency>
<groupId>io.entgra.device.mgt.plugins</groupId>
<artifactId>org.wso2.carbon.device.mgt.mobile.api</artifactId>
<version>${carbon.devicemgt.plugins.version}</version>
<version>${io.entgra.device.mgt.plugins.version}</version>
</dependency>
<dependency>
<groupId>io.entgra.device.mgt.plugins</groupId>
<artifactId>org.wso2.carbon.device.mgt.mobile.url.printer</artifactId>
<version>${carbon.devicemgt.plugins.version}</version>
<version>${io.entgra.device.mgt.plugins.version}</version>
</dependency>
<!--Android dependencies-->
<dependency>
<groupId>io.entgra.device.mgt.plugins</groupId>
<artifactId>io.entgra.device.mgt.plugins.mobile.android</artifactId>
<version>${carbon.devicemgt.plugins.version}</version>
<version>${io.entgra.device.mgt.plugins.version}</version>
</dependency>
<dependency>
<groupId>io.entgra.device.mgt.plugins</groupId>
<artifactId>io.entgra.device.mgt.plugins.mobile.android.api</artifactId>
<version>${carbon.devicemgt.plugins.version}</version>
<version>${io.entgra.device.mgt.plugins.version}</version>
</dependency>
<dependency>
<groupId>io.entgra.device.mgt.plugins</groupId>
<artifactId>io.entgra.device.mgt.plugins.virtualfirealarm.api</artifactId>
<version>${carbon.devicemgt.plugins.version}</version>
<version>${io.entgra.device.mgt.plugins.version}</version>
</dependency>
<dependency>
<groupId>io.entgra.device.mgt.plugins</groupId>
<artifactId>io.entgra.device.mgt.plugins.virtualfirealarm.agent.impl</artifactId>
<version>${carbon.devicemgt.plugins.version}</version>
<version>${io.entgra.device.mgt.plugins.version}</version>
</dependency>
<!--Osgi dependencies-->
@ -1002,12 +1002,12 @@
<dependency>
<groupId>io.entgra.device.mgt.plugins</groupId>
<artifactId>org.wso2.carbon.andes.extensions.device.mgt.mqtt.authorization</artifactId>
<version>${carbon.devicemgt.plugins.version}</version>
<version>${io.entgra.device.mgt.plugins.version}</version>
</dependency>
<dependency>
<groupId>io.entgra.device.mgt.plugins</groupId>
<artifactId>org.wso2.carbon.andes.extensions.device.mgt.api</artifactId>
<version>${carbon.devicemgt.plugins.version}</version>
<version>${io.entgra.device.mgt.plugins.version}</version>
</dependency>
<!--EMQX Extensions -->
@ -1015,12 +1015,12 @@
<groupId>io.entgra.device.mgt.plugins</groupId>
<artifactId>io.entgra.device.mgt.plugins.emqx.exhook</artifactId>
<classifier>jar-with-dependencies</classifier>
<version>${carbon.devicemgt.plugins.version}</version>
<version>${io.entgra.device.mgt.plugins.version}</version>
</dependency>
<dependency>
<groupId>io.entgra.device.mgt.plugins</groupId>
<artifactId>io.entgra.device.mgt.plugins.emqx.initializer</artifactId>
<version>${carbon.devicemgt.plugins.version}</version>
<version>${io.entgra.device.mgt.plugins.version}</version>
</dependency>
<dependency>
<groupId>org.ops4j.pax.logging</groupId>
@ -1166,11 +1166,11 @@
<properties>
<!-- Carbon Device Management -->
<carbon.devicemgt.version>5.0.26-SNAPSHOT</carbon.devicemgt.version>
<carbon.devicemgt.version.range>[5.0.0, 6.0.0)</carbon.devicemgt.version.range>
<io.entgra.device.mgt.core.version>5.0.26-SNAPSHOT</io.entgra.device.mgt.core.version>
<io.entgra.device.mgt.core.version.range>[5.0.0, 6.0.0)</io.entgra.device.mgt.core.version.range>
<!-- Carbon Device Management Plugins -->
<carbon.devicemgt.plugins.version>6.0.17-SNAPSHOT</carbon.devicemgt.plugins.version>
<io.entgra.device.mgt.plugins.version>6.0.17-SNAPSHOT</io.entgra.device.mgt.plugins.version>
<!-- Android Agent Artifact Version-->
<android.agent.version>4.0.0</android.agent.version>

Write Preview
Loading…
Cancel
Save