Skip to content

Commit 644a6e2

Browse files
gtiwari333gtiwari333
committed
cleanupsmore fixes, removed querydsl
1 parent 9874ed7 commit 644a6e2

File tree

36 files changed

+310
-329
lines changed

36 files changed

+310
-329
lines changed

‎.mvn/wrapper/MavenWrapperDownloader.java‎

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

‎.mvn/wrapper/maven-wrapper.jar‎

-49.5 KB
Binary file not shown.

‎.mvn/wrapper/maven-wrapper.properties‎

Lines changed: 2 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,3 @@
1-
# Licensed to the Apache Software Foundation (ASF) under one
2-
# or more contributor license agreements. See the NOTICE file
3-
# distributed with this work for additional information
4-
# regarding copyright ownership. The ASF licenses this file
5-
# to you under the Apache License, Version 2.0 (the
6-
# "License"); you may not use this file except in compliance
7-
# with the License. You may obtain a copy of the License at
8-
#
9-
# http://www.apache.org/licenses/LICENSE-2.0
10-
#
11-
# Unless required by applicable law or agreed to in writing,
12-
# software distributed under the License is distributed on an
13-
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
14-
# KIND, either express or implied. See the License for the
15-
# specific language governing permissions and limitations
16-
# under the License.
17-
wrapperVersion=3.3.2
1+
wrapperVersion=3.3.4
182
distributionType=only-script
19-
distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.9/apache-maven-3.9.9-bin.zip
3+
distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.11/apache-maven-3.9.11-bin.zip

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ Persistence/Search:
4747

4848
Test:
4949
- Unit/integration with JUnit 5, Mockito and Spring Test
50-
- Tests with Spock Framework (Groovy 4, Spock 2)
50+
- Tests with Spock Framework (Groovy 5, Spock 2.4)
5151
- e2e with Selenide, fixtures. default data generated using Spring
5252
- Load test with Gatling/Scala
5353
- Architecture tests using ArchUnit

‎common/pom.xml‎

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -74,18 +74,16 @@
7474

7575
<build>
7676
<plugins>
77-
<plugin>
78-
<groupId>com.github.spotbugs</groupId>
79-
<artifactId>spotbugs-maven-plugin</artifactId>
80-
<configuration>
81-
<excludeFilterFile>../spot-bugs.filter-exclude.xml</excludeFilterFile>
82-
</configuration>
83-
</plugin>
8477
<plugin>
8578
<groupId>org.apache.maven.plugins</groupId>
86-
<artifactId>maven-checkstyle-plugin</artifactId>
79+
<artifactId>maven-compiler-plugin</artifactId>
8780
<configuration>
88-
<configLocation>../checkstyle.xml</configLocation>
81+
<annotationProcessorPaths>
82+
<path>
83+
<groupId>org.projectlombok</groupId>
84+
<artifactId>lombok</artifactId>
85+
</path>
86+
</annotationProcessorPaths>
8987
</configuration>
9088
</plugin>
9189
</plugins>

‎content-checker/content-checker-service-model/pom.xml‎

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,10 +30,15 @@
3030
<build>
3131
<plugins>
3232
<plugin>
33-
<groupId>com.github.spotbugs</groupId>
34-
<artifactId>spotbugs-maven-plugin</artifactId>
33+
<groupId>org.apache.maven.plugins</groupId>
34+
<artifactId>maven-compiler-plugin</artifactId>
3535
<configuration>
36-
<excludeFilterFile>../../spot-bugs.filter-exclude.xml</excludeFilterFile>
36+
<annotationProcessorPaths>
37+
<path>
38+
<groupId>org.projectlombok</groupId>
39+
<artifactId>lombok</artifactId>
40+
</path>
41+
</annotationProcessorPaths>
3742
</configuration>
3843
</plugin>
3944
</plugins>

‎content-checker/content-checker-service/pom.xml‎

Lines changed: 20 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,13 +67,13 @@
6767
<!-- test dependencies -->
6868
<dependency>
6969
<groupId>org.springframework.boot</groupId>
70-
<artifactId>spring-boot-starter-test</artifactId>
70+
<artifactId>spring-boot-starter-webmvc-test</artifactId>
7171
<scope>test</scope>
7272
</dependency>
7373
</dependencies>
7474

7575
<build>
76-
<finalName>${build.profile}-${artifactId}-${project.version}</finalName>
76+
<finalName>${artifactId}-${project.version}</finalName>
7777
<defaultGoal>spring-boot:run</defaultGoal>
7878
<plugins>
7979

@@ -85,6 +85,24 @@
8585
<layers>
8686
<enabled>true</enabled>
8787
</layers>
88+
<excludes>
89+
<exclude>
90+
<groupId>org.projectlombok</groupId>
91+
<artifactId>lombok</artifactId>
92+
</exclude>
93+
</excludes>
94+
</configuration>
95+
</plugin>
96+
<plugin>
97+
<groupId>org.apache.maven.plugins</groupId>
98+
<artifactId>maven-compiler-plugin</artifactId>
99+
<configuration>
100+
<annotationProcessorPaths>
101+
<path>
102+
<groupId>org.projectlombok</groupId>
103+
<artifactId>lombok</artifactId>
104+
</path>
105+
</annotationProcessorPaths>
88106
</configuration>
89107
</plugin>
90108
<plugin>

‎email/email-service-api/pom.xml‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,4 +33,21 @@
3333
</dependency>
3434
</dependencies>
3535

36+
<build>
37+
<plugins>
38+
<plugin>
39+
<groupId>org.apache.maven.plugins</groupId>
40+
<artifactId>maven-compiler-plugin</artifactId>
41+
<configuration>
42+
<annotationProcessorPaths>
43+
<path>
44+
<groupId>org.projectlombok</groupId>
45+
<artifactId>lombok</artifactId>
46+
</path>
47+
</annotationProcessorPaths>
48+
</configuration>
49+
</plugin>
50+
</plugins>
51+
</build>
52+
3653
</project>

‎email/email-service/pom.xml‎

Lines changed: 34 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,12 @@
7575
<!-- test dependencies -->
7676
<dependency>
7777
<groupId>org.springframework.boot</groupId>
78-
<artifactId>spring-boot-starter-test</artifactId>
78+
<artifactId>spring-boot-starter-mail-test</artifactId>
79+
<scope>test</scope>
80+
</dependency>
81+
<dependency>
82+
<groupId>org.springframework.boot</groupId>
83+
<artifactId>spring-boot-starter-webmvc-test</artifactId>
7984
<scope>test</scope>
8085
</dependency>
8186

@@ -110,7 +115,7 @@
110115
</dependencyManagement>
111116

112117
<build>
113-
<finalName>${build.profile}-${artifactId}-${project.version}</finalName>
118+
<finalName>${artifactId}-${project.version}</finalName>
114119
<defaultGoal>spring-boot:run</defaultGoal>
115120
<plugins>
116121
<plugin>
@@ -121,17 +126,39 @@
121126
<layers>
122127
<enabled>true</enabled>
123128
</layers>
129+
<excludes>
130+
<exclude>
131+
<groupId>org.projectlombok</groupId>
132+
<artifactId>lombok</artifactId>
133+
</exclude>
134+
</excludes>
124135
</configuration>
125136
</plugin>
126137
<plugin>
127-
<groupId>org.springframework.cloud</groupId>
128-
<artifactId>spring-cloud-contract-maven-plugin</artifactId>
129-
<extensions>true</extensions>
138+
<groupId>org.apache.maven.plugins</groupId>
139+
<artifactId>maven-compiler-plugin</artifactId>
130140
<configuration>
131-
<baseClassForTests>gt.mail.BaseTestCloudContract</baseClassForTests>
132-
<testFramework>JUNIT5</testFramework>
141+
<annotationProcessorPaths>
142+
<path>
143+
<groupId>org.projectlombok</groupId>
144+
<artifactId>lombok</artifactId>
145+
</path>
146+
</annotationProcessorPaths>
133147
</configuration>
134148
</plugin>
149+
150+
<!-- its currently failing, uncomment when the bug if fixed -->
151+
<!-- https://github.com/spring-cloud/spring-cloud-contract/issues/2379 -->
152+
<!-- https://github.com/rest-assured/rest-assured/issues/1850 -->
153+
<!-- <plugin>-->
154+
<!-- <groupId>org.springframework.cloud</groupId>-->
155+
<!-- <artifactId>spring-cloud-contract-maven-plugin</artifactId>-->
156+
<!-- <extensions>true</extensions>-->
157+
<!-- <configuration>-->
158+
<!-- <baseClassForTests>gt.mail.BaseTestCloudContract</baseClassForTests>-->
159+
<!-- <testFramework>JUNIT5</testFramework>-->
160+
<!-- </configuration>-->
161+
<!-- </plugin>-->
135162
<plugin>
136163
<groupId>com.github.spotbugs</groupId>
137164
<artifactId>spotbugs-maven-plugin</artifactId>

‎email/email-service/src/test/java/gt/mail/web/rest/EmailResourceIT.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22

33
import org.junit.jupiter.api.Test;
44
import org.springframework.beans.factory.annotation.Autowired;
5-
import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc;
65
import org.springframework.boot.test.context.SpringBootTest;
6+
import org.springframework.boot.webmvc.test.autoconfigure.AutoConfigureMockMvc;
77
import org.springframework.http.MediaType;
88
import org.springframework.test.annotation.DirtiesContext;
99
import org.springframework.test.web.servlet.MockMvc;

0 commit comments

Comments
 (0)