Merge remote-tracking branch 'origin/2025.0.x'

OlgaMaciaszek · OlgaMaciaszek · commit 01981e39a464 · 2025-09-09T15:20:36.000+02:00
Signed-off-by: Olga Maciaszek-Sharma &lt;olga.maciaszek-sharma@broadcom.com&gt;

# Conflicts:
#	docs/modules/ROOT/pages/index.adoc
#	docs/pom.xml
#	spring-cloud-starter-parent/pom.xml
diff --git a/docs/src/main/java/org/springframework/cloud/internal/ArtifactFetcher.java b/docs/src/main/java/org/springframework/cloud/internal/ArtifactFetcher.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2020 the original author or authors.
+ * Copyright 2013-present the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/docs/src/main/java/org/springframework/cloud/internal/ConfigurationPropertiesAggregator.java b/docs/src/main/java/org/springframework/cloud/internal/ConfigurationPropertiesAggregator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2020 the original author or authors.
+ * Copyright 2013-present the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/docs/src/main/java/org/springframework/cloud/internal/ConfigurationProperty.java b/docs/src/main/java/org/springframework/cloud/internal/ConfigurationProperty.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2020 the original author or authors.
+ * Copyright 2013-present the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/docs/src/main/java/org/springframework/cloud/internal/GenerateReleaseTrainDocs.java b/docs/src/main/java/org/springframework/cloud/internal/GenerateReleaseTrainDocs.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2020 the original author or authors.
+ * Copyright 2013-present the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/docs/src/main/java/org/springframework/cloud/internal/HandlebarsHelper.java b/docs/src/main/java/org/springframework/cloud/internal/HandlebarsHelper.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2020 the original author or authors.
+ * Copyright 2013-present the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/docs/src/main/java/org/springframework/cloud/internal/Logger.java b/docs/src/main/java/org/springframework/cloud/internal/Logger.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2020 the original author or authors.
+ * Copyright 2013-present the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/docs/src/main/java/org/springframework/cloud/internal/PomReader.java b/docs/src/main/java/org/springframework/cloud/internal/PomReader.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2020 the original author or authors.
+ * Copyright 2013-present the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/docs/src/main/java/org/springframework/cloud/internal/Project.java b/docs/src/main/java/org/springframework/cloud/internal/Project.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2020 the original author or authors.
+ * Copyright 2013-present the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/docs/src/main/java/org/springframework/cloud/internal/TemplateGenerator.java b/docs/src/main/java/org/springframework/cloud/internal/TemplateGenerator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2020 the original author or authors.
+ * Copyright 2013-present the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/docs/src/main/java/org/springframework/cloud/internal/TemplateProject.java b/docs/src/main/java/org/springframework/cloud/internal/TemplateProject.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2020 the original author or authors.
+ * Copyright 2013-present the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/docs/src/main/java/org/springframework/cloud/internal/ZipCategory.java b/docs/src/main/java/org/springframework/cloud/internal/ZipCategory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2020 the original author or authors.
+ * Copyright 2013-present the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/docs/src/test/java/org/springframework/cloud/internal/GenerateReleaseTrainDocsTests.java b/docs/src/test/java/org/springframework/cloud/internal/GenerateReleaseTrainDocsTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2020 the original author or authors.
+ * Copyright 2013-present the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/docs/src/test/java/org/springframework/cloud/internal/ZipCategoryTests.java b/docs/src/test/java/org/springframework/cloud/internal/ZipCategoryTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2020 the original author or authors.
+ * Copyright 2013-present the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/pom.xml b/pom.xml
@@ -20,6 +20,64 @@
 		<developerConnection>scm:git:ssh://git@github.com/spring-cloud/spring-cloud-release.git</developerConnection>
 		<tag>HEAD</tag>
 	</scm>
+	<licenses>
+		<license>
+			<name>Apache License, Version 2.0</name>
+			<url>https://www.apache.org/licenses/LICENSE-2.0</url>
+		</license>
+	</licenses>
+	<developers>
+		<developer>
+			<id>dsyer</id>
+			<name>Dave Syer</name>
+			<email>david.syer at broadcom.com</email>
+			<organization>Broadcom, Inc.</organization>
+			<organizationUrl>https://www.spring.io</organizationUrl>
+			<roles>
+				<role>lead</role>
+			</roles>
+		</developer>
+		<developer>
+			<id>sgibb</id>
+			<name>Spencer Gibb</name>
+			<email>spencer.gibb at broadcom.com</email>
+			<organization>Broadcom, Inc.</organization>
+			<organizationUrl>https://www.spring.io</organizationUrl>
+			<roles>
+				<role>lead</role>
+			</roles>
+		</developer>
+		<developer>
+			<id>mgrzejszczak</id>
+			<name>Marcin Grzejszczak</name>
+			<email>>marcin.grzejszczak at broadcom.com</email>
+			<organization>Broadcom, Inc.</organization>
+			<organizationUrl>https://www.spring.io</organizationUrl>
+			<roles>
+				<role>developer</role>
+			</roles>
+		</developer>
+		<developer>
+			<id>rbaxter</id>
+			<name>Ryan Baxter</name>
+			<email>ryan.baxter at broadcom.com</email>
+			<organization>Broadcom, Inc.</organization>
+			<organizationUrl>https://www.spring.io</organizationUrl>
+			<roles>
+				<role>developer</role>
+			</roles>
+		</developer>
+		<developer>
+			<id>omaciaszeksharma</id>
+			<name>Olga Maciaszek-Sharma</name>
+			<email>olga.maciaszek-sharma at broadcom.com</email>
+			<organization>Broadcom, Inc.</organization>
+			<organizationUrl>https://www.spring.io</organizationUrl>
+			<roles>
+				<role>developer</role>
+			</roles>
+		</developer>
+	</developers>
 
 	<properties>
 		<bintray.package>starters</bintray.package>

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`/*`
`2`		`- * Copyright 2013-2020 the original author or authors.`
	`2`	`+ * Copyright 2013-present the original author or authors.`
`3`	`3`	`*`
`4`	`4`	`* Licensed under the Apache License, Version 2.0 (the "License");`
`5`	`5`	`* you may not use this file except in compliance with the License.`