Do not override colibri etl config with defaults on build 6.0
authorChristian Schwarzinger <christian.schwarzinger@proclos.com>
Fri, 11 Nov 2016 08:48:46 +0100
branch6.0
changeset 247936a62069080
parent 244 c46161a80f67
child 248 56f849b377b1
Do not override colibri etl config with defaults on build
colibriweb/pom.xml
colibriweb/webapp/config/ssl.properties
     1.1 --- a/colibriweb/pom.xml	Thu Nov 03 12:22:58 2016 +0100
     1.2 +++ b/colibriweb/pom.xml	Fri Nov 11 08:48:46 2016 +0100
     1.3 @@ -37,7 +37,7 @@
     1.4  					</execution>
     1.5  				</executions>
     1.6  			</plugin>
     1.7 -			
     1.8 +			<!--  
     1.9  			<plugin>
    1.10  				<artifactId>maven-dependency-plugin</artifactId>
    1.11  				<executions>
    1.12 @@ -88,7 +88,7 @@
    1.13  					</execution>
    1.14  				</executions>
    1.15  			</plugin>
    1.16 -			
    1.17 +			-->
    1.18  			
    1.19  			<plugin>
    1.20  				<!-- Currently drawback: database task will ask for a password if the 
     2.1 --- a/colibriweb/webapp/config/ssl.properties	Thu Nov 03 12:22:58 2016 +0100
     2.2 +++ b/colibriweb/webapp/config/ssl.properties	Fri Nov 11 08:48:46 2016 +0100
     2.3 @@ -1,3 +1,4 @@
     2.4 +javax.net.ssl.trustStore=keystore
     2.5  javax.net.ssl.keyStore=keystore
     2.6  javax.net.ssl.keyStorePassword=changeit
     2.7  javax.net.ssl.keyStoreType=JKS
     2.8 \ No newline at end of file