Skip to content

Commit 3e45b4a

Browse files
author
Guilherme Biff Zarelli
committed
fix: spring runner
1 parent 3d1bf76 commit 3e45b4a

File tree

8 files changed

+66
-25
lines changed

8 files changed

+66
-25
lines changed

adapter/input/jaxrs-controller-v1/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@
7878
</dependency>
7979
<dependency>
8080
<groupId>org.glassfish.jersey.core</groupId>
81-
<artifactId>jersey-common</artifactId>
81+
<artifactId>jersey-server</artifactId>
8282
<scope>test</scope>
8383
</dependency>
8484
</dependencies>

adapter/output/jpa-mysql-repository/pom.xml

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -70,11 +70,6 @@
7070
<artifactId>slf4j-simple</artifactId>
7171
<scope>test</scope>
7272
</dependency>
73-
<dependency>
74-
<groupId>org.glassfish.jersey.core</groupId>
75-
<artifactId>jersey-common</artifactId>
76-
<scope>test</scope>
77-
</dependency>
7873
</dependencies>
7974

8075
</project>

app/spring-app/pom.xml

Lines changed: 26 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@
1515
<properties>
1616
<maven.compiler.source>11</maven.compiler.source>
1717
<maven.compiler.target>11</maven.compiler.target>
18+
<spring-boot.version>2.4.1</spring-boot.version>
1819
<mutation.skip>true</mutation.skip>
19-
<spring-boot.version>2.4.4</spring-boot.version>
2020
<jackson.version>2.8.5</jackson.version>
2121
<coverage.line>0</coverage.line>
2222
<coverage.branch>0</coverage.branch>
@@ -38,7 +38,7 @@
3838
<dependencies>
3939
<dependency>
4040
<groupId>org.springframework.boot</groupId>
41-
<artifactId>spring-boot-starter-web</artifactId>
41+
<artifactId>spring-boot-starter-jersey</artifactId>
4242
</dependency>
4343
<dependency>
4444
<groupId>${project.groupId}</groupId>
@@ -77,11 +77,35 @@
7777
</dependencies>
7878

7979
<build>
80+
<finalName>spring-application</finalName>
8081
<plugins>
8182
<plugin>
8283
<groupId>org.springframework.boot</groupId>
8384
<artifactId>spring-boot-maven-plugin</artifactId>
85+
<configuration>
86+
<layers>
87+
<enabled>true</enabled>
88+
<configuration>${project.basedir}/src/layers.xml</configuration>
89+
</layers>
90+
</configuration>
91+
</plugin>
92+
<plugin>
93+
<groupId>org.springframework.boot</groupId>
94+
<artifactId>spring-boot-maven-plugin</artifactId>
95+
<configuration>
96+
<mainClass>br.com.helpdev.SpringSampleApplication</mainClass>
97+
</configuration>
98+
99+
<executions>
100+
<execution>
101+
<goals>
102+
<goal>repackage</goal>
103+
</goals>
104+
</execution>
105+
</executions>
106+
84107
</plugin>
85108
</plugins>
86109
</build>
110+
87111
</project>

app/spring-app/src/layers.xml

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
<layers xmlns="http://www.springframework.org/schema/boot/layers"
2+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
3+
xsi:schemaLocation="http://www.springframework.org/schema/boot/layers
4+
https://www.springframework.org/schema/boot/layers/layers-2.3.xsd">
5+
<application>
6+
<into layer="spring-boot-loader">
7+
<include>org/springframework/boot/loader/**</include>
8+
</into>
9+
<into layer="application" />
10+
</application>
11+
<dependencies>
12+
<into layer="snapshot-dependencies">
13+
<include>*:*:*SNAPSHOT</include>
14+
</into>
15+
<into layer="dependencies" />
16+
</dependencies>
17+
<layerOrder>
18+
<layer>dependencies</layer>
19+
<layer>spring-boot-loader</layer>
20+
<layer>snapshot-dependencies</layer>
21+
<layer>application</layer>
22+
</layerOrder>
23+
</layers>

app/spring-app/src/main/java/br/com/helpdev/SpringSampleApplication.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
import org.springframework.boot.autoconfigure.SpringBootApplication;
55

66
@SpringBootApplication(
7-
scanBasePackages = {"br.com.helpdev", "br.com.helpdev.output"}
7+
scanBasePackages = {"br.com.helpdev"}
88
)
99
public class SpringSampleApplication {
1010

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
package br.com.helpdev.config;
2+
3+
import org.glassfish.jersey.server.ResourceConfig;
4+
import org.springframework.stereotype.Component;
5+
6+
@Component
7+
public class WebJerseyConfiguration extends ResourceConfig {
8+
9+
public WebJerseyConfiguration() {
10+
packages("br.com.helpdev.controller");
11+
}
12+
}

app/spring-app/src/main/java/br/com/helpdev/wrapper/MessageControllerWrapper.java

Lines changed: 0 additions & 12 deletions
This file was deleted.

pom.xml

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@
6464
<validation-api.version>2.0.1.Final</validation-api.version>
6565
<microprofile-fault-tolerance.version>3.0</microprofile-fault-tolerance.version>
6666
<modelmapper.version>2.3.0</modelmapper.version>
67-
<glassfish.version>2.22.2</glassfish.version>
67+
<glassfish.test.version>2.32</glassfish.test.version>
6868
<jaxb-api.version>2.3.1</jaxb-api.version>
6969
</properties>
7070

@@ -269,9 +269,8 @@
269269
</dependency>
270270
<dependency>
271271
<groupId>org.glassfish.jersey.core</groupId>
272-
<artifactId>jersey-common</artifactId>
273-
<version>${glassfish.version}</version>
274-
<scope>test</scope>
272+
<artifactId>jersey-server</artifactId>
273+
<version>${glassfish.test.version}</version>
275274
</dependency>
276275
<dependency>
277276
<groupId>com.github.tomakehurst</groupId>

0 commit comments

Comments
 (0)