Skip to content

Commit

Permalink
Merge branch 'release/v4.8.0'
Browse files Browse the repository at this point in the history
  • Loading branch information
shiido committed Jun 1, 2022
2 parents a7cd0d5 + 6856f44 commit 0e1ef3f
Show file tree
Hide file tree
Showing 105 changed files with 6,935 additions and 4,998 deletions.
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ ENV CLOUD_CONFIG=$CLOUD_CONFIG

VOLUME /tmp

ADD ./target/st-microservice-workspaces-3.11.1.jar st-microservice-workspaces.jar
ADD ./target/st-microservice-workspaces-4.5.0.jar st-microservice-workspaces.jar

EXPOSE 8080

Expand Down
62 changes: 59 additions & 3 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,12 @@

<groupId>com.ai.st.microservice.workspaces</groupId>
<artifactId>st-microservice-workspaces</artifactId>
<version>4.1.5</version>
<version>4.8.0</version>
<name>st-microservice-workspaces</name>
<description>Microservice Workspaces</description>

<properties>
<java.version>1.8</java.version>
<java.version>11</java.version>
<spring-cloud.version>Hoxton.RC2</spring-cloud.version>
</properties>

Expand Down Expand Up @@ -122,7 +122,34 @@
<dependency>
<groupId>com.ai.st.microservice.common</groupId>
<artifactId>st-common</artifactId>
<version>1.1.2</version>
<version>1.1.6</version>
</dependency>

<dependency>
<groupId>org.immutables</groupId>
<artifactId>value</artifactId>
<version>2.8.2</version>
<scope>provided</scope>
</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>
Expand All @@ -145,6 +172,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>workspaces</schema>
</schemas>
</configuration>
</plugin>
</plugins>
</build>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,10 @@
import org.springframework.context.annotation.ComponentScan;

@SpringBootApplication
@EnableFeignClients(basePackages = {"com.ai.st.microservice.common.clients", "com.ai.st.microservice.workspaces.clients"})
@EnableFeignClients(basePackages = { "com.ai.st.microservice.common.clients", "com.ai.st.microservice.workspaces" })
@EnableEurekaClient
@ComponentScan(value = {"com.ai.st.microservice.common.business", "com.ai.st.microservice.workspaces"})
@ComponentScan(value = { "com.ai.st.microservice.common.business", "com.ai.st.microservice.workspaces" })

public class StMicroserviceWorkspacesApplication {

public static void main(String[] args) {
Expand Down

This file was deleted.

Loading

0 comments on commit 0e1ef3f

Please sign in to comment.