Skip to content

Commit 53a7fd8

Browse files
committed
Merge branch '3.2.x' into 3.3.x
2 parents 2b405a9 + 5545e67 commit 53a7fd8

File tree

7 files changed

+55
-23
lines changed

7 files changed

+55
-23
lines changed

.github/workflows/composites/clean-space/action.yaml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,12 @@ runs:
44
using: "composite"
55
steps:
66

7+
- name: Disable man-db to make package install and removal faster
8+
shell: bash
9+
run: |
10+
echo 'set man-db/auto-update false' | sudo debconf-communicate >/dev/null
11+
sudo dpkg-reconfigure man-db
12+
713
- name: Free Disk Space
814
uses: jlumbroso/free-disk-space@main
915
with:

.github/workflows/composites/run-and-save-test-times-when-cache-missing/action.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,9 @@ runs:
4646
-Dhttp.keepAlive=false \
4747
-Dmaven.wagon.http.pool=false \
4848
-Dmaven.wagon.http.retryHandler.class=standard \
49+
-Dmaven.wagon.httpconnectionManager.ttlSeconds=120 \
4950
-Dmaven.wagon.http.retryHandler.count=3 \
51+
-Dmaven.resolver.transport=wagon \
5052
-Dspring-boot.build-image.skip=true
5153
5254
touch /tmp/test_times_${{ env.CURRENT_INDEX }}.txt

.github/workflows/composites/run-and-save-test-times-when-cache-present/action.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,9 @@ runs:
155155
-Dhttp.keepAlive=false \
156156
-Dmaven.wagon.http.pool=false \
157157
-Dmaven.wagon.http.retryHandler.class=standard \
158+
-Dmaven.wagon.httpconnectionManager.ttlSeconds=120 \
158159
-Dmaven.wagon.http.retryHandler.count=3 \
160+
-Dmaven.resolver.transport=wagon \
159161
-Dspring-boot.build-image.skip=true
160162

161163
touch /tmp/test_times_${{ env.CURRENT_INDEX }}.txt

.settings.xml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,10 @@
4646
</repository>
4747
</repositories>
4848
<pluginRepositories>
49+
<pluginRepository>
50+
<id>central</id>
51+
<url>https://repo1.maven.org/maven2/</url>
52+
</pluginRepository>
4953
<pluginRepository>
5054
<id>spring-snapshots</id>
5155
<name>Spring Snapshots</name>

pom.xml

Lines changed: 40 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@
3333
<version>3.3.1-SNAPSHOT</version>
3434
<packaging>pom</packaging>
3535
<name>Spring Cloud Kubernetes</name>
36+
<description>Spring Cloud Kubernetes</description>
3637

3738
<url>https://cloud.spring.io</url>
3839
<inceptionYear>2017</inceptionYear>
@@ -49,7 +50,28 @@
4950
<distribution>repo</distribution>
5051
</license>
5152
</licenses>
52-
53+
<developers>
54+
<developer>
55+
<id>sgibb</id>
56+
<name>Spencer Gibb</name>
57+
<email>spencer.gibb at broadcom.com</email>
58+
<organization>Broadcom, Inc.</organization>
59+
<organizationUrl>https://www.spring.io</organizationUrl>
60+
<roles>
61+
<role>lead</role>
62+
</roles>
63+
</developer>
64+
<developer>
65+
<id>rbaxter</id>
66+
<name>Ryan Baxter</name>
67+
<email>ryan.baxter at broadcom.com</email>
68+
<organization>Broadcom, Inc.</organization>
69+
<organizationUrl>https://www.spring.io</organizationUrl>
70+
<roles>
71+
<role>developer</role>
72+
</roles>
73+
</developer>
74+
</developers>
5375
<scm>
5476
<url>https://github.com/spring-cloud/spring-cloud-kubernetes</url>
5577
<connection>
@@ -229,6 +251,23 @@
229251
</reporting>
230252

231253
<profiles>
254+
<profile>
255+
<id>central</id>
256+
<build>
257+
<plugins>
258+
<plugin>
259+
<groupId>org.sonatype.central</groupId>
260+
<artifactId>central-publishing-maven-plugin</artifactId>
261+
<configuration>
262+
<excludeArtifacts>
263+
<artifact>spring-cloud-kubernetes-examples</artifact>
264+
<artifact>spring-cloud-kubernetes-integration-tests</artifact>
265+
</excludeArtifacts>
266+
</configuration>
267+
</plugin>
268+
</plugins>
269+
</build>
270+
</profile>
232271
<profile>
233272
<id>spring</id>
234273
<repositories>

spring-cloud-kubernetes-commons/pom.xml

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -11,18 +11,6 @@
1111

1212
<artifactId>spring-cloud-kubernetes-commons</artifactId>
1313
<name>${project.artifactId}</name>
14-
<build>
15-
<plugins>
16-
<plugin>
17-
<groupId>org.apache.maven.plugins</groupId>
18-
<artifactId>maven-compiler-plugin</artifactId>
19-
<configuration>
20-
<source>17</source>
21-
<target>17</target>
22-
</configuration>
23-
</plugin>
24-
</plugins>
25-
</build>
2614

2715
<dependencies>
2816
<dependency>

spring-cloud-kubernetes-examples/kubernetes-leader-election-example/pom.xml

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,7 @@
1111

1212
<artifactId>kubernetes-leader-election-example</artifactId>
1313
<name>Spring Cloud Kubernetes :: Examples :: Leader Election</name>
14-
<description>Leader election demonstration with Spring Integration and ConfigMap
15-
</description>
14+
<description>Leader election demonstration with Spring Integration and ConfigMap</description>
1615

1716
<dependencyManagement>
1817
<dependencies>
@@ -73,14 +72,6 @@
7372
<skip>true</skip>
7473
</configuration>
7574
</plugin>
76-
<plugin>
77-
<artifactId>maven-surefire-plugin</artifactId>
78-
<version>3.5.3</version>
79-
</plugin>
80-
<plugin>
81-
<artifactId>maven-failsafe-plugin</artifactId>
82-
<version>3.5.3</version>
83-
</plugin>
8475
</plugins>
8576
</build>
8677

0 commit comments

Comments
 (0)