community/product-iots
1
0
Fork 0
mirror of https://repository.entgra.net/community/product-iots.git synced 2025-09-16 23:32:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Removing patches and upgrading DAS and MB

Browse Source
This commit is contained in:
Ace 2016-01-25 10:47:31 +05:30
parent 429e9981ec
commit 94f1b87ce3
3 changed files with 25 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
modules/distribution/src/assembly/bin.xml
View File

@ -659,7 +659,7 @@
<!-- Copying temporary patches from DAS that fixes JIRA DAS-339 and a Concurrent DB Access Issue --> <!-- Copying temporary patches from DAS that fixes JIRA DAS-339 and a Concurrent DB Access Issue -->
<!-- Can be safely removed upon a DAS release with these fixes --> <!-- Can be safely removed upon a DAS release with these fixes -->
<fileSet> <!--fileSet>
<directory> <directory>
src/repository/patches src/repository/patches
</directory> </directory>
@ -669,7 +669,7 @@
<includes> <includes>
<include>**/*</include> <include>**/*</include>
</includes> </includes>
</fileSet> </fileSet-->
</fileSets> </fileSets>
@ -801,14 +801,13 @@
<filtered>true</filtered> <filtered>true</filtered>
<fileMode>644</fileMode> <fileMode>644</fileMode>
</file> </file>
<!-- <file> <file>
<source>../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/event-broker.xml <source>../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/event-broker.xml
</source> </source>
<outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/</outputDirectory> <outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/</outputDirectory>
<filtered>true</filtered> <filtered>true</filtered>
<fileMode>644</fileMode> <fileMode>644</fileMode>
</file>--> </file>
<file> <file>
<source>INSTALL.txt</source> <source>INSTALL.txt</source>
<outputDirectory>${pom.artifactId}-${pom.version}</outputDirectory> <outputDirectory>${pom.artifactId}-${pom.version}</outputDirectory>
@ -863,9 +862,8 @@
<filtered>true</filtered> <filtered>true</filtered>
<fileMode>644</fileMode> <fileMode>644</fileMode>
</file> </file>
<file> <file>
<source>../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/carbon-event-broker.xml</source> <source>../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/messaging-event-broker.xml</source>
<outputDirectory>${pom.artifactId}-${pom.version}/repository/conf</outputDirectory> <outputDirectory>${pom.artifactId}-${pom.version}/repository/conf</outputDirectory>
<filtered>true</filtered> <filtered>true</filtered>
<fileMode>644</fileMode> <fileMode>644</fileMode>

7
modules/p2-profile-gen/pom.xml
View File

@ -671,6 +671,9 @@
<featureArtifactDef> <featureArtifactDef>
org.wso2.carbon.analytics:org.wso2.carbon.analytics.datasource.feature:${carbon.analytics.version} org.wso2.carbon.analytics:org.wso2.carbon.analytics.datasource.feature:${carbon.analytics.version}
</featureArtifactDef> </featureArtifactDef>
<featureArtifactDef>
org.wso2.carbon.analytics:org.wso2.carbon.analytics.datasource.hbase.server.feature:${carbon.analytics.version}
</featureArtifactDef>
<featureArtifactDef> <featureArtifactDef>
org.wso2.carbon.analytics:org.wso2.carbon.analytics.spark.feature:${carbon.analytics.version} org.wso2.carbon.analytics:org.wso2.carbon.analytics.spark.feature:${carbon.analytics.version}
</featureArtifactDef> </featureArtifactDef>
@ -1522,6 +1525,10 @@
<id>org.wso2.carbon.analytics.datasource.feature.group</id> <id>org.wso2.carbon.analytics.datasource.feature.group</id>
<version>${carbon.analytics.version}</version> <version>${carbon.analytics.version}</version>
</feature> </feature>
<feature>
<id>org.wso2.carbon.analytics.datasource.hbase.server.feature.group</id>
<version>${carbon.analytics.version}</version>
</feature>
<feature> <feature>
<id>org.wso2.carbon.analytics.spark.feature.group</id> <id>org.wso2.carbon.analytics.spark.feature.group</id>
<version>${carbon.analytics.version}</version> <version>${carbon.analytics.version}</version>

16
pom.xml
View File

@ -988,7 +988,7 @@
<properties> <properties>
<!--Carbon kernel versions--> <!--Carbon kernel versions-->
<carbon.kernel.version>4.4.2</carbon.kernel.version> <carbon.kernel.version>4.4.3</carbon.kernel.version>
<carbon.kernel.version.range>[4.4.0, 4.5.0)</carbon.kernel.version.range> <carbon.kernel.version.range>[4.4.0, 4.5.0)</carbon.kernel.version.range>
<carbon.p2.plugin.version>1.5.4</carbon.p2.plugin.version> <carbon.p2.plugin.version>1.5.4</carbon.p2.plugin.version>
@ -1063,7 +1063,7 @@
<carbon.mediation.version>4.4.11</carbon.mediation.version> <carbon.mediation.version>4.4.11</carbon.mediation.version>
<!-- Carbon Analytics Common (DAS) --> <!-- Carbon Analytics Common (DAS) -->
<carbon.analytics.common.version>5.0.6</carbon.analytics.common.version> <carbon.analytics.common.version>5.0.9-SNAPSHOT</carbon.analytics.common.version>
<!-- Tomcat --> <!-- Tomcat -->
<orbit.tomcat.version>7.0.59.wso2v1</orbit.tomcat.version> <orbit.tomcat.version>7.0.59.wso2v1</orbit.tomcat.version>
@ -1078,12 +1078,12 @@
<axis2-transports.wso2.version>1.1.0-wso2v17</axis2-transports.wso2.version> <axis2-transports.wso2.version>1.1.0-wso2v17</axis2-transports.wso2.version>
<!--DAS--> <!--DAS-->
<carbon.analytics.version>1.0.4</carbon.analytics.version> <carbon.analytics.version>1.0.6-SNAPSHOT</carbon.analytics.version>
<cipher.tool.version>1.0.0-wso2v3</cipher.tool.version> <cipher.tool.version>1.0.0-wso2v3</cipher.tool.version>
<carbon.dashboard.version>1.0.9</carbon.dashboard.version> <carbon.dashboard.version>1.0.9</carbon.dashboard.version>
<shindig.version>1.0.0</shindig.version> <shindig.version>1.0.0</shindig.version>
<carbon.event-processing.version>2.0.9</carbon.event-processing.version> <carbon.event-processing.version>2.0.11-SNAPSHOT</carbon.event-processing.version>
<carbon.data.version>4.3.2</carbon.data.version> <carbon.data.version>4.3.5-SNAPSHOT</carbon.data.version>
<orbit.version.commons-httpclient>3.1.0.wso2v2</orbit.version.commons-httpclient> <orbit.version.commons-httpclient>3.1.0.wso2v2</orbit.version.commons-httpclient>
<wss4j.security.version>1.6.17</wss4j.security.version> <wss4j.security.version>1.6.17</wss4j.security.version>
@ -1123,9 +1123,9 @@
<uuf.version>1.0.0-SNAPSHOT</uuf.version> <uuf.version>1.0.0-SNAPSHOT</uuf.version>
<!-- MB Features --> <!-- MB Features -->
<carbon.messaging.version>3.0.1</carbon.messaging.version> <carbon.messaging.version>3.1.0-SNAPSHOT</carbon.messaging.version>
<product.mb.version>3.0.0</product.mb.version> <product.mb.version>3.1.0-SNAPSHOT</product.mb.version>
<carbon.metrics.version>1.1.1</carbon.metrics.version> <carbon.metrics.version>1.2.0</carbon.metrics.version>
</properties> </properties>
<scm> <scm>