Skip to content

Commit 0c8cad7

Browse files
jzheauxjzheaux
authored
Merge pull request eugenp#8038 from sjmillington/rest-move-1
[BAEL-18364] move spring-rest-*** articles - 1
2 parents 8d1c5e0 + 599df3c commit 0c8cad7

File tree

83 files changed

+437
-292
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

83 files changed

+437
-292
lines changed

‎spring-rest-full/README.md

Lines changed: 0 additions & 2 deletions

‎spring-rest/README.md

Lines changed: 0 additions & 5 deletions

‎spring-rest/pom.xml

Lines changed: 5 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,7 @@
2020
<groupId>org.springframework.boot</groupId>
2121
<artifactId>spring-boot-starter-web</artifactId>
2222
</dependency>
23-
<dependency>
24-
<groupId>org.springframework.boot</groupId>
25-
<artifactId>spring-boot-starter-thymeleaf</artifactId>
26-
</dependency>
23+
2724
<dependency>
2825
<groupId>org.springframework.boot</groupId>
2926
<artifactId>spring-boot-starter-actuator</artifactId>
@@ -141,11 +138,7 @@
141138
<artifactId>commons-io</artifactId>
142139
<version>${commons-io.version}</version>
143140
</dependency>
144-
<dependency>
145-
<groupId>au.com.dius</groupId>
146-
<artifactId>pact-jvm-provider-junit_2.11</artifactId>
147-
<version>${pact.version}</version>
148-
</dependency>
141+
149142
<dependency>
150143
<groupId>io.rest-assured</groupId>
151144
<artifactId>rest-assured</artifactId>
@@ -176,21 +169,7 @@
176169
<groupId>org.apache.maven.plugins</groupId>
177170
<artifactId>maven-war-plugin</artifactId>
178171
</plugin>
179-
<plugin>
180-
<groupId>org.apache.maven.plugins</groupId>
181-
<artifactId>maven-checkstyle-plugin</artifactId>
182-
<version>${checkstyle-maven-plugin.version}</version>
183-
<configuration>
184-
<configLocation>checkstyle.xml</configLocation>
185-
</configuration>
186-
<executions>
187-
<execution>
188-
<goals>
189-
<goal>check</goal>
190-
</goals>
191-
</execution>
192-
</executions>
193-
</plugin>
172+
194173
</plugins>
195174
</build>
196175

@@ -250,18 +229,7 @@
250229

251230
</profiles>
252231

253-
<reporting>
254-
<plugins>
255-
<plugin>
256-
<groupId>org.apache.maven.plugins</groupId>
257-
<artifactId>maven-checkstyle-plugin</artifactId>
258-
<version>${checkstyle-maven-plugin.version}</version>
259-
<configuration>
260-
<configLocation>checkstyle.xml</configLocation>
261-
</configuration>
262-
</plugin>
263-
</plugins>
264-
</reporting>
232+
265233

266234
<properties>
267235
<commons-fileupload.version>1.3.2</commons-fileupload.version>
@@ -275,7 +243,7 @@
275243
<!-- Maven plugins -->
276244
<cargo-maven2-plugin.version>1.6.0</cargo-maven2-plugin.version>
277245
<findbugs-maven-plugin.version>3.0.4</findbugs-maven-plugin.version>
278-
<checkstyle-maven-plugin.version>3.0.0</checkstyle-maven-plugin.version>
246+
279247
<dependency.locations.enabled>false</dependency.locations.enabled>
280248

281249
<json.path.version>2.2.0</json.path.version>

‎spring-resttemplate/README.md

Lines changed: 3 additions & 0 deletions

‎spring-resttemplate/pom.xml

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,10 @@
2121
<groupId>org.springframework.boot</groupId>
2222
<artifactId>spring-boot-starter-actuator</artifactId>
2323
</dependency>
24+
<dependency>
25+
<groupId>org.springframework.boot</groupId>
26+
<artifactId>spring-boot-starter-thymeleaf</artifactId>
27+
</dependency>
2428
<dependency>
2529
<groupId>org.springframework.boot</groupId>
2630
<artifactId>spring-boot-devtools</artifactId>
@@ -32,7 +36,13 @@
3236
<dependency>
3337
<groupId>org.springframework.boot</groupId>
3438
<artifactId>spring-boot-starter-test</artifactId>
35-
<scope>test</scope>
39+
</dependency>
40+
41+
42+
<dependency>
43+
<groupId>au.com.dius</groupId>
44+
<artifactId>pact-jvm-provider-junit_2.11</artifactId>
45+
<version>${pact.version}</version>
3646
</dependency>
3747

3848
<!-- Spring -->
@@ -111,11 +121,13 @@
111121

112122
<!-- test scoped -->
113123

124+
<!-- https://mvnrepository.com/artifact/junit/junit -->
114125
<dependency>
115126
<groupId>junit</groupId>
116127
<artifactId>junit</artifactId>
117-
<scope>test</scope>
128+
<version>4.12</version>
118129
</dependency>
130+
119131
<dependency>
120132
<groupId>org.hamcrest</groupId>
121133
<artifactId>hamcrest-core</artifactId>
@@ -295,6 +307,7 @@
295307

296308
<!-- okhttp -->
297309
<com.squareup.okhttp3.version>3.4.1</com.squareup.okhttp3.version>
310+
<pact.version>3.5.11</pact.version>
298311
</properties>
299312

300313
</project>

‎spring-rest/src/test/java/com/baeldung/SpringContextIntegrationTest.java renamed to ‎spring-resttemplate/src/main/java/com/baeldung/SpringContextIntegrationTest.java

File renamed without changes.

‎spring-rest/src/test/java/com/baeldung/SpringContextTest.java renamed to ‎spring-resttemplate/src/main/java/com/baeldung/SpringContextTest.java

File renamed without changes.

‎spring-rest/src/main/java/com/baeldung/changeport/CustomApplication.java renamed to ‎spring-resttemplate/src/main/java/com/baeldung/changeport/CustomApplication.java

File renamed without changes.

‎spring-rest/src/main/java/com/baeldung/changeport/ServerPortCustomizer.java renamed to ‎spring-resttemplate/src/main/java/com/baeldung/changeport/ServerPortCustomizer.java

File renamed without changes.

‎spring-rest/src/main/java/com/baeldung/produceimage/ImageApplication.java renamed to ‎spring-resttemplate/src/main/java/com/baeldung/produceimage/ImageApplication.java

File renamed without changes.

0 commit comments

Comments
 (0)