Skip to content

Commit 2d7e0fc

Browse files
SteKoeSteKoe
authored
chore: fix build (#2617)
* chore: remove maven cache by moving it to java setup * chore: set 4 thread * chore: fix formatting
1 parent 7272375 commit 2d7e0fc

File tree

6 files changed

+22
-80
lines changed

6 files changed

+22
-80
lines changed

‎.github/workflows/build-feature.yml‎

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -24,18 +24,7 @@ jobs:
2424
with:
2525
distribution: 'adopt'
2626
java-version: '17'
27-
28-
- name: Cache local Maven repository
29-
uses: actions/[email protected]
30-
env:
31-
cache-name: cache-mvn
32-
with:
33-
path: ~/.m2/repository
34-
key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('**/pom.xml') }}
35-
restore-keys: |
36-
${{ runner.os }}-build-${{ env.cache-name }}-
37-
${{ runner.os }}-build-
38-
${{ runner.os }}-
27+
cache: 'maven'
3928

4029
- name: Cache node modules
4130
uses: actions/cache@v3
@@ -51,7 +40,6 @@ jobs:
5140
# otherwise the build will fail https://stackoverflow.com/questions/38051787/maven-javadoc-skip-true-throws-an-error
5241
- name: Build with Maven
5342
run: |
54-
mvn -B spring-javaformat:apply --no-transfer-progress
5543
mvn -B verify -P coverage --no-transfer-progress -D maven.javadoc.skip=true
5644
5745
- uses: codecov/codecov-action@v3

‎.github/workflows/build-main.yml‎

Lines changed: 2 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -23,18 +23,7 @@ jobs:
2323
with:
2424
distribution: 'adopt'
2525
java-version: '17'
26-
27-
- name: Cache local Maven repository
28-
uses: actions/[email protected]
29-
env:
30-
cache-name: cache-mvn
31-
with:
32-
path: ~/.m2/repository
33-
key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('**/pom.xml') }}
34-
restore-keys: |
35-
${{ runner.os }}-build-${{ env.cache-name }}-
36-
${{ runner.os }}-build-
37-
${{ runner.os }}-
26+
cache: 'maven'
3827

3928
- name: Cache node modules
4029
uses: actions/cache@v3
@@ -50,7 +39,6 @@ jobs:
5039
# otherwise the build will fail https://stackoverflow.com/questions/38051787/maven-javadoc-skip-true-throws-an-error
5140
- name: Build with Maven
5241
run: |
53-
mvn -B spring-javaformat:apply --no-transfer-progress
5442
mvn -B verify -P coverage --no-transfer-progress -D maven.javadoc.skip=true
5543
5644
- uses: codecov/codecov-action@v3
@@ -69,18 +57,7 @@ jobs:
6957
with:
7058
distribution: 'adopt'
7159
java-version: '17'
72-
73-
- name: Cache local Maven repository
74-
uses: actions/[email protected]
75-
env:
76-
cache-name: cache-mvn
77-
with:
78-
path: ~/.m2/repository
79-
key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('**/pom.xml') }}
80-
restore-keys: |
81-
${{ runner.os }}-build-${{ env.cache-name }}-
82-
${{ runner.os }}-build-
83-
${{ runner.os }}-
60+
cache: 'maven'
8461

8562
- name: Cache node modules
8663
uses: actions/cache@v3

‎.github/workflows/build-pullrequest.yml‎

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -19,18 +19,7 @@ jobs:
1919
with:
2020
distribution: 'adopt'
2121
java-version: '17'
22-
23-
- name: Cache local Maven repository
24-
uses: actions/[email protected]
25-
env:
26-
cache-name: cache-mvn
27-
with:
28-
path: ~/.m2/repository
29-
key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('**/pom.xml') }}
30-
restore-keys: |
31-
${{ runner.os }}-build-${{ env.cache-name }}-
32-
${{ runner.os }}-build-
33-
${{ runner.os }}-
22+
cache: 'maven'
3423

3524
- name: Cache node modules
3625
uses: actions/cache@v3
@@ -46,7 +35,6 @@ jobs:
4635
# otherwise the build will fail https://stackoverflow.com/questions/38051787/maven-javadoc-skip-true-throws-an-error
4736
- name: Build with Maven
4837
run: |
49-
mvn -B spring-javaformat:apply --no-transfer-progress
5038
mvn -B verify -P coverage --no-transfer-progress -D maven.javadoc.skip=true
5139
5240
- uses: codecov/codecov-action@v3

‎.github/workflows/release-to-maven-central.yml‎

Lines changed: 2 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -31,18 +31,7 @@ jobs:
3131
server-password: MAVEN_PASSWORD
3232
gpg-private-key: ${{ secrets.MAVEN_GPG_PRIVATE_KEY }}
3333
gpg-passphrase: MAVEN_GPG_PASSPHRASE
34-
35-
- name: Cache local Maven repository
36-
uses: actions/[email protected]
37-
env:
38-
cache-name: cache-mvn
39-
with:
40-
path: ~/.m2/repository
41-
key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('**/pom.xml') }}
42-
restore-keys: |
43-
${{ runner.os }}-build-${{ env.cache-name }}-
44-
${{ runner.os }}-build-
45-
${{ runner.os }}-
34+
cache: 'maven'
4635

4736
- name: Cache node modules
4837
uses: actions/cache@v3
@@ -58,7 +47,7 @@ jobs:
5847
run: mvn versions:set "-DnewVersion=${{ github.event.inputs.releaseversion }}" --no-transfer-progress
5948

6049
- name: Publish package
61-
run: mvn --batch-mode clean deploy --no-transfer-progress -P central-deploy -DskipTests=true
50+
run: mvn -B deploy --no-transfer-progress -P central-deploy -DskipTests=true
6251
env:
6352
#TODO: This is a workaround for NEXUS-27902 which uses XStream that fails on JVM >16
6453
JDK_JAVA_OPTIONS: "--add-opens java.base/java.util=ALL-UNNAMED --add-opens java.base/java.lang.reflect=ALL-UNNAMED --add-opens java.base/java.text=ALL-UNNAMED --add-opens java.desktop/java.awt.font=ALL-UNNAMED"

‎spring-boot-admin-client/src/test/java/de/codecentric/boot/admin/client/config/SpringBootAdminClientAutoConfigurationTest.java‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,8 @@ public class SpringBootAdminClientAutoConfigurationTest {
4444

4545
private final WebApplicationContextRunner contextRunner = new WebApplicationContextRunner()
4646
.withConfiguration(AutoConfigurations.of(EndpointAutoConfiguration.class, WebEndpointAutoConfiguration.class,
47-
DispatcherServletAutoConfiguration.class, RestTemplateAutoConfiguration.class,
48-
SpringBootAdminClientAutoConfiguration.class));
47+
DispatcherServletAutoConfiguration.class, RestTemplateAutoConfiguration.class,
48+
SpringBootAdminClientAutoConfiguration.class));
4949

5050
@Test
5151
public void not_active() {
@@ -62,7 +62,7 @@ public void active() {
6262
public void disabled() {
6363
this.contextRunner
6464
.withPropertyValues("spring.boot.admin.client.url:http://localhost:8081",
65-
"spring.boot.admin.client.enabled:false")
65+
"spring.boot.admin.client.enabled:false")
6666
.run((context) -> assertThat(context).doesNotHaveBean(ApplicationRegistrator.class));
6767
}
6868

@@ -79,8 +79,8 @@ public void nonWebEnvironment() {
7979
public void reactiveEnvironment() {
8080
ReactiveWebApplicationContextRunner reactiveContextRunner = new ReactiveWebApplicationContextRunner()
8181
.withConfiguration(
82-
AutoConfigurations.of(EndpointAutoConfiguration.class, WebEndpointAutoConfiguration.class,
83-
WebClientAutoConfiguration.class, SpringBootAdminClientAutoConfiguration.class))
82+
AutoConfigurations.of(EndpointAutoConfiguration.class, WebEndpointAutoConfiguration.class,
83+
WebClientAutoConfiguration.class, SpringBootAdminClientAutoConfiguration.class))
8484
.withBean(WebFluxProperties.class);
8585
reactiveContextRunner.withPropertyValues("spring.boot.admin.client.url:http://localhost:8081")
8686
.run((context) -> assertThat(context).hasSingleBean(ApplicationRegistrator.class));
@@ -90,16 +90,16 @@ public void reactiveEnvironment() {
9090
public void blockingClientInBlockingEnvironment() {
9191
WebApplicationContextRunner webApplicationContextRunner = new WebApplicationContextRunner()
9292
.withConfiguration(AutoConfigurations.of(EndpointAutoConfiguration.class,
93-
WebEndpointAutoConfiguration.class, DispatcherServletAutoConfiguration.class,
94-
RestTemplateAutoConfiguration.class, SpringBootAdminClientAutoConfiguration.class));
93+
WebEndpointAutoConfiguration.class, DispatcherServletAutoConfiguration.class,
94+
RestTemplateAutoConfiguration.class, SpringBootAdminClientAutoConfiguration.class));
9595

9696
webApplicationContextRunner
9797
.withPropertyValues("spring.boot.admin.client.url:http://localhost:8081",
98-
"spring.boot.admin.client.connectTimeout=1337", "spring.boot.admin.client.readTimeout=42")
98+
"spring.boot.admin.client.connectTimeout=1337", "spring.boot.admin.client.readTimeout=42")
9999
.run((context) -> {
100100
RegistrationClient registrationClient = context.getBean(RegistrationClient.class);
101101
RestTemplate restTemplate = (RestTemplate) ReflectionTestUtils.getField(registrationClient,
102-
"restTemplate");
102+
"restTemplate");
103103
assertThat(restTemplate).isNotNull();
104104

105105
ClientHttpRequestFactory requestFactory = restTemplate.getRequestFactory();
@@ -116,8 +116,8 @@ public void customBlockingClientInReactiveEnvironment() {
116116
ReactiveWebApplicationContextRunner reactiveContextRunner = new ReactiveWebApplicationContextRunner()
117117
.withConfiguration(UserConfigurations.of(CustomBlockingConfiguration.class))
118118
.withConfiguration(
119-
AutoConfigurations.of(EndpointAutoConfiguration.class, WebEndpointAutoConfiguration.class,
120-
WebClientAutoConfiguration.class, SpringBootAdminClientAutoConfiguration.class))
119+
AutoConfigurations.of(EndpointAutoConfiguration.class, WebEndpointAutoConfiguration.class,
120+
WebClientAutoConfiguration.class, SpringBootAdminClientAutoConfiguration.class))
121121
.withBean(WebFluxProperties.class);
122122

123123
reactiveContextRunner.withPropertyValues("spring.boot.admin.client.url:http://localhost:8081")
@@ -133,8 +133,8 @@ public void customBlockingClientInBlockingEnvironment() {
133133
WebApplicationContextRunner webApplicationContextRunner = new WebApplicationContextRunner()
134134
.withConfiguration(UserConfigurations.of(CustomBlockingConfiguration.class))
135135
.withConfiguration(AutoConfigurations.of(EndpointAutoConfiguration.class,
136-
WebEndpointAutoConfiguration.class, DispatcherServletAutoConfiguration.class,
137-
RestTemplateAutoConfiguration.class, SpringBootAdminClientAutoConfiguration.class));
136+
WebEndpointAutoConfiguration.class, DispatcherServletAutoConfiguration.class,
137+
RestTemplateAutoConfiguration.class, SpringBootAdminClientAutoConfiguration.class));
138138

139139
webApplicationContextRunner.withPropertyValues("spring.boot.admin.client.url:http://localhost:8081")
140140
.run((context) -> {

‎spring-boot-admin-client/src/test/java/de/codecentric/boot/admin/client/config/SpringBootAdminClientCloudFoundryAutoConfigurationTest.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,9 +36,9 @@ public class SpringBootAdminClientCloudFoundryAutoConfigurationTest {
3636

3737
private final WebApplicationContextRunner contextRunner = new WebApplicationContextRunner()
3838
.withConfiguration(AutoConfigurations.of(EndpointAutoConfiguration.class, WebEndpointAutoConfiguration.class,
39-
WebMvcAutoConfiguration.class, DispatcherServletAutoConfiguration.class,
40-
RestTemplateAutoConfiguration.class, SpringBootAdminClientAutoConfiguration.class,
41-
SpringBootAdminClientCloudFoundryAutoConfiguration.class));
39+
WebMvcAutoConfiguration.class, DispatcherServletAutoConfiguration.class,
40+
RestTemplateAutoConfiguration.class, SpringBootAdminClientAutoConfiguration.class,
41+
SpringBootAdminClientCloudFoundryAutoConfiguration.class));
4242

4343
@Test
4444
public void non_cloud_platform() {

0 commit comments

Comments
 (0)