From f2842bb4c7eb6443de10bb74cc98deda627e79be Mon Sep 17 00:00:00 2001
From: Leonardo Vannucci <leonardo.vannucci@grupposistematica.it>
Date: Fri, 17 Aug 2018 17:11:49 +0200
Subject: [PATCH] Deploy su TOMCAT

---
 dg1cloud-core/src/main/resources/application.properties |    6 +++---
 dg1cloud-core/pom.xml                                   |   10 +++++++++-
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/dg1cloud-core/pom.xml b/dg1cloud-core/pom.xml
index d97e3cd..cbdc0ec 100644
--- a/dg1cloud-core/pom.xml
+++ b/dg1cloud-core/pom.xml
@@ -6,7 +6,7 @@
 	<groupId>it.digione.cloud</groupId>
 	<artifactId>dg1cloud-core</artifactId>
 	<version>0.0.1-SNAPSHOT</version>
-	<packaging>jar</packaging>
+	<packaging>war</packaging>
 
 	<name>dg1cloud-core</name>
 	<description>Servizio cloud per ricezione file</description>
@@ -33,6 +33,7 @@
 		<dependency>
 			<groupId>org.flywaydb</groupId>
 			<artifactId>flyway-core</artifactId>
+			<version>4.0.1</version>
 		</dependency>
 
 		<dependency>
@@ -44,6 +45,12 @@
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-web</artifactId>
+			<exclusions>
+				<exclusion>
+					<groupId>org.springframework.boot</groupId>
+					<artifactId>spring-boot-starter-tomcat</artifactId>
+				</exclusion>
+			</exclusions>
 		</dependency>
 		
 		<dependency>
@@ -110,6 +117,7 @@
 	</dependencies>
 
 	<build>
+		<finalName>${project.artifactId}</finalName>
 		<plugins>
 			<plugin>
 				<groupId>org.springframework.boot</groupId>
diff --git a/dg1cloud-core/src/main/resources/application.properties b/dg1cloud-core/src/main/resources/application.properties
index af62d1d..3cec1bc 100644
--- a/dg1cloud-core/src/main/resources/application.properties
+++ b/dg1cloud-core/src/main/resources/application.properties
@@ -1,6 +1,6 @@
 spring.datasource.url=jdbc:postgresql://localhost:5432/dg1cloud
-spring.datasource.username=postgres
-spring.datasource.password=passero
+#spring.datasource.username=postgres
+#spring.datasource.password=passero
 spring.datasource.driver-class-name=org.postgresql.Driver
 spring.datasource.tomcat.initial-size=10
 spring.datasource.tomcat.max-wait=30000 
@@ -14,6 +14,6 @@
 
 spring.jpa.open-in-view=true
 
-server.address=vannux.grupposistematica.it
+#server.address=vannux.grupposistematica.it
 
 logging.level.it.digione.dg1cloud=DEBUG
\ No newline at end of file

--
Gitblit v1.6.2