Merge branch 'release/v2.4.0'

SwissTierrasColombia · Jun 1, 2022 · 54d7b8d · 54d7b8d
2 parents 56993e0 + c3fc602
commit 54d7b8d
Show file tree

Hide file tree

Showing 73 changed files with 3,160 additions and 3,875 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -10,7 +10,7 @@ ENV CLOUD_CONFIG=$CLOUD_CONFIG
 
 VOLUME /tmp
 
-ADD  ./target/st-microservice-ili-1.10.0.jar st-microservice-ili.jar
+ADD  ./target/st-microservice-ili-2.2.0.jar st-microservice-ili.jar
 
 EXPOSE 8080
 

diff --git a/pom.xml b/pom.xml
@@ -14,12 +14,12 @@
 
 	<groupId>com.ai.st.microservice.ili</groupId>
 	<artifactId>st-microservice-ili</artifactId>
-	<version>2.0.7</version>
+	<version>2.4.0</version>
 	<name>st-microservice-ili</name>
 	<description>Microservice ILI</description>
 
 	<properties>
-		<java.version>1.8</java.version>
+		<java.version>11</java.version>
 		<spring-cloud.version>Hoxton.RC2</spring-cloud.version>
 	</properties>
 
@@ -155,6 +155,32 @@
 			</exclusions>
 		</dependency>
 
+		<dependency>
+			<groupId>com.ai.st.microservice.common</groupId>
+			<artifactId>st-common</artifactId>
+			<version>1.1.6</version>
+		</dependency>
+
+		<dependency>
+			<groupId>com.newrelic.logging</groupId>
+			<artifactId>logback</artifactId>
+			<version>2.3.2</version>
+		</dependency>
+
+		<dependency>
+			<groupId>com.newrelic.agent.java</groupId>
+			<artifactId>newrelic-api</artifactId>
+			<version>7.5.0</version>
+			<scope>compile</scope>
+		</dependency>
+
+		<dependency>
+			<groupId>com.newrelic.agent.java</groupId>
+			<artifactId>newrelic-agent</artifactId>
+			<version>7.5.0</version>
+			<scope>provided</scope>
+		</dependency>
+
 	</dependencies>
 
 	<dependencyManagement>
@@ -175,6 +201,35 @@
 				<groupId>org.springframework.boot</groupId>
 				<artifactId>spring-boot-maven-plugin</artifactId>
 			</plugin>
+			<plugin>
+				<groupId>net.revelc.code.formatter</groupId>
+				<artifactId>formatter-maven-plugin</artifactId>
+				<version>2.18.0</version>
+				<configuration>
+					<lineEnding>LF</lineEnding>
+					<encoding>UTF-8</encoding>
+				</configuration>
+				<executions>
+					<execution>
+						<goals>
+							<goal>format</goal>
+						</goals>
+					</execution>
+				</executions>
+			</plugin>
+			<plugin>
+				<groupId>org.flywaydb</groupId>
+				<artifactId>flyway-maven-plugin</artifactId>
+				<version>8.5.4</version>
+				<configuration>
+					<user>postgres</user>
+					<password>123456</password>
+					<url>jdbc:postgresql://localhost:54321/sistema-transicion</url>
+					<schemas>
+						<schema>ili</schema>
+					</schemas>
+				</configuration>
+			</plugin>
 		</plugins>
 	</build>
 

diff --git a/src/main/java/com/ai/st/microservice/ili/StMicroserviceIliApplication.java b/src/main/java/com/ai/st/microservice/ili/StMicroserviceIliApplication.java
@@ -8,8 +8,8 @@
 @EnableEurekaClient
 public class StMicroserviceIliApplication {
 
-	public static void main(String[] args) {
-		SpringApplication.run(StMicroserviceIliApplication.class, args);
-	}
+    public static void main(String[] args) {
+        SpringApplication.run(StMicroserviceIliApplication.class, args);
+    }
 
 }
diff --git a/src/main/java/com/ai/st/microservice/ili/StMicroserviceIliApplicationStartup.java b/src/main/java/com/ai/st/microservice/ili/StMicroserviceIliApplicationStartup.java
diff --git a/src/main/java/com/ai/st/microservice/ili/business/QueryBusiness.java b/src/main/java/com/ai/st/microservice/ili/business/QueryBusiness.java
diff --git a/src/main/java/com/ai/st/microservice/ili/business/QueryTypeBusiness.java b/src/main/java/com/ai/st/microservice/ili/business/QueryTypeBusiness.java
@@ -5,17 +5,11 @@
 @Component
 public class QueryTypeBusiness {
 
-	public static final Long QUERY_TYPE_MATCH_INTEGRATION = (long) 1;
-	public static final Long QUERY_TYPE_INSERT_INTEGRATION_ = (long) 2;
-	public static final Long QUERY_TYPE_COUNT_SNR_INTEGRATION = (long) 3;
-	public static final Long QUERY_TYPE_COUNT_CADASTRE_INTEGRATION = (long) 4;
-	public static final Long QUERY_TYPE_COUNT_MATCH_INTEGRATION = (long) 5;
-	public static final Long QUERY_TYPE_GET_PAIRING_TYPE_INTEGRATION = (long) 11;
-
-	public static final Long QUERY_TYPE_REGISTRAL_GET_RECORDS_TO_REVISION = (long) 6;
-	public static final Long QUERY_TYPE_COUNT_REGISTRAL_GET_RECORDS_TO_REVISION = (long) 7;
-	public static final Long QUERY_TYPE_INSERT_EXTARCHIVO_REVISION = (long) 8;
-	public static final Long QUERY_TYPE_SELECT_EXTARCHIVO_REVISION = (long) 9;
-	public static final Long QUERY_TYPE_UPDATE_EXTARCHIVO_REVISION = (long) 10;
+    public static final Long QUERY_TYPE_MATCH_INTEGRATION = (long) 1;
+    public static final Long QUERY_TYPE_INSERT_INTEGRATION_ = (long) 2;
+    public static final Long QUERY_TYPE_COUNT_SNR_INTEGRATION = (long) 3;
+    public static final Long QUERY_TYPE_COUNT_CADASTRE_INTEGRATION = (long) 4;
+    public static final Long QUERY_TYPE_COUNT_MATCH_INTEGRATION = (long) 5;
+    public static final Long QUERY_TYPE_GET_PAIRING_TYPE_INTEGRATION = (long) 11;
 
 }