Adding trustores and dependency changes

wso2-attic · Jun 7, 2017 · 7f4100e · 7f4100e
1 parent 927e8d9
commit 7f4100e
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 1 deletion.
diff --git a/modules/distribution/carbon-home/conf/security/client-truststore.jks b/modules/distribution/carbon-home/conf/security/client-truststore.jks
diff --git a/modules/distribution/carbon-home/conf/security/wso2carbon.jks b/modules/distribution/carbon-home/conf/security/wso2carbon.jks
diff --git a/modules/distribution/src/assembly/bin.xml b/modules/distribution/src/assembly/bin.xml
@@ -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>

diff --git a/pom.xml b/pom.xml
@@ -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>