diff --git a/CODE_OF_CONDUCT.adoc b/CODE_OF_CONDUCT.adoc
index 17783c7c06..18c62c93ec 100644
--- a/CODE_OF_CONDUCT.adoc
+++ b/CODE_OF_CONDUCT.adoc
@@ -34,7 +34,7 @@ This Code of Conduct applies both within project spaces and in public spaces whe
individual is representing the project or its community.
Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by
-contacting a project maintainer at spring-code-of-conduct@pivotal.io . All complaints will
+contacting a project maintainer at code-of-conduct@spring.io. All complaints will
be reviewed and investigated and will result in a response that is deemed necessary and
appropriate to the circumstances. Maintainers are obligated to maintain confidentiality
with regard to the reporter of an incident.
diff --git a/CONTRIBUTING.adoc b/CONTRIBUTING.adoc
index 0bee31a937..d2541b7a7e 100755
--- a/CONTRIBUTING.adoc
+++ b/CONTRIBUTING.adoc
@@ -6,7 +6,7 @@ Spring Boot is released under the Apache 2.0 license. If you would like to contr
== Code of Conduct
This project adheres to the Contributor Covenant link:CODE_OF_CONDUCT.adoc[code of conduct].
-By participating, you are expected to uphold this code. Please report unacceptable behavior to spring-code-of-conduct@pivotal.io.
+By participating, you are expected to uphold this code. Please report unacceptable behavior to code-of-conduct@spring.io.
diff --git a/buildSrc/src/main/java/org/springframework/boot/build/MavenPublishingConventions.java b/buildSrc/src/main/java/org/springframework/boot/build/MavenPublishingConventions.java
index 711b733607..7ff8d9fb93 100644
--- a/buildSrc/src/main/java/org/springframework/boot/build/MavenPublishingConventions.java
+++ b/buildSrc/src/main/java/org/springframework/boot/build/MavenPublishingConventions.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2012-2022 the original author or authors.
+ * Copyright 2012-2023 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.
@@ -129,7 +129,7 @@ class MavenPublishingConventions {
}
private void customizeOrganization(MavenPomOrganization organization) {
- organization.getName().set("Pivotal Software, Inc.");
+ organization.getName().set("VMware, Inc.");
organization.getUrl().set("https://spring.io");
}
@@ -142,9 +142,9 @@ class MavenPublishingConventions {
private void customizeDevelopers(MavenPomDeveloperSpec developers) {
developers.developer((developer) -> {
- developer.getName().set("Pivotal");
- developer.getEmail().set("info@pivotal.io");
- developer.getOrganization().set("Pivotal Software, Inc.");
+ developer.getName().set("Spring");
+ developer.getEmail().set("ask@spring.io");
+ developer.getOrganization().set("VMware, Inc.");
developer.getOrganizationUrl().set("https://www.spring.io");
});
}
diff --git a/buildSrc/src/main/resources/NOTICE.txt b/buildSrc/src/main/resources/NOTICE.txt
index 8aff84e68e..412d9807a7 100644
--- a/buildSrc/src/main/resources/NOTICE.txt
+++ b/buildSrc/src/main/resources/NOTICE.txt
@@ -1,5 +1,5 @@
Spring Boot ${version}
-Copyright (c) 2012-2023 Pivotal, Inc.
+Copyright (c) 2012-2023 VMware, Inc.
This product is licensed to you under the Apache License, Version 2.0
(the "License"). You may not use this product except in compliance with
diff --git a/ci/images/releasescripts/src/test/resources/io/spring/concourse/releasescripts/sonatype/artifactory-repo/org/springframework/example/module-one/1.0.0/module-one-1.0.0.pom b/ci/images/releasescripts/src/test/resources/io/spring/concourse/releasescripts/sonatype/artifactory-repo/org/springframework/example/module-one/1.0.0/module-one-1.0.0.pom
index cd3ade53cf..d618d6e120 100644
--- a/ci/images/releasescripts/src/test/resources/io/spring/concourse/releasescripts/sonatype/artifactory-repo/org/springframework/example/module-one/1.0.0/module-one-1.0.0.pom
+++ b/ci/images/releasescripts/src/test/resources/io/spring/concourse/releasescripts/sonatype/artifactory-repo/org/springframework/example/module-one/1.0.0/module-one-1.0.0.pom
@@ -14,7 +14,7 @@
Example module
https://spring.io/projects/spring-boot
- Pivotal Software, Inc.
+ Spring
https://spring.io
@@ -25,9 +25,9 @@
- Pivotal
- info@pivotal.io
- Pivotal Software, Inc.
+ Spring
+ ask@spring.io
+ Spring
https://www.spring.io
diff --git a/ci/images/releasescripts/src/test/resources/io/spring/concourse/releasescripts/sonatype/artifactory-repo/org/springframework/example/module-three/1.0.0/module-three-1.0.0.pom b/ci/images/releasescripts/src/test/resources/io/spring/concourse/releasescripts/sonatype/artifactory-repo/org/springframework/example/module-three/1.0.0/module-three-1.0.0.pom
index d67dcd644a..badff025f6 100644
--- a/ci/images/releasescripts/src/test/resources/io/spring/concourse/releasescripts/sonatype/artifactory-repo/org/springframework/example/module-three/1.0.0/module-three-1.0.0.pom
+++ b/ci/images/releasescripts/src/test/resources/io/spring/concourse/releasescripts/sonatype/artifactory-repo/org/springframework/example/module-three/1.0.0/module-three-1.0.0.pom
@@ -14,7 +14,7 @@
Example module
https://spring.io/projects/spring-boot
- Pivotal Software, Inc.
+ Spring
https://spring.io
@@ -25,9 +25,9 @@
- Pivotal
- info@pivotal.io
- Pivotal Software, Inc.
+ Spring
+ ask@spring.io
+ Spring
https://www.spring.io
@@ -45,5 +45,5 @@
https://github.com/spring-projects/spring-boot/issues
-
+
diff --git a/ci/images/releasescripts/src/test/resources/io/spring/concourse/releasescripts/sonatype/artifactory-repo/org/springframework/example/module-two/1.0.0/module-two-1.0.0.pom b/ci/images/releasescripts/src/test/resources/io/spring/concourse/releasescripts/sonatype/artifactory-repo/org/springframework/example/module-two/1.0.0/module-two-1.0.0.pom
index b8ef79e38c..31433f6293 100644
--- a/ci/images/releasescripts/src/test/resources/io/spring/concourse/releasescripts/sonatype/artifactory-repo/org/springframework/example/module-two/1.0.0/module-two-1.0.0.pom
+++ b/ci/images/releasescripts/src/test/resources/io/spring/concourse/releasescripts/sonatype/artifactory-repo/org/springframework/example/module-two/1.0.0/module-two-1.0.0.pom
@@ -14,7 +14,7 @@
Example module
https://spring.io/projects/spring-boot
- Pivotal Software, Inc.
+ Spring
https://spring.io
@@ -25,9 +25,9 @@
- Pivotal
- info@pivotal.io
- Pivotal Software, Inc.
+ Spring
+ ask@spring.io
+ Spring
https://www.spring.io
@@ -45,5 +45,5 @@
https://github.com/spring-projects/spring-boot/issues
-
+
diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/ldap/embedded/EmbeddedLdapAutoConfigurationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/ldap/embedded/EmbeddedLdapAutoConfigurationTests.java
index dc3d02c6f9..8a5e571a4c 100644
--- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/ldap/embedded/EmbeddedLdapAutoConfigurationTests.java
+++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/ldap/embedded/EmbeddedLdapAutoConfigurationTests.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2012-2020 the original author or authors.
+ * Copyright 2012-2023 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.
@@ -141,11 +141,11 @@ class EmbeddedLdapAutoConfigurationTests {
@Test
void testMultiBaseDn() {
this.contextRunner.withPropertyValues("spring.ldap.embedded.ldif:classpath:schema-multi-basedn.ldif",
- "spring.ldap.embedded.base-dn[0]:dc=spring,dc=org", "spring.ldap.embedded.base-dn[1]:dc=pivotal,dc=io")
+ "spring.ldap.embedded.base-dn[0]:dc=spring,dc=org", "spring.ldap.embedded.base-dn[1]:dc=vmware,dc=com")
.run((context) -> {
InMemoryDirectoryServer server = context.getBean(InMemoryDirectoryServer.class);
assertThat(server.countEntriesBelow("ou=company1,c=Sweden,dc=spring,dc=org")).isEqualTo(5);
- assertThat(server.countEntriesBelow("c=Sweden,dc=pivotal,dc=io")).isEqualTo(2);
+ assertThat(server.countEntriesBelow("c=Sweden,dc=vmware,dc=com")).isEqualTo(2);
});
}
diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/resources/schema-multi-basedn.ldif b/spring-boot-project/spring-boot-autoconfigure/src/test/resources/schema-multi-basedn.ldif
index 1bf396af5b..42380080c9 100644
--- a/spring-boot-project/spring-boot-autoconfigure/src/test/resources/schema-multi-basedn.ldif
+++ b/spring-boot-project/spring-boot-autoconfigure/src/test/resources/schema-multi-basedn.ldif
@@ -84,24 +84,24 @@ sn: Person
description: Sweden, Company1, Some Person
telephoneNumber: +46 555-456321
-dn: dc=pivotal,dc=io
+dn: dc=vmware,dc=com
objectclass: top
objectclass: domain
objectclass: extensibleObject
-dc: pivotal
+dc: vmware
-dn: ou=groups,dc=pivotal,dc=io
+dn: ou=groups,dc=vmware,dc=com
objectclass: top
objectclass: organizationalUnit
ou: groups
-dn: c=Sweden,dc=pivotal,dc=io
+dn: c=Sweden,dc=vmware,dc=com
objectclass: top
objectclass: country
c: Sweden
description:The country of Sweden
-dn: cn=Some Random Person,c=Sweden,dc=pivotal,dc=io
+dn: cn=Some Random Person,c=Sweden,dc=vmware,dc=com
objectclass: top
objectclass: person
objectclass: organizationalPerson
@@ -110,5 +110,5 @@ uid: some.random.person
userPassword: password
cn: Some Random Person
sn: Person
-description: Sweden, Pivotal, Some Random Person
+description: Sweden, VMware, Some Random Person
telephoneNumber: +46 555-123456
diff --git a/spring-boot-project/spring-boot-cli/src/main/content/legal/open_source_licenses.txt b/spring-boot-project/spring-boot-cli/src/main/content/legal/open_source_licenses.txt
index 82ae3dbe2a..e12c09dd35 100644
--- a/spring-boot-project/spring-boot-cli/src/main/content/legal/open_source_licenses.txt
+++ b/spring-boot-project/spring-boot-cli/src/main/content/legal/open_source_licenses.txt
@@ -3,7 +3,7 @@ open_source_licenses.txt
Spring Boot CLI
==================================================================
-Pivotal makes available all content in this download ("Content").
+VMware makes available all content in this download ("Content").
Unless otherwise indicated below, the Content is provided to you under
the terms and conditions of the Apache License 2.0 (the "License"). A
copy of the license is available in the file called LICENSE.txt or you
@@ -249,11 +249,11 @@ components and modifications thereto, if any, (the "Source Files"), by
downloading the Source Files from https://github.com/spring-projects/spring-boot,
or by sending a request, with your name and address to:
- Pivotal, Inc., 875 Howard St,
+ VMware, Inc., 875 Howard St,
San Francisco, CA 94103
United States of America
-or email info@pivotal.io. All such requests should clearly specify:
+or email ask@spring.io. All such requests should clearly specify:
OPEN SOURCE FILES REQUEST
Attention General Counsel
diff --git a/spring-boot-project/spring-boot-docs/src/docs/asciidoc/data/nosql.adoc b/spring-boot-project/spring-boot-docs/src/docs/asciidoc/data/nosql.adoc
index fceb3cbb3d..d9724f7ca9 100644
--- a/spring-boot-project/spring-boot-docs/src/docs/asciidoc/data/nosql.adoc
+++ b/spring-boot-project/spring-boot-docs/src/docs/asciidoc/data/nosql.adoc
@@ -568,7 +568,7 @@ In yaml files, you can use the yaml list notation. In properties files, you must
----
spring.ldap.embedded.base-dn:
- "dc=spring,dc=io"
- - "dc=pivotal,dc=io"
+ - "dc=vmware,dc=com"
----
====
diff --git a/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/maven/resources/pom.xml b/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/maven/resources/pom.xml
index 559dd6235e..d25d11fce4 100644
--- a/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/maven/resources/pom.xml
+++ b/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/maven/resources/pom.xml
@@ -27,7 +27,7 @@
https://github.com/spring-projects/spring-boot/issues
- Pivotal Software, Inc.
+ Spring
https://spring.io