Skip to content
This repository has been archived by the owner on Apr 13, 2024. It is now read-only.

Commit

Permalink
Merge pull request #171 from mohanvive/master
Browse files Browse the repository at this point in the history
Adding trustores and dependency changes
  • Loading branch information
dnwick authored Jun 7, 2017
2 parents 927e8d9 + 7f4100e commit 4234c9d
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 1 deletion.
Binary file not shown.
Binary file not shown.
5 changes: 5 additions & 0 deletions modules/distribution/src/assembly/bin.xml
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,11 @@
<outputDirectory>conf/osgi</outputDirectory>
<fileMode>644</fileMode>
</fileSet>
<fileSet>
<directory>carbon-home/conf/security</directory>
<outputDirectory>conf/security</outputDirectory>
<fileMode>644</fileMode>
</fileSet>
<fileSet>
<directory>carbon-home/resources/security</directory>
<outputDirectory>resources/security</outputDirectory>
Expand Down
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -641,7 +641,7 @@
</build>

<properties>
<carbon.analytics.version>2.0.15</carbon.analytics.version>
<carbon.analytics.version>2.0.24</carbon.analytics.version>
<siddhi.version>4.0.0-M5</siddhi.version>
<siddhi.extension.version>1.0.0</siddhi.extension.version>

Expand Down

0 comments on commit 4234c9d

Please sign in to comment.