Skip to content

clean-up a bit #1942

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 7 commits into from
Jul 15, 2025
Merged

clean-up a bit #1942

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
0b9bf02
test
wind57 Jul 1, 2025
c3cd4c8
test
wind57 Jul 2, 2025
e9eb689
test
wind57 Jul 2, 2025
1ed3290
test
wind57 Jul 2, 2025
669d000
disable man-db
wind57 Jul 2, 2025
1a5990f
drop explicit java version
wind57 Jul 2, 2025
218b4ac
fix comments
wind57 Jul 15, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions .github/workflows/composites/clean-space/action.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,12 @@ runs:
using: "composite"
steps:

- name: Disable man-db to make package install and removal faster
Copy link
Contributor Author

@wind57 wind57 Jul 2, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

about 1m improvement here because of this

shell: bash
run: |
echo 'set man-db/auto-update false' | sudo debconf-communicate >/dev/null
sudo dpkg-reconfigure man-db

- name: Free Disk Space
uses: jlumbroso/free-disk-space@main
with:
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/composites/run-and-save-test-times-when-cache-missing/action.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,9 @@ runs:
-Dhttp.keepAlive=false \
-Dmaven.wagon.http.pool=false \
-Dmaven.wagon.http.retryHandler.class=standard \
-Dmaven.wagon.httpconnectionManager.ttlSeconds=120 \
Copy link
Contributor Author

@wind57 wind57 Jul 2, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I have observed that we get some timeouts from time to time when we need something from maven central, seems that adding these options fixes the problem.

-Dmaven.wagon.http.retryHandler.count=3 \
-Dmaven.resolver.transport=wagon \
-Dspring-boot.build-image.skip=true

touch /tmp/test_times_${{ env.CURRENT_INDEX }}.txt
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/composites/run-and-save-test-times-when-cache-present/action.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,9 @@ runs:
-Dhttp.keepAlive=false \
-Dmaven.wagon.http.pool=false \
-Dmaven.wagon.http.retryHandler.class=standard \
-Dmaven.wagon.httpconnectionManager.ttlSeconds=120 \
-Dmaven.wagon.http.retryHandler.count=3 \
-Dmaven.resolver.transport=wagon \
-Dspring-boot.build-image.skip=true

touch /tmp/test_times_${{ env.CURRENT_INDEX }}.txt
Expand Down
4 changes: 4 additions & 0 deletions .settings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,10 @@
</repository>
</repositories>
<pluginRepositories>
<pluginRepository>
Copy link
Contributor Author

@wind57 wind57 Jul 2, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I am not sure why, but if I put this one here explicitly, it will not go to spring repositories for download, but use maven central

<id>central</id>
<url>https://repo1.maven.org/maven2/</url>
</pluginRepository>
<pluginRepository>
<id>spring-snapshots</id>
<name>Spring Snapshots</name>
Expand Down
12 changes: 0 additions & 12 deletions spring-cloud-kubernetes-commons/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,18 +11,6 @@

<artifactId>spring-cloud-kubernetes-commons</artifactId>
<name>${project.artifactId}</name>
<build>
<plugins>
<plugin>
Copy link
Contributor Author

@wind57 wind57 Jul 2, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

drop explicit java version

<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<source>17</source>
<target>17</target>
</configuration>
</plugin>
</plugins>
</build>

<dependencies>
<dependency>
Expand Down
11 changes: 1 addition & 10 deletions spring-cloud-kubernetes-examples/kubernetes-leader-election-example/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,7 @@

<artifactId>kubernetes-leader-election-example</artifactId>
<name>Spring Cloud Kubernetes :: Examples :: Leader Election</name>
<description>Leader election demonstration with Spring Integration and ConfigMap
</description>
<description>Leader election demonstration with Spring Integration and ConfigMap</description>

<dependencyManagement>
<dependencies>
Expand Down Expand Up @@ -73,14 +72,6 @@
<skip>true</skip>
</configuration>
</plugin>
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
Copy link
Contributor Author

@wind57 wind57 Jul 2, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

remove explicit versions and use the inherited ones

<version>3.1.2</version>
</plugin>
<plugin>
<artifactId>maven-failsafe-plugin</artifactId>
<version>3.1.2</version>
</plugin>
</plugins>
</build>

Expand Down
Loading