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

Set broker version to be same as the core version

Browse Source
merge-requests/1/head
charitha 8 years ago
parent 93ecdd3428
commit 3ff3207ac1
2 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File

4
modules/broker/distribution/pom.xml
Unescape View File

@ -116,13 +116,13 @@
<mkdir dir="${tempdir}" /> <mkdir dir="${tempdir}" />
<unzip dest="${tempdir}"> <unzip dest="${tempdir}">
<fileset dir="target"> <fileset dir="target">
<include name="wso2iot-broker-${product.wso2iot.broker.version}.zip" /> <include name="wso2iot-broker-${product.iot.broker.version}.zip" />
</fileset> </fileset>
</unzip> </unzip>
<!-- Disabling default way of checking authorizations due to https://wso2.org/jira/browse/IDENTITY-3489--> <!-- Disabling default way of checking authorizations due to https://wso2.org/jira/browse/IDENTITY-3489-->
<replace file="target/wso2carbon-core-${carbon.kernel.version}/repository/conf/user-mgt.xml" token="&lt;Property name=&quot;GetAllRolesOfUserEnabled&quot;&gt;true&lt;/Property&gt;" value="&lt;!--Property name=&quot;GetAllRolesOfUserEnabled&quot;&gt;true&lt;/Property--&gt;" /> <replace file="target/wso2carbon-core-${carbon.kernel.version}/repository/conf/user-mgt.xml" token="&lt;Property name=&quot;GetAllRolesOfUserEnabled&quot;&gt;true&lt;/Property&gt;" value="&lt;!--Property name=&quot;GetAllRolesOfUserEnabled&quot;&gt;true&lt;/Property--&gt;" />
<copy todir="target/wso2carbon-core-${carbon.kernel.version}/repository/components/" overwrite="false"> <copy todir="target/wso2carbon-core-${carbon.kernel.version}/repository/components/" overwrite="false">
<fileset dir="${tempdir}/wso2iot-broker-${product.wso2iot.broker.version}/repository/components/"> <fileset dir="${tempdir}/wso2iot-broker-${product.iot.broker.version}/repository/components/">
</fileset> </fileset>
</copy> </copy>
<unzip dest="${tempdir}"> <unzip dest="${tempdir}">

19
pom.xml
Unescape View File

@ -1278,7 +1278,7 @@
<dependency> <dependency>
<groupId>org.wso2.iot</groupId> <groupId>org.wso2.iot</groupId>
<artifactId>org.wso2.stratos.mb.dashboard.ui</artifactId> <artifactId>org.wso2.stratos.mb.dashboard.ui</artifactId>
<version>${product.wso2iot.broker.version}</version> <version>${product.iot.broker.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.wso2.carbon</groupId> <groupId>org.wso2.carbon</groupId>
@ -1288,38 +1288,38 @@
<dependency> <dependency>
<groupId>org.wso2.iot</groupId> <groupId>org.wso2.iot</groupId>
<artifactId>org.wso2.stratos.mb.deployment</artifactId> <artifactId>org.wso2.stratos.mb.deployment</artifactId>
<version>${product.wso2iot.broker.version}</version> <version>${product.iot.broker.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.wso2.iot</groupId> <groupId>org.wso2.iot</groupId>
<artifactId>org.wso2.stratos.mb.login.ui</artifactId> <artifactId>org.wso2.stratos.mb.login.ui</artifactId>
<version>${product.wso2iot.broker.version}</version> <version>${product.iot.broker.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.wso2.iot</groupId> <groupId>org.wso2.iot</groupId>
<artifactId>org.wso2.iot.broker.styles</artifactId> <artifactId>org.wso2.iot.broker.styles</artifactId>
<version>${product.wso2iot.broker.version}</version> <version>${product.iot.broker.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.wso2.iot</groupId> <groupId>org.wso2.iot</groupId>
<artifactId>org.wso2.stratos.mb.styles</artifactId> <artifactId>org.wso2.stratos.mb.styles</artifactId>
<version>${product.wso2iot.broker.version}</version> <version>${product.iot.broker.version}</version>
</dependency> </dependency>
<!--Dependencies for integration tests --> <!--Dependencies for integration tests -->
<dependency> <dependency>
<groupId>org.wso2.iot</groupId> <groupId>org.wso2.iot</groupId>
<artifactId>org.wso2.iot.broker.integration.common.clients</artifactId> <artifactId>org.wso2.iot.broker.integration.common.clients</artifactId>
<version>${product.wso2iot.broker.version}</version> <version>${product.iot.broker.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.wso2.iot</groupId> <groupId>org.wso2.iot</groupId>
<artifactId>org.wso2.iot.broker.integration.common.utils</artifactId> <artifactId>org.wso2.iot.broker.integration.common.utils</artifactId>
<version>${product.wso2iot.broker.version}</version> <version>${product.iot.broker.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.wso2.iot</groupId> <groupId>org.wso2.iot</groupId>
<artifactId>org.wso2.iot.broker.platform.common.utils</artifactId> <artifactId>org.wso2.iot.broker.platform.common.utils</artifactId>
<version>${product.wso2iot.broker.version}</version> <version>${product.iot.broker.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>jline</groupId> <groupId>jline</groupId>
@ -1566,7 +1566,6 @@
<product.iot.analytics.version>${product.iot.version}</product.iot.analytics.version> <product.iot.analytics.version>${product.iot.version}</product.iot.analytics.version>
<product.das.version>3.1.0</product.das.version> <product.das.version>3.1.0</product.das.version>
<product.mb.version>3.1.0</product.mb.version> <product.mb.version>3.1.0</product.mb.version>
<product.iot.broker.version>${product.iot.version}</product.iot.broker.version>
<!-- Tomcat --> <!-- Tomcat -->
<orbit.tomcat.version>7.0.59.wso2v1</orbit.tomcat.version> <orbit.tomcat.version>7.0.59.wso2v1</orbit.tomcat.version>
@ -1581,7 +1580,7 @@
<orbit.version.rampart>1.6.1.wso2v10</orbit.version.rampart> <orbit.version.rampart>1.6.1.wso2v10</orbit.version.rampart>
<!-- IoT Broker Dependencies --> <!-- IoT Broker Dependencies -->
<product.wso2iot.broker.version>1.0.0-SNAPSHOT</product.wso2iot.broker.version> <product.iot.broker.version>${product.iot.version}</product.iot.broker.version>
<andes.version>3.2.0-SNAPSHOT</andes.version> <andes.version>3.2.0-SNAPSHOT</andes.version>
<carbon.messaging.version>3.2.0-SNAPSHOT</carbon.messaging.version> <carbon.messaging.version>3.2.0-SNAPSHOT</carbon.messaging.version>

Write Preview
Loading…
Cancel
Save